From 44413454c857e018f809034f3ad868ed7d4ac560 Mon Sep 17 00:00:00 2001 From: Jeremiah Winsley Date: Wed, 1 Dec 2021 00:46:29 -0500 Subject: [PATCH] Update to 1.18 --- .github/workflows/gradle.yml | 5 +- .github/workflows/release.yml | 7 +- build.gradle | 59 ++-- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 257 +++++++++++------- .../tags/blocks/mineable/pickaxe.json | 7 + .../recipes/pylons/clear_player_filter.json | 4 +- .../recipes/pylons/clear_potion_filter.json | 4 +- .../recipes/pylons/expulsion_pylon.json | 4 +- .../recipes/pylons/infusion_pylon.json | 4 +- .../recipes/pylons/player_filter.json | 4 +- .../recipes/pylons/potion_filter.json | 4 +- .../loot_tables/blocks/expulsion_pylon.json | 3 +- .../loot_tables/blocks/infusion_pylon.json | 3 +- .../net/permutated/pylons/ModRegistry.java | 53 ++-- .../pylons/block/AbstractPylonBlock.java | 138 +++++----- .../pylons/block/ExpulsionPylonBlock.java | 30 +- .../pylons/block/InfusionPylonBlock.java | 30 +- .../permutated/pylons/block/package-info.java | 2 +- .../permutated/pylons/client/ClientSetup.java | 6 +- .../client/gui/AbstractPylonScreen.java | 44 ++- .../client/gui/ExpulsionPylonScreen.java | 14 +- .../client/gui/InfusionPylonScreen.java | 10 +- .../pylons/client/gui/package-info.java | 2 +- .../pylons/data/DataGenerators.java | 5 +- .../pylons/data/client/BlockStates.java | 6 +- .../pylons/data/client/ItemModels.java | 8 +- .../pylons/data/client/package-info.java | 2 +- .../permutated/pylons/data/package-info.java | 2 +- .../pylons/data/server/BlockLoot.java | 56 ++++ .../pylons/data/server/BlockTags.java | 25 ++ .../pylons/data/server/CraftingRecipes.java | 13 +- .../pylons/data/server/LootTables.java | 54 ---- .../pylons/data/server/package-info.java | 2 +- .../container/AbstractPylonContainer.java | 38 +-- .../container/ExpulsionPylonContainer.java | 10 +- .../container/InfusionPylonContainer.java | 10 +- .../inventory/container/package-info.java | 2 +- .../pylons/item/PlayerFilterCard.java | 52 ++-- .../pylons/item/PotionFilterCard.java | 93 ++++--- .../permutated/pylons/item/package-info.java | 2 +- .../pylons/recipe/AbstractPylonRecipe.java | 24 +- .../pylons/recipe/package-info.java | 2 +- .../pylons/tile/AbstractPylonTile.java | 119 +++----- .../pylons/tile/ExpulsionPylonTile.java | 107 ++++---- .../pylons/tile/InfusionPylonTile.java | 26 +- .../permutated/pylons/tile/package-info.java | 2 +- .../permutated/pylons/util/ResourceUtil.java | 14 +- .../permutated/pylons/util/package-info.java | 2 +- src/main/resources/META-INF/mods.toml | 6 +- src/main/resources/pack.mcmeta | 3 +- 53 files changed, 741 insertions(+), 642 deletions(-) create mode 100644 src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json create mode 100644 src/main/java/net/permutated/pylons/data/server/BlockLoot.java create mode 100644 src/main/java/net/permutated/pylons/data/server/BlockTags.java delete mode 100644 src/main/java/net/permutated/pylons/data/server/LootTables.java diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 6bf5c41..5c2cab7 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -17,9 +17,10 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: - java-version: 11 + distribution: 'zulu' + java-version: '17' - name: Cache Gradle packages uses: actions/cache@v2 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a07558e..471e8d4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,10 +12,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - name: Set up JDK 17 + uses: actions/setup-java@v2 with: - java-version: 11 + distribution: 'zulu' + java-version: '17' - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle diff --git a/build.gradle b/build.gradle index 632ecfc..16f3f01 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,6 @@ buildscript { repositories { + // These repositories are only for Gradle plugins, put any other repositories in the repository block further below maven { url = 'https://maven.minecraftforge.net' } mavenCentral() } @@ -12,12 +13,12 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'maven-publish' -java.toolchain.languageVersion = JavaLanguageVersion.of(8) // Mojang ships Java 8 to end users, so your mod should target Java 8. - +// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. +java.toolchain.languageVersion = JavaLanguageVersion.of(17) println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) minecraft { - // The mappings can be changed at any time, and must be in the following format. + // The mappings can be changed at any time and must be in the following format. // Channel: Version: // snapshot YYYYMMDD Snapshot are built nightly. // stable # Stables are built at the discretion of the MCP team. @@ -26,12 +27,11 @@ minecraft { // You must be aware of the Mojang license when using the 'official' mappings. // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md // - // Use non-default mappings at your own risk. they may not always work. + // Use non-default mappings at your own risk. They may not always work. // Simply re-run your setup task after changing the mappings to update your workspace. - mappings channel: 'official', version: '1.16.5' - // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. + mappings channel: 'official', version: '1.18' - // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') + // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default. // Default run configurations. // These can be tweaked, removed, or duplicated as needed. @@ -40,7 +40,7 @@ minecraft { workingDirectory project.file('run') // Recommended logging data for a userdev environment - // The markers can be changed as needed. + // The markers can be added/remove as needed separated by commas. // "SCAN": For mods scan. // "REGISTRIES": For firing of registry events. // "REGISTRYDUMP": For getting the contents of all registries. @@ -62,7 +62,7 @@ minecraft { workingDirectory project.file('run') // Recommended logging data for a userdev environment - // The markers can be changed as needed. + // The markers can be added/remove as needed separated by commas. // "SCAN": For mods scan. // "REGISTRIES": For firing of registry events. // "REGISTRYDUMP": For getting the contents of all registries. @@ -84,7 +84,7 @@ minecraft { workingDirectory project.file('run') // Recommended logging data for a userdev environment - // The markers can be changed as needed. + // The markers can be added/remove as needed separated by commas. // "SCAN": For mods scan. // "REGISTRIES": For firing of registry events. // "REGISTRYDUMP": For getting the contents of all registries. @@ -120,26 +120,12 @@ repositories { } dependencies { - // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed - // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. + // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed + // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied. // The userdev artifact is a special name and will get all sorts of transformations applied to it. - minecraft 'net.minecraftforge:forge:1.16.5-36.2.0' - - // You may put jars on which you depend on in ./libs or you may define them like so.. - // compile "some.group:artifact:version:classifier" - // compile "some.group:artifact:version" - - runtimeOnly fg.deobf("curse.maven:jei-238222:3414898") - - // Real examples - // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env - // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env - - // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. - // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' + minecraft 'net.minecraftforge:forge:1.18-38.0.4' - // These dependencies get remapped to your current MCP mappings - // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev' +// runtimeOnly fg.deobf("curse.maven:jei-238222:3414898") // For more info... // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html @@ -150,22 +136,21 @@ dependencies { jar { manifest { attributes([ - "Specification-Title": mod_id, - "Specification-Vendor": group, - "Specification-Version": "1", - "Implementation-Title": "Pylons", - "Implementation-Version": "${project.version}", - "Implementation-Vendor" :"Jeremiah Winsley", + "Specification-Title" : mod_id, + "Specification-Vendor" : group, + "Specification-Version" : "1", // We are version 1 of ourselves + "Implementation-Title" : project.name, + "Implementation-Version" : project.jar.archiveVersion, "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), ]) } } -// Example configuration to allow publishing using the maven-publish task +// Example configuration to allow publishing using the maven-publish plugin // This is the preferred method to reobfuscate your jar file jar.finalizedBy('reobfJar') // However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing -//publish.dependsOn('reobfJar') +// publish.dependsOn('reobfJar') publishing { publications { @@ -175,7 +160,7 @@ publishing { } repositories { maven { - url "file:///${project.projectDir}/mcmodsrepo" + url "file://${project.projectDir}/mcmodsrepo" } } } diff --git a/gradle.properties b/gradle.properties index 1cc2b71..cf53283 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,4 +5,4 @@ org.gradle.daemon=false group=net.permutated mod_id=pylons -version=1.0.4 +version=2.0.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18435 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 B8dv}T delta 17845 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 X49Luk)baa85H9$5YCsTPT`SVRWMtMW diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 05679dc..e750102 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..c53aefa 100644 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json new file mode 100644 index 0000000..c8e2236 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "pylons:expulsion_pylon", + "pylons:infusion_pylon" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/pylons/advancements/recipes/pylons/clear_player_filter.json b/src/generated/resources/data/pylons/advancements/recipes/pylons/clear_player_filter.json index 0d2cd89..38adb10 100644 --- a/src/generated/resources/data/pylons/advancements/recipes/pylons/clear_player_filter.json +++ b/src/generated/resources/data/pylons/advancements/recipes/pylons/clear_player_filter.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "pylons:player_filter" + "items": [ + "pylons:player_filter" + ] } ] } diff --git a/src/generated/resources/data/pylons/advancements/recipes/pylons/clear_potion_filter.json b/src/generated/resources/data/pylons/advancements/recipes/pylons/clear_potion_filter.json index c02ab5b..9c0b8b4 100644 --- a/src/generated/resources/data/pylons/advancements/recipes/pylons/clear_potion_filter.json +++ b/src/generated/resources/data/pylons/advancements/recipes/pylons/clear_potion_filter.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "pylons:potion_filter" + "items": [ + "pylons:potion_filter" + ] } ] } diff --git a/src/generated/resources/data/pylons/advancements/recipes/pylons/expulsion_pylon.json b/src/generated/resources/data/pylons/advancements/recipes/pylons/expulsion_pylon.json index b733103..e3057fd 100644 --- a/src/generated/resources/data/pylons/advancements/recipes/pylons/expulsion_pylon.json +++ b/src/generated/resources/data/pylons/advancements/recipes/pylons/expulsion_pylon.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "minecraft:diamond_block" + "items": [ + "minecraft:diamond_block" + ] } ] } diff --git a/src/generated/resources/data/pylons/advancements/recipes/pylons/infusion_pylon.json b/src/generated/resources/data/pylons/advancements/recipes/pylons/infusion_pylon.json index dd76889..6fbafb8 100644 --- a/src/generated/resources/data/pylons/advancements/recipes/pylons/infusion_pylon.json +++ b/src/generated/resources/data/pylons/advancements/recipes/pylons/infusion_pylon.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "minecraft:emerald_block" + "items": [ + "minecraft:emerald_block" + ] } ] } diff --git a/src/generated/resources/data/pylons/advancements/recipes/pylons/player_filter.json b/src/generated/resources/data/pylons/advancements/recipes/pylons/player_filter.json index a8f16b4..a0e36b9 100644 --- a/src/generated/resources/data/pylons/advancements/recipes/pylons/player_filter.json +++ b/src/generated/resources/data/pylons/advancements/recipes/pylons/player_filter.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "pylons:expulsion_pylon" + "items": [ + "pylons:expulsion_pylon" + ] } ] } diff --git a/src/generated/resources/data/pylons/advancements/recipes/pylons/potion_filter.json b/src/generated/resources/data/pylons/advancements/recipes/pylons/potion_filter.json index bce525f..5bd21b6 100644 --- a/src/generated/resources/data/pylons/advancements/recipes/pylons/potion_filter.json +++ b/src/generated/resources/data/pylons/advancements/recipes/pylons/potion_filter.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "item": "pylons:infusion_pylon" + "items": [ + "pylons:infusion_pylon" + ] } ] } diff --git a/src/generated/resources/data/pylons/loot_tables/blocks/expulsion_pylon.json b/src/generated/resources/data/pylons/loot_tables/blocks/expulsion_pylon.json index 15f292e..8bf24de 100644 --- a/src/generated/resources/data/pylons/loot_tables/blocks/expulsion_pylon.json +++ b/src/generated/resources/data/pylons/loot_tables/blocks/expulsion_pylon.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/src/generated/resources/data/pylons/loot_tables/blocks/infusion_pylon.json b/src/generated/resources/data/pylons/loot_tables/blocks/infusion_pylon.json index c049f49..d26eff0 100644 --- a/src/generated/resources/data/pylons/loot_tables/blocks/infusion_pylon.json +++ b/src/generated/resources/data/pylons/loot_tables/blocks/infusion_pylon.json @@ -2,7 +2,8 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, + "rolls": 1.0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", diff --git a/src/main/java/net/permutated/pylons/ModRegistry.java b/src/main/java/net/permutated/pylons/ModRegistry.java index 1bb9935..96d24bb 100644 --- a/src/main/java/net/permutated/pylons/ModRegistry.java +++ b/src/main/java/net/permutated/pylons/ModRegistry.java @@ -3,21 +3,22 @@ import com.mojang.datafixers.types.Type; import com.mojang.datafixers.types.constant.EmptyPart; import com.mojang.datafixers.util.Unit; -import net.minecraft.block.Block; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.container.ContainerType; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntityType; -import net.minecraftforge.common.extensions.IForgeContainerType; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.MenuType; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.entity.BlockEntityType.BlockEntitySupplier; +import net.minecraftforge.common.extensions.IForgeMenuType; import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.fml.RegistryObject; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.fml.network.IContainerFactory; +import net.minecraftforge.network.IContainerFactory; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; import net.permutated.pylons.block.ExpulsionPylonBlock; import net.permutated.pylons.block.InfusionPylonBlock; import net.permutated.pylons.inventory.container.ExpulsionPylonContainer; @@ -39,11 +40,11 @@ private ModRegistry() { public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, Pylons.MODID); public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, Pylons.MODID); - public static final DeferredRegister> TILES = DeferredRegister.create(ForgeRegistries.TILE_ENTITIES, Pylons.MODID); - public static final DeferredRegister> CONTAINERS = DeferredRegister.create(ForgeRegistries.CONTAINERS, Pylons.MODID); + public static final DeferredRegister> TILES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, Pylons.MODID); + public static final DeferredRegister> CONTAINERS = DeferredRegister.create(ForgeRegistries.CONTAINERS, Pylons.MODID); - public static final ItemGroup CREATIVE_TAB = new ModItemGroup(Pylons.MODID, + public static final CreativeModeTab CREATIVE_TAB = new ModItemGroup(Pylons.MODID, () -> new ItemStack(ModRegistry.PLAYER_FILTER.get())); // Items @@ -59,12 +60,12 @@ private ModRegistry() { public static final RegistryObject INFUSION_PYLON_ITEM = blockItem(INFUSION_PYLON); // Tiles - public static final RegistryObject> EXPULSION_PYLON_TILE = tile(EXPULSION_PYLON, ExpulsionPylonTile::new); - public static final RegistryObject> INFUSION_PYLON_TILE = tile(INFUSION_PYLON, InfusionPylonTile::new); + public static final RegistryObject> EXPULSION_PYLON_TILE = blockEntity(EXPULSION_PYLON, ExpulsionPylonTile::new); + public static final RegistryObject> INFUSION_PYLON_TILE = blockEntity(INFUSION_PYLON, InfusionPylonTile::new); // Containers - public static final RegistryObject> EXPULSION_PYLON_CONTAINER = container(Constants.EXPULSION_PYLON, ExpulsionPylonContainer::new); - public static final RegistryObject> INFUSION_PYLON_CONTAINER = container(Constants.INFUSION_PYLON, InfusionPylonContainer::new); + public static final RegistryObject> EXPULSION_PYLON_CONTAINER = container(Constants.EXPULSION_PYLON, ExpulsionPylonContainer::new); + public static final RegistryObject> INFUSION_PYLON_CONTAINER = container(Constants.INFUSION_PYLON, InfusionPylonContainer::new); /** * Register a BlockItem for a Block @@ -90,8 +91,8 @@ private static RegistryObject material(String path) { /** * Used as a NOOP type for the tile registry builder to avoid passing null * - * @see TileEntityType.Builder#build(Type) - * @see #tile(RegistryObject, Supplier) + * @see BlockEntityType.Builder#build(Type) + * @see #blockEntity(RegistryObject, BlockEntitySupplier) */ private static final Type EMPTY_PART = new EmptyPart(); @@ -99,16 +100,16 @@ private static RegistryObject material(String path) { * Register a tile entity for a Block * * @param registryObject a registry object containing a Block - * @param supplier a Supplier that returns the new Tile Entity + * @param supplier a Supplier that returns the new Block Entity * @return the new registry object */ - private static RegistryObject> tile(RegistryObject registryObject, Supplier supplier) { + private static RegistryObject> blockEntity(RegistryObject registryObject, BlockEntitySupplier supplier) { return TILES.register(registryObject.getId().getPath(), - () -> TileEntityType.Builder.of(supplier, registryObject.get()).build(EMPTY_PART)); + () -> BlockEntityType.Builder.of(supplier, registryObject.get()).build(EMPTY_PART)); } - private static RegistryObject> container(String path, IContainerFactory supplier) { - return CONTAINERS.register(path, () -> IForgeContainerType.create(supplier)); + private static RegistryObject> container(String path, IContainerFactory supplier) { + return CONTAINERS.register(path, () -> IForgeMenuType.create(supplier)); } public static void register() { @@ -119,7 +120,7 @@ public static void register() { CONTAINERS.register(bus); } - public static final class ModItemGroup extends ItemGroup { + public static final class ModItemGroup extends CreativeModeTab { private final Supplier iconSupplier; public ModItemGroup(final String name, final Supplier iconSupplier) { diff --git a/src/main/java/net/permutated/pylons/block/AbstractPylonBlock.java b/src/main/java/net/permutated/pylons/block/AbstractPylonBlock.java index 2af20f9..a9e5e3a 100644 --- a/src/main/java/net/permutated/pylons/block/AbstractPylonBlock.java +++ b/src/main/java/net/permutated/pylons/block/AbstractPylonBlock.java @@ -1,36 +1,38 @@ package net.permutated.pylons.block; import io.netty.buffer.Unpooled; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.material.Material; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.container.INamedContainerProvider; -import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.shapes.ISelectionContext; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; -import net.minecraft.util.text.IFormattableTextComponent; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; -import net.minecraft.world.World; -import net.minecraftforge.common.ToolType; +import net.minecraft.ChatFormatting; +import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.MenuProvider; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.EntityBlock; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.material.Material; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.Shapes; +import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.event.world.BlockEvent; -import net.minecraftforge.fml.network.IContainerFactory; -import net.minecraftforge.fml.network.NetworkHooks; +import net.minecraftforge.network.IContainerFactory; +import net.minecraftforge.network.NetworkHooks; import net.permutated.pylons.Pylons; import net.permutated.pylons.inventory.container.AbstractPylonContainer; import net.permutated.pylons.tile.AbstractPylonTile; @@ -39,46 +41,45 @@ import javax.annotation.Nullable; import java.util.Optional; -public abstract class AbstractPylonBlock extends Block { - private static final VoxelShape SHAPE = VoxelShapes.or( +public abstract class AbstractPylonBlock extends Block implements EntityBlock { + private static final VoxelShape SHAPE = Shapes.or( Block.box(0.0D, 0.0D, 0.0D, 16.0D, 3.0D, 16.0D), Block.box(1.0D, 3.0D, 1.0D, 15.0D, 16.0D, 15.0D) ); protected AbstractPylonBlock() { - super(Properties.of(Material.METAL).harvestTool(ToolType.PICKAXE).strength(2F, 1200F)); + super(Properties.of(Material.METAL).strength(2F, 1200F)); } @Override @SuppressWarnings("java:S1874") // deprecated - public VoxelShape getShape(BlockState blockState, IBlockReader reader, BlockPos pos, ISelectionContext context) { + public VoxelShape getShape(BlockState blockState, BlockGetter reader, BlockPos pos, CollisionContext context) { return SHAPE; } - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } + public abstract IContainerFactory containerFactory(); - @Override - @SuppressWarnings("java:S3038") // method is required here to override default from IForgeBlock - public abstract TileEntity createTileEntity(BlockState state, IBlockReader world); + @SuppressWarnings("java:S1452") // wildcard required here + public abstract BlockEntityType getTileType(); - public abstract IContainerFactory containerFactory(); + @Nullable + @Override + public BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { + return type == getTileType() ? AbstractPylonTile::tick : null; + } @Override - public void setPlacedBy(World level, BlockPos blockPos, BlockState blockState, @Nullable LivingEntity entity, ItemStack itemStack) { - if (!level.isClientSide && entity instanceof PlayerEntity) { - TileEntity tileEntity = level.getBlockEntity(blockPos); - if (tileEntity instanceof AbstractPylonTile) { - AbstractPylonTile pylonTile = (AbstractPylonTile) tileEntity; + public void setPlacedBy(Level level, BlockPos blockPos, BlockState blockState, @Nullable LivingEntity entity, ItemStack itemStack) { + if (!level.isClientSide && entity instanceof Player) { + BlockEntity tileEntity = level.getBlockEntity(blockPos); + if (tileEntity instanceof AbstractPylonTile pylonTile) { pylonTile.setOwner(entity.getUUID()); } } } @Override - public void destroy(IWorld world, BlockPos blockPos, BlockState blockState) { + public void destroy(LevelAccessor world, BlockPos blockPos, BlockState blockState) { Optional.ofNullable(world.getBlockEntity(blockPos)) .map(AbstractPylonTile.class::cast) .ifPresent(AbstractPylonTile::dropItems); @@ -96,10 +97,9 @@ public static void onBlockBreakEvent(BlockEvent.BreakEvent event) { } if (event.getState().getBlock() instanceof AbstractPylonBlock) { - TileEntity tileEntity = event.getWorld().getBlockEntity(event.getPos()); + BlockEntity tileEntity = event.getWorld().getBlockEntity(event.getPos()); - if (tileEntity instanceof AbstractPylonTile) { - AbstractPylonTile pylonTile = (AbstractPylonTile) tileEntity; + if (tileEntity instanceof AbstractPylonTile pylonTile) { if (!event.getPlayer().getUUID().equals(pylonTile.getOwner())) { event.setCanceled(true); } @@ -110,14 +110,14 @@ public static void onBlockBreakEvent(BlockEvent.BreakEvent event) { @Override @SuppressWarnings("java:S1874") // deprecated method from super class - public void onRemove(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) + public void onRemove(BlockState state, Level worldIn, BlockPos pos, BlockState newState, boolean isMoving) { if (!state.is(newState.getBlock())) { - TileEntity tileentity = worldIn.getBlockEntity(pos); - if (tileentity instanceof AbstractPylonTile) + BlockEntity tileentity = worldIn.getBlockEntity(pos); + if (tileentity instanceof AbstractPylonTile pylonTile) { - ((AbstractPylonTile) tileentity).dropItems(); + pylonTile.dropItems(); worldIn.updateNeighbourForOutputSignal(pos, this); } @@ -127,41 +127,39 @@ public void onRemove(BlockState state, World worldIn, BlockPos pos, BlockState n @Override @SuppressWarnings("java:S1874") // deprecated method from super class - public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult blockRayTraceResult) + public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult blockRayTraceResult) { if (!world.isClientSide) { - TileEntity tileEntity = world.getBlockEntity(pos); - if (tileEntity instanceof AbstractPylonTile) { - AbstractPylonTile pylonTile = (AbstractPylonTile) tileEntity; - - INamedContainerProvider containerProvider = new INamedContainerProvider() { + BlockEntity tileEntity = world.getBlockEntity(pos); + if (tileEntity instanceof AbstractPylonTile pylonTile) { + MenuProvider containerProvider = new MenuProvider() { @Override - public ITextComponent getDisplayName() { - return new TranslationTextComponent(getDescriptionId()); + public Component getDisplayName() { + return new TranslatableComponent(getDescriptionId()); } @Override - public Container createMenu(int i, PlayerInventory playerInventory, PlayerEntity playerEntity) { - PacketBuffer buffer = new PacketBuffer(Unpooled.buffer()); + public AbstractContainerMenu createMenu(int i, Inventory playerInventory, Player playerEntity) { + FriendlyByteBuf buffer = new FriendlyByteBuf(Unpooled.buffer()); pylonTile.updateContainer(buffer); return containerFactory().create(i, playerInventory, buffer); } }; if (player.getUUID().equals(pylonTile.getOwner()) || player.hasPermissions(2)) { - NetworkHooks.openGui((ServerPlayerEntity) player, containerProvider, pylonTile::updateContainer); + NetworkHooks.openGui((ServerPlayer) player, containerProvider, pylonTile::updateContainer); } else { - return ActionResultType.FAIL; + return InteractionResult.FAIL; } } else { Pylons.LOGGER.error("tile entity not instance of AbstractPylonTile"); - return ActionResultType.FAIL; + return InteractionResult.FAIL; } } - return ActionResultType.SUCCESS; + return InteractionResult.SUCCESS; } - protected IFormattableTextComponent translate(String key) { - return new TranslationTextComponent(TranslationKey.tooltip(key)).withStyle(TextFormatting.GRAY); + protected MutableComponent translate(String key) { + return new TranslatableComponent(TranslationKey.tooltip(key)).withStyle(ChatFormatting.GRAY); } } diff --git a/src/main/java/net/permutated/pylons/block/ExpulsionPylonBlock.java b/src/main/java/net/permutated/pylons/block/ExpulsionPylonBlock.java index ebf2012..1864efe 100644 --- a/src/main/java/net/permutated/pylons/block/ExpulsionPylonBlock.java +++ b/src/main/java/net/permutated/pylons/block/ExpulsionPylonBlock.java @@ -1,23 +1,33 @@ package net.permutated.pylons.block; -import net.minecraft.block.BlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.IBlockReader; -import net.minecraftforge.fml.network.IContainerFactory; +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraftforge.network.IContainerFactory; +import net.permutated.pylons.ModRegistry; import net.permutated.pylons.inventory.container.AbstractPylonContainer; import net.permutated.pylons.inventory.container.ExpulsionPylonContainer; +import net.permutated.pylons.tile.AbstractPylonTile; import net.permutated.pylons.tile.ExpulsionPylonTile; import javax.annotation.Nullable; import java.util.List; public class ExpulsionPylonBlock extends AbstractPylonBlock { + @Nullable @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) { - return new ExpulsionPylonTile(); + public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { + return new ExpulsionPylonTile(pos, state); + } + + @Override + public BlockEntityType getTileType() { + return ModRegistry.EXPULSION_PYLON_TILE.get(); } @Override @@ -27,7 +37,7 @@ public IContainerFactory containerFactory() { @Override - public void appendHoverText(ItemStack stack, @Nullable IBlockReader reader, List tooltip, ITooltipFlag flagIn) { + public void appendHoverText(ItemStack stack, @Nullable BlockGetter reader, List tooltip, TooltipFlag flagIn) { super.appendHoverText(stack, reader, tooltip, flagIn); tooltip.add(translate("expulsion1")); diff --git a/src/main/java/net/permutated/pylons/block/InfusionPylonBlock.java b/src/main/java/net/permutated/pylons/block/InfusionPylonBlock.java index 7f6fc14..c17801c 100644 --- a/src/main/java/net/permutated/pylons/block/InfusionPylonBlock.java +++ b/src/main/java/net/permutated/pylons/block/InfusionPylonBlock.java @@ -1,24 +1,34 @@ package net.permutated.pylons.block; -import net.minecraft.block.BlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.IBlockReader; -import net.minecraftforge.fml.network.IContainerFactory; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.network.chat.Component; +import net.minecraft.world.level.BlockGetter; +import net.minecraftforge.network.IContainerFactory; +import net.permutated.pylons.ModRegistry; import net.permutated.pylons.inventory.container.AbstractPylonContainer; import net.permutated.pylons.inventory.container.InfusionPylonContainer; +import net.permutated.pylons.tile.AbstractPylonTile; import net.permutated.pylons.tile.InfusionPylonTile; import javax.annotation.Nullable; import java.util.List; public class InfusionPylonBlock extends AbstractPylonBlock { + @Nullable @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) { - return new InfusionPylonTile(); + public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { + return new InfusionPylonTile(pos, state); + } + + @Override + public BlockEntityType getTileType() { + return ModRegistry.INFUSION_PYLON_TILE.get(); } @Override @@ -27,7 +37,7 @@ public IContainerFactory containerFactory() { } @Override - public void appendHoverText(ItemStack stack, @Nullable IBlockReader reader, List tooltip, ITooltipFlag flagIn) { + public void appendHoverText(ItemStack stack, @Nullable BlockGetter reader, List tooltip, TooltipFlag flagIn) { super.appendHoverText(stack, reader, tooltip, flagIn); tooltip.add(translate("infusion1")); diff --git a/src/main/java/net/permutated/pylons/block/package-info.java b/src/main/java/net/permutated/pylons/block/package-info.java index c17bbab..6a5c438 100644 --- a/src/main/java/net/permutated/pylons/block/package-info.java +++ b/src/main/java/net/permutated/pylons/block/package-info.java @@ -2,6 +2,6 @@ @MethodsReturnNonnullByDefault package net.permutated.pylons.block; -import mcp.MethodsReturnNonnullByDefault; +import net.minecraft.MethodsReturnNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/net/permutated/pylons/client/ClientSetup.java b/src/main/java/net/permutated/pylons/client/ClientSetup.java index 402cdd4..26e55a3 100644 --- a/src/main/java/net/permutated/pylons/client/ClientSetup.java +++ b/src/main/java/net/permutated/pylons/client/ClientSetup.java @@ -1,6 +1,6 @@ package net.permutated.pylons.client; -import net.minecraft.client.gui.ScreenManager; +import net.minecraft.client.gui.screens.MenuScreens; import net.permutated.pylons.ModRegistry; import net.permutated.pylons.client.gui.ExpulsionPylonScreen; import net.permutated.pylons.client.gui.InfusionPylonScreen; @@ -11,7 +11,7 @@ private ClientSetup() { } public static void register() { - ScreenManager.register(ModRegistry.EXPULSION_PYLON_CONTAINER.get(), ExpulsionPylonScreen::new); - ScreenManager.register(ModRegistry.INFUSION_PYLON_CONTAINER.get(), InfusionPylonScreen::new); + MenuScreens.register(ModRegistry.EXPULSION_PYLON_CONTAINER.get(), ExpulsionPylonScreen::new); + MenuScreens.register(ModRegistry.INFUSION_PYLON_CONTAINER.get(), InfusionPylonScreen::new); } } diff --git a/src/main/java/net/permutated/pylons/client/gui/AbstractPylonScreen.java b/src/main/java/net/permutated/pylons/client/gui/AbstractPylonScreen.java index c1d1fd4..fd9f4bf 100644 --- a/src/main/java/net/permutated/pylons/client/gui/AbstractPylonScreen.java +++ b/src/main/java/net/permutated/pylons/client/gui/AbstractPylonScreen.java @@ -1,24 +1,22 @@ package net.permutated.pylons.client.gui; -import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.systems.RenderSystem; -import net.minecraft.client.gui.screen.inventory.ContainerScreen; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.network.chat.Component; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.TranslatableComponent; import net.permutated.pylons.inventory.container.AbstractPylonContainer; import net.permutated.pylons.util.Constants; import net.permutated.pylons.util.ResourceUtil; import net.permutated.pylons.util.TranslationKey; -import java.util.Objects; - -public abstract class AbstractPylonScreen extends ContainerScreen { +public abstract class AbstractPylonScreen extends AbstractContainerScreen { protected final ResourceLocation gui; - protected AbstractPylonScreen(T container, PlayerInventory inv, ITextComponent name, String pylonType) { + protected AbstractPylonScreen(T container, Inventory inv, Component name, String pylonType) { super(container, inv, name); this.gui = ResourceUtil.gui("pylon"); this.imageWidth = 176; @@ -26,44 +24,44 @@ protected AbstractPylonScreen(T container, PlayerInventory inv, ITextComponent n } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { + public void render(PoseStack matrixStack, int mouseX, int mouseY, float partialTicks) { this.renderBackground(matrixStack); super.render(matrixStack, mouseX, mouseY, partialTicks); this.renderTooltip(matrixStack, mouseX, mouseY); } @Override - protected void renderBg(MatrixStack matrixStack, float partialTicks, int mouseX, int mouseY) { - RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); - Objects.requireNonNull(this.minecraft).getTextureManager().bind(gui); + protected void renderBg(PoseStack matrixStack, float partialTicks, int mouseX, int mouseY) { + RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.setShaderTexture(0, gui); int relX = (this.width - this.imageWidth) / 2; int relY = (this.height - this.imageHeight) / 2; this.blit(matrixStack, relX, relY, 0, 0, this.imageWidth, this.imageHeight); } @Override - protected void renderLabels(MatrixStack matrixStack, int mouseX, int mouseY) { + protected void renderLabels(PoseStack matrixStack, int mouseX, int mouseY) { super.renderLabels(matrixStack, mouseX, mouseY); String owner = this.menu.getOwnerName(); - ITextComponent component; + Component component; if (owner.equals(Constants.UNKNOWN)) { - component = translate("noOwner").withStyle(TextFormatting.RED); + component = translate("noOwner").withStyle(ChatFormatting.RED); } else { component = translate("owner", owner); } drawText(matrixStack, component, 24); } - protected void drawText(MatrixStack stack, ITextComponent component, int yPos) { + protected void drawText(PoseStack stack, Component component, int yPos) { this.font.draw(stack, component, 8, yPos, 4210752); } - protected TranslationTextComponent translate(String key) { - return new TranslationTextComponent(TranslationKey.gui(key)); + protected TranslatableComponent translate(String key) { + return new TranslatableComponent(TranslationKey.gui(key)); } - protected TranslationTextComponent translate(String key, Object... values) { - return new TranslationTextComponent(TranslationKey.gui(key), values); + protected TranslatableComponent translate(String key, Object... values) { + return new TranslatableComponent(TranslationKey.gui(key), values); } } diff --git a/src/main/java/net/permutated/pylons/client/gui/ExpulsionPylonScreen.java b/src/main/java/net/permutated/pylons/client/gui/ExpulsionPylonScreen.java index 510eec9..8f771dd 100644 --- a/src/main/java/net/permutated/pylons/client/gui/ExpulsionPylonScreen.java +++ b/src/main/java/net/permutated/pylons/client/gui/ExpulsionPylonScreen.java @@ -1,25 +1,25 @@ package net.permutated.pylons.client.gui; -import com.mojang.blaze3d.matrix.MatrixStack; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.network.chat.Component; +import net.minecraft.ChatFormatting; import net.permutated.pylons.inventory.container.ExpulsionPylonContainer; import net.permutated.pylons.util.Constants; @SuppressWarnings("java:S110") // inheritance required public class ExpulsionPylonScreen extends AbstractPylonScreen { - public ExpulsionPylonScreen(ExpulsionPylonContainer container, PlayerInventory inv, ITextComponent name) { + public ExpulsionPylonScreen(ExpulsionPylonContainer container, Inventory inv, Component name) { super(container, inv, name, Constants.EXPULSION_PYLON); } @Override - protected void renderLabels(MatrixStack matrixStack, int mouseX, int mouseY) { + protected void renderLabels(PoseStack matrixStack, int mouseX, int mouseY) { super.renderLabels(matrixStack, mouseX, mouseY); if (this.menu.isAllowedDimension()) { drawText(matrixStack, translate("whitelist"), 36); } else { - drawText(matrixStack, translate("wrongDimension").withStyle(TextFormatting.RED), 36); + drawText(matrixStack, translate("wrongDimension").withStyle(ChatFormatting.RED), 36); } } } diff --git a/src/main/java/net/permutated/pylons/client/gui/InfusionPylonScreen.java b/src/main/java/net/permutated/pylons/client/gui/InfusionPylonScreen.java index 5455a0a..fcfd16c 100644 --- a/src/main/java/net/permutated/pylons/client/gui/InfusionPylonScreen.java +++ b/src/main/java/net/permutated/pylons/client/gui/InfusionPylonScreen.java @@ -1,19 +1,19 @@ package net.permutated.pylons.client.gui; -import com.mojang.blaze3d.matrix.MatrixStack; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.network.chat.Component; import net.permutated.pylons.inventory.container.InfusionPylonContainer; import net.permutated.pylons.util.Constants; @SuppressWarnings("java:S110") // inheritance required public class InfusionPylonScreen extends AbstractPylonScreen { - public InfusionPylonScreen(InfusionPylonContainer container, PlayerInventory inv, ITextComponent name) { + public InfusionPylonScreen(InfusionPylonContainer container, Inventory inv, Component name) { super(container, inv, name, Constants.INFUSION_PYLON); } @Override - protected void renderLabels(MatrixStack matrixStack, int mouseX, int mouseY) { + protected void renderLabels(PoseStack matrixStack, int mouseX, int mouseY) { super.renderLabels(matrixStack, mouseX, mouseY); drawText(matrixStack, translate("effects"), 36); } diff --git a/src/main/java/net/permutated/pylons/client/gui/package-info.java b/src/main/java/net/permutated/pylons/client/gui/package-info.java index 495a5af..558d4bd 100644 --- a/src/main/java/net/permutated/pylons/client/gui/package-info.java +++ b/src/main/java/net/permutated/pylons/client/gui/package-info.java @@ -2,6 +2,6 @@ @MethodsReturnNonnullByDefault package net.permutated.pylons.client.gui; -import mcp.MethodsReturnNonnullByDefault; +import net.minecraft.MethodsReturnNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/net/permutated/pylons/data/DataGenerators.java b/src/main/java/net/permutated/pylons/data/DataGenerators.java index da56283..03f98e0 100644 --- a/src/main/java/net/permutated/pylons/data/DataGenerators.java +++ b/src/main/java/net/permutated/pylons/data/DataGenerators.java @@ -4,7 +4,7 @@ import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.GatherDataEvent; +import net.minecraftforge.forge.event.lifecycle.GatherDataEvent; import net.permutated.pylons.data.client.BlockStates; import net.permutated.pylons.data.client.ItemModels; import net.permutated.pylons.data.client.Languages; @@ -20,8 +20,9 @@ public static void gatherData(GatherDataEvent event) { ExistingFileHelper fileHelper = event.getExistingFileHelper(); if (event.includeServer()) { + generator.addProvider(new BlockTags(generator, fileHelper)); generator.addProvider(new CraftingRecipes(generator)); - generator.addProvider(new LootTables(generator)); + generator.addProvider(new BlockLoot(generator)); } if (event.includeClient()) { generator.addProvider(new BlockStates(generator, fileHelper)); diff --git a/src/main/java/net/permutated/pylons/data/client/BlockStates.java b/src/main/java/net/permutated/pylons/data/client/BlockStates.java index 3633584..b914644 100644 --- a/src/main/java/net/permutated/pylons/data/client/BlockStates.java +++ b/src/main/java/net/permutated/pylons/data/client/BlockStates.java @@ -1,12 +1,12 @@ package net.permutated.pylons.data.client; -import net.minecraft.block.Block; +import net.minecraft.world.level.block.Block; import net.minecraft.data.DataGenerator; -import net.minecraft.util.ResourceLocation; +import net.minecraft.resources.ResourceLocation; import net.minecraftforge.client.model.generators.BlockStateProvider; import net.minecraftforge.client.model.generators.ModelFile; import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.registries.RegistryObject; import net.permutated.pylons.ModRegistry; import net.permutated.pylons.Pylons; diff --git a/src/main/java/net/permutated/pylons/data/client/ItemModels.java b/src/main/java/net/permutated/pylons/data/client/ItemModels.java index ea80424..ebe83c0 100644 --- a/src/main/java/net/permutated/pylons/data/client/ItemModels.java +++ b/src/main/java/net/permutated/pylons/data/client/ItemModels.java @@ -1,12 +1,12 @@ package net.permutated.pylons.data.client; import net.minecraft.data.DataGenerator; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; -import net.minecraft.util.ResourceLocation; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.resources.ResourceLocation; import net.minecraftforge.client.model.generators.ItemModelProvider; import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.registries.RegistryObject; import net.permutated.pylons.Pylons; import net.permutated.pylons.ModRegistry; diff --git a/src/main/java/net/permutated/pylons/data/client/package-info.java b/src/main/java/net/permutated/pylons/data/client/package-info.java index e03ae2c..c3b32ac 100644 --- a/src/main/java/net/permutated/pylons/data/client/package-info.java +++ b/src/main/java/net/permutated/pylons/data/client/package-info.java @@ -2,6 +2,6 @@ @MethodsReturnNonnullByDefault package net.permutated.pylons.data.client; -import mcp.MethodsReturnNonnullByDefault; +import net.minecraft.MethodsReturnNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/net/permutated/pylons/data/package-info.java b/src/main/java/net/permutated/pylons/data/package-info.java index 8f84e79..9e6f48c 100644 --- a/src/main/java/net/permutated/pylons/data/package-info.java +++ b/src/main/java/net/permutated/pylons/data/package-info.java @@ -2,6 +2,6 @@ @MethodsReturnNonnullByDefault package net.permutated.pylons.data; -import mcp.MethodsReturnNonnullByDefault; +import net.minecraft.MethodsReturnNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/net/permutated/pylons/data/server/BlockLoot.java b/src/main/java/net/permutated/pylons/data/server/BlockLoot.java new file mode 100644 index 0000000..59e1754 --- /dev/null +++ b/src/main/java/net/permutated/pylons/data/server/BlockLoot.java @@ -0,0 +1,56 @@ +package net.permutated.pylons.data.server; + +import com.mojang.datafixers.util.Pair; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.loot.LootTableProvider; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.storage.loot.LootTable; +import net.minecraft.world.level.storage.loot.LootTables; +import net.minecraft.world.level.storage.loot.ValidationContext; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSet; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; +import net.minecraftforge.registries.RegistryObject; +import net.permutated.pylons.ModRegistry; + +import java.util.List; +import java.util.Map; +import java.util.function.BiConsumer; +import java.util.function.Consumer; +import java.util.function.Supplier; +import java.util.stream.Collectors; + +public class BlockLoot extends LootTableProvider { + + public BlockLoot(DataGenerator generator) { + super(generator); + } + + @Override + protected List>>, LootContextParamSet>> getTables() + { + return List.of(Pair.of(Blocks::new, LootContextParamSets.BLOCK)); + } + + private static class Blocks extends net.minecraft.data.loot.BlockLoot + { + @Override + protected void addTables() + { + ModRegistry.BLOCKS.getEntries().forEach(block -> dropSelf(block.get())); + } + + @Override + protected Iterable getKnownBlocks() + { + return ModRegistry.BLOCKS.getEntries().stream().map(RegistryObject::get).collect(Collectors.toList()); + } + } + + @Override + protected void validate(Map map, ValidationContext validationtracker) + { + map.forEach((name, table) -> LootTables.validate(validationtracker, name, table)); + } + +} diff --git a/src/main/java/net/permutated/pylons/data/server/BlockTags.java b/src/main/java/net/permutated/pylons/data/server/BlockTags.java new file mode 100644 index 0000000..e4a6c9e --- /dev/null +++ b/src/main/java/net/permutated/pylons/data/server/BlockTags.java @@ -0,0 +1,25 @@ +package net.permutated.pylons.data.server; + +import net.minecraft.data.DataGenerator; +import net.minecraft.data.tags.BlockTagsProvider; +import net.minecraftforge.common.data.ExistingFileHelper; +import net.permutated.pylons.ModRegistry; +import net.permutated.pylons.Pylons; + +import javax.annotation.Nullable; + +import static net.permutated.pylons.util.ResourceUtil.blockTag; + +public class BlockTags extends BlockTagsProvider { + public BlockTags(DataGenerator generator, @Nullable ExistingFileHelper existingFileHelper) { + super(generator, Pylons.MODID, existingFileHelper); + } + + @Override + protected void addTags() { + tag(blockTag("minecraft:mineable/pickaxe")).add( + ModRegistry.EXPULSION_PYLON.get(), + ModRegistry.INFUSION_PYLON.get() + ); + } +} diff --git a/src/main/java/net/permutated/pylons/data/server/CraftingRecipes.java b/src/main/java/net/permutated/pylons/data/server/CraftingRecipes.java index f98352f..ce999eb 100644 --- a/src/main/java/net/permutated/pylons/data/server/CraftingRecipes.java +++ b/src/main/java/net/permutated/pylons/data/server/CraftingRecipes.java @@ -1,8 +1,8 @@ package net.permutated.pylons.data.server; import net.minecraft.data.*; -import net.minecraft.item.Items; -import net.minecraft.util.IItemProvider; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.ItemLike; import net.minecraftforge.common.Tags; import net.permutated.pylons.ModRegistry; import net.permutated.pylons.Pylons; @@ -12,18 +12,23 @@ import static net.permutated.pylons.util.ResourceUtil.prefix; +import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.data.recipes.ShapedRecipeBuilder; +import net.minecraft.data.recipes.ShapelessRecipeBuilder; + public class CraftingRecipes extends RecipeProvider { public CraftingRecipes(DataGenerator generatorIn) { super(generatorIn); } - private ShapedRecipeBuilder shaped(IItemProvider provider) { + private ShapedRecipeBuilder shaped(ItemLike provider) { return ShapedRecipeBuilder.shaped(provider) .group(Pylons.MODID); } @Override - protected void buildShapelessRecipes(Consumer consumer) { + protected void buildCraftingRecipes(Consumer consumer) { // Expulsion Pylong shaped(ModRegistry.EXPULSION_PYLON.get()) diff --git a/src/main/java/net/permutated/pylons/data/server/LootTables.java b/src/main/java/net/permutated/pylons/data/server/LootTables.java deleted file mode 100644 index cbc0faa..0000000 --- a/src/main/java/net/permutated/pylons/data/server/LootTables.java +++ /dev/null @@ -1,54 +0,0 @@ -package net.permutated.pylons.data.server; - -import com.google.common.collect.ImmutableList; -import com.mojang.datafixers.util.Pair; -import net.minecraft.block.Block; -import net.minecraft.data.DataGenerator; -import net.minecraft.data.LootTableProvider; -import net.minecraft.data.loot.BlockLootTables; -import net.minecraft.loot.*; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.RegistryObject; -import net.permutated.pylons.ModRegistry; - -import java.util.List; -import java.util.Map; -import java.util.function.BiConsumer; -import java.util.function.Consumer; -import java.util.function.Supplier; -import java.util.stream.Collectors; - -public class LootTables extends LootTableProvider { - - public LootTables(DataGenerator generator) { - super(generator); - } - - @Override - protected List>>, LootParameterSet>> getTables() - { - return ImmutableList.of(Pair.of(Blocks::new, LootParameterSets.BLOCK)); - } - - private static class Blocks extends BlockLootTables - { - @Override - protected void addTables() - { - ModRegistry.BLOCKS.getEntries().forEach(block -> dropSelf(block.get())); - } - - @Override - protected Iterable getKnownBlocks() - { - return ModRegistry.BLOCKS.getEntries().stream().map(RegistryObject::get).collect(Collectors.toList()); - } - } - - @Override - protected void validate(Map map, ValidationTracker validationtracker) - { - map.forEach((name, table) -> LootTableManager.validate(validationtracker, name, table)); - } - -} diff --git a/src/main/java/net/permutated/pylons/data/server/package-info.java b/src/main/java/net/permutated/pylons/data/server/package-info.java index 7981ac6..46d335a 100644 --- a/src/main/java/net/permutated/pylons/data/server/package-info.java +++ b/src/main/java/net/permutated/pylons/data/server/package-info.java @@ -2,6 +2,6 @@ @MethodsReturnNonnullByDefault package net.permutated.pylons.data.server; -import mcp.MethodsReturnNonnullByDefault; +import net.minecraft.MethodsReturnNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/net/permutated/pylons/inventory/container/AbstractPylonContainer.java b/src/main/java/net/permutated/pylons/inventory/container/AbstractPylonContainer.java index ce54d64..ed0c9cb 100644 --- a/src/main/java/net/permutated/pylons/inventory/container/AbstractPylonContainer.java +++ b/src/main/java/net/permutated/pylons/inventory/container/AbstractPylonContainer.java @@ -1,17 +1,17 @@ package net.permutated.pylons.inventory.container; -import net.minecraft.block.Block; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.container.ContainerType; -import net.minecraft.inventory.container.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.IWorldPosCallable; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.RegistryObject; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.MenuType; +import net.minecraft.world.inventory.Slot; +import net.minecraft.world.item.ItemStack; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.inventory.ContainerLevelAccess; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.Level; +import net.minecraftforge.registries.RegistryObject; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.SlotItemHandler; @@ -20,17 +20,17 @@ import javax.annotation.Nullable; -public abstract class AbstractPylonContainer extends Container { +public abstract class AbstractPylonContainer extends AbstractContainerMenu { @Nullable // should only be accessed from server private final AbstractPylonTile tileEntity; protected final String ownerName; - protected AbstractPylonContainer(@Nullable ContainerType containerType, int windowId, PlayerInventory playerInventory, PacketBuffer packetBuffer) { + protected AbstractPylonContainer(@Nullable MenuType containerType, int windowId, Inventory playerInventory, FriendlyByteBuf packetBuffer) { super(containerType, windowId); BlockPos pos = packetBuffer.readBlockPos(); - World world = playerInventory.player.getCommandSenderWorld(); + Level world = playerInventory.player.getCommandSenderWorld(); tileEntity = (AbstractPylonTile) world.getBlockEntity(pos); IItemHandler wrappedInventory = new InvWrapper(playerInventory); @@ -60,11 +60,11 @@ public String getOwnerName() { } @Override - public boolean stillValid(PlayerEntity playerEntity) { + public boolean stillValid(Player playerEntity) { if (tileEntity != null) { - World world = tileEntity.getLevel(); + Level world = tileEntity.getLevel(); if (world != null) { - IWorldPosCallable callable = IWorldPosCallable.create(world, tileEntity.getBlockPos()); + ContainerLevelAccess callable = ContainerLevelAccess.create(world, tileEntity.getBlockPos()); return stillValid(callable, playerEntity, getBlock().get()); } } @@ -72,7 +72,7 @@ public boolean stillValid(PlayerEntity playerEntity) { } @Override - public ItemStack quickMoveStack(PlayerEntity playerIn, int index) { + public ItemStack quickMoveStack(Player playerIn, int index) { ItemStack itemstack = ItemStack.EMPTY; Slot slot = this.slots.get(index); diff --git a/src/main/java/net/permutated/pylons/inventory/container/ExpulsionPylonContainer.java b/src/main/java/net/permutated/pylons/inventory/container/ExpulsionPylonContainer.java index 9d3c44b..a3f426d 100644 --- a/src/main/java/net/permutated/pylons/inventory/container/ExpulsionPylonContainer.java +++ b/src/main/java/net/permutated/pylons/inventory/container/ExpulsionPylonContainer.java @@ -1,16 +1,16 @@ package net.permutated.pylons.inventory.container; -import net.minecraft.block.Block; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.fml.RegistryObject; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraftforge.registries.RegistryObject; import net.permutated.pylons.ModRegistry; public class ExpulsionPylonContainer extends AbstractPylonContainer { private final boolean allowedDimension; - public ExpulsionPylonContainer(int windowId, PlayerInventory playerInventory, PacketBuffer packetBuffer) { + public ExpulsionPylonContainer(int windowId, Inventory playerInventory, FriendlyByteBuf packetBuffer) { super(ModRegistry.EXPULSION_PYLON_CONTAINER.get(), windowId, playerInventory, packetBuffer); allowedDimension = packetBuffer.readBoolean(); } diff --git a/src/main/java/net/permutated/pylons/inventory/container/InfusionPylonContainer.java b/src/main/java/net/permutated/pylons/inventory/container/InfusionPylonContainer.java index 733b50a..3e55822 100644 --- a/src/main/java/net/permutated/pylons/inventory/container/InfusionPylonContainer.java +++ b/src/main/java/net/permutated/pylons/inventory/container/InfusionPylonContainer.java @@ -1,14 +1,14 @@ package net.permutated.pylons.inventory.container; -import net.minecraft.block.Block; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.fml.RegistryObject; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraftforge.registries.RegistryObject; import net.permutated.pylons.ModRegistry; public class InfusionPylonContainer extends AbstractPylonContainer { - public InfusionPylonContainer(int windowId, PlayerInventory playerInventory, PacketBuffer packetBuffer) { + public InfusionPylonContainer(int windowId, Inventory playerInventory, FriendlyByteBuf packetBuffer) { super(ModRegistry.INFUSION_PYLON_CONTAINER.get(), windowId, playerInventory, packetBuffer); } diff --git a/src/main/java/net/permutated/pylons/inventory/container/package-info.java b/src/main/java/net/permutated/pylons/inventory/container/package-info.java index 2588ef1..45a0583 100644 --- a/src/main/java/net/permutated/pylons/inventory/container/package-info.java +++ b/src/main/java/net/permutated/pylons/inventory/container/package-info.java @@ -2,6 +2,6 @@ @MethodsReturnNonnullByDefault package net.permutated.pylons.inventory.container; -import mcp.MethodsReturnNonnullByDefault; +import net.minecraft.MethodsReturnNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/net/permutated/pylons/item/PlayerFilterCard.java b/src/main/java/net/permutated/pylons/item/PlayerFilterCard.java index a62e20f..5746d04 100644 --- a/src/main/java/net/permutated/pylons/item/PlayerFilterCard.java +++ b/src/main/java/net/permutated/pylons/item/PlayerFilterCard.java @@ -1,14 +1,13 @@ package net.permutated.pylons.item; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.text.*; -import net.minecraft.world.World; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.level.Level; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.LogicalSide; import net.permutated.pylons.ModRegistry; @@ -19,6 +18,12 @@ import javax.annotation.Nullable; import java.util.List; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.TranslatableComponent; + public class PlayerFilterCard extends Item { public PlayerFilterCard() { super(new Properties().stacksTo(1).tab(ModRegistry.CREATIVE_TAB).setNoRepair()); @@ -26,23 +31,22 @@ public PlayerFilterCard() { public static void onPlayerInteractEvent(final PlayerInteractEvent.EntityInteract event) { ItemStack itemStack = event.getItemStack(); - if (itemStack.getItem() instanceof PlayerFilterCard && event.getTarget() instanceof PlayerEntity) { + if (itemStack.getItem() instanceof PlayerFilterCard && event.getTarget() instanceof Player) { if (event.getSide() == LogicalSide.SERVER) { - CompoundNBT tag = itemStack.getOrCreateTagElement(Pylons.MODID); + CompoundTag tag = itemStack.getOrCreateTagElement(Pylons.MODID); tag.putUUID(Constants.NBT.UUID, event.getTarget().getUUID()); tag.putString(Constants.NBT.NAME, getProfileName(event.getTarget())); - event.setCancellationResult(ActionResultType.SUCCESS); + event.setCancellationResult(InteractionResult.SUCCESS); } else { - event.setCancellationResult(ActionResultType.CONSUME); + event.setCancellationResult(InteractionResult.CONSUME); } event.setCanceled(true); } } protected static String getProfileName(Entity entity) { - if (entity instanceof PlayerEntity) { - PlayerEntity player = (PlayerEntity) entity; + if (entity instanceof Player player) { return player.getGameProfile().getName(); } return "unknown"; @@ -50,20 +54,20 @@ protected static String getProfileName(Entity entity) { @Override public boolean isFoil(ItemStack stack) { - CompoundNBT tag = stack.getTagElement(Pylons.MODID); + CompoundTag tag = stack.getTagElement(Pylons.MODID); return (tag != null && tag.hasUUID(Constants.NBT.UUID)); } @Override - public void appendHoverText(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { + public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List tooltip, TooltipFlag flagIn) { super.appendHoverText(stack, worldIn, tooltip, flagIn); - CompoundNBT tag = stack.getTagElement(Pylons.MODID); + CompoundTag tag = stack.getTagElement(Pylons.MODID); if (tag != null) { String username = tag.getString(Constants.NBT.NAME); - tooltip.add(translate("player", username).withStyle(TextFormatting.BLUE)); + tooltip.add(translate("player", username).withStyle(ChatFormatting.BLUE)); - tooltip.add(new StringTextComponent("")); + tooltip.add(new TextComponent("")); tooltip.add(translate("insert1")); tooltip.add(translate("insert2")); } else { @@ -71,11 +75,11 @@ public void appendHoverText(ItemStack stack, @Nullable World worldIn, List use(World level, PlayerEntity player, Hand hand) { + public InteractionResultHolder use(Level level, Player player, InteractionHand hand) { final ItemStack stack = player.getItemInHand(hand); if (stack.getItem() instanceof PotionFilterCard) { if (!level.isClientSide) { - Effect effect = PotionFilterCard.getEffect(stack); + MobEffect effect = PotionFilterCard.getEffect(stack); int amplifier = PotionFilterCard.getAmplifier(stack); int duration = PotionFilterCard.getDuration(stack); if (duration >= PotionFilterCard.REQUIRED) { - return ActionResult.success(stack); + return InteractionResultHolder.success(stack); } - Optional active; + Optional active; if (effect == null) { active = player.getActiveEffects().stream() // Require a configured minimum effect length @@ -69,7 +74,7 @@ public ActionResult use(World level, PlayerEntity player, Hand hand) if (active.isPresent()) { - Effect activeEffect = active.get().getEffect(); + MobEffect activeEffect = active.get().getEffect(); int activeAmplifier = active.get().getAmplifier(); int activeDuration = active.get().getDuration(); @@ -83,26 +88,26 @@ public ActionResult use(World level, PlayerEntity player, Hand hand) } player.removeEffect(activeEffect); - return ActionResult.success(copy); + return InteractionResultHolder.success(copy); } } else { - return ActionResult.consume(stack); + return InteractionResultHolder.consume(stack); } } - return ActionResult.pass(stack); + return InteractionResultHolder.pass(stack); } @Override public boolean isFoil(ItemStack stack) { - CompoundNBT tag = stack.getTagElement(Pylons.MODID); + CompoundTag tag = stack.getTagElement(Pylons.MODID); return (tag != null && tag.contains(Constants.NBT.EFFECT)); } @Override - public void appendHoverText(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { + public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List tooltip, TooltipFlag flagIn) { super.appendHoverText(stack, worldIn, tooltip, flagIn); - Effect effect = getEffect(stack); + MobEffect effect = getEffect(stack); int duration = getDuration(stack); int amplifier = getAmplifier(stack); @@ -111,27 +116,27 @@ public void appendHoverText(ItemStack stack, @Nullable World worldIn, List 0) { component = withAmplifier(component, amplifier); } if (effect.isBeneficial()) { - tooltip.add(component.withStyle(TextFormatting.BLUE)); + tooltip.add(component.withStyle(ChatFormatting.BLUE)); } else { - tooltip.add(component.withStyle(TextFormatting.RED)); + tooltip.add(component.withStyle(ChatFormatting.RED)); } - tooltip.add(new StringTextComponent("")); + tooltip.add(new TextComponent("")); if (duration >= REQUIRED) { tooltip.add(translate("insert1")); tooltip.add(translate("insert2")); - tooltip.add(translate("activated").withStyle(TextFormatting.GREEN)); + tooltip.add(translate("activated").withStyle(ChatFormatting.GREEN)); } else { tooltip.add(translate("increase1")); tooltip.add(translate("increase2")); - tooltip.add(translate("progress", display, REQUIRED / 20).withStyle(TextFormatting.RED)); + tooltip.add(translate("progress", display, REQUIRED / 20).withStyle(ChatFormatting.RED)); } } else { tooltip.add(translate("no_effect1")); @@ -153,13 +158,13 @@ public void appendHoverText(ItemStack stack, @Nullable World worldIn, List { +public abstract class AbstractPylonRecipe implements Recipe { private final ResourceLocation id; @@ -34,12 +34,12 @@ public boolean canCraftInDimensions(int width, int height) } @Override - public boolean matches(IInventory inventory, World world) { + public boolean matches(Container inventory, Level world) { return true; } @Override - public ItemStack assemble(IInventory inv) + public ItemStack assemble(Container inv) { return ItemStack.EMPTY; } @@ -50,10 +50,10 @@ public ItemStack getResultItem() return ItemStack.EMPTY; } - public abstract void write(PacketBuffer buffer); + public abstract void write(FriendlyByteBuf buffer); protected abstract static class AbstractSerializer - extends ForgeRegistryEntry> implements IRecipeSerializer { + extends ForgeRegistryEntry> implements RecipeSerializer { } } diff --git a/src/main/java/net/permutated/pylons/recipe/package-info.java b/src/main/java/net/permutated/pylons/recipe/package-info.java index dfbf760..fc6668a 100644 --- a/src/main/java/net/permutated/pylons/recipe/package-info.java +++ b/src/main/java/net/permutated/pylons/recipe/package-info.java @@ -2,6 +2,6 @@ @MethodsReturnNonnullByDefault package net.permutated.pylons.recipe; -import mcp.MethodsReturnNonnullByDefault; +import net.minecraft.MethodsReturnNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/net/permutated/pylons/tile/AbstractPylonTile.java b/src/main/java/net/permutated/pylons/tile/AbstractPylonTile.java index 79e2035..7683caa 100644 --- a/src/main/java/net/permutated/pylons/tile/AbstractPylonTile.java +++ b/src/main/java/net/permutated/pylons/tile/AbstractPylonTile.java @@ -1,23 +1,20 @@ package net.permutated.pylons.tile; -import net.minecraft.block.BlockState; -import net.minecraft.inventory.InventoryHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.PacketBuffer; -import net.minecraft.network.play.server.SUpdateTileEntityPacket; -import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.Connection; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket; +import net.minecraft.world.Containers; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.common.UsernameCache; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.util.INBTSerializable; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.energy.EnergyStorage; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemStackHandler; @@ -28,10 +25,10 @@ import javax.annotation.Nullable; import java.util.UUID; -public abstract class AbstractPylonTile extends TileEntity implements ITickableTileEntity { +public abstract class AbstractPylonTile extends BlockEntity { - protected AbstractPylonTile(TileEntityType tileEntityType) { - super(tileEntityType); + protected AbstractPylonTile(BlockEntityType tileEntityType, BlockPos pos, BlockState state) { + super(tileEntityType, pos, state); } public static final int SLOTS = 9; @@ -91,12 +88,21 @@ public boolean canTick(final int every) { } } - protected static void dropItems(@Nullable World world, BlockPos pos, IItemHandler itemHandler) { + public abstract void tick(); + + @SuppressWarnings("java:S1172") // unused arguments are required + public static void tick(Level level, BlockPos pos, BlockState state, T blockEntity) { + if (blockEntity instanceof AbstractPylonTile pylonTile) { + pylonTile.tick(); + } + } + + protected static void dropItems(@Nullable Level world, BlockPos pos, IItemHandler itemHandler) { for (int i = 0; i < itemHandler.getSlots(); ++i) { ItemStack itemstack = itemHandler.getStackInSlot(i); if (itemstack.getCount() > 0 && world != null) { - InventoryHelper.dropItemStack(world, pos.getX(), pos.getY(), pos.getZ(), itemstack); + Containers.dropItemStack(world, pos.getX(), pos.getY(), pos.getZ(), itemstack); } } } @@ -107,7 +113,7 @@ protected static void dropItems(@Nullable World world, BlockPos pos, IItemHandle * Overrides MUST call the super method first to ensure correct deserialization. * @param packetBuffer the packet ready to be filled */ - public void updateContainer(PacketBuffer packetBuffer) { + public void updateContainer(FriendlyByteBuf packetBuffer) { String lastKnown = UsernameCache.getLastKnownUsername(owner); String username = StringUtils.defaultString(lastKnown, Constants.UNKNOWN); @@ -118,14 +124,13 @@ public void updateContainer(PacketBuffer packetBuffer) { // Save TE data to disk @Override - public CompoundNBT save(CompoundNBT tag) { + protected void saveAdditional(CompoundTag tag) { tag.put(Constants.NBT.INV, itemStackHandler.serializeNBT()); writeOwner(tag); - return super.save(tag); } // Write TE data to a provided CompoundNBT - private void writeOwner(CompoundNBT tag) { + private void writeOwner(CompoundTag tag) { if (owner != null) { tag.putUUID(Constants.NBT.OWNER, owner); } @@ -133,43 +138,43 @@ private void writeOwner(CompoundNBT tag) { // Load TE data from disk @Override - public void load(BlockState state, CompoundNBT tag) { + public void load(CompoundTag tag) { itemStackHandler.deserializeNBT(tag.getCompound(Constants.NBT.INV)); readOwner(tag); - super.load(state, tag); + super.load(tag); } // Read TE data from a provided CompoundNBT - private void readOwner(CompoundNBT tag) { - if (tag.hasUUID(Constants.NBT.OWNER)) { + private void readOwner(@Nullable CompoundTag tag) { + if (tag != null && tag.hasUUID(Constants.NBT.OWNER)) { owner = tag.getUUID(Constants.NBT.OWNER); } } // Called whenever a client loads a new chunk @Override - public CompoundNBT getUpdateTag() { - CompoundNBT tag = super.getUpdateTag(); + public CompoundTag getUpdateTag() { + CompoundTag tag = super.getUpdateTag(); writeOwner(tag); return tag; } @Override - public void handleUpdateTag(BlockState state, CompoundNBT tag) { + public void handleUpdateTag(@Nullable CompoundTag tag) { readOwner(tag); } // Called whenever a block update happens on the client @Nullable @Override - public SUpdateTileEntityPacket getUpdatePacket() { - return new SUpdateTileEntityPacket(worldPosition, -1, getUpdateTag()); + public ClientboundBlockEntityDataPacket getUpdatePacket() { + return ClientboundBlockEntityDataPacket.create(this, BlockEntity::getUpdateTag); } // Handles the update packet received from the server @Override - public void onDataPacket(NetworkManager net, SUpdateTileEntityPacket pkt) { - this.handleUpdateTag(this.getBlockState(), pkt.getTag()); + public void onDataPacket(Connection net, ClientboundBlockEntityDataPacket pkt) { + this.handleUpdateTag(pkt.getTag()); } public class PylonItemStackHandler extends ItemStackHandler { @@ -182,48 +187,4 @@ protected void onContentsChanged(int slot) { setChanged(); } } - - public class PylonEnergyStorage extends EnergyStorage implements INBTSerializable { - - public PylonEnergyStorage(int capacity, int maxTransfer) { - super(capacity, maxTransfer); - } - - public void onEnergyChanged() { - setChanged(); - } - - public void setEnergy(int energy) { - this.energy = energy; - onEnergyChanged(); - } - - public void addEnergy(int energy) { - this.energy += energy; - if (this.energy > getMaxEnergyStored()) { - this.energy = getEnergyStored(); - } - onEnergyChanged(); - } - - public void consumeEnergy(int energy) { - this.energy -= energy; - if (this.energy < 0) { - this.energy = 0; - } - onEnergyChanged(); - } - - @Override - public CompoundNBT serializeNBT() { - CompoundNBT tag = new CompoundNBT(); - tag.putInt(Constants.NBT.ENERGY, getEnergyStored()); - return tag; - } - - @Override - public void deserializeNBT(CompoundNBT nbt) { - setEnergy(nbt.getInt(Constants.NBT.ENERGY)); - } - } } diff --git a/src/main/java/net/permutated/pylons/tile/ExpulsionPylonTile.java b/src/main/java/net/permutated/pylons/tile/ExpulsionPylonTile.java index 4be2a61..33a74db 100644 --- a/src/main/java/net/permutated/pylons/tile/ExpulsionPylonTile.java +++ b/src/main/java/net/permutated/pylons/tile/ExpulsionPylonTile.java @@ -1,40 +1,43 @@ package net.permutated.pylons.tile; import com.google.common.collect.ImmutableList; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.network.PacketBuffer; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Registry; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; -import net.minecraft.server.management.PlayerInteractionManager; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.tags.BlockTags; -import net.minecraft.util.RegistryKey; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.util.registry.Registry; -import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.util.Mth; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.chunk.LevelChunk; +import net.minecraft.world.level.levelgen.structure.BoundingBox; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.Vec3; import net.permutated.pylons.ConfigManager; import net.permutated.pylons.ModRegistry; import net.permutated.pylons.Pylons; import net.permutated.pylons.item.PlayerFilterCard; import net.permutated.pylons.util.Constants; -import java.util.*; -import java.util.stream.Collectors; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.UUID; public class ExpulsionPylonTile extends AbstractPylonTile { - private List> allowedDimensions = null; + private List> allowedDimensions = null; - public ExpulsionPylonTile() { - super(ModRegistry.EXPULSION_PYLON_TILE.get()); + public ExpulsionPylonTile(BlockPos pos, BlockState state) { + super(ModRegistry.EXPULSION_PYLON_TILE.get(), pos, state); } @Override @@ -45,16 +48,24 @@ protected boolean isItemValid(ItemStack stack) { @Override public void tick() { if (level != null && !level.isClientSide && canTick(10) && owner != null && isAllowedDimension()) { - Chunk chunk = level.getChunkAt(worldPosition); - List players = Arrays.stream(chunk.getEntitySections()) - .map(multiMap -> multiMap.find(ServerPlayerEntity.class)) - .flatMap(Collection::stream) - .collect(Collectors.toList()); + LevelChunk chunk = level.getChunkAt(worldPosition); + + var chunkPos = chunk.getPos(); + var aabb = new AABB( + chunkPos.getMinBlockX(), + level.getMinBuildHeight(), + chunkPos.getMinBlockZ(), + chunkPos.getMaxBlockX() + 1D, + level.getMaxBuildHeight() + 1D, + chunkPos.getMaxBlockZ() + 1D + ); + + var players = level.getEntitiesOfClass(ServerPlayer.class, aabb); List allowed = allowedPlayers(); MinecraftServer server = level.getServer(); - for (ServerPlayerEntity player : players) { + for (ServerPlayer player : players) { if (server != null && !player.hasPermissions(2) && !player.getUUID().equals(owner) @@ -66,7 +77,7 @@ public void tick() { } @Override - public void updateContainer(PacketBuffer packetBuffer) { + public void updateContainer(FriendlyByteBuf packetBuffer) { super.updateContainer(packetBuffer); packetBuffer.writeBoolean(isAllowedDimension()); } @@ -74,10 +85,10 @@ public void updateContainer(PacketBuffer packetBuffer) { public boolean isAllowedDimension() { if (level != null) { if (allowedDimensions == null) { - List> temp = new ArrayList<>(); + List> temp = new ArrayList<>(); List allowed = ConfigManager.COMMON.expulsionAllowedDimensions.get(); for (String key : allowed) { - temp.add(RegistryKey.create(Registry.DIMENSION_REGISTRY, new ResourceLocation(key))); + temp.add(ResourceKey.create(Registry.DIMENSION_REGISTRY, new ResourceLocation(key))); } allowedDimensions = ImmutableList.copyOf(temp); } @@ -96,7 +107,7 @@ private List allowedPlayers() { for (int i = 0; i < itemStackHandler.getSlots(); i++) { ItemStack stack = itemStackHandler.getStackInSlot(i); if (!stack.isEmpty() && stack.getItem() instanceof PlayerFilterCard) { - CompoundNBT tag = stack.getTagElement(Pylons.MODID); + CompoundTag tag = stack.getTagElement(Pylons.MODID); if (tag != null && tag.hasUUID(Constants.NBT.UUID)) { allowed.add(tag.getUUID(Constants.NBT.UUID)); } @@ -105,24 +116,22 @@ private List allowedPlayers() { return allowed; } - private void doRespawn(MinecraftServer server, ServerPlayerEntity player) { + private void doRespawn(MinecraftServer server, ServerPlayer player) { BlockPos respawnPosition = player.getRespawnPosition(); float respawnAngle = player.getRespawnAngle(); boolean flag = player.isRespawnForced(); - ServerWorld respawnLevel = server.getLevel(player.getRespawnDimension()); + ServerLevel respawnLevel = server.getLevel(player.getRespawnDimension()); - Optional optional; + Optional optional; if (respawnLevel != null && respawnPosition != null) { - optional = PlayerEntity.findRespawnPositionAndUseSpawnBlock(respawnLevel, respawnPosition, respawnAngle, flag, true); + optional = Player.findRespawnPositionAndUseSpawnBlock(respawnLevel, respawnPosition, respawnAngle, flag, true); } else { optional = Optional.empty(); } - ServerWorld actualLevel = respawnLevel != null && optional.isPresent() ? respawnLevel : server.overworld(); - PlayerInteractionManager manager = new PlayerInteractionManager(actualLevel); - - ServerPlayerEntity dummyPlayer = new ServerPlayerEntity(server, actualLevel, player.getGameProfile(), manager); + ServerLevel actualLevel = respawnLevel != null && optional.isPresent() ? respawnLevel : server.overworld(); + ServerPlayer dummyPlayer = new ServerPlayer(server, actualLevel, player.getGameProfile()); if (optional.isPresent()) { // player has a spawn position, is this in the same chunk? @@ -132,19 +141,25 @@ private void doRespawn(MinecraftServer server, ServerPlayerEntity player) { BlockState blockstate = actualLevel.getBlockState(respawnPosition); boolean isAnchor = blockstate.is(Blocks.RESPAWN_ANCHOR); - Vector3d spawnPos = optional.get(); + Vec3 spawnPos = optional.get(); float actualAngle; if (!blockstate.is(BlockTags.BEDS) && !isAnchor) { actualAngle = respawnAngle; } else { - Vector3d vector3d = Vector3d.atBottomCenterOf(respawnPosition).subtract(spawnPos).normalize(); - actualAngle = (float) MathHelper.wrapDegrees(MathHelper.atan2(vector3d.z, vector3d.x) * (180F / (float) Math.PI) - 90.0D); + Vec3 vector3d = Vec3.atBottomCenterOf(respawnPosition).subtract(spawnPos).normalize(); + actualAngle = (float) Mth.wrapDegrees(Mth.atan2(vector3d.z, vector3d.x) * (180F / (float) Math.PI) - 90.0D); } dummyPlayer.moveTo(spawnPos.x, spawnPos.y, spawnPos.z, actualAngle, 0.0F); } else { + int spawnRadius = server.getSpawnRadius(actualLevel); + + var bb = new BoundingBox(actualLevel.getSharedSpawnPos()); + var area = bb.inflatedBy(spawnRadius); + // player does not have a spawn position, is this in the world spawn? - if (sameChunk(actualLevel, actualLevel.getSharedSpawnPos())) { + // sameChunk(actualLevel, actualLevel.getSharedSpawnPos()) || + if (area.intersects(getBlockPos().getX(), getBlockPos().getZ(), getBlockPos().getX(), getBlockPos().getZ())) { return; } } @@ -153,10 +168,10 @@ private void doRespawn(MinecraftServer server, ServerPlayerEntity player) { dummyPlayer.setPos(dummyPlayer.getX(), dummyPlayer.getY() + 1.0D, dummyPlayer.getZ()); } - player.teleportTo(actualLevel, dummyPlayer.getX(), dummyPlayer.getY(), dummyPlayer.getZ(), dummyPlayer.yRot, dummyPlayer.xRot); + player.teleportTo(actualLevel, dummyPlayer.getX(), dummyPlayer.getY(), dummyPlayer.getZ(), dummyPlayer.getYRot(), dummyPlayer.getXRot()); } - private boolean sameChunk(World world, BlockPos target) { + private boolean sameChunk(Level world, BlockPos target) { if (level != null && level.dimension() == world.dimension()) { int thisX = worldPosition.getX() >> 4; int thisZ = worldPosition.getZ() >> 4; diff --git a/src/main/java/net/permutated/pylons/tile/InfusionPylonTile.java b/src/main/java/net/permutated/pylons/tile/InfusionPylonTile.java index a06ebd9..e117b0c 100644 --- a/src/main/java/net/permutated/pylons/tile/InfusionPylonTile.java +++ b/src/main/java/net/permutated/pylons/tile/InfusionPylonTile.java @@ -1,10 +1,12 @@ package net.permutated.pylons.tile; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Effect; -import net.minecraft.potion.EffectInstance; +import net.minecraft.core.BlockPos; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.server.MinecraftServer; +import net.minecraft.world.level.block.state.BlockState; import net.permutated.pylons.ModRegistry; import net.permutated.pylons.item.PotionFilterCard; @@ -12,8 +14,8 @@ import java.util.List; public class InfusionPylonTile extends AbstractPylonTile { - public InfusionPylonTile() { - super(ModRegistry.INFUSION_PYLON_TILE.get()); + public InfusionPylonTile(BlockPos pos, BlockState state) { + super(ModRegistry.INFUSION_PYLON_TILE.get(), pos, state); } @Override @@ -27,10 +29,10 @@ public void tick() { MinecraftServer server = level.getServer(); if (server != null) { - PlayerEntity player = server.getPlayerList().getPlayer(owner); + Player player = server.getPlayerList().getPlayer(owner); if (player != null && player.isAffectedByPotions()) { - for (EffectInstance effect : getEffects()) { + for (MobEffectInstance effect : getEffects()) { player.addEffect(effect); } } @@ -38,18 +40,18 @@ public void tick() { } } - public List getEffects() { - List effects = new ArrayList<>(); + public List getEffects() { + List effects = new ArrayList<>(); for (int i = 0; i < itemStackHandler.getSlots(); i++) { ItemStack stack = itemStackHandler.getStackInSlot(i); if (!stack.isEmpty() && stack.getItem() instanceof PotionFilterCard) { - Effect effect = PotionFilterCard.getEffect(stack); + MobEffect effect = PotionFilterCard.getEffect(stack); int duration = PotionFilterCard.getDuration(stack); int amplifier = PotionFilterCard.getAmplifier(stack); if (duration >= PotionFilterCard.REQUIRED && effect != null) { // 300 ticks - 15 seconds - effects.add(new EffectInstance(effect, 300, amplifier, false, false)); + effects.add(new MobEffectInstance(effect, 300, amplifier, false, false)); } } } diff --git a/src/main/java/net/permutated/pylons/tile/package-info.java b/src/main/java/net/permutated/pylons/tile/package-info.java index 6fae53e..e29e23a 100644 --- a/src/main/java/net/permutated/pylons/tile/package-info.java +++ b/src/main/java/net/permutated/pylons/tile/package-info.java @@ -2,6 +2,6 @@ @MethodsReturnNonnullByDefault package net.permutated.pylons.tile; -import mcp.MethodsReturnNonnullByDefault; +import net.minecraft.MethodsReturnNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/net/permutated/pylons/util/ResourceUtil.java b/src/main/java/net/permutated/pylons/util/ResourceUtil.java index 54113da..9732dce 100644 --- a/src/main/java/net/permutated/pylons/util/ResourceUtil.java +++ b/src/main/java/net/permutated/pylons/util/ResourceUtil.java @@ -1,9 +1,11 @@ package net.permutated.pylons.util; -import net.minecraft.item.Item; -import net.minecraft.tags.ITag; +import net.minecraft.tags.BlockTags; +import net.minecraft.world.item.Item; import net.minecraft.tags.ItemTags; -import net.minecraft.util.ResourceLocation; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.common.Tags; import net.permutated.pylons.Pylons; public class ResourceUtil { @@ -23,10 +25,14 @@ public static ResourceLocation forge(String path) { return new ResourceLocation("forge", path); } - public static ITag tag(String path) { + public static Tags.IOptionalNamedTag tag(String path) { return ItemTags.createOptional(new ResourceLocation(path)); } + public static Tags.IOptionalNamedTag blockTag(String path) { + return BlockTags.createOptional(new ResourceLocation(path)); + } + public static ResourceLocation gui(String path) { return prefix(String.format("textures/gui/%s.png", path)); } diff --git a/src/main/java/net/permutated/pylons/util/package-info.java b/src/main/java/net/permutated/pylons/util/package-info.java index dc0a8cc..c7c9f8d 100644 --- a/src/main/java/net/permutated/pylons/util/package-info.java +++ b/src/main/java/net/permutated/pylons/util/package-info.java @@ -2,6 +2,6 @@ @MethodsReturnNonnullByDefault package net.permutated.pylons.util; -import mcp.MethodsReturnNonnullByDefault; +import net.minecraft.MethodsReturnNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 4002a7e..15a033d 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -6,7 +6,7 @@ # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml modLoader="javafml" #mandatory # A version range to match for said mod loader - for regular FML @Mod it will be the forge version -loaderVersion="[36,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +loaderVersion="[38,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. # The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. license="All rights reserved" @@ -33,7 +33,7 @@ Utility Pylons # Does this dependency have to exist - if not, ordering below must be specified mandatory=true #mandatory # The version range of the dependency - versionRange="[36,)" #mandatory + versionRange="[38,)" #mandatory # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory ordering="NONE" # Side this dependency is applied on - BOTH, CLIENT or SERVER @@ -43,6 +43,6 @@ Utility Pylons modId="minecraft" mandatory=true # This version range declares a minimum of the current minecraft version up to but not including the next major version - versionRange="[1.16.5,1.17)" + versionRange="[1.18,1.19)" ordering="NONE" side="BOTH" diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 0310cff..16b3956 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,7 +1,6 @@ { "pack": { "description": "Pylons resources", - "pack_format": 6, - "_comment": "A pack_format of 6 requires json lang files and some texture changes from 1.16.2. Note: we require v6 pack meta for all mods." + "pack_format": 8 } }