diff --git a/build.gradle b/build.gradle index 41a521c4b..d9bfead78 100755 --- a/build.gradle +++ b/build.gradle @@ -4,14 +4,10 @@ buildscript { mavenCentral() } dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.+', changing: true + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true } } -plugins { - id 'info.solidsoft.pitest' version '1.5.1' -} - repositories { maven { url = "https://dvs1.progwml6.com/files/maven/" @@ -30,13 +26,8 @@ repositories { apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'maven-publish' -apply plugin: 'info.solidsoft.pitest' -pitest { - junit5PluginVersion = "0.12" -} - -version = '1.9.17' +version = '1.10.0' def env = System.getenv() if (env.BUILD_NUMBER) { version = version + "+" + "${env.BUILD_NUMBER}" @@ -47,7 +38,7 @@ archivesBaseName = 'refinedstorage' java.toolchain.languageVersion = JavaLanguageVersion.of(8) minecraft { - mappings channel: 'snapshot', version: '20210309-1.16.5' + mappings channel: 'official', version: '1.16.5' accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') runs { @@ -99,20 +90,13 @@ sourceSets { processResources { inputs.property 'version', project.version - - from(sourceSets.main.resources.srcDirs) { - include 'META-INF/mods.toml' - + filesMatching('META-INF/mods.toml') { expand 'version': project.version } - - from(sourceSets.main.resources.srcDirs) { - exclude 'META-INF/mods.toml' - } } dependencies { - minecraft 'net.minecraftforge:forge:1.16.5-36.1.31' + minecraft 'net.minecraftforge:forge:1.16.5-36.1.31' compileOnly fg.deobf("mezz.jei:jei-1.16.5:7.7.0.106:api") runtimeOnly fg.deobf("mezz.jei:jei-1.16.5:7.7.0.106") @@ -124,9 +108,21 @@ dependencies { runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.16.5-4.0.5.2") compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.16.5-4.0.5.2:api") + /*minecraft 'net.minecraftforge:forge:1.18.1-39.0.0' + + compileOnly fg.deobf("mezz.jei:jei-1.18.1:9.1.0.41:api") + runtimeOnly fg.deobf("mezz.jei:jei-1.18.1:9.1.0.41") + + compileOnly fg.deobf('curse.maven:mouse-tweaks-60089:3546383') + + compileOnly fg.deobf('curse.maven:crafting-tweaks-233071:3545611') + + runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.18-5.0.2.4") + compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.18-5.0.2.4:api")*/ + testImplementation('org.junit.jupiter:junit-jupiter-api:5.6.2') - testRuntime('org.junit.jupiter:junit-jupiter-engine:5.6.2') - testCompile group: 'org.assertj', name: 'assertj-core', version: '3.16.1' + testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.6.2') + testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.16.1' } jar { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c02..7454180f2 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 549d84424..e750102e0 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-6.9-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 4f906e0c8..c53aefaa5 100755 --- 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 -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 - -# 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 - # 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\"" - fi - i=`expr $i + 1` - 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" ;; +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 -# 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, 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. -# 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" +# For Cygwin or MSYS, switch paths to Windows format before running java +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 + 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 + # 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 +fi + +# 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. +# + +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/main/java/com/refinedmods/refinedstorage/RSBlocks.java b/src/main/java/com/refinedmods/refinedstorage/RSBlocks.java index 831efe2a3..5352ecca8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/RSBlocks.java +++ b/src/main/java/com/refinedmods/refinedstorage/RSBlocks.java @@ -85,9 +85,9 @@ public final class RSBlocks { } GRID.registerBlocks("grid", () -> new GridBlock(GridType.NORMAL)); - CRAFTING_GRID.registerBlocks(GridType.CRAFTING.getString() + GRID_SUFFIX, () -> new GridBlock(GridType.CRAFTING)); - PATTERN_GRID.registerBlocks(GridType.PATTERN.getString() + GRID_SUFFIX, () -> new GridBlock(GridType.PATTERN)); - FLUID_GRID.registerBlocks(GridType.FLUID.getString() + GRID_SUFFIX, () -> new GridBlock(GridType.FLUID)); + CRAFTING_GRID.registerBlocks(GridType.CRAFTING.getSerializedName() + GRID_SUFFIX, () -> new GridBlock(GridType.CRAFTING)); + PATTERN_GRID.registerBlocks(GridType.PATTERN.getSerializedName() + GRID_SUFFIX, () -> new GridBlock(GridType.PATTERN)); + FLUID_GRID.registerBlocks(GridType.FLUID.getSerializedName() + GRID_SUFFIX, () -> new GridBlock(GridType.FLUID)); CONTROLLER.registerBlocks("controller", () -> new ControllerBlock(NetworkType.NORMAL)); CREATIVE_CONTROLLER.registerBlocks("creative_controller", () -> new ControllerBlock(NetworkType.CREATIVE)); NETWORK_RECEIVER.registerBlocks("network_receiver", NetworkReceiverBlock::new); diff --git a/src/main/java/com/refinedmods/refinedstorage/RSItems.java b/src/main/java/com/refinedmods/refinedstorage/RSItems.java index ceb7d993d..c449c7ed5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/RSItems.java +++ b/src/main/java/com/refinedmods/refinedstorage/RSItems.java @@ -167,13 +167,13 @@ public final class RSItems { LATE_REGISTRATION.add(() -> { RSBlocks.CONTROLLER.forEach((color, block) -> { if (color != ColorMap.DEFAULT_COLOR) { - CONTROLLER.put(color, ITEMS.register(RSBlocks.CONTROLLER.get(color).getId().getPath(), () -> new ControllerBlockItem(RSBlocks.CONTROLLER.get(color).get(), color, new TranslationTextComponent(RSBlocks.CONTROLLER.get(ColorMap.DEFAULT_COLOR).get().getTranslationKey())))); + CONTROLLER.put(color, ITEMS.register(RSBlocks.CONTROLLER.get(color).getId().getPath(), () -> new ControllerBlockItem(RSBlocks.CONTROLLER.get(color).get(), color, new TranslationTextComponent(RSBlocks.CONTROLLER.get(ColorMap.DEFAULT_COLOR).get().getDescriptionId())))); } }); RSBlocks.CREATIVE_CONTROLLER.forEach((color, block) -> { if (color != ColorMap.DEFAULT_COLOR) { - CREATIVE_CONTROLLER.put(color, ITEMS.register(RSBlocks.CREATIVE_CONTROLLER.get(color).getId().getPath(), () -> new ControllerBlockItem(RSBlocks.CREATIVE_CONTROLLER.get(color).get(), color, new TranslationTextComponent(RSBlocks.CREATIVE_CONTROLLER.get(ColorMap.DEFAULT_COLOR).get().getTranslationKey())))); + CREATIVE_CONTROLLER.put(color, ITEMS.register(RSBlocks.CREATIVE_CONTROLLER.get(color).getId().getPath(), () -> new ControllerBlockItem(RSBlocks.CREATIVE_CONTROLLER.get(color).get(), color, new TranslationTextComponent(RSBlocks.CREATIVE_CONTROLLER.get(ColorMap.DEFAULT_COLOR).get().getDescriptionId())))); } }); }); @@ -207,7 +207,7 @@ public final class RSItems { } private static RegistryObject registerBlockItemFor(RegistryObject block) { - return ITEMS.register(block.getId().getPath(), () -> new BaseBlockItem(block.get(), new Item.Properties().group(RS.MAIN_GROUP))); + return ITEMS.register(block.getId().getPath(), () -> new BaseBlockItem(block.get(), new Item.Properties().tab(RS.MAIN_GROUP))); } public static void register() { diff --git a/src/main/java/com/refinedmods/refinedstorage/RSKeyBindings.java b/src/main/java/com/refinedmods/refinedstorage/RSKeyBindings.java index 247f6ff13..e96a8a3fb 100644 --- a/src/main/java/com/refinedmods/refinedstorage/RSKeyBindings.java +++ b/src/main/java/com/refinedmods/refinedstorage/RSKeyBindings.java @@ -27,28 +27,28 @@ public final class RSKeyBindings { public static final KeyBinding OPEN_WIRELESS_GRID = new KeyBinding( "key.refinedstorage.openWirelessGrid", KeyConflictContext.IN_GAME, - InputMappings.INPUT_INVALID, + InputMappings.UNKNOWN, RS.NAME ); public static final KeyBinding OPEN_WIRELESS_FLUID_GRID = new KeyBinding( "key.refinedstorage.openWirelessFluidGrid", KeyConflictContext.IN_GAME, - InputMappings.INPUT_INVALID, + InputMappings.UNKNOWN, RS.NAME ); public static final KeyBinding OPEN_WIRELESS_CRAFTING_MONITOR = new KeyBinding( "key.refinedstorage.openWirelessCraftingMonitor", KeyConflictContext.IN_GAME, - InputMappings.INPUT_INVALID, + InputMappings.UNKNOWN, RS.NAME ); public static final KeyBinding OPEN_PORTABLE_GRID = new KeyBinding( "key.refinedstorage.openPortableGrid", KeyConflictContext.IN_GAME, - InputMappings.INPUT_INVALID, + InputMappings.UNKNOWN, RS.NAME ); diff --git a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternContainer.java b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternContainer.java index ac01de77c..7d60417df 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/autocrafting/ICraftingPatternContainer.java @@ -202,7 +202,7 @@ public interface ICraftingPatternContainer { boolean success = current == null && stacks.isEmpty(); if (!success && action == Action.PERFORM) { - LogManager.getLogger().warn("Inventory unexpectedly didn't accept {}, the remainder has been voided!", current != null ? current.getTranslationKey() : null); + LogManager.getLogger().warn("Inventory unexpectedly didn't accept {}, the remainder has been voided!", current != null ? current.getDescriptionId() : null); } return success; diff --git a/src/main/java/com/refinedmods/refinedstorage/api/network/grid/GridType.java b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/GridType.java index 8d5ce69f5..128b4269c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/api/network/grid/GridType.java +++ b/src/main/java/com/refinedmods/refinedstorage/api/network/grid/GridType.java @@ -36,7 +36,7 @@ public enum GridType implements IStringSerializable { @Nonnull @Override - public String getString() { + public String getSerializedName() { return name; } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java index 693810377..5d19d194d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java @@ -130,12 +130,12 @@ public class API implements IRSAPI { @Override public INetworkNodeManager getNetworkNodeManager(ServerWorld world) { - return world.getSavedData().getOrCreate(() -> new NetworkNodeManager(NetworkNodeManager.NAME, world), NetworkNodeManager.NAME); + return world.getDataStorage().computeIfAbsent(() -> new NetworkNodeManager(NetworkNodeManager.NAME, world), NetworkNodeManager.NAME); } @Override public INetworkManager getNetworkManager(ServerWorld world) { - return world.getSavedData().getOrCreate(() -> new NetworkManager(NetworkManager.NAME, world), NetworkManager.NAME); + return world.getDataStorage().computeIfAbsent(() -> new NetworkManager(NetworkManager.NAME, world), NetworkManager.NAME); } @Override @@ -195,9 +195,9 @@ public class API implements IRSAPI { @Nonnull @Override public IStorageDiskManager getStorageDiskManager(ServerWorld anyWorld) { - ServerWorld world = anyWorld.getServer().func_241755_D_(); // Get the overworld + ServerWorld world = anyWorld.getServer().overworld(); // Get the overworld - return world.getSavedData().getOrCreate(() -> new StorageDiskManager(StorageDiskManager.NAME, world), StorageDiskManager.NAME); + return world.getDataStorage().computeIfAbsent(() -> new StorageDiskManager(StorageDiskManager.NAME, world), StorageDiskManager.NAME); } @Nonnull @@ -209,9 +209,9 @@ public class API implements IRSAPI { @Nonnull @Override public IStorageTrackerManager getStorageTrackerManager(ServerWorld anyWorld) { - ServerWorld world = anyWorld.getServer().func_241755_D_(); // Get the overworld + ServerWorld world = anyWorld.getServer().overworld(); // Get the overworld - return world.getSavedData().getOrCreate(() -> new StorageTrackerManager(StorageTrackerManager.NAME), StorageTrackerManager.NAME); + return world.getDataStorage().computeIfAbsent(() -> new StorageTrackerManager(StorageTrackerManager.NAME), StorageTrackerManager.NAME); } @Override @@ -295,7 +295,7 @@ public class API implements IRSAPI { } private int getHashCode(CompoundNBT tag, int result) { - for (String key : tag.keySet()) { + for (String key : tag.getAllKeys()) { result = 31 * result + key.hashCode(); result = getHashCode(tag.get(key), result); } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPattern.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPattern.java index 7aad5036a..e5b9f6c81 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPattern.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPattern.java @@ -92,10 +92,10 @@ public class CraftingPattern implements ICraftingPattern { CraftingInventory inv = new DummyCraftingInventory(); for (int i = 0; i < took.size(); ++i) { - inv.setInventorySlotContents(i, took.get(i)); + inv.setItem(i, took.get(i)); } - ItemStack result = recipe.getCraftingResult(inv); + ItemStack result = recipe.assemble(inv); if (result.isEmpty()) { throw new IllegalStateException("Cannot have empty result"); } @@ -125,7 +125,7 @@ public class CraftingPattern implements ICraftingPattern { CraftingInventory inv = new DummyCraftingInventory(); for (int i = 0; i < took.size(); ++i) { - inv.setInventorySlotContents(i, took.get(i)); + inv.setItem(i, took.get(i)); } NonNullList remainingItems = recipe.getRemainingItems(inv); @@ -269,7 +269,7 @@ public class CraftingPattern implements ICraftingPattern { public DummyCraftingInventory() { super(new Container(null, 0) { @Override - public boolean canInteractWith(PlayerEntity player) { + public boolean stillValid(PlayerEntity player) { return true; } }, 3, 3); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java index 305801d54..4221349ab 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java @@ -55,13 +55,13 @@ public class CraftingPatternFactory { fillCraftingInputs(inv, stack, inputs, i); } - Optional foundRecipe = world.getRecipeManager().getRecipe(IRecipeType.CRAFTING, inv, world); + Optional foundRecipe = world.getRecipeManager().getRecipeFor(IRecipeType.CRAFTING, inv, world); if (foundRecipe.isPresent()) { recipe = foundRecipe.get(); byproducts = recipe.getRemainingItems(inv); - ItemStack output = recipe.getCraftingResult(inv); + ItemStack output = recipe.assemble(inv); if (!output.isEmpty()) { outputs.add(output); @@ -102,7 +102,7 @@ public class CraftingPatternFactory { possibilities.add(input.copy()); if (allowedTagList != null) { - Collection tagsOfItem = ItemTags.getCollection().getOwningTags(input.getItem()); + Collection tagsOfItem = ItemTags.getAllTags().getMatchingTags(input.getItem()); Set declaredAllowedTags = allowedTagList.getAllowedItemTags().get(i); for (ResourceLocation declaredAllowedTag : declaredAllowedTags) { @@ -111,11 +111,11 @@ public class CraftingPatternFactory { new TranslationTextComponent( "misc.refinedstorage.pattern.error.tag_no_longer_applicable", declaredAllowedTag.toString(), - input.getDisplayName() + input.getHoverName() ) ); } else { - for (Item element : ItemTags.getCollection().get(declaredAllowedTag).getAllElements()) { + for (Item element : ItemTags.getAllTags().getTag(declaredAllowedTag).getValues()) { possibilities.add(new ItemStack(element, input.getCount())); } } @@ -141,7 +141,7 @@ public class CraftingPatternFactory { possibilities.add(input.copy()); if (allowedTagList != null) { - Collection tagsOfFluid = FluidTags.getCollection().getOwningTags(input.getFluid()); + Collection tagsOfFluid = FluidTags.getAllTags().getMatchingTags(input.getFluid()); Set declaredAllowedTags = allowedTagList.getAllowedFluidTags().get(i); for (ResourceLocation declaredAllowedTag : declaredAllowedTags) { @@ -154,7 +154,7 @@ public class CraftingPatternFactory { ) ); } else { - for (Fluid element : FluidTags.getCollection().get(declaredAllowedTag).getAllElements()) { + for (Fluid element : FluidTags.getAllTags().getTag(declaredAllowedTag).getValues()) { possibilities.add(new FluidStack(element, input.getAmount())); } } @@ -173,9 +173,9 @@ public class CraftingPatternFactory { private void fillCraftingInputs(CraftingInventory inv, ItemStack stack, List> inputs, int i) { ItemStack input = PatternItem.getInputSlot(stack, i); - inputs.add(input.isEmpty() ? NonNullList.create() : NonNullList.from(ItemStack.EMPTY, input)); + inputs.add(input.isEmpty() ? NonNullList.create() : NonNullList.of(ItemStack.EMPTY, input)); - inv.setInventorySlotContents(i, input); + inv.setItem(i, input); } private void modifyCraftingInputsToUseAlternatives(ICraftingRecipe recipe, List> inputs) { @@ -183,7 +183,7 @@ public class CraftingPatternFactory { inputs.clear(); for (int i = 0; i < recipe.getIngredients().size(); ++i) { - inputs.add(i, NonNullList.from(ItemStack.EMPTY, recipe.getIngredients().get(i).getMatchingStacks())); + inputs.add(i, NonNullList.of(ItemStack.EMPTY, recipe.getIngredients().get(i).getItems())); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java index b246164be..e4c03fc82 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java @@ -55,7 +55,7 @@ public class ErrorCraftingMonitorElement implements ICraftingMonitorElement { @Override public void write(PacketBuffer buf) { buf.writeResourceLocation(base.getId()); - buf.writeString(message); + buf.writeUtf(message); base.write(buf); } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java index 2d8f11d31..95bc0a647 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java @@ -58,42 +58,42 @@ public class FluidCraftingMonitorElement implements ICraftingMonitorElement { drawers.getFluidDrawer().draw(matrixStack, x + 4, y + 6, stack); - float scale = Minecraft.getInstance().getForceUnicodeFont() ? 1F : 0.5F; + float scale = Minecraft.getInstance().isEnforceUnicode() ? 1F : 0.5F; - matrixStack.push(); + matrixStack.pushPose(); matrixStack.scale(scale, scale, 1); int yy = y + 7; if (stored > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.format("gui.refinedstorage.crafting_monitor.stored", API.instance().getQuantityFormatter().formatInBucketForm(stored))); + drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.stored", API.instance().getQuantityFormatter().formatInBucketForm(stored))); yy += 7; } if (missing > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.format("gui.refinedstorage.crafting_monitor.missing", API.instance().getQuantityFormatter().formatInBucketForm(missing))); + drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.missing", API.instance().getQuantityFormatter().formatInBucketForm(missing))); yy += 7; } if (processing > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.format("gui.refinedstorage.crafting_monitor.processing", API.instance().getQuantityFormatter().formatInBucketForm(processing))); + drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.processing", API.instance().getQuantityFormatter().formatInBucketForm(processing))); yy += 7; } if (scheduled > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.format("gui.refinedstorage.crafting_monitor.scheduled", API.instance().getQuantityFormatter().formatInBucketForm(scheduled))); + drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.scheduled", API.instance().getQuantityFormatter().formatInBucketForm(scheduled))); yy += 7; } if (crafting > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.format("gui.refinedstorage.crafting_monitor.crafting", API.instance().getQuantityFormatter().formatInBucketForm(crafting))); + drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.crafting", API.instance().getQuantityFormatter().formatInBucketForm(crafting))); } - matrixStack.pop(); + matrixStack.popPose(); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java index c5badf49b..b32bf8264 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java @@ -58,42 +58,42 @@ public class ItemCraftingMonitorElement implements ICraftingMonitorElement { drawers.getItemDrawer().draw(matrixStack, x + 4, y + 6, stack); - float scale = Minecraft.getInstance().getForceUnicodeFont() ? 1F : 0.5F; + float scale = Minecraft.getInstance().isEnforceUnicode() ? 1F : 0.5F; - matrixStack.push(); + matrixStack.pushPose(); matrixStack.scale(scale, scale, 1); int yy = y + 7; if (stored > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.format("gui.refinedstorage.crafting_monitor.stored", stored)); + drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.stored", stored)); yy += 7; } if (missing > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.format("gui.refinedstorage.crafting_monitor.missing", missing)); + drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.missing", missing)); yy += 7; } if (processing > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.format("gui.refinedstorage.crafting_monitor.processing", processing)); + drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.processing", processing)); yy += 7; } if (scheduled > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.format("gui.refinedstorage.crafting_monitor.scheduled", scheduled)); + drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.scheduled", scheduled)); yy += 7; } if (crafting > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.format("gui.refinedstorage.crafting_monitor.crafting", crafting)); + drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy, scale), I18n.get("gui.refinedstorage.crafting_monitor.crafting", crafting)); } - matrixStack.pop(); + matrixStack.popPose(); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java index 5211b9ecd..063fac890 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java @@ -37,7 +37,7 @@ public class ErrorCraftingPreviewElement implements ICraftingPreviewElement { @Override public void write(PacketBuffer buf) { buf.writeInt(type.ordinal()); - buf.writeItemStack(recursedPattern); + buf.writeItem(recursedPattern); } public CalculationResultType getType() { @@ -47,7 +47,7 @@ public class ErrorCraftingPreviewElement implements ICraftingPreviewElement { public static ErrorCraftingPreviewElement read(PacketBuffer buf) { int errorIdx = buf.readInt(); CalculationResultType error = errorIdx >= 0 && errorIdx < CalculationResultType.values().length ? CalculationResultType.values()[errorIdx] : CalculationResultType.TOO_COMPLEX; - ItemStack stack = buf.readItemStack(); + ItemStack stack = buf.readItem(); return new ErrorCraftingPreviewElement(error, stack); } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java index 96af13564..4b01cac74 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java @@ -67,25 +67,25 @@ public class FluidCraftingPreviewElement implements ICraftingPreviewElement { drawers.getFluidDrawer().draw(matrixStack, x, y, getStack()); - float scale = Minecraft.getInstance().getForceUnicodeFont() ? 1F : 0.5F; + float scale = Minecraft.getInstance().isEnforceUnicode() ? 1F : 0.5F; y += 2; - matrixStack.push(); + matrixStack.pushPose(); matrixStack.scale(scale, scale, 1); if (toCraft > 0) { String format = doesDisableTaskStarting() ? "gui.refinedstorage.crafting_preview.missing" : "gui.refinedstorage.crafting_preview.to_craft"; - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.format(format, API.instance().getQuantityFormatter().formatInBucketForm(toCraft))); + drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.get(format, API.instance().getQuantityFormatter().formatInBucketForm(toCraft))); y += 7; } if (available > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.format("gui.refinedstorage.crafting_preview.available", API.instance().getQuantityFormatter().formatInBucketForm(available))); + drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.get("gui.refinedstorage.crafting_preview.available", API.instance().getQuantityFormatter().formatInBucketForm(available))); } - matrixStack.pop(); + matrixStack.popPose(); } public void addAvailable(int amount) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java index b3fa7f131..bc3c0ffdb 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java @@ -40,14 +40,14 @@ public class ItemCraftingPreviewElement implements ICraftingPreviewElement { @Override public void write(PacketBuffer buf) { - buf.writeItemStack(stack); + buf.writeItem(stack); buf.writeInt(available); buf.writeBoolean(missing); buf.writeInt(toCraft); } public static ItemCraftingPreviewElement read(PacketBuffer buf) { - ItemStack stack = buf.readItemStack(); + ItemStack stack = buf.readItem(); int available = buf.readInt(); boolean missing = buf.readBoolean(); int toCraft = buf.readInt(); @@ -67,25 +67,25 @@ public class ItemCraftingPreviewElement implements ICraftingPreviewElement { drawers.getItemDrawer().draw(matrixStack, x, y, stack); - float scale = Minecraft.getInstance().getForceUnicodeFont() ? 1F : 0.5F; + float scale = Minecraft.getInstance().isEnforceUnicode() ? 1F : 0.5F; y += 2; - matrixStack.push(); + matrixStack.pushPose(); matrixStack.scale(scale, scale, 1); if (toCraft > 0) { String format = doesDisableTaskStarting() ? "gui.refinedstorage.crafting_preview.missing" : "gui.refinedstorage.crafting_preview.to_craft"; - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.format(format, toCraft)); + drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.get(format, toCraft)); y += 7; } if (available > 0) { - drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.format("gui.refinedstorage.crafting_preview.available", available)); + drawers.getStringDrawer().draw(matrixStack, RenderUtils.getOffsetOnScale(x + 23, scale), RenderUtils.getOffsetOnScale(y, scale), I18n.get("gui.refinedstorage.crafting_preview.available", available)); } - matrixStack.pop(); + matrixStack.popPose(); } public void addAvailable(int amount) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java index 6c9784119..04d2d2ec0 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java @@ -92,7 +92,7 @@ public class CraftingTask implements ICraftingTask, NodeListener { this.requested = API.instance().createCraftingRequestInfo(tag.getCompound(NBT_REQUESTED)); this.quantity = tag.getInt(NBT_QUANTITY); this.pattern = SerializationUtil.readPatternFromNbt(tag.getCompound(NBT_PATTERN), network.getWorld()); - this.id = tag.getUniqueId(NBT_ID); + this.id = tag.getUUID(NBT_ID); this.nodes = new NodeList(); this.ticks = tag.getInt(NBT_TICKS); @@ -119,7 +119,7 @@ public class CraftingTask implements ICraftingTask, NodeListener { tag.putInt(NBT_QUANTITY, quantity); tag.put(NBT_PATTERN, SerializationUtil.writePatternToNbt(pattern)); tag.putInt(NBT_TICKS, ticks); - tag.putUniqueId(NBT_ID, id); + tag.putUUID(NBT_ID, id); tag.putLong(NBT_EXECUTION_STARTED, startTime); tag.put(NBT_INTERNAL_STORAGE, internalStorage.writeToNbt()); tag.put(NBT_INTERNAL_FLUID_STORAGE, internalFluidStorage.writeToNbt()); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/SerializationUtil.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/SerializationUtil.java index dd06842e1..054b165bf 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/SerializationUtil.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/SerializationUtil.java @@ -80,18 +80,18 @@ public class SerializationUtil { CompoundNBT tag = new CompoundNBT(); tag.put(NBT_PATTERN_STACK, pattern.getStack().serializeNBT()); - tag.putLong(NBT_PATTERN_CONTAINER_POS, pattern.getContainer().getPosition().toLong()); + tag.putLong(NBT_PATTERN_CONTAINER_POS, pattern.getContainer().getPosition().asLong()); return tag; } public static ICraftingPattern readPatternFromNbt(CompoundNBT tag, World world) throws CraftingTaskReadException { - BlockPos containerPos = BlockPos.fromLong(tag.getLong(NBT_PATTERN_CONTAINER_POS)); + BlockPos containerPos = BlockPos.of(tag.getLong(NBT_PATTERN_CONTAINER_POS)); INetworkNode node = API.instance().getNetworkNodeManager((ServerWorld) world).getNode(containerPos); if (node instanceof ICraftingPatternContainer) { - ItemStack stack = ItemStack.read(tag.getCompound(NBT_PATTERN_STACK)); + ItemStack stack = ItemStack.of(tag.getCompound(NBT_PATTERN_STACK)); if (stack.getItem() instanceof ICraftingPatternProvider) { return ((ICraftingPatternProvider) stack.getItem()).create(world, stack, (ICraftingPatternContainer) node); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java index 8365665a9..944154941 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java @@ -105,7 +105,7 @@ public class Network implements INetwork, IRedstoneConfigurable { this.type = type; this.root = new RootNetworkNode(this, world, pos); this.nodeGraph.addListener(() -> { - TileEntity tile = world.getTileEntity(pos); + TileEntity tile = world.getBlockEntity(pos); if (tile instanceof ControllerTile) { ((ControllerTile) tile).getDataManager().sendParameterToWatchers(ControllerTile.NODES); @@ -148,16 +148,16 @@ public class Network implements INetwork, IRedstoneConfigurable { @Override public void update() { - if (!world.isRemote) { - long tickStart = Util.nanoTime(); + if (!world.isClientSide) { + long tickStart = Util.getNanos(); if (ticks == 0) { - redstonePowered = world.isBlockPowered(pos); + redstonePowered = world.hasNeighborSignal(pos); } ++ticks; - amILoaded = world.isBlockPresent(pos); + amILoaded = world.isLoaded(pos); updateEnergyUsage(); @@ -205,11 +205,11 @@ public class Network implements INetwork, IRedstoneConfigurable { BlockState state = world.getBlockState(pos); if (state.getBlock() instanceof ControllerBlock) { - world.setBlockState(pos, state.with(ControllerBlock.ENERGY_TYPE, energyType)); + world.setBlockAndUpdate(pos, state.setValue(ControllerBlock.ENERGY_TYPE, energyType)); } } - tickTimes[tickCounter % tickTimes.length] = Util.nanoTime() - tickStart; + tickTimes[tickCounter % tickTimes.length] = Util.getNanos() - tickStart; tickCounter++; } } @@ -506,7 +506,7 @@ public class Network implements INetwork, IRedstoneConfigurable { craftingManager.readFromNbt(tag); if (tag.contains(NBT_ITEM_STORAGE_TRACKER_ID)) { - this.itemStorageTrackerId = tag.getUniqueId(NBT_ITEM_STORAGE_TRACKER_ID); + this.itemStorageTrackerId = tag.getUUID(NBT_ITEM_STORAGE_TRACKER_ID); } else { if (tag.contains(NBT_ITEM_STORAGE_TRACKER)) { //TODO: remove next version getItemStorageTracker().readFromNbt(tag.getList(NBT_ITEM_STORAGE_TRACKER, Constants.NBT.TAG_COMPOUND)); @@ -514,7 +514,7 @@ public class Network implements INetwork, IRedstoneConfigurable { } if (tag.contains(NBT_FLUID_STORAGE_TRACKER_ID)) { - this.fluidStorageTrackerId = tag.getUniqueId(NBT_FLUID_STORAGE_TRACKER_ID); + this.fluidStorageTrackerId = tag.getUUID(NBT_FLUID_STORAGE_TRACKER_ID); } else { if (tag.contains(NBT_FLUID_STORAGE_TRACKER)) { //TODO: remove next version getFluidStorageTracker().readFromNbt(tag.getList(NBT_FLUID_STORAGE_TRACKER, Constants.NBT.TAG_COMPOUND)); @@ -532,11 +532,11 @@ public class Network implements INetwork, IRedstoneConfigurable { craftingManager.writeToNbt(tag); if (itemStorageTrackerId != null) { - tag.putUniqueId(NBT_ITEM_STORAGE_TRACKER_ID, itemStorageTrackerId); + tag.putUUID(NBT_ITEM_STORAGE_TRACKER_ID, itemStorageTrackerId); } if (fluidStorageTrackerId != null) { - tag.putUniqueId(NBT_FLUID_STORAGE_TRACKER_ID, fluidStorageTrackerId); + tag.putUUID(NBT_FLUID_STORAGE_TRACKER_ID, fluidStorageTrackerId); } return tag; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkListener.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkListener.java index 05390e2ac..13b40e080 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkListener.java @@ -10,22 +10,22 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; public class NetworkListener { @SubscribeEvent public void onWorldTick(TickEvent.WorldTickEvent e) { - if (!e.world.isRemote() && e.phase == TickEvent.Phase.END) { - e.world.getProfiler().startSection("network ticking"); + if (!e.world.isClientSide() && e.phase == TickEvent.Phase.END) { + e.world.getProfiler().push("network ticking"); for (INetwork network : API.instance().getNetworkManager((ServerWorld) e.world).all()) { network.update(); } - e.world.getProfiler().endSection(); + e.world.getProfiler().pop(); - e.world.getProfiler().startSection("network node ticking"); + e.world.getProfiler().push("network node ticking"); for (INetworkNode node : API.instance().getNetworkNodeManager((ServerWorld) e.world).all()) { node.update(); } - e.world.getProfiler().endSection(); + e.world.getProfiler().pop(); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkManager.java index 44028dd5e..48dd8abfb 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkManager.java @@ -37,7 +37,7 @@ public class NetworkManager extends RSWorldSavedData implements INetworkManager } @Override - public void read(CompoundNBT tag) { + public void load(CompoundNBT tag) { if (tag.contains(NBT_NETWORKS)) { ListNBT networksTag = tag.getList(NBT_NETWORKS, Constants.NBT.TAG_COMPOUND); @@ -47,7 +47,7 @@ public class NetworkManager extends RSWorldSavedData implements INetworkManager CompoundNBT networkTag = networksTag.getCompound(i); CompoundNBT data = networkTag.getCompound(NBT_DATA); - BlockPos pos = BlockPos.fromLong(networkTag.getLong(NBT_POS)); + BlockPos pos = BlockPos.of(networkTag.getLong(NBT_POS)); int type = networkTag.getInt(NBT_TYPE); INetwork network = new Network(world, pos, NetworkType.values()[type]); @@ -64,14 +64,14 @@ public class NetworkManager extends RSWorldSavedData implements INetworkManager } @Override - public CompoundNBT write(CompoundNBT tag) { + public CompoundNBT save(CompoundNBT tag) { ListNBT list = new ListNBT(); for (INetwork network : all()) { try { CompoundNBT networkTag = new CompoundNBT(); - networkTag.putLong(NBT_POS, network.getPosition().toLong()); + networkTag.putLong(NBT_POS, network.getPosition().asLong()); networkTag.put(NBT_DATA, network.writeToNbt(new CompoundNBT())); networkTag.putInt(NBT_TYPE, network.getType().ordinal()); @@ -121,6 +121,6 @@ public class NetworkManager extends RSWorldSavedData implements INetworkManager @Override public void markForSaving() { - markDirty(); + setDirty(); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraph.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraph.java index a07d443af..d2805d755 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraph.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraph.java @@ -15,6 +15,8 @@ import javax.annotation.Nullable; import java.util.*; import java.util.function.Consumer; +import com.refinedmods.refinedstorage.api.network.INetworkNodeVisitor.Operator; + public class NetworkNodeGraph implements INetworkNodeGraph { private final INetwork network; private Set entries = Sets.newConcurrentHashSet(); @@ -34,7 +36,7 @@ public class NetworkNodeGraph implements INetworkNodeGraph { Operator operator = new Operator(action); - INetworkNode originNode = NetworkUtils.getNodeFromTile(world.getTileEntity(origin)); + INetworkNode originNode = NetworkUtils.getNodeFromTile(world.getBlockEntity(origin)); if (originNode instanceof INetworkNodeVisitor) { ((INetworkNodeVisitor) originNode).visit(operator); } @@ -113,7 +115,7 @@ public class NetworkNodeGraph implements INetworkNodeGraph { @Override public void apply(World world, BlockPos pos, @Nullable Direction side) { - TileEntity tile = world.getTileEntity(pos); + TileEntity tile = world.getBlockEntity(pos); INetworkNode otherNode = NetworkUtils.getNodeFromTile(tile); if (otherNode != null) { @@ -144,7 +146,7 @@ public class NetworkNodeGraph implements INetworkNodeGraph { private void dropConflictingBlock(World world, BlockPos pos) { if (!network.getPosition().equals(pos)) { - Block.spawnDrops(world.getBlockState(pos), world, pos, world.getTileEntity(pos)); + Block.dropResources(world.getBlockState(pos), world, pos, world.getBlockEntity(pos)); world.removeBlock(pos, false); } @@ -181,7 +183,7 @@ public class NetworkNodeGraph implements INetworkNodeGraph { INetworkNode nodeOnSide = NetworkUtils.getNodeFromTile(tile); if (nodeOnSide == node) { - operator.apply(world, pos.offset(checkSide), checkSide.getOpposite()); + operator.apply(world, pos.relative(checkSide), checkSide.getOpposite()); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraphEntry.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraphEntry.java index 018d6fde6..36318fe89 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraphEntry.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraphEntry.java @@ -26,7 +26,7 @@ public class NetworkNodeGraphEntry implements INetworkNodeGraphEntry { NetworkNodeGraphEntry otherItem = (NetworkNodeGraphEntry) other; - if (node.getWorld().getDimensionKey() != otherItem.node.getWorld().getDimensionKey()) { + if (node.getWorld().dimension() != otherItem.node.getWorld().dimension()) { return false; } @@ -36,7 +36,7 @@ public class NetworkNodeGraphEntry implements INetworkNodeGraphEntry { @Override public int hashCode() { int result = node.getPos().hashCode(); - result = 31 * result + node.getWorld().getDimensionKey().hashCode(); + result = 31 * result + node.getWorld().dimension().hashCode(); return result; } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeListener.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeListener.java index 7d7c6205e..5b38a1910 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeListener.java @@ -17,14 +17,14 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; public class NetworkNodeListener { @SubscribeEvent public void onBlockPlace(BlockEvent.EntityPlaceEvent e) { - if (!e.getWorld().isRemote() && e.getEntity() instanceof PlayerEntity) { + if (!e.getWorld().isClientSide() && e.getEntity() instanceof PlayerEntity) { PlayerEntity player = (PlayerEntity) e.getEntity(); - INetworkNode placed = NetworkUtils.getNodeFromTile(e.getWorld().getTileEntity(e.getPos())); + INetworkNode placed = NetworkUtils.getNodeFromTile(e.getWorld().getBlockEntity(e.getPos())); if (placed != null) { for (Direction facing : Direction.values()) { - INetworkNode node = NetworkUtils.getNodeFromTile(e.getWorld().getTileEntity(e.getBlockSnapshot().getPos().offset(facing))); + INetworkNode node = NetworkUtils.getNodeFromTile(e.getWorld().getBlockEntity(e.getBlockSnapshot().getPos().relative(facing))); if (node != null && node.getNetwork() != null && !node.getNetwork().getSecurityManager().hasPermission(Permission.BUILD, player)) { WorldUtils.sendNoPermissionMessage(player); @@ -47,7 +47,7 @@ public class NetworkNodeListener { private void discoverNode(IWorld world, BlockPos pos) { for (Direction facing : Direction.values()) { - INetworkNode node = NetworkUtils.getNodeFromTile(world.getTileEntity(pos.offset(facing))); + INetworkNode node = NetworkUtils.getNodeFromTile(world.getBlockEntity(pos.relative(facing))); if (node != null && node.getNetwork() != null) { node.getNetwork().getNodeGraph().invalidate(Action.PERFORM, node.getNetwork().getWorld(), node.getNetwork().getPosition()); @@ -59,8 +59,8 @@ public class NetworkNodeListener { @SubscribeEvent public void onBlockBreak(BlockEvent.BreakEvent e) { - if (!e.getWorld().isRemote()) { - INetworkNode node = NetworkUtils.getNodeFromTile(e.getWorld().getTileEntity(e.getPos())); + if (!e.getWorld().isClientSide()) { + INetworkNode node = NetworkUtils.getNodeFromTile(e.getWorld().getBlockEntity(e.getPos())); if (node != null && node.getNetwork() != null && !node.getNetwork().getSecurityManager().hasPermission(Permission.BUILD, e.getPlayer())) { WorldUtils.sendNoPermissionMessage(e.getPlayer()); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeManager.java index 0b379f9af..5c3273ae6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeManager.java @@ -39,7 +39,7 @@ public class NetworkNodeManager extends RSWorldSavedData implements INetworkNode } @Override - public void read(CompoundNBT tag) { + public void load(CompoundNBT tag) { if (tag.contains(NBT_NODES)) { ListNBT nodesTag = tag.getList(NBT_NODES, Constants.NBT.TAG_COMPOUND); @@ -50,7 +50,7 @@ public class NetworkNodeManager extends RSWorldSavedData implements INetworkNode ResourceLocation id = new ResourceLocation(nodeTag.getString(NBT_NODE_ID)); CompoundNBT data = nodeTag.getCompound(NBT_NODE_DATA); - BlockPos pos = BlockPos.fromLong(nodeTag.getLong(NBT_NODE_POS)); + BlockPos pos = BlockPos.of(nodeTag.getLong(NBT_NODE_POS)); INetworkNodeFactory factory = API.instance().getNetworkNodeRegistry().get(id); @@ -74,7 +74,7 @@ public class NetworkNodeManager extends RSWorldSavedData implements INetworkNode } @Override - public CompoundNBT write(CompoundNBT tag) { + public CompoundNBT save(CompoundNBT tag) { ListNBT list = new ListNBT(); for (INetworkNode node : all()) { @@ -82,7 +82,7 @@ public class NetworkNodeManager extends RSWorldSavedData implements INetworkNode CompoundNBT nodeTag = new CompoundNBT(); nodeTag.putString(NBT_NODE_ID, node.getId().toString()); - nodeTag.putLong(NBT_NODE_POS, node.getPos().toLong()); + nodeTag.putLong(NBT_NODE_POS, node.getPos().asLong()); nodeTag.put(NBT_NODE_DATA, node.write(new CompoundNBT())); list.add(nodeTag); @@ -131,6 +131,6 @@ public class NetworkNodeManager extends RSWorldSavedData implements INetworkNode @Override public void markForSaving() { - markDirty(); + setDirty(); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/CraftingGridBehavior.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/CraftingGridBehavior.java index 1b64827bd..5b1c13a2d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/CraftingGridBehavior.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/CraftingGridBehavior.java @@ -37,25 +37,25 @@ public class CraftingGridBehavior implements ICraftingGridBehavior { CraftingInventory matrix = grid.getCraftingMatrix(); - for (int i = 0; i < grid.getCraftingMatrix().getSizeInventory(); ++i) { - ItemStack slot = matrix.getStackInSlot(i); + for (int i = 0; i < grid.getCraftingMatrix().getContainerSize(); ++i) { + ItemStack slot = matrix.getItem(i); // Do we have a remainder? if (i < remainder.size() && !remainder.get(i).isEmpty()) { // If there is no space for the remainder, dump it in the player inventory. if (!slot.isEmpty() && slot.getCount() > 1) { - if (!player.inventory.addItemStackToInventory(remainder.get(i).copy())) { // If there is no space in the player inventory, try to dump it in the network. + if (!player.inventory.add(remainder.get(i).copy())) { // If there is no space in the player inventory, try to dump it in the network. ItemStack remainderStack = network == null ? remainder.get(i).copy() : network.insertItem(remainder.get(i).copy(), remainder.get(i).getCount(), Action.PERFORM); // If there is no space in the network, just dump it in the world. if (!remainderStack.isEmpty()) { - InventoryHelper.spawnItemStack(player.getEntityWorld(), player.getPosX(), player.getPosY(), player.getPosZ(), remainderStack); + InventoryHelper.dropItemStack(player.getCommandSenderWorld(), player.getX(), player.getY(), player.getZ(), remainderStack); } } - matrix.decrStackSize(i, 1); + matrix.removeItem(i, 1); } else { - matrix.setInventorySlotContents(i, remainder.get(i).copy()); + matrix.setItem(i, remainder.get(i).copy()); } } else if (!slot.isEmpty()) { // We don't have a remainder, but the slot is not empty. if (slot.getCount() == 1 && network != null && grid.isGridActive()) { // Attempt to refill the slot with the same item from the network, only if we have a network and only if it's the last item. @@ -72,13 +72,13 @@ public class CraftingGridBehavior implements ICraftingGridBehavior { } } - matrix.setInventorySlotContents(i, refill); + matrix.setItem(i, refill); if (!refill.isEmpty()) { network.getItemStorageTracker().changed(player, refill.copy()); } } else { // We don't have a network, or, the slot still has more than 1 items in it. Just decrement then. - matrix.decrStackSize(i, 1); + matrix.removeItem(i, 1); } } } @@ -91,7 +91,7 @@ public class CraftingGridBehavior implements ICraftingGridBehavior { CraftingInventory matrix = grid.getCraftingMatrix(); INetwork network = grid.getNetwork(); List craftedItemsList = new ArrayList<>(); - ItemStack crafted = grid.getCraftingResult().getStackInSlot(0); + ItemStack crafted = grid.getCraftingResult().getItem(0); int maxCrafted = crafted.getMaxStackSize(); @@ -116,14 +116,14 @@ public class CraftingGridBehavior implements ICraftingGridBehavior { craftedItemsList.add(crafted.copy()); amountCrafted += crafted.getCount(); - } while (API.instance().getComparer().isEqual(crafted, grid.getCraftingResult().getStackInSlot(0)) && amountCrafted < maxCrafted && amountCrafted + crafted.getCount() <= maxCrafted); + } while (API.instance().getComparer().isEqual(crafted, grid.getCraftingResult().getItem(0)) && amountCrafted < maxCrafted && amountCrafted + crafted.getCount() <= maxCrafted); if (useNetwork) { usedItems.getStacks().forEach(stack -> network.extractItem(stack.getStack(), stack.getStack().getCount(), Action.PERFORM)); } for (ItemStack craftedItem : craftedItemsList) { - if (!player.inventory.addItemStackToInventory(craftedItem.copy())) { + if (!player.inventory.add(craftedItem.copy())) { ItemStack remainder = craftedItem; @@ -132,7 +132,7 @@ public class CraftingGridBehavior implements ICraftingGridBehavior { } if (!remainder.isEmpty()) { - InventoryHelper.spawnItemStack(player.getEntityWorld(), player.getPosX(), player.getPosY(), player.getPosZ(), remainder); + InventoryHelper.dropItemStack(player.getCommandSenderWorld(), player.getX(), player.getY(), player.getZ(), remainder); } } } @@ -140,14 +140,14 @@ public class CraftingGridBehavior implements ICraftingGridBehavior { // @Volatile: This is some logic copied from CraftingResultSlot#onCrafting. We call this manually for shift clicking because // otherwise it's not being called. // For regular crafting, this is already called in ResultCraftingGridSlot#onTake -> onCrafting(stack) - crafted.onCrafting(player.world, player, amountCrafted); + crafted.onCraftedBy(player.level, player, amountCrafted); BasicEventHooks.firePlayerCraftingEvent(player, ItemHandlerHelper.copyStackWithSize(crafted, amountCrafted), grid.getCraftingMatrix()); ForgeHooks.setCraftingPlayer(null); } private void filterDuplicateStacks(INetwork network, CraftingInventory matrix, IStackList availableItems) { - for (int i = 0; i < matrix.getSizeInventory(); ++i) { - ItemStack stack = network.getItemStorageCache().getList().get(matrix.getStackInSlot(i)); + for (int i = 0; i < matrix.getContainerSize(); ++i) { + ItemStack stack = network.getItemStorageCache().getList().get(matrix.getItem(i)); //Don't add the same item twice into the list. Items may appear twice in a recipe but not in storage. if (stack != null && availableItems.get(stack) == null) { @@ -165,8 +165,8 @@ public class CraftingGridBehavior implements ICraftingGridBehavior { } // First try to empty the crafting matrix - for (int i = 0; i < grid.getCraftingMatrix().getSizeInventory(); ++i) { - ItemStack slot = grid.getCraftingMatrix().getStackInSlot(i); + for (int i = 0; i < grid.getCraftingMatrix().getContainerSize(); ++i) { + ItemStack slot = grid.getCraftingMatrix().getItem(i); if (!slot.isEmpty()) { // Only if we are a crafting grid. Pattern grids can just be emptied. @@ -182,19 +182,19 @@ public class CraftingGridBehavior implements ICraftingGridBehavior { } } else { // If we aren't connected, try to insert into player inventory. If it fails, stop. - if (!player.inventory.addItemStackToInventory(slot.copy())) { + if (!player.inventory.add(slot.copy())) { return; } } } - grid.getCraftingMatrix().setInventorySlotContents(i, ItemStack.EMPTY); + grid.getCraftingMatrix().setItem(i, ItemStack.EMPTY); } } AtomicReference> playerItems = new AtomicReference<>(); // Now let's fill the matrix - for (int i = 0; i < grid.getCraftingMatrix().getSizeInventory(); ++i) { + for (int i = 0; i < grid.getCraftingMatrix().getContainerSize(); ++i) { if (recipe[i] != null) { ItemStack[] possibilities = recipe[i]; @@ -214,7 +214,7 @@ public class CraftingGridBehavior implements ICraftingGridBehavior { ItemStack took = network.extractItem(possibility, 1, IComparer.COMPARE_NBT, Action.PERFORM); if (!took.isEmpty()) { - grid.getCraftingMatrix().setInventorySlotContents(i, took); + grid.getCraftingMatrix().setItem(i, took); network.getItemStorageTracker().changed(player, took.copy()); @@ -228,11 +228,11 @@ public class CraftingGridBehavior implements ICraftingGridBehavior { // If we haven't found anything in the network (or we are disconnected), go look in the player inventory if (!found) { for (ItemStack possibility : possibilities) { - for (int j = 0; j < player.inventory.getSizeInventory(); ++j) { - if (API.instance().getComparer().isEqual(possibility, player.inventory.getStackInSlot(j), IComparer.COMPARE_NBT)) { - grid.getCraftingMatrix().setInventorySlotContents(i, ItemHandlerHelper.copyStackWithSize(player.inventory.getStackInSlot(j), 1)); + for (int j = 0; j < player.inventory.getContainerSize(); ++j) { + if (API.instance().getComparer().isEqual(possibility, player.inventory.getItem(j), IComparer.COMPARE_NBT)) { + grid.getCraftingMatrix().setItem(i, ItemHandlerHelper.copyStackWithSize(player.inventory.getItem(j), 1)); - player.inventory.decrStackSize(j, 1); + player.inventory.removeItem(j, 1); found = true; @@ -247,7 +247,7 @@ public class CraftingGridBehavior implements ICraftingGridBehavior { } } else if (grid.getGridType() == GridType.PATTERN) { // If we are a pattern grid we can just set the slot - grid.getCraftingMatrix().setInventorySlotContents(i, possibilities.length == 0 ? ItemStack.EMPTY : possibilities[0]); + grid.getCraftingMatrix().setItem(i, possibilities.length == 0 ? ItemStack.EMPTY : possibilities[0]); } } } @@ -284,8 +284,8 @@ public class CraftingGridBehavior implements ICraftingGridBehavior { private Map makePlayerInventoryMap(PlayerEntity player, INetwork network) { Map playerItems = new HashMap<>(); - for (int j = 0; j < player.inventory.getSizeInventory(); j++) { - ItemStack inventoryStack = player.inventory.getStackInSlot(j); + for (int j = 0; j < player.inventory.getContainerSize(); j++) { + ItemStack inventoryStack = player.inventory.getItem(j); if (inventoryStack.getItem() instanceof ICraftingPatternProvider) { ICraftingPattern pattern = PatternItem.fromCache(network.getWorld(), inventoryStack); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridManager.java index 73d16b676..3feeabe05 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridManager.java @@ -53,7 +53,7 @@ public class GridManager implements IGridManager { buf.writeBoolean(stack != null); if (stack != null) { - buf.writeItemStack(stack); + buf.writeItem(stack); } slot.writePlayerSlot(buf); @@ -70,7 +70,7 @@ public class GridManager implements IGridManager { } IGrid grid = null; - TileEntity tile = factory.getRelevantTile(player.world, pos); + TileEntity tile = factory.getRelevantTile(player.level, pos); if (factory.getType() == GridFactoryType.STACK) { grid = factory.createFromStack(player, stack, slot); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java index c5e6748a3..9c9a04ddf 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java @@ -47,7 +47,7 @@ public class GridTab implements IGridTab { @Override public void drawIcon(MatrixStack matrixStack, int x, int y, IElementDrawer itemDrawer, IElementDrawer fluidDrawer) { if (!icon.isEmpty()) { - RenderHelper.setupGui3DDiffuseLighting(); + RenderHelper.setupFor3DItems(); itemDrawer.draw(matrixStack, x, y, icon); } else { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/GridBlockGridFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/GridBlockGridFactory.java index 4c2a820bb..1985be640 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/GridBlockGridFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/GridBlockGridFactory.java @@ -27,7 +27,7 @@ public class GridBlockGridFactory implements IGridFactory { @Override @Nullable public IGrid createFromBlock(PlayerEntity player, BlockPos pos) { - TileEntity tile = getRelevantTile(player.getEntityWorld(), pos); + TileEntity tile = getRelevantTile(player.getCommandSenderWorld(), pos); if (tile instanceof GridTile) { return ((GridTile) tile).getNode(); @@ -39,7 +39,7 @@ public class GridBlockGridFactory implements IGridFactory { @Nullable @Override public TileEntity getRelevantTile(World world, BlockPos pos) { - return world.getTileEntity(pos); + return world.getBlockEntity(pos); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridBlockGridFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridBlockGridFactory.java index 2339277b0..dbb365490 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridBlockGridFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/factory/PortableGridBlockGridFactory.java @@ -27,7 +27,7 @@ public class PortableGridBlockGridFactory implements IGridFactory { @Override @Nullable public IGrid createFromBlock(PlayerEntity player, BlockPos pos) { - TileEntity tile = getRelevantTile(player.world, pos); + TileEntity tile = getRelevantTile(player.level, pos); if (tile instanceof PortableGridTile) { return (PortableGridTile) tile; @@ -39,7 +39,7 @@ public class PortableGridBlockGridFactory implements IGridFactory { @Nullable @Override public TileEntity getRelevantTile(World world, BlockPos pos) { - return world.getTileEntity(pos); + return world.getBlockEntity(pos); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java index d482df178..f0e8683cd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java @@ -48,12 +48,12 @@ public class FluidGridHandler implements IFluidGridHandler { fluidHandler.fill(extracted, IFluidHandler.FluidAction.EXECUTE); if (shift) { - if (!player.inventory.addItemStackToInventory(fluidHandler.getContainer().copy())) { - InventoryHelper.spawnItemStack(player.getEntityWorld(), player.getPosX(), player.getPosY(), player.getPosZ(), fluidHandler.getContainer()); + if (!player.inventory.add(fluidHandler.getContainer().copy())) { + InventoryHelper.dropItemStack(player.getCommandSenderWorld(), player.getX(), player.getY(), player.getZ(), fluidHandler.getContainer()); } } else { - player.inventory.setItemStack(fluidHandler.getContainer()); - player.updateHeldItem(); + player.inventory.setCarried(fluidHandler.getContainer()); + player.broadcastCarriedItem(); } network.getNetworkItemManager().drainEnergy(player, RS.SERVER_CONFIG.getWirelessFluidGrid().getExtractUsage()); @@ -86,8 +86,8 @@ public class FluidGridHandler implements IFluidGridHandler { @Override public void onInsertHeldContainer(ServerPlayerEntity player) { - player.inventory.setItemStack(onInsert(player, player.inventory.getItemStack())); - player.updateHeldItem(); + player.inventory.setCarried(onInsert(player, player.inventory.getCarried())); + player.broadcastCarriedItem(); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java index 2194551c2..5889e9b6e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java @@ -58,13 +58,13 @@ public class ItemGridHandler implements IItemGridHandler { boolean single = (flags & EXTRACT_SINGLE) == EXTRACT_SINGLE; - ItemStack held = player.inventory.getItemStack(); + ItemStack held = player.inventory.getCarried(); if (single) { if (!held.isEmpty() && (!API.instance().getComparer().isEqualNoQuantity(item, held) || held.getCount() + 1 > held.getMaxStackSize())) { return; } - } else if (!player.inventory.getItemStack().isEmpty()) { + } else if (!player.inventory.getCarried().isEmpty()) { return; } @@ -119,10 +119,10 @@ public class ItemGridHandler implements IItemGridHandler { if (single && !held.isEmpty()) { held.grow(1); } else { - player.inventory.setItemStack(took); + player.inventory.setCarried(took); } - player.updateHeldItem(); + player.broadcastCarriedItem(); } } @@ -157,11 +157,11 @@ public class ItemGridHandler implements IItemGridHandler { @Override public void onInsertHeldItem(ServerPlayerEntity player, boolean single) { - if (player.inventory.getItemStack().isEmpty() || !network.getSecurityManager().hasPermission(Permission.INSERT, player) || !network.canRun()) { + if (player.inventory.getCarried().isEmpty() || !network.getSecurityManager().hasPermission(Permission.INSERT, player) || !network.canRun()) { return; } - ItemStack stack = player.inventory.getItemStack(); + ItemStack stack = player.inventory.getCarried(); int size = single ? 1 : stack.getCount(); network.getItemStorageTracker().changed(player, stack.copy()); @@ -173,10 +173,10 @@ public class ItemGridHandler implements IItemGridHandler { stack.shrink(size); } } else { - player.inventory.setItemStack(network.insertItem(stack, size, Action.PERFORM)); + player.inventory.setCarried(network.insertItem(stack, size, Action.PERFORM)); } - player.updateHeldItem(); + player.broadcastCarriedItem(); network.getNetworkItemManager().drainEnergy(player, RS.SERVER_CONFIG.getWirelessGrid().getInsertUsage()); } @@ -253,7 +253,7 @@ public class ItemGridHandler implements IItemGridHandler { } public static void onInventoryScroll(IItemGridHandler gridHandler, ServerPlayerEntity player, int slot, boolean shift, boolean up, @Nullable INetwork network) { - if (player == null || !(player.openContainer instanceof GridContainer)) { + if (player == null || !(player.containerMenu instanceof GridContainer)) { return; } @@ -262,15 +262,15 @@ public class ItemGridHandler implements IItemGridHandler { } int flags = EXTRACT_SINGLE; - ItemStack stackInSlot = player.inventory.getStackInSlot(slot); - ItemStack stackOnCursor = player.inventory.getItemStack(); + ItemStack stackInSlot = player.inventory.getItem(slot); + ItemStack stackOnCursor = player.inventory.getCarried(); if (shift) { // shift flags |= EXTRACT_SHIFT; if (!stackInSlot.isEmpty()) { if (up) { // scroll up - player.inventory.setInventorySlotContents(slot, gridHandler.onInsert(player, stackInSlot, true)); + player.inventory.setItem(slot, gridHandler.onInsert(player, stackInSlot, true)); } else { // scroll down gridHandler.onExtract(player, stackInSlot, slot, flags); } @@ -279,7 +279,7 @@ public class ItemGridHandler implements IItemGridHandler { if (up) { // scroll up if (!stackOnCursor.isEmpty()) { gridHandler.onInsert(player, stackOnCursor, true); - player.updateHeldItem(); + player.broadcastCarriedItem(); } } else { //scroll down if (stackOnCursor.isEmpty()) { @@ -297,7 +297,7 @@ public class ItemGridHandler implements IItemGridHandler { } public static void onGridScroll(IItemGridHandler gridHandler, ServerPlayerEntity player, @Nullable UUID id, boolean shift, boolean up, @Nullable INetwork network) { - if (player == null || !(player.openContainer instanceof GridContainer)) { + if (player == null || !(player.containerMenu instanceof GridContainer)) { return; } @@ -305,7 +305,7 @@ public class ItemGridHandler implements IItemGridHandler { return; } - IGrid grid = ((GridContainer) player.openContainer).getGrid(); + IGrid grid = ((GridContainer) player.containerMenu).getGrid(); int flags = EXTRACT_SINGLE; @@ -317,9 +317,9 @@ public class ItemGridHandler implements IItemGridHandler { return; } - for (int i = 0; i < player.inventory.mainInventory.size(); i++) { - if (API.instance().getComparer().isEqual(player.inventory.getStackInSlot(i), cache.getList().get(id), IComparer.COMPARE_NBT)) { - gridHandler.onInsert(player, player.inventory.getStackInSlot(i), true); + for (int i = 0; i < player.inventory.items.size(); i++) { + if (API.instance().getComparer().isEqual(player.inventory.getItem(i), cache.getList().get(id), IComparer.COMPARE_NBT)) { + gridHandler.onInsert(player, player.inventory.getItem(i), true); break; } } @@ -331,9 +331,9 @@ public class ItemGridHandler implements IItemGridHandler { if (!up && id != null) { //scroll down, extract hovering item gridHandler.onExtract(player, id, -1, flags); - } else if (up && !player.inventory.getItemStack().isEmpty()) { // insert stack from cursor - gridHandler.onInsert(player, player.inventory.getItemStack(), true); - player.updateHeldItem(); + } else if (up && !player.inventory.getCarried().isEmpty()) { // insert stack from cursor + gridHandler.onInsert(player, player.inventory.getCarried(), true); + player.broadcastCarriedItem(); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java index bc826a393..e4a17d1f5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java @@ -40,13 +40,13 @@ public class PortableFluidGridHandler implements IFluidGridHandler { ItemStack bucket = ItemStack.EMPTY; - for (int i = 0; i < player.inventory.getSizeInventory(); ++i) { - ItemStack slot = player.inventory.getStackInSlot(i); + for (int i = 0; i < player.inventory.getContainerSize(); ++i) { + ItemStack slot = player.inventory.getItem(i); if (API.instance().getComparer().isEqualNoQuantity(StackUtils.EMPTY_BUCKET, slot)) { bucket = StackUtils.EMPTY_BUCKET.copy(); - player.inventory.decrStackSize(i, 1); + player.inventory.removeItem(i, 1); break; } @@ -59,12 +59,12 @@ public class PortableFluidGridHandler implements IFluidGridHandler { fluidHandler.fill(portableGrid.getFluidStorage().extract(stack, FluidAttributes.BUCKET_VOLUME, IComparer.COMPARE_NBT, Action.PERFORM), IFluidHandler.FluidAction.EXECUTE); if (shift) { - if (!player.inventory.addItemStackToInventory(fluidHandler.getContainer().copy())) { - InventoryHelper.spawnItemStack(player.getEntityWorld(), player.getPosX(), player.getPosY(), player.getPosZ(), fluidHandler.getContainer()); + if (!player.inventory.add(fluidHandler.getContainer().copy())) { + InventoryHelper.dropItemStack(player.getCommandSenderWorld(), player.getX(), player.getY(), player.getZ(), fluidHandler.getContainer()); } } else { - player.inventory.setItemStack(fluidHandler.getContainer()); - player.updateHeldItem(); + player.inventory.setCarried(fluidHandler.getContainer()); + player.broadcastCarriedItem(); } portableGrid.drainEnergy(RS.SERVER_CONFIG.getPortableGrid().getExtractUsage()); @@ -98,8 +98,8 @@ public class PortableFluidGridHandler implements IFluidGridHandler { @Override public void onInsertHeldContainer(ServerPlayerEntity player) { - player.inventory.setItemStack(onInsert(player, player.inventory.getItemStack())); - player.updateHeldItem(); + player.inventory.setCarried(onInsert(player, player.inventory.getCarried())); + player.broadcastCarriedItem(); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java index cefa2d5d7..1cacd9b1b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java @@ -56,13 +56,13 @@ public class PortableItemGridHandler implements IItemGridHandler { boolean single = (flags & EXTRACT_SINGLE) == EXTRACT_SINGLE; - ItemStack held = player.inventory.getItemStack(); + ItemStack held = player.inventory.getCarried(); if (single) { if (!held.isEmpty() && (!API.instance().getComparer().isEqualNoQuantity(item, held) || held.getCount() + 1 > held.getMaxStackSize())) { return; } - } else if (!player.inventory.getItemStack().isEmpty()) { + } else if (!player.inventory.getCarried().isEmpty()) { return; } @@ -116,10 +116,10 @@ public class PortableItemGridHandler implements IItemGridHandler { if (single && !held.isEmpty()) { held.grow(1); } else { - player.inventory.setItemStack(took); + player.inventory.setCarried(took); } - player.updateHeldItem(); + player.broadcastCarriedItem(); } portableGrid.drainEnergy(RS.SERVER_CONFIG.getPortableGrid().getExtractUsage()); @@ -152,11 +152,11 @@ public class PortableItemGridHandler implements IItemGridHandler { @Override public void onInsertHeldItem(ServerPlayerEntity player, boolean single) { - if (player.inventory.getItemStack().isEmpty() || portableGrid.getStorage() == null || !grid.isGridActive()) { + if (player.inventory.getCarried().isEmpty() || portableGrid.getStorage() == null || !grid.isGridActive()) { return; } - ItemStack stack = player.inventory.getItemStack(); + ItemStack stack = player.inventory.getCarried(); int size = single ? 1 : stack.getCount(); portableGrid.getItemStorageTracker().changed(player, stack.copy()); @@ -168,10 +168,10 @@ public class PortableItemGridHandler implements IItemGridHandler { stack.shrink(size); } } else { - player.inventory.setItemStack(portableGrid.getItemStorage().insert(stack, size, Action.PERFORM)); + player.inventory.setCarried(portableGrid.getItemStorage().insert(stack, size, Action.PERFORM)); } - player.updateHeldItem(); + player.broadcastCarriedItem(); portableGrid.drainEnergy(RS.SERVER_CONFIG.getPortableGrid().getInsertUsage()); } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/NetworkItemManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/NetworkItemManager.java index 10271144f..8054d675b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/NetworkItemManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/NetworkItemManager.java @@ -34,12 +34,12 @@ public class NetworkItemManager implements INetworkItemManager { if (node instanceof IWirelessTransmitter && network.canRun() && node.isActive() && - ((IWirelessTransmitter) node).getDimension() == player.getEntityWorld().getDimensionKey()) { + ((IWirelessTransmitter) node).getDimension() == player.getCommandSenderWorld().dimension()) { IWirelessTransmitter transmitter = (IWirelessTransmitter) node; - Vector3d pos = player.getPositionVec(); + Vector3d pos = player.position(); - double distance = Math.sqrt(Math.pow(transmitter.getOrigin().getX() - pos.getX(), 2) + Math.pow(transmitter.getOrigin().getY() - pos.getY(), 2) + Math.pow(transmitter.getOrigin().getZ() - pos.getZ(), 2)); + double distance = Math.sqrt(Math.pow(transmitter.getOrigin().getX() - pos.x(), 2) + Math.pow(transmitter.getOrigin().getY() - pos.y(), 2) + Math.pow(transmitter.getOrigin().getZ() - pos.z(), 2)); if (distance < transmitter.getRange()) { inRange = true; @@ -50,7 +50,7 @@ public class NetworkItemManager implements INetworkItemManager { } if (!inRange) { - player.sendMessage(new TranslationTextComponent("misc.refinedstorage.network_item.out_of_range"), player.getUniqueID()); + player.sendMessage(new TranslationTextComponent("misc.refinedstorage.network_item.out_of_range"), player.getUUID()); return; } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java index a9f05151e..ce6674457 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java @@ -77,7 +77,7 @@ public class WirelessCraftingMonitorNetworkItem implements INetworkItem { if (energyStorage.getEnergyStored() <= 0) { handler.close(player); - player.closeScreen(); + player.closeContainer(); sendOutOfEnergyMessage(); } @@ -86,6 +86,6 @@ public class WirelessCraftingMonitorNetworkItem implements INetworkItem { } private void sendOutOfEnergyMessage() { - player.sendMessage(new TranslationTextComponent("misc.refinedstorage.network_item.out_of_energy", new TranslationTextComponent(stack.getItem().getTranslationKey())), player.getUniqueID()); + player.sendMessage(new TranslationTextComponent("misc.refinedstorage.network_item.out_of_energy", new TranslationTextComponent(stack.getItem().getDescriptionId())), player.getUUID()); } } \ No newline at end of file diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java index 3b0aa53be..f3edd17f2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java @@ -70,7 +70,7 @@ public class WirelessFluidGridNetworkItem implements INetworkItem { if (energyStorage.getEnergyStored() <= 0) { handler.close(player); - player.closeScreen(); + player.closeContainer(); sendOutOfEnergyMessage(); } @@ -79,6 +79,6 @@ public class WirelessFluidGridNetworkItem implements INetworkItem { } private void sendOutOfEnergyMessage() { - player.sendMessage(new TranslationTextComponent("misc.refinedstorage.network_item.out_of_energy", new TranslationTextComponent(stack.getItem().getTranslationKey())), player.getUniqueID()); + player.sendMessage(new TranslationTextComponent("misc.refinedstorage.network_item.out_of_energy", new TranslationTextComponent(stack.getItem().getDescriptionId())), player.getUUID()); } } \ No newline at end of file diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessGridNetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessGridNetworkItem.java index 723a81cb5..4f9e20a8d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessGridNetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessGridNetworkItem.java @@ -70,7 +70,7 @@ public class WirelessGridNetworkItem implements INetworkItem { if (energyStorage.getEnergyStored() <= 0) { handler.close(player); - player.closeScreen(); + player.closeContainer(); sendOutOfEnergyMessage(); } @@ -79,6 +79,6 @@ public class WirelessGridNetworkItem implements INetworkItem { } private void sendOutOfEnergyMessage() { - player.sendMessage(new TranslationTextComponent("misc.refinedstorage.network_item.out_of_energy", new TranslationTextComponent(stack.getItem().getTranslationKey())), player.getUniqueID()); + player.sendMessage(new TranslationTextComponent("misc.refinedstorage.network_item.out_of_energy", new TranslationTextComponent(stack.getItem().getDescriptionId())), player.getUUID()); } } \ No newline at end of file diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java index b7d4ab9fe..49bdfd07b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java @@ -45,6 +45,8 @@ import net.minecraftforge.items.IItemHandlerModifiable; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction; + public class ConstructorNetworkNode extends NetworkNode implements IComparable, IType, ICoverable { public static final ResourceLocation ID = new ResourceLocation(RS.ID, "constructor"); @@ -82,7 +84,7 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable, public void update() { super.update(); - if (canUpdate() && ticks % upgrades.getSpeed(BASE_SPEED, 4) == 0 && world.isBlockPresent(pos)) { + if (canUpdate() && ticks % upgrades.getSpeed(BASE_SPEED, 4) == 0 && world.isLoaded(pos)) { if (type == IType.ITEMS && !itemFilters.getStackInSlot(0).isEmpty()) { ItemStack stack = itemFilters.getStackInSlot(0); @@ -100,7 +102,7 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable, } private void extractAndPlaceFluid(FluidStack stack) { - BlockPos front = pos.offset(getDirection()); + BlockPos front = pos.relative(getDirection()); if (network.extractFluid(stack, FluidAttributes.BUCKET_VOLUME, compare, Action.SIMULATE).getAmount() < FluidAttributes.BUCKET_VOLUME) { if (upgrades.hasUpgrade(UpgradeItem.Type.CRAFTING)) { @@ -123,7 +125,7 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable, ); ActionResultType result = ForgeHooks.onPlaceItemIntoWorld(ctx); - if (result.isSuccessOrConsume()) { + if (result.consumesAction()) { network.extractItem(stack, 1, Action.PERFORM); } } else if (upgrades.hasUpgrade(UpgradeItem.Type.CRAFTING)) { @@ -137,7 +139,7 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable, ItemStack took = network.extractItem(stack, upgrades.getStackInteractCount(), compare, Action.PERFORM); if (!took.isEmpty()) { - DefaultDispenseItemBehavior.doDispense(world, took, 6, getDirection(), new Position(getDispensePositionX(), getDispensePositionY(), getDispensePositionZ())); + DefaultDispenseItemBehavior.spawnItem(world, took, 6, getDirection(), new Position(getDispensePositionX(), getDispensePositionY(), getDispensePositionZ())); } else if (upgrades.hasUpgrade(UpgradeItem.Type.CRAFTING)) { network.getCraftingManager().request(this, stack, 1); } @@ -147,20 +149,20 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable, ItemStack took = network.extractItem(stack, 1, compare, Action.PERFORM); if (!took.isEmpty()) { - world.addEntity(new FireworkRocketEntity(world, getDispensePositionX(), getDispensePositionY(), getDispensePositionZ(), took)); + world.addFreshEntity(new FireworkRocketEntity(world, getDispensePositionX(), getDispensePositionY(), getDispensePositionZ(), took)); } } private double getDispensePositionX() { - return (double) pos.getX() + 0.5D + 0.8D * (double) getDirection().getXOffset(); + return (double) pos.getX() + 0.5D + 0.8D * (double) getDirection().getStepX(); } private double getDispensePositionY() { - return (double) pos.getY() + (getDirection() == Direction.DOWN ? 0.45D : 0.5D) + 0.8D * (double) getDirection().getYOffset(); + return (double) pos.getY() + (getDirection() == Direction.DOWN ? 0.45D : 0.5D) + 0.8D * (double) getDirection().getStepY(); } private double getDispensePositionZ() { - return (double) pos.getZ() + 0.5D + 0.8D * (double) getDirection().getZOffset(); + return (double) pos.getZ() + 0.5D + 0.8D * (double) getDirection().getStepZ(); } @Override @@ -259,7 +261,7 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable, @Override public int getType() { - return world.isRemote ? ConstructorTile.TYPE.getValue() : type; + return world.isClientSide ? ConstructorTile.TYPE.getValue() : type; } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterManagerNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterManagerNetworkNode.java index f24f257ab..184595e96 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterManagerNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterManagerNetworkNode.java @@ -35,7 +35,7 @@ public class CrafterManagerNetworkNode extends NetworkNode { } public int getSize() { - return world.isRemote ? CrafterManagerTile.SIZE.getValue() : size; + return world.isClientSide ? CrafterManagerTile.SIZE.getValue() : size; } public void setSize(int size) { @@ -66,7 +66,7 @@ public class CrafterManagerNetworkNode extends NetworkNode { } public int getSearchBoxMode() { - return world.isRemote ? CrafterManagerTile.SEARCH_BOX_MODE.getValue() : searchBoxMode; + return world.isClientSide ? CrafterManagerTile.SEARCH_BOX_MODE.getValue() : searchBoxMode; } public void setSearchBoxMode(int searchBoxMode) { @@ -77,7 +77,7 @@ public class CrafterManagerNetworkNode extends NetworkNode { BlockState state = world.getBlockState(pos); if (state.getBlock() instanceof CrafterManagerBlock) { - return state.get(NetworkNodeBlock.CONNECTED); + return state.getValue(NetworkNodeBlock.CONNECTED); } return false; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java index 5b0adb7f4..0cf183d56 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java @@ -84,7 +84,7 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC .addListener(new NetworkNodeInventoryListener(this)) .addListener((handler, slot, reading) -> { if (!reading) { - if (!world.isRemote) { + if (!world.isClientSide) { invalidate(); } @@ -145,8 +145,8 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC invalidate(); } - if (mode == CrafterMode.PULSE_INSERTS_NEXT_SET && world.isBlockPresent(pos)) { - if (world.isBlockPowered(pos)) { + if (mode == CrafterMode.PULSE_INSERTS_NEXT_SET && world.isLoaded(pos)) { + if (world.hasNeighborSignal(pos)) { this.wasPowered = true; markDirty(); @@ -195,11 +195,11 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC StackUtils.readItems(upgrades, 1, tag); if (tag.contains(NBT_DISPLAY_NAME)) { - displayName = ITextComponent.Serializer.getComponentFromJson(tag.getString(NBT_DISPLAY_NAME)); + displayName = ITextComponent.Serializer.fromJson(tag.getString(NBT_DISPLAY_NAME)); } - if (tag.hasUniqueId(NBT_UUID)) { - uuid = tag.getUniqueId(NBT_UUID); + if (tag.hasUUID(NBT_UUID)) { + uuid = tag.getUUID(NBT_UUID); } if (tag.contains(NBT_MODE)) { @@ -232,7 +232,7 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC } if (uuid != null) { - tag.putUniqueId(NBT_UUID, uuid); + tag.putUUID(NBT_UUID, uuid); } tag.putInt(NBT_MODE, mode.ordinal()); @@ -314,12 +314,12 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC @Nullable @Override public TileEntity getFacingTile() { - BlockPos facingPos = pos.offset(getDirection()); - if (!world.isBlockPresent(facingPos)) { + BlockPos facingPos = pos.relative(getDirection()); + if (!world.isLoaded(facingPos)) { return null; } - return world.getTileEntity(facingPos); + return world.getBlockEntity(facingPos); } @Override @@ -346,7 +346,7 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC } if (facing != null) { - return new TranslationTextComponent(world.getBlockState(facing.getPos()).getBlock().getTranslationKey()); + return new TranslationTextComponent(world.getBlockState(facing.getBlockPos()).getBlock().getDescriptionId()); } return DEFAULT_NAME; @@ -394,7 +394,7 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC return null; } - INetworkNode facing = API.instance().getNetworkNodeManager((ServerWorld) world).getNode(pos.offset(getDirection())); + INetworkNode facing = API.instance().getNetworkNodeManager((ServerWorld) world).getNode(pos.relative(getDirection())); if (!(facing instanceof ICraftingPatternContainer) || facing.getNetwork() != network) { return this; } @@ -438,9 +438,9 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC case IGNORE: return false; case SIGNAL_LOCKS_AUTOCRAFTING: - return world.isBlockPowered(pos); + return world.hasNeighborSignal(pos); case SIGNAL_UNLOCKS_AUTOCRAFTING: - return !world.isBlockPowered(pos); + return !world.hasNeighborSignal(pos); case PULSE_INSERTS_NEXT_SET: return locked; default: diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java index eb5ec319a..542af3895 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java @@ -82,7 +82,7 @@ public class CraftingMonitorNetworkNode extends NetworkNode implements ICrafting BlockState state = world.getBlockState(pos); if (state.getBlock() instanceof CraftingMonitorBlock) { - return state.get(NetworkNodeBlock.CONNECTED); + return state.getValue(NetworkNodeBlock.CONNECTED); } return false; @@ -94,7 +94,7 @@ public class CraftingMonitorNetworkNode extends NetworkNode implements ICrafting tag.putInt(NBT_TAB_PAGE, tabPage); - tabSelected.ifPresent(uuid -> tag.putUniqueId(NBT_TAB_SELECTED, uuid)); + tabSelected.ifPresent(uuid -> tag.putUUID(NBT_TAB_SELECTED, uuid)); return tag; } @@ -107,8 +107,8 @@ public class CraftingMonitorNetworkNode extends NetworkNode implements ICrafting tabPage = tag.getInt(NBT_TAB_PAGE); } - if (tag.hasUniqueId(NBT_TAB_SELECTED)) { - tabSelected = Optional.of(tag.getUniqueId(NBT_TAB_SELECTED)); + if (tag.hasUUID(NBT_TAB_SELECTED)) { + tabSelected = Optional.of(tag.getUUID(NBT_TAB_SELECTED)); } } @@ -127,12 +127,12 @@ public class CraftingMonitorNetworkNode extends NetworkNode implements ICrafting @Override public Optional getTabSelected() { - return world.isRemote ? CraftingMonitorTile.TAB_SELECTED.getValue() : tabSelected; + return world.isClientSide ? CraftingMonitorTile.TAB_SELECTED.getValue() : tabSelected; } @Override public int getTabPage() { - return world.isRemote ? CraftingMonitorTile.TAB_PAGE.getValue() : tabPage; + return world.isClientSide ? CraftingMonitorTile.TAB_PAGE.getValue() : tabPage; } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java index e677d5329..471df7ed5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java @@ -89,7 +89,7 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I public void update() { super.update(); - if (canUpdate() && ticks % upgrades.getSpeed(BASE_SPEED, 4) == 0 && world.isBlockPresent(pos)) { + if (canUpdate() && ticks % upgrades.getSpeed(BASE_SPEED, 4) == 0 && world.isLoaded(pos)) { if (type == IType.ITEMS) { if (pickupItem) { pickupItems(); @@ -103,12 +103,12 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I } private void pickupItems() { - BlockPos front = pos.offset(getDirection()); + BlockPos front = pos.relative(getDirection()); List droppedItems = new ArrayList<>(); Chunk chunk = world.getChunkAt(front); - chunk.getEntitiesWithinAABBForEntity(null, new AxisAlignedBB(front), droppedItems, null); + chunk.getEntities((Entity)null, new AxisAlignedBB(front), droppedItems, null); for (Entity entity : droppedItems) { if (entity instanceof ItemEntity) { @@ -127,7 +127,7 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I } private void breakBlock() { - BlockPos front = pos.offset(getDirection()); + BlockPos front = pos.relative(getDirection()); BlockState frontBlockState = world.getBlockState(front); Block frontBlock = frontBlockState.getBlock(); ItemStack frontStack = frontBlock.getPickBlock( @@ -140,12 +140,12 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I if (!frontStack.isEmpty() && IWhitelistBlacklist.acceptsItem(itemFilters, mode, compare, frontStack) && - frontBlockState.getBlockHardness(world, front) != -1.0) { + frontBlockState.getDestroySpeed(world, front) != -1.0) { List drops = Block.getDrops( frontBlockState, (ServerWorld) world, front, - world.getTileEntity(front), + world.getBlockEntity(front), WorldUtils.getFakePlayer((ServerWorld) world, getOwner()), tool ); @@ -159,7 +159,7 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I BlockEvent.BreakEvent e = new BlockEvent.BreakEvent(world, front, frontBlockState, WorldUtils.getFakePlayer((ServerWorld) world, getOwner())); if (!MinecraftForge.EVENT_BUS.post(e)) { - frontBlock.onBlockHarvested(world, front, frontBlockState, WorldUtils.getFakePlayer((ServerWorld) world, getOwner())); + frontBlock.playerWillDestroy(world, front, frontBlockState, WorldUtils.getFakePlayer((ServerWorld) world, getOwner())); world.removeBlock(front, false); @@ -167,7 +167,7 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I // We check if the controller isn't null here because when a destructor faces a node and removes it // it will essentially remove this block itself from the network without knowing if (network == null) { - InventoryHelper.spawnItemStack(world, front.getX(), front.getY(), front.getZ(), drop); + InventoryHelper.dropItemStack(world, front.getX(), front.getY(), front.getZ(), drop); } else { network.insertItemTracked(drop, drop.getCount()); } @@ -177,13 +177,13 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I } private void breakFluid() { - BlockPos front = pos.offset(getDirection()); + BlockPos front = pos.relative(getDirection()); BlockState frontBlockState = world.getBlockState(front); Block frontBlock = frontBlockState.getBlock(); if (frontBlock instanceof FlowingFluidBlock) { // @Volatile: Logic from FlowingFluidBlock#pickupFluid - if (frontBlockState.get(FlowingFluidBlock.LEVEL) == 0) { + if (frontBlockState.getValue(FlowingFluidBlock.LEVEL) == 0) { Fluid fluid = ((FlowingFluidBlock) frontBlock).getFluid(); FluidStack stack = new FluidStack(fluid, FluidAttributes.BUCKET_VOLUME); @@ -192,7 +192,7 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I network.insertFluid(stack, stack.getAmount(), Action.SIMULATE).isEmpty()) { network.insertFluidTracked(stack, stack.getAmount()); - world.setBlockState(front, Blocks.AIR.getDefaultState(), 11); + world.setBlock(front, Blocks.AIR.defaultBlockState(), 11); } } } else if (frontBlock instanceof IFluidBlock) { @@ -215,13 +215,13 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I ItemStack newTool = new ItemStack(Items.DIAMOND_PICKAXE); if (upgrades.hasUpgrade(UpgradeItem.Type.SILK_TOUCH)) { - newTool.addEnchantment(Enchantments.SILK_TOUCH, 1); + newTool.enchant(Enchantments.SILK_TOUCH, 1); } else if (upgrades.hasUpgrade(UpgradeItem.Type.FORTUNE_3)) { - newTool.addEnchantment(Enchantments.FORTUNE, 3); + newTool.enchant(Enchantments.BLOCK_FORTUNE, 3); } else if (upgrades.hasUpgrade(UpgradeItem.Type.FORTUNE_2)) { - newTool.addEnchantment(Enchantments.FORTUNE, 2); + newTool.enchant(Enchantments.BLOCK_FORTUNE, 2); } else if (upgrades.hasUpgrade(UpgradeItem.Type.FORTUNE_1)) { - newTool.addEnchantment(Enchantments.FORTUNE, 1); + newTool.enchant(Enchantments.BLOCK_FORTUNE, 1); } return newTool; @@ -332,7 +332,7 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I @Override public int getType() { - return world.isRemote ? DestructorTile.TYPE.getValue() : type; + return world.isClientSide ? DestructorTile.TYPE.getValue() : type; } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DetectorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DetectorNetworkNode.java index c0832e0a5..5b8968900 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DetectorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DetectorNetworkNode.java @@ -62,11 +62,11 @@ public class DetectorNetworkNode extends NetworkNode implements IComparable, ITy public void update() { super.update(); - if (powered != wasPowered && world.isBlockPresent(pos)) { + if (powered != wasPowered && world.isLoaded(pos)) { wasPowered = powered; - world.setBlockState(pos, world.getBlockState(pos).with(DetectorBlock.POWERED, powered)); - world.notifyNeighborsOfStateChange(pos, world.getBlockState(pos).getBlock()); + world.setBlockAndUpdate(pos, world.getBlockState(pos).setValue(DetectorBlock.POWERED, powered)); + world.updateNeighborsAt(pos, world.getBlockState(pos).getBlock()); } if (canUpdate() && ticks % SPEED == 0) { @@ -215,7 +215,7 @@ public class DetectorNetworkNode extends NetworkNode implements IComparable, ITy @Override public int getType() { - return world.isRemote ? DetectorTile.TYPE.getValue() : type; + return world.isClientSide ? DetectorTile.TYPE.getValue() : type; } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java index e07ef3da0..84f4c5ce4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java @@ -90,7 +90,7 @@ public class ExporterNetworkNode extends NetworkNode implements IComparable, ITy public void update() { super.update(); - if (canUpdate() && ticks % upgrades.getSpeed() == 0 && world.isBlockPresent(pos)) { + if (canUpdate() && ticks % upgrades.getSpeed() == 0 && world.isLoaded(pos)) { if (type == IType.ITEMS) { IItemHandler handler = WorldUtils.getItemHandler(getFacingTile(), getDirection().getOpposite()); @@ -311,7 +311,7 @@ public class ExporterNetworkNode extends NetworkNode implements IComparable, ITy @Override public int getType() { - return world.isRemote ? ExporterTile.TYPE.getValue() : type; + return world.isClientSide ? ExporterTile.TYPE.getValue() : type; } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExternalStorageNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExternalStorageNetworkNode.java index a9b7ada18..a5b8a627c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExternalStorageNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExternalStorageNetworkNode.java @@ -90,7 +90,7 @@ public class ExternalStorageNetworkNode extends NetworkNode implements IStorageP public void update() { super.update(); - if (canUpdate() && world.isBlockPresent(pos)) { + if (canUpdate() && world.isLoaded(pos)) { if (networkTicks++ == 0) { updateStorage(network, InvalidateCause.INITIAL_TICK_INVALIDATION); @@ -293,7 +293,7 @@ public class ExternalStorageNetworkNode extends NetworkNode implements IStorageP @Override public int getType() { - return world.isRemote ? ExternalStorageTile.TYPE.getValue() : type; + return world.isClientSide ? ExternalStorageTile.TYPE.getValue() : type; } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/FluidInterfaceNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/FluidInterfaceNetworkNode.java index d3cc13530..4230c2cdc 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/FluidInterfaceNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/FluidInterfaceNetworkNode.java @@ -45,8 +45,8 @@ public class FluidInterfaceNetworkNode extends NetworkNode { protected void onContentsChanged() { super.onContentsChanged(); - if (!world.isRemote) { - ((FluidInterfaceTile) world.getTileEntity(pos)).getDataManager().sendParameterToWatchers(FluidInterfaceTile.TANK_IN); + if (!world.isClientSide) { + ((FluidInterfaceTile) world.getBlockEntity(pos)).getDataManager().sendParameterToWatchers(FluidInterfaceTile.TANK_IN); } markDirty(); @@ -155,7 +155,7 @@ public class FluidInterfaceNetworkNode extends NetworkNode { private boolean isActingAsStorage() { for (Direction facing : Direction.values()) { - INetworkNode facingNode = API.instance().getNetworkNodeManager((ServerWorld) world).getNode(pos.offset(facing)); + INetworkNode facingNode = API.instance().getNetworkNodeManager((ServerWorld) world).getNode(pos.relative(facing)); if (facingNode instanceof ExternalStorageNetworkNode && facingNode.isActive() && @@ -250,8 +250,8 @@ public class FluidInterfaceNetworkNode extends NetworkNode { } private void onTankOutChanged() { - if (!world.isRemote && world.isBlockPresent(pos)) { - ((FluidInterfaceTile) world.getTileEntity(pos)).getDataManager().sendParameterToWatchers(FluidInterfaceTile.TANK_OUT); + if (!world.isClientSide && world.isLoaded(pos)) { + ((FluidInterfaceTile) world.getBlockEntity(pos)).getDataManager().sendParameterToWatchers(FluidInterfaceTile.TANK_OUT); } markDirty(); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java index 2340e634c..0bf244663 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java @@ -85,13 +85,13 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I private final Container craftingContainer = new Container(ContainerType.CRAFTING, 0) { @Override - public boolean canInteractWith(PlayerEntity player) { + public boolean stillValid(PlayerEntity player) { return false; } @Override - public void onCraftMatrixChanged(IInventory inventory) { - if (!world.isRemote) { + public void slotsChanged(IInventory inventory) { + if (!world.isClientSide) { onCraftingMatrixChanged(); } } @@ -163,7 +163,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I } } else { for (int i = 0; i < 9; ++i) { - matrix.setInventorySlotContents(i, PatternItem.getInputSlot(pattern, i)); + matrix.setItem(i, PatternItem.getInputSlot(pattern, i)); } } @@ -219,7 +219,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I private void updateAllowedTags() { markDirty(); - TileEntity tile = world.getTileEntity(pos); + TileEntity tile = world.getBlockEntity(pos); if (tile instanceof GridTile) { ((GridTile) tile).getDataManager().sendParameterToWatchers(GridTile.ALLOWED_ITEM_TAGS); @@ -280,7 +280,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I } public boolean isProcessingPattern() { - return world.isRemote ? GridTile.PROCESSING_PATTERN.getValue() : processingPattern; + return world.isClientSide ? GridTile.PROCESSING_PATTERN.getValue() : processingPattern; } public void setProcessingPattern(boolean processingPattern) { @@ -383,13 +383,13 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I @Override public void onCraftingMatrixChanged() { if (currentRecipe == null || !currentRecipe.matches(matrix, world)) { - currentRecipe = world.getRecipeManager().getRecipe(IRecipeType.CRAFTING, matrix, world).orElse(null); + currentRecipe = world.getRecipeManager().getRecipeFor(IRecipeType.CRAFTING, matrix, world).orElse(null); } if (currentRecipe == null) { - result.setInventorySlotContents(0, ItemStack.EMPTY); + result.setItem(0, ItemStack.EMPTY); } else { - result.setInventorySlotContents(0, currentRecipe.getCraftingResult(matrix)); + result.setItem(0, currentRecipe.assemble(matrix)); } craftingListeners.forEach(ICraftingGridListener::onCraftingMatrixChanged); @@ -413,8 +413,8 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I processingMatrixFluids.setFluid(i, FluidStack.EMPTY); } - for (int i = 0; i < matrix.getSizeInventory(); ++i) { - matrix.setInventorySlotContents(i, ItemStack.EMPTY); + for (int i = 0; i < matrix.getContainerSize(); ++i) { + matrix.setItem(i, ItemStack.EMPTY); } } @@ -428,7 +428,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I BlockState state = world.getBlockState(pos); if (state.getBlock() instanceof GridBlock) { - return state.get(NetworkNodeBlock.CONNECTED); + return state.getValue(NetworkNodeBlock.CONNECTED); } return false; @@ -448,21 +448,21 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I public void onClear(PlayerEntity player) { if (type == GridType.CRAFTING) { if (network != null && network.canRun() && network.getSecurityManager().hasPermission(Permission.INSERT, player)) { - for (int i = 0; i < matrix.getSizeInventory(); ++i) { - ItemStack slot = matrix.getStackInSlot(i); + for (int i = 0; i < matrix.getContainerSize(); ++i) { + ItemStack slot = matrix.getItem(i); if (!slot.isEmpty()) { - matrix.setInventorySlotContents(i, network.insertItem(slot, slot.getCount(), Action.PERFORM)); + matrix.setItem(i, network.insertItem(slot, slot.getCount(), Action.PERFORM)); network.getItemStorageTracker().changed(player, slot.copy()); } } } else { - for (int i = 0; i < matrix.getSizeInventory(); i++) { - ItemStack slot = matrix.getStackInSlot(i); + for (int i = 0; i < matrix.getContainerSize(); i++) { + ItemStack slot = matrix.getItem(i); if (!slot.isEmpty()) { - player.inventory.addItemStackToInventory(matrix.getStackInSlot(i)); + player.inventory.add(matrix.getItem(i)); } onCraftingMatrixChanged(); @@ -517,7 +517,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I } } else { for (int i = 0; i < 9; ++i) { - ItemStack ingredient = matrix.getStackInSlot(i); + ItemStack ingredient = matrix.getItem(i); if (!ingredient.isEmpty()) { PatternItem.setInputSlot(pattern, i, ingredient); @@ -564,43 +564,43 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I return inputsFilled > 0 && outputsFilled > 0; } else { - return !result.getStackInSlot(0).isEmpty() && isPatternAvailable(); + return !result.getItem(0).isEmpty() && isPatternAvailable(); } } @Override public int getViewType() { - return world.isRemote ? GridTile.VIEW_TYPE.getValue() : viewType; + return world.isClientSide ? GridTile.VIEW_TYPE.getValue() : viewType; } @Override public int getSortingDirection() { - return world.isRemote ? GridTile.SORTING_DIRECTION.getValue() : sortingDirection; + return world.isClientSide ? GridTile.SORTING_DIRECTION.getValue() : sortingDirection; } @Override public int getSortingType() { - return world.isRemote ? GridTile.SORTING_TYPE.getValue() : sortingType; + return world.isClientSide ? GridTile.SORTING_TYPE.getValue() : sortingType; } @Override public int getSearchBoxMode() { - return world.isRemote ? GridTile.SEARCH_BOX_MODE.getValue() : searchBoxMode; + return world.isClientSide ? GridTile.SEARCH_BOX_MODE.getValue() : searchBoxMode; } @Override public int getSize() { - return world.isRemote ? GridTile.SIZE.getValue() : size; + return world.isClientSide ? GridTile.SIZE.getValue() : size; } @Override public int getTabSelected() { - return world.isRemote ? GridTile.TAB_SELECTED.getValue() : tabSelected; + return world.isClientSide ? GridTile.TAB_SELECTED.getValue() : tabSelected; } @Override public int getTabPage() { - return world.isRemote ? GridTile.TAB_PAGE.getValue() : Math.min(tabPage, getTotalTabPages()); + return world.isClientSide ? GridTile.TAB_PAGE.getValue() : Math.min(tabPage, getTotalTabPages()); } @Override @@ -647,7 +647,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I @Override public int getType() { - return world.isRemote ? GridTile.PROCESSING_TYPE.getValue() : processingType; + return world.isClientSide ? GridTile.PROCESSING_TYPE.getValue() : processingType; } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java index 2193b0cd4..0023b8c4a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java @@ -65,7 +65,7 @@ public class ImporterNetworkNode extends NetworkNode implements IComparable, IWh public void update() { super.update(); - if (!canUpdate() || !world.isBlockPresent(pos)) { + if (!canUpdate() || !world.isLoaded(pos)) { return; } @@ -226,7 +226,7 @@ public class ImporterNetworkNode extends NetworkNode implements IComparable, IWh @Override public int getType() { - return world.isRemote ? ImporterTile.TYPE.getValue() : type; + return world.isClientSide ? ImporterTile.TYPE.getValue() : type; } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/InterfaceNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/InterfaceNetworkNode.java index 6f07c0606..1d1297b97 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/InterfaceNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/InterfaceNetworkNode.java @@ -129,7 +129,7 @@ public class InterfaceNetworkNode extends NetworkNode implements IComparable { private boolean isActingAsStorage() { for (Direction facing : Direction.values()) { - INetworkNode facingNode = API.instance().getNetworkNodeManager((ServerWorld) world).getNode(pos.offset(facing)); + INetworkNode facingNode = API.instance().getNetworkNodeManager((ServerWorld) world).getNode(pos.relative(facing)); if (facingNode instanceof ExternalStorageNetworkNode && facingNode.isActive() && diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkNode.java index 3aae03cba..8cee1a398 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkNode.java @@ -24,6 +24,8 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.UUID; +import com.refinedmods.refinedstorage.api.network.INetworkNodeVisitor.Operator; + public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { private static final String NBT_OWNER = "Owner"; private static final String NBT_VERSION = "Version"; @@ -84,7 +86,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { @Nonnull @Override public ItemStack getItemStack() { - return new ItemStack(Item.BLOCK_TO_ITEM.get(world.getBlockState(pos).getBlock()), 1); + return new ItemStack(Item.BY_BLOCK.get(world.getBlockState(pos).getBlock()), 1); } @Override @@ -107,7 +109,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { @Override public void markDirty() { - if (!world.isRemote) { + if (!world.isClientSide) { API.instance().getNetworkNodeManager((ServerWorld) world).markForSaving(); } } @@ -140,7 +142,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { @Override public void update() { if (ticks == 0) { - redstonePowered = world.isBlockPowered(pos); + redstonePowered = world.hasNeighborSignal(pos); } ++ticks; @@ -158,7 +160,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { BlockState blockState = world.getBlockState(pos); if (blockState.getBlock() instanceof NetworkNodeBlock && ((NetworkNodeBlock) blockState.getBlock()).hasConnectedState()) { - world.setBlockState(pos, world.getBlockState(pos).with(NetworkNodeBlock.CONNECTED, canUpdate)); + world.setBlockAndUpdate(pos, world.getBlockState(pos).setValue(NetworkNodeBlock.CONNECTED, canUpdate)); } if (network != null) { @@ -177,7 +179,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { @Override public CompoundNBT write(CompoundNBT tag) { if (owner != null) { - tag.putUniqueId(NBT_OWNER, owner); + tag.putUUID(NBT_OWNER, owner); } tag.putInt(NBT_VERSION, CURRENT_VERSION); @@ -194,8 +196,8 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { } public void read(CompoundNBT tag) { - if (tag.hasUniqueId(NBT_OWNER)) { - owner = tag.getUniqueId(NBT_OWNER); + if (tag.hasUUID(NBT_OWNER)) { + owner = tag.getUUID(NBT_OWNER); } if (tag.contains(NBT_VERSION)) { @@ -234,19 +236,19 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { @Override public void visit(Operator operator) { for (Direction facing : Direction.values()) { - INetworkNode oppositeNode = NetworkUtils.getNodeFromTile(world.getTileEntity(pos.offset(facing))); + INetworkNode oppositeNode = NetworkUtils.getNodeFromTile(world.getBlockEntity(pos.relative(facing))); if (oppositeNode == null) { continue; } if (canConduct(facing) && oppositeNode.canReceive(facing.getOpposite())) { - operator.apply(world, pos.offset(facing), facing.getOpposite()); + operator.apply(world, pos.relative(facing), facing.getOpposite()); } } } @Nullable public TileEntity getFacingTile() { - return world.getTileEntity(pos.offset(getDirection())); + return world.getBlockEntity(pos.relative(getDirection())); } public Direction getDirection() { @@ -254,7 +256,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { BlockState state = world.getBlockState(pos); if (state.getBlock() instanceof BaseBlock) { - direction = state.get(((BaseBlock) state.getBlock()).getDirection().getProperty()); + direction = state.getValue(((BaseBlock) state.getBlock()).getDirection().getProperty()); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java index fb7012379..9e4f1f5ec 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java @@ -98,7 +98,7 @@ public class NetworkTransmitterNetworkNode extends NetworkNode { } public boolean isSameDimension() { - return world.getDimensionKey() == receiverDimension; + return world.dimension() == receiverDimension; } private boolean canTransmit() { @@ -116,13 +116,13 @@ public class NetworkTransmitterNetworkNode extends NetworkNode { if (canTransmit()) { if (!isSameDimension()) { - World dimensionWorld = world.getServer().getWorld(receiverDimension); + World dimensionWorld = world.getServer().getLevel(receiverDimension); - if (dimensionWorld != null && dimensionWorld.getTileEntity(receiver) instanceof NetworkReceiverTile) { + if (dimensionWorld != null && dimensionWorld.getBlockEntity(receiver) instanceof NetworkReceiverTile) { operator.apply(dimensionWorld, receiver, null); } } else { - if (world.getTileEntity(receiver) instanceof NetworkReceiverTile) { + if (world.getBlockEntity(receiver) instanceof NetworkReceiverTile) { operator.apply(world, receiver, null); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RootNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RootNetworkNode.java index 125b47f91..f2282e4ba 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RootNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RootNetworkNode.java @@ -16,6 +16,8 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.UUID; +import com.refinedmods.refinedstorage.api.network.INetworkNodeVisitor.Operator; + public class RootNetworkNode implements INetworkNode, INetworkNodeVisitor { private final INetwork network; private final World world; @@ -54,7 +56,7 @@ public class RootNetworkNode implements INetworkNode, INetworkNodeVisitor { BlockState state = world.getBlockState(pos); @SuppressWarnings("deprecation") - Item item = Item.getItemFromBlock(state.getBlock()); + Item item = Item.byBlock(state.getBlock()); return new ItemStack(item, 1); } @@ -107,7 +109,7 @@ public class RootNetworkNode implements INetworkNode, INetworkNodeVisitor { @Override public void visit(Operator operator) { for (Direction facing : Direction.values()) { - operator.apply(world, pos.offset(facing), facing.getOpposite()); + operator.apply(world, pos.relative(facing), facing.getOpposite()); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SecurityManagerNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SecurityManagerNetworkNode.java index 33258b997..32ec86349 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SecurityManagerNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SecurityManagerNetworkNode.java @@ -35,7 +35,7 @@ public class SecurityManagerNetworkNode extends NetworkNode implements ISecurity .addValidator(new ItemValidator(RSItems.SECURITY_CARD.get())) .addListener(new NetworkNodeInventoryListener(this)) .addListener(((handler, slot, reading) -> { - if (!world.isRemote) { + if (!world.isClientSide) { invalidate(); } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java index db3ed1dbc..122212379 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java @@ -109,11 +109,11 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl long insertedAt = deposit.getValue(); if (System.currentTimeMillis() - insertedAt < DEPOSIT_ALL_MAX_DELAY) { - for (int i = 0; i < player.inventory.getSizeInventory(); ++i) { - ItemStack toInsert = player.inventory.getStackInSlot(i); + for (int i = 0; i < player.inventory.getContainerSize(); ++i) { + ItemStack toInsert = player.inventory.getItem(i); if (API.instance().getComparer().isEqual(inserted, toInsert, compare)) { - player.inventory.setInventorySlotContents(i, network.insertItemTracked(toInsert, toInsert.getCount())); + player.inventory.setItem(i, network.insertItemTracked(toInsert, toInsert.getCount())); } } } @@ -143,7 +143,7 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl ItemStack filter = itemFilter.getStackInSlot(0); if (!filter.isEmpty() && API.instance().getComparer().isEqual(filter, toInsert, compare)) { - player.inventory.setInventorySlotContents(player.inventory.currentItem, network.insertItemTracked(toInsert, toInsert.getCount())); + player.inventory.setItem(player.inventory.selected, network.insertItemTracked(toInsert, toInsert.getCount())); deposits.put(player.getGameProfile().getName(), Pair.of(toInsert, System.currentTimeMillis())); } @@ -165,11 +165,11 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl network.insertFluidTracked(result.getValue(), result.getValue().getAmount()); - player.inventory.setInventorySlotContents(player.inventory.currentItem, ItemStack.EMPTY); + player.inventory.setItem(player.inventory.selected, ItemStack.EMPTY); ItemStack container = result.getLeft(); - if (!player.inventory.addItemStackToInventory(container.copy())) { - InventoryHelper.spawnItemStack(player.getEntityWorld(), player.getPosX(), player.getPosY(), player.getPosZ(), container); + if (!player.inventory.add(container.copy())) { + InventoryHelper.dropItemStack(player.getCommandSenderWorld(), player.getX(), player.getY(), player.getZ(), container); } } } @@ -198,8 +198,8 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl if (!filter.isEmpty()) { ItemStack result = network.extractItem(filter, toExtract, compare, Action.PERFORM); - if (!result.isEmpty() && !player.inventory.addItemStackToInventory(result.copy())) { - InventoryHelper.spawnItemStack(world, player.getPosX(), player.getPosY(), player.getPosZ(), result); + if (!result.isEmpty() && !player.inventory.add(result.copy())) { + InventoryHelper.dropItemStack(world, player.getX(), player.getY(), player.getZ(), result); } } } @@ -223,8 +223,8 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl fluidHandler.fill(network.extractFluid(stack, FluidAttributes.BUCKET_VOLUME, Action.PERFORM), IFluidHandler.FluidAction.EXECUTE); - if (!player.inventory.addItemStackToInventory(fluidHandler.getContainer().copy())) { - InventoryHelper.spawnItemStack(player.getEntityWorld(), player.getPosX(), player.getPosY(), player.getPosZ(), fluidHandler.getContainer()); + if (!player.inventory.add(fluidHandler.getContainer().copy())) { + InventoryHelper.dropItemStack(player.getCommandSenderWorld(), player.getX(), player.getY(), player.getZ(), fluidHandler.getContainer()); } })); } @@ -318,7 +318,7 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl @Override public int getType() { - return world.isRemote ? StorageMonitorTile.TYPE.getValue() : type; + return world.isClientSide ? StorageMonitorTile.TYPE.getValue() : type; } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java index 1f6c040e6..e3cb9881a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java @@ -15,6 +15,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; +import com.refinedmods.refinedstorage.api.network.INetworkNodeVisitor.Operator; + public class WirelessTransmitterNetworkNode extends NetworkNode implements IWirelessTransmitter { public static final ResourceLocation ID = new ResourceLocation(RS.ID, "wireless_transmitter"); @@ -62,7 +64,7 @@ public class WirelessTransmitterNetworkNode extends NetworkNode implements IWire @Override public RegistryKey getDimension() { - return world.getDimensionKey(); + return world.dimension(); } public BaseItemHandler getUpgrades() { @@ -81,6 +83,6 @@ public class WirelessTransmitterNetworkNode extends NetworkNode implements IWire @Override public void visit(Operator operator) { - operator.apply(world, pos.offset(Direction.DOWN), Direction.UP); + operator.apply(world, pos.relative(Direction.DOWN), Direction.UP); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/cover/CoverManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/cover/CoverManager.java index d7cd93b8d..287abf97c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/cover/CoverManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/cover/CoverManager.java @@ -92,11 +92,11 @@ public class CoverManager { public void readFromNbt(CompoundNBT nbt) { covers.clear(); - for (String s : nbt.keySet()) { + for (String s : nbt.getAllKeys()) { CompoundNBT tag = nbt.getCompound(s); if (tag.contains(NBT_DIRECTION) && tag.contains(NBT_ITEM)) { - Direction direction = Direction.byIndex(tag.getInt(NBT_DIRECTION)); - ItemStack item = ItemStack.read(tag.getCompound(NBT_ITEM)); + Direction direction = Direction.from3DDataValue(tag.getInt(NBT_DIRECTION)); + ItemStack item = ItemStack.of(tag.getCompound(NBT_ITEM)); int type = tag.contains(NBT_TYPE) ? tag.getInt(NBT_TYPE) : 0; if (type >= CoverType.values().length) { @@ -151,16 +151,16 @@ public class CoverManager { BlockState state = getBlockState(item); - return block != null && state != null && isModelSupported(state) && !block.ticksRandomly(state) - && !block.hasTileEntity(state) && !state.isTransparent(); //Changed from 1.12: to use 1.16 methods + return block != null && state != null && isModelSupported(state) && !block.isRandomlyTicking(state) + && !block.hasTileEntity(state) && !state.useShapeForLightOcclusion(); //Changed from 1.12: to use 1.16 methods } private static boolean isModelSupported(BlockState state) { - if (state.getRenderType() != BlockRenderType.MODEL) { + if (state.getRenderShape() != BlockRenderType.MODEL) { return false; } - return state.isSolid(); + return state.canOcclude(); } @Nullable @@ -169,7 +169,7 @@ public class CoverManager { return null; } - Block block = Block.getBlockFromItem(item.getItem()); + Block block = Block.byItem(item.getItem()); if (block == Blocks.AIR) { return null; @@ -187,7 +187,7 @@ public class CoverManager { return null; } - return block.getDefaultState(); + return block.defaultBlockState(); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java index 7d5ad7684..0fc923492 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java @@ -64,7 +64,7 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageProvide .addValidator(new StorageDiskItemValidator()) .addListener(new NetworkNodeInventoryListener(this)) .addListener((handler, slot, reading) -> { - if (!world.isRemote) { + if (!world.isClientSide) { StackUtils.createStorages( (ServerWorld) world, handler.getStackInSlot(slot), @@ -328,7 +328,7 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageProvide @Override public int getType() { - return world.isRemote ? DiskDriveTile.TYPE.getValue() : type; + return world.isClientSide ? DiskDriveTile.TYPE.getValue() : type; } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java index 93e8f48bb..c12059e1e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java @@ -76,7 +76,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab .addValidator(new StorageDiskItemValidator()) .addListener(new NetworkNodeInventoryListener(this)) .addListener((handler, slot, reading) -> { - if (!world.isRemote) { + if (!world.isClientSide) { StackUtils.createStorages( (ServerWorld) world, handler.getStackInSlot(slot), @@ -97,7 +97,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab .addValidator(new StorageDiskItemValidator()) .addListener(new NetworkNodeInventoryListener(this)) .addListener(((handler, slot, reading) -> { - if (!world.isRemote) { + if (!world.isClientSide) { StackUtils.createStorages( (ServerWorld) world, handler.getStackInSlot(slot), @@ -420,7 +420,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab @Override public int getType() { - return world.isRemote ? DiskManipulatorTile.TYPE.getValue() : type; + return world.isClientSide ? DiskManipulatorTile.TYPE.getValue() : type; } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageNetworkNode.java index 6963a5e44..de30105be 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageNetworkNode.java @@ -140,7 +140,7 @@ public class FluidStorageNetworkNode extends NetworkNode implements IStorageScre public CompoundNBT write(CompoundNBT tag) { super.write(tag); - tag.putUniqueId(NBT_ID, storageId); + tag.putUUID(NBT_ID, storageId); return tag; } @@ -149,8 +149,8 @@ public class FluidStorageNetworkNode extends NetworkNode implements IStorageScre public void read(CompoundNBT tag) { super.read(tag); - if (tag.hasUniqueId(NBT_ID)) { - storageId = tag.getUniqueId(NBT_ID); + if (tag.hasUUID(NBT_ID)) { + storageId = tag.getUUID(NBT_ID); loadStorage(null); } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java index 49b5211a8..40f4ab2b6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java @@ -140,7 +140,7 @@ public class StorageNetworkNode extends NetworkNode implements IStorageScreen, I public CompoundNBT write(CompoundNBT tag) { super.write(tag); - tag.putUniqueId(NBT_ID, storageId); + tag.putUUID(NBT_ID, storageId); return tag; } @@ -149,8 +149,8 @@ public class StorageNetworkNode extends NetworkNode implements IStorageScreen, I public void read(CompoundNBT tag) { super.read(tag); - if (tag.hasUniqueId(NBT_ID)) { - storageId = tag.getUniqueId(NBT_ID); + if (tag.hasUUID(NBT_ID)) { + storageId = tag.getUUID(NBT_ID); loadStorage(null); } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/security/SecurityManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/security/SecurityManager.java index ae1bcddd3..18f3da79e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/security/SecurityManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/security/SecurityManager.java @@ -24,9 +24,9 @@ public class SecurityManager implements ISecurityManager { @Override public boolean hasPermission(Permission permission, PlayerEntity player) { - OpList ops = player.getServer().getPlayerList().getOppedPlayers(); + OpList ops = player.getServer().getPlayerList().getOps(); - if (ops.getEntry(player.getGameProfile()) != null) { + if (ops.get(player.getGameProfile()) != null) { return true; } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java index e08dc02e1..2ee42a8a9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java @@ -60,7 +60,7 @@ public class FluidStorageDisk implements IStorageDisk { tag.putInt(NBT_CAPACITY, capacity); if (owner != null) { - tag.putUniqueId(NBT_OWNER, owner); + tag.putUUID(NBT_OWNER, owner); } return tag; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java index ae5bebc61..d9f1a1270 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java @@ -62,7 +62,7 @@ public class ItemStorageDisk implements IStorageDisk { tag.putInt(NBT_CAPACITY, capacity); if (owner != null) { - tag.putUniqueId(NBT_OWNER, owner); + tag.putUUID(NBT_OWNER, owner); } return tag; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java index 3e83a3e16..d6b3d6d2b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskManager.java @@ -90,18 +90,18 @@ public class StorageDiskManager extends RSWorldSavedData implements IStorageDisk @Override public void markForSaving() { - markDirty(); + setDirty(); } @Override - public void read(CompoundNBT tag) { + public void load(CompoundNBT tag) { if (tag.contains(NBT_DISKS)) { ListNBT disksTag = tag.getList(NBT_DISKS, Constants.NBT.TAG_COMPOUND); for (int i = 0; i < disksTag.size(); ++i) { CompoundNBT diskTag = disksTag.getCompound(i); - UUID id = diskTag.getUniqueId(NBT_DISK_ID); + UUID id = diskTag.getUUID(NBT_DISK_ID); CompoundNBT data = diskTag.getCompound(NBT_DISK_DATA); String type = diskTag.getString(NBT_DISK_TYPE); @@ -114,13 +114,13 @@ public class StorageDiskManager extends RSWorldSavedData implements IStorageDisk } @Override - public CompoundNBT write(CompoundNBT tag) { + public CompoundNBT save(CompoundNBT tag) { ListNBT disksTag = new ListNBT(); for (Map.Entry entry : disks.entrySet()) { CompoundNBT diskTag = new CompoundNBT(); - diskTag.putUniqueId(NBT_DISK_ID, entry.getKey()); + diskTag.putUUID(NBT_DISK_ID, entry.getKey()); diskTag.put(NBT_DISK_DATA, entry.getValue().writeToNbt()); diskTag.putString(NBT_DISK_TYPE, entry.getValue().getFactoryId().toString()); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/FluidStorageDiskFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/FluidStorageDiskFactory.java index 24745d791..8ea41f36d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/FluidStorageDiskFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/FluidStorageDiskFactory.java @@ -26,7 +26,7 @@ public class FluidStorageDiskFactory implements IStorageDiskFactory FluidStorageDisk disk = new FluidStorageDisk( world, tag.getInt(FluidStorageDisk.NBT_CAPACITY), - tag.contains(FluidStorageDisk.NBT_OWNER) ? tag.getUniqueId(FluidStorageDisk.NBT_OWNER) : null + tag.contains(FluidStorageDisk.NBT_OWNER) ? tag.getUUID(FluidStorageDisk.NBT_OWNER) : null ); ListNBT list = tag.getList(FluidStorageDisk.NBT_FLUIDS, Constants.NBT.TAG_COMPOUND); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/ItemStorageDiskFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/ItemStorageDiskFactory.java index ed368cdd4..42be32603 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/ItemStorageDiskFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/factory/ItemStorageDiskFactory.java @@ -26,7 +26,7 @@ public class ItemStorageDiskFactory implements IStorageDiskFactory { ItemStorageDisk disk = new ItemStorageDisk( world, tag.getInt(ItemStorageDisk.NBT_CAPACITY), - tag.contains(ItemStorageDisk.NBT_OWNER) ? tag.getUniqueId(ItemStorageDisk.NBT_OWNER) : null + tag.contains(ItemStorageDisk.NBT_OWNER) ? tag.getUUID(ItemStorageDisk.NBT_OWNER) : null ); ListNBT list = tag.getList(ItemStorageDisk.NBT_ITEMS, Constants.NBT.TAG_COMPOUND); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageProvider.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageProvider.java index 6d3cc4a4a..f4a09ef18 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageProvider.java @@ -21,7 +21,7 @@ public class FluidExternalStorageProvider implements IExternalStorageProvider provide(IExternalStorageContext context, TileEntity tile, Direction direction) { return new FluidExternalStorage(context, () -> { - if (!tile.getWorld().isBlockPresent(tile.getPos())) { + if (!tile.getLevel().isLoaded(tile.getBlockPos())) { return null; } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorageProvider.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorageProvider.java index 3491fbe40..d6f75561f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorageProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorageProvider.java @@ -30,7 +30,7 @@ public class ItemExternalStorageProvider implements IExternalStorageProvider provide(IExternalStorageContext context, TileEntity tile, Direction direction) { return new ItemExternalStorage(context, () -> { - if (!tile.getWorld().isBlockPresent(tile.getPos())) { + if (!tile.getLevel().isLoaded(tile.getBlockPos())) { return null; } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/tracker/StorageTrackerManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/tracker/StorageTrackerManager.java index 632d92d78..ebabaf65b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/tracker/StorageTrackerManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/tracker/StorageTrackerManager.java @@ -28,7 +28,7 @@ public class StorageTrackerManager extends RSWorldSavedData implements IStorageT @Override public void markForSaving() { - this.markDirty(); + this.setDirty(); } @@ -55,14 +55,14 @@ public class StorageTrackerManager extends RSWorldSavedData implements IStorageT } @Override - public void read(CompoundNBT nbt) { + public void load(CompoundNBT nbt) { if (nbt.contains(NBT_TRACKERS)) { ListNBT trackerTags = nbt.getList(NBT_TRACKERS, Constants.NBT.TAG_COMPOUND); for (int i = 0; i < trackerTags.size(); ++i) { CompoundNBT trackerTag = trackerTags.getCompound(i); - UUID id = trackerTag.getUniqueId(NBT_TRACKER_ID); + UUID id = trackerTag.getUUID(NBT_TRACKER_ID); ListNBT data = trackerTag.getList(NBT_TRACKER_DATA, Constants.NBT.TAG_COMPOUND); StorageType type = StorageType.values()[trackerTag.getInt(NBT_TRACKER_TYPE)]; @@ -73,13 +73,13 @@ public class StorageTrackerManager extends RSWorldSavedData implements IStorageT } @Override - public CompoundNBT write(CompoundNBT compound) { + public CompoundNBT save(CompoundNBT compound) { ListNBT trackerListTag = new ListNBT(); for (Map.Entry> entry : trackers.entrySet()) { CompoundNBT trackerTag = new CompoundNBT(); - trackerTag.putUniqueId(NBT_TRACKER_ID, entry.getKey()); + trackerTag.putUUID(NBT_TRACKER_ID, entry.getKey()); trackerTag.put(NBT_TRACKER_DATA, entry.getValue().serializeNbt()); trackerTag.putInt(NBT_TRACKER_TYPE, entry.getValue() instanceof ItemStorageTracker ? StorageType.ITEM.ordinal() : StorageType.FLUID.ordinal()); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/Comparer.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/Comparer.java index 9d79cfa08..d0a0893b8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/Comparer.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/Comparer.java @@ -13,11 +13,11 @@ public class Comparer implements IComparer { return true; } - if (!ItemStack.areItemsEqual(left, right)) { + if (!ItemStack.isSame(left, right)) { return false; } - if ((flags & COMPARE_NBT) == COMPARE_NBT && !ItemStack.areItemStackTagsEqual(left, right)) { + if ((flags & COMPARE_NBT) == COMPARE_NBT && !ItemStack.tagMatches(left, right)) { return false; } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/RSWorldSavedData.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/RSWorldSavedData.java index d8af7d92c..59ec490b8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/RSWorldSavedData.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/util/RSWorldSavedData.java @@ -19,10 +19,10 @@ public abstract class RSWorldSavedData extends WorldSavedData { } @Override - public abstract void read(CompoundNBT nbt); + public abstract void load(CompoundNBT nbt); @Override - public abstract CompoundNBT write(CompoundNBT compound); + public abstract CompoundNBT save(CompoundNBT compound); @Override public void save(File fileIn) { @@ -31,8 +31,8 @@ public abstract class RSWorldSavedData extends WorldSavedData { File tempFile = fileIn.toPath().getParent().resolve(fileIn.getName() + ".temp").toFile(); CompoundNBT compoundnbt = new CompoundNBT(); - compoundnbt.put("data", this.write(new CompoundNBT())); - compoundnbt.putInt("DataVersion", SharedConstants.getVersion().getWorldVersion()); + compoundnbt.put("data", this.save(new CompoundNBT())); + compoundnbt.putInt("DataVersion", SharedConstants.getCurrentVersion().getWorldVersion()); try { CompressedStreamTools.writeCompressed(compoundnbt, tempFile); diff --git a/src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java index e7127e3ab..1aab59fb3 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java @@ -8,6 +8,8 @@ import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraft.block.AbstractBlock.Properties; + public abstract class BaseBlock extends Block { protected BaseBlock(Properties properties) { super(properties); @@ -22,9 +24,9 @@ public abstract class BaseBlock extends Block { public BlockState rotate(BlockState state, Rotation rot) { BlockDirection dir = getDirection(); if (dir != BlockDirection.NONE) { - Direction newDirection = dir.cycle(state.get(dir.getProperty())); + Direction newDirection = dir.cycle(state.getValue(dir.getProperty())); - return state.with(dir.getProperty(), newDirection); + return state.setValue(dir.getProperty(), newDirection); } return super.rotate(state, rot); @@ -36,8 +38,8 @@ public abstract class BaseBlock extends Block { @Override @SuppressWarnings("deprecation") - public void onReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean isMoving) { - super.onReplaced(state, world, pos, newState, isMoving); + public void onRemove(BlockState state, World world, BlockPos pos, BlockState newState, boolean isMoving) { + super.onRemove(state, world, pos, newState, isMoving); checkIfDirectionHasChanged(state, world, pos, newState); } @@ -45,14 +47,14 @@ public abstract class BaseBlock extends Block { protected void checkIfDirectionHasChanged(BlockState state, World world, BlockPos pos, BlockState newState) { if (getDirection() != BlockDirection.NONE && state.getBlock() == newState.getBlock() && - state.get(getDirection().getProperty()) != newState.get(getDirection().getProperty())) { - onDirectionChanged(world, pos, newState.get(getDirection().getProperty())); + state.getValue(getDirection().getProperty()) != newState.getValue(getDirection().getProperty())) { + onDirectionChanged(world, pos, newState.getValue(getDirection().getProperty())); } } @Override - protected void fillStateContainer(StateContainer.Builder builder) { - super.fillStateContainer(builder); + protected void createBlockStateDefinition(StateContainer.Builder builder) { + super.createBlockStateDefinition(builder); BlockDirection dir = getDirection(); if (dir != BlockDirection.NONE) { diff --git a/src/main/java/com/refinedmods/refinedstorage/block/BlockDirection.java b/src/main/java/com/refinedmods/refinedstorage/block/BlockDirection.java index 0a57fcfe6..a76911a4f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/BlockDirection.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/BlockDirection.java @@ -31,7 +31,7 @@ public enum BlockDirection { case ANY_FACE_PLAYER: return DirectionUtils.getFacingFromEntity(pos, entity); case HORIZONTAL: - return entity.getHorizontalFacing().getOpposite(); + return entity.getDirection().getOpposite(); default: throw new IllegalStateException("Unknown direction type"); } @@ -43,7 +43,7 @@ public enum BlockDirection { case ANY_FACE_PLAYER: return previous.ordinal() + 1 >= Direction.values().length ? Direction.values()[0] : Direction.values()[previous.ordinal() + 1]; case HORIZONTAL: - return previous.rotateYCCW(); + return previous.getCounterClockWise(); default: throw new IllegalStateException("Unknown direction type"); } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java index 2e6d9e1e4..376f779f3 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java @@ -34,6 +34,8 @@ import net.minecraft.world.World; import javax.annotation.Nullable; import java.util.Optional; +import net.minecraft.block.AbstractBlock.Properties; + public class CableBlock extends NetworkNodeBlock implements IWaterLoggable { private static final BooleanProperty NORTH = BooleanProperty.create("north"); private static final BooleanProperty EAST = BooleanProperty.create("east"); @@ -43,40 +45,40 @@ public class CableBlock extends NetworkNodeBlock implements IWaterLoggable { private static final BooleanProperty DOWN = BooleanProperty.create("down"); private static final BooleanProperty WATERLOGGED = BooleanProperty.create("waterlogged"); - protected static final VoxelShape HOLDER_NORTH = makeCuboidShape(7, 7, 2, 9, 9, 6); - protected static final VoxelShape HOLDER_EAST = makeCuboidShape(10, 7, 7, 14, 9, 9); - protected static final VoxelShape HOLDER_SOUTH = makeCuboidShape(7, 7, 10, 9, 9, 14); - protected static final VoxelShape HOLDER_WEST = makeCuboidShape(2, 7, 7, 6, 9, 9); - protected static final VoxelShape HOLDER_UP = makeCuboidShape(7, 10, 7, 9, 14, 9); - protected static final VoxelShape HOLDER_DOWN = makeCuboidShape(7, 2, 7, 9, 6, 9); + protected static final VoxelShape HOLDER_NORTH = box(7, 7, 2, 9, 9, 6); + protected static final VoxelShape HOLDER_EAST = box(10, 7, 7, 14, 9, 9); + protected static final VoxelShape HOLDER_SOUTH = box(7, 7, 10, 9, 9, 14); + protected static final VoxelShape HOLDER_WEST = box(2, 7, 7, 6, 9, 9); + protected static final VoxelShape HOLDER_UP = box(7, 10, 7, 9, 14, 9); + protected static final VoxelShape HOLDER_DOWN = box(7, 2, 7, 9, 6, 9); - private static final VoxelShape SHAPE_CORE = makeCuboidShape(6, 6, 6, 10, 10, 10); - private static final VoxelShape SHAPE_NORTH = makeCuboidShape(6, 6, 0, 10, 10, 6); - private static final VoxelShape SHAPE_EAST = makeCuboidShape(10, 6, 6, 16, 10, 10); - private static final VoxelShape SHAPE_SOUTH = makeCuboidShape(6, 6, 10, 10, 10, 16); - private static final VoxelShape SHAPE_WEST = makeCuboidShape(0, 6, 6, 6, 10, 10); - private static final VoxelShape SHAPE_UP = makeCuboidShape(6, 10, 6, 10, 16, 10); - private static final VoxelShape SHAPE_DOWN = makeCuboidShape(6, 0, 6, 10, 6, 10); + private static final VoxelShape SHAPE_CORE = box(6, 6, 6, 10, 10, 10); + private static final VoxelShape SHAPE_NORTH = box(6, 6, 0, 10, 10, 6); + private static final VoxelShape SHAPE_EAST = box(10, 6, 6, 16, 10, 10); + private static final VoxelShape SHAPE_SOUTH = box(6, 6, 10, 10, 10, 16); + private static final VoxelShape SHAPE_WEST = box(0, 6, 6, 6, 10, 10); + private static final VoxelShape SHAPE_UP = box(6, 10, 6, 10, 16, 10); + private static final VoxelShape SHAPE_DOWN = box(6, 0, 6, 10, 6, 10); public CableBlock(Properties props) { super(props); - this.setDefaultState(getDefaultState().with(WATERLOGGED, false)); + this.registerDefaultState(defaultBlockState().setValue(WATERLOGGED, false)); } public CableBlock() { super(BlockUtils.DEFAULT_GLASS_PROPERTIES); - this.setDefaultState(getDefaultState().with(NORTH, false).with(EAST, false).with(SOUTH, false).with(WEST, false).with(UP, false).with(DOWN, false).with(WATERLOGGED, false)); + this.registerDefaultState(defaultBlockState().setValue(NORTH, false).setValue(EAST, false).setValue(SOUTH, false).setValue(WEST, false).setValue(UP, false).setValue(DOWN, false).setValue(WATERLOGGED, false)); } @Override @SuppressWarnings("deprecation") - public BlockState updatePostPlacement(BlockState state, Direction dir, BlockState facingState, IWorld world, BlockPos pos, BlockPos facingPos) { + public BlockState updateShape(BlockState state, Direction dir, BlockState facingState, IWorld world, BlockPos pos, BlockPos facingPos) { return getState(state, world, pos); } @Override - public boolean allowsMovement(BlockState state, IBlockReader worldIn, BlockPos pos, PathType type) { + public boolean isPathfindable(BlockState state, IBlockReader worldIn, BlockPos pos, PathType type) { return false; } @@ -89,27 +91,27 @@ public class CableBlock extends NetworkNodeBlock implements IWaterLoggable { protected static VoxelShape getCableShape(BlockState state) { VoxelShape shape = SHAPE_CORE; - if (Boolean.TRUE.equals(state.get(NORTH))) { + if (Boolean.TRUE.equals(state.getValue(NORTH))) { shape = VoxelShapes.or(shape, SHAPE_NORTH); } - if (Boolean.TRUE.equals(state.get(EAST))) { + if (Boolean.TRUE.equals(state.getValue(EAST))) { shape = VoxelShapes.or(shape, SHAPE_EAST); } - if (Boolean.TRUE.equals(state.get(SOUTH))) { + if (Boolean.TRUE.equals(state.getValue(SOUTH))) { shape = VoxelShapes.or(shape, SHAPE_SOUTH); } - if (Boolean.TRUE.equals(state.get(WEST))) { + if (Boolean.TRUE.equals(state.getValue(WEST))) { shape = VoxelShapes.or(shape, SHAPE_WEST); } - if (Boolean.TRUE.equals(state.get(UP))) { + if (Boolean.TRUE.equals(state.getValue(UP))) { shape = VoxelShapes.or(shape, SHAPE_UP); } - if (Boolean.TRUE.equals(state.get(DOWN))) { + if (Boolean.TRUE.equals(state.getValue(DOWN))) { shape = VoxelShapes.or(shape, SHAPE_DOWN); } @@ -125,15 +127,15 @@ public class CableBlock extends NetworkNodeBlock implements IWaterLoggable { // This is already checked in hasNode(). // But since rotate() doesn't invalidate that connection, we need to do it here. // Ideally, this code would be in rotate(). But rotate() doesn't have any data about the position and world, so we need to do it here. - world.setBlockState(pos, getState(world.getBlockState(pos), world, pos)); + world.setBlockAndUpdate(pos, getState(world.getBlockState(pos), world, pos)); //when rotating skip rotations blocked by covers BlockDirection dir = getDirection(); if (dir != BlockDirection.NONE) { - if (isSideCovered(world.getTileEntity(pos), newDirection)) { + if (isSideCovered(world.getBlockEntity(pos), newDirection)) { BlockState newState = rotate(world.getBlockState(pos), Rotation.CLOCKWISE_90); - world.setBlockState(pos, newState); + world.setBlockAndUpdate(pos, newState); } } @@ -143,45 +145,45 @@ public class CableBlock extends NetworkNodeBlock implements IWaterLoggable { @Override public void neighborChanged(BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) { super.neighborChanged(state, world, pos, blockIn, fromPos, isMoving); - world.setBlockState(pos, getState(world.getBlockState(pos), world, pos)); + world.setBlockAndUpdate(pos, getState(world.getBlockState(pos), world, pos)); } @Nullable @Override public BlockState getStateForPlacement(BlockItemUseContext ctx) { - return getState(getDefaultState(), ctx.getWorld(), ctx.getPos()); + return getState(defaultBlockState(), ctx.getLevel(), ctx.getClickedPos()); } @Override @SuppressWarnings("deprecation") public FluidState getFluidState(BlockState state) { - return Boolean.TRUE.equals(state.get(WATERLOGGED)) ? Fluids.WATER.getStillFluidState(false) : super.getFluidState(state); + return Boolean.TRUE.equals(state.getValue(WATERLOGGED)) ? Fluids.WATER.getSource(false) : super.getFluidState(state); } @Override - public boolean receiveFluid(IWorld worldIn, BlockPos pos, BlockState state, FluidState fluidStateIn) { - return IWaterLoggable.super.receiveFluid(worldIn, pos, state, fluidStateIn); + public boolean placeLiquid(IWorld worldIn, BlockPos pos, BlockState state, FluidState fluidStateIn) { + return IWaterLoggable.super.placeLiquid(worldIn, pos, state, fluidStateIn); } @Override - public boolean canContainFluid(IBlockReader worldIn, BlockPos pos, BlockState state, Fluid fluidIn) { - return IWaterLoggable.super.canContainFluid(worldIn, pos, state, fluidIn); + public boolean canPlaceLiquid(IBlockReader worldIn, BlockPos pos, BlockState state, Fluid fluidIn) { + return IWaterLoggable.super.canPlaceLiquid(worldIn, pos, state, fluidIn); } private boolean hasNodeConnection(IWorld world, BlockPos pos, BlockState state, Direction direction) { // Prevent the "holder" of a cable block conflicting with a cable connection. - if (getDirection() != BlockDirection.NONE && state.get(getDirection().getProperty()).getOpposite() == direction) { + if (getDirection() != BlockDirection.NONE && state.getValue(getDirection().getProperty()).getOpposite() == direction) { return false; } - TileEntity tile = world.getTileEntity(pos); + TileEntity tile = world.getBlockEntity(pos); if (tile == null) { return false; } return tile.getCapability(NetworkNodeProxyCapability.NETWORK_NODE_PROXY_CAPABILITY, direction).isPresent() && !isSideCovered(tile, direction) - && !isSideCovered(world.getTileEntity(pos.offset(direction)), direction.getOpposite()); + && !isSideCovered(world.getBlockEntity(pos.relative(direction)), direction.getOpposite()); } private boolean isSideCovered(TileEntity tile, Direction direction) { @@ -204,20 +206,20 @@ public class CableBlock extends NetworkNodeBlock implements IWaterLoggable { } private BlockState getState(BlockState currentState, IWorld world, BlockPos pos) { - boolean north = hasNodeConnection(world, pos.offset(Direction.NORTH), currentState, Direction.SOUTH); - boolean east = hasNodeConnection(world, pos.offset(Direction.EAST), currentState, Direction.WEST); - boolean south = hasNodeConnection(world, pos.offset(Direction.SOUTH), currentState, Direction.NORTH); - boolean west = hasNodeConnection(world, pos.offset(Direction.WEST), currentState, Direction.EAST); - boolean up = hasNodeConnection(world, pos.offset(Direction.UP), currentState, Direction.DOWN); - boolean down = hasNodeConnection(world, pos.offset(Direction.DOWN), currentState, Direction.UP); + boolean north = hasNodeConnection(world, pos.relative(Direction.NORTH), currentState, Direction.SOUTH); + boolean east = hasNodeConnection(world, pos.relative(Direction.EAST), currentState, Direction.WEST); + boolean south = hasNodeConnection(world, pos.relative(Direction.SOUTH), currentState, Direction.NORTH); + boolean west = hasNodeConnection(world, pos.relative(Direction.WEST), currentState, Direction.EAST); + boolean up = hasNodeConnection(world, pos.relative(Direction.UP), currentState, Direction.DOWN); + boolean down = hasNodeConnection(world, pos.relative(Direction.DOWN), currentState, Direction.UP); return currentState - .with(NORTH, north) - .with(EAST, east) - .with(SOUTH, south) - .with(WEST, west) - .with(UP, up) - .with(DOWN, down); + .setValue(NORTH, north) + .setValue(EAST, east) + .setValue(SOUTH, south) + .setValue(WEST, west) + .setValue(UP, up) + .setValue(DOWN, down); } @Nullable @@ -227,8 +229,8 @@ public class CableBlock extends NetworkNodeBlock implements IWaterLoggable { } @Override - protected void fillStateContainer(StateContainer.Builder builder) { - super.fillStateContainer(builder); + protected void createBlockStateDefinition(StateContainer.Builder builder) { + super.createBlockStateDefinition(builder); builder.add(NORTH, EAST, SOUTH, WEST, UP, DOWN, WATERLOGGED); } @@ -236,17 +238,17 @@ public class CableBlock extends NetworkNodeBlock implements IWaterLoggable { public static boolean hasVisualConnectionOnSide(BlockState state, Direction direction) { switch (direction) { case DOWN: - return state.get(DOWN); + return state.getValue(DOWN); case UP: - return state.get(UP); + return state.getValue(UP); case NORTH: - return state.get(NORTH); + return state.getValue(NORTH); case SOUTH: - return state.get(SOUTH); + return state.getValue(SOUTH); case WEST: - return state.get(WEST); + return state.getValue(WEST); case EAST: - return state.get(EAST); + return state.getValue(EAST); } return false; } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ColoredNetworkBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ColoredNetworkBlock.java index ea4824842..1718cd006 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ColoredNetworkBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ColoredNetworkBlock.java @@ -4,6 +4,8 @@ import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraft.block.AbstractBlock.Properties; + public class ColoredNetworkBlock extends NetworkNodeBlock { public ColoredNetworkBlock(Properties props) { super(props); @@ -11,11 +13,11 @@ public class ColoredNetworkBlock extends NetworkNodeBlock { // Don't do block drops if we change the color. @Override - public void onReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean isMoving) { + public void onRemove(BlockState state, World world, BlockPos pos, BlockState newState, boolean isMoving) { if (state.getBlock().getClass().equals(newState.getBlock().getClass())) { checkIfDirectionHasChanged(state, world, pos, newState); } else { - super.onReplaced(state, world, pos, newState, isMoving); + super.onRemove(state, world, pos, newState, isMoving); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java index 029c25788..1735b2f25 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java @@ -28,12 +28,12 @@ import net.minecraftforge.fml.network.NetworkHooks; import javax.annotation.Nullable; public class ConstructorBlock extends CableBlock { - private static final VoxelShape HEAD_NORTH = VoxelShapes.or(makeCuboidShape(2, 2, 0, 14, 14, 2), HOLDER_NORTH); - private static final VoxelShape HEAD_EAST = VoxelShapes.or(makeCuboidShape(14, 2, 2, 16, 14, 14), HOLDER_EAST); - private static final VoxelShape HEAD_SOUTH = VoxelShapes.or(makeCuboidShape(2, 2, 14, 14, 14, 16), HOLDER_SOUTH); - private static final VoxelShape HEAD_WEST = VoxelShapes.or(makeCuboidShape(0, 2, 2, 2, 14, 14), HOLDER_WEST); - private static final VoxelShape HEAD_DOWN = VoxelShapes.or(makeCuboidShape(2, 0, 2, 14, 2, 14), HOLDER_DOWN); - private static final VoxelShape HEAD_UP = VoxelShapes.or(makeCuboidShape(2, 14, 2, 14, 16, 14), HOLDER_UP); + private static final VoxelShape HEAD_NORTH = VoxelShapes.or(box(2, 2, 0, 14, 14, 2), HOLDER_NORTH); + private static final VoxelShape HEAD_EAST = VoxelShapes.or(box(14, 2, 2, 16, 14, 14), HOLDER_EAST); + private static final VoxelShape HEAD_SOUTH = VoxelShapes.or(box(2, 2, 14, 14, 14, 16), HOLDER_SOUTH); + private static final VoxelShape HEAD_WEST = VoxelShapes.or(box(0, 2, 2, 2, 14, 14), HOLDER_WEST); + private static final VoxelShape HEAD_DOWN = VoxelShapes.or(box(2, 0, 2, 14, 2, 14), HOLDER_DOWN); + private static final VoxelShape HEAD_UP = VoxelShapes.or(box(2, 14, 2, 14, 16, 14), HOLDER_UP); public ConstructorBlock() { super(BlockUtils.DEFAULT_GLASS_PROPERTIES); @@ -62,7 +62,7 @@ public class ConstructorBlock extends CableBlock { } private VoxelShape getHeadShape(BlockState state) { - Direction direction = state.get(getDirection().getProperty()); + Direction direction = state.getValue(getDirection().getProperty()); if (direction == Direction.NORTH) { return HEAD_NORTH; @@ -93,8 +93,8 @@ public class ConstructorBlock extends CableBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { - if (!world.isRemote && CollisionUtils.isInBounds(getHeadShape(state), pos, hit.getHitVec())) { + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + if (!world.isClientSide && CollisionUtils.isInBounds(getHeadShape(state), pos, hit.getLocation())) { return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java index 88fd73e94..465b0b6f9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java @@ -52,7 +52,7 @@ public class ControllerBlock extends BaseBlock { } @Override - public String getString() { + public String getSerializedName() { return name; } @@ -70,12 +70,12 @@ public class ControllerBlock extends BaseBlock { super(BlockUtils.DEFAULT_ROCK_PROPERTIES); this.type = type; - this.setDefaultState(getStateContainer().getBaseState().with(ENERGY_TYPE, EnergyType.OFF)); + this.registerDefaultState(getStateDefinition().any().setValue(ENERGY_TYPE, EnergyType.OFF)); } @Override - protected void fillStateContainer(StateContainer.Builder builder) { - super.fillStateContainer(builder); + protected void createBlockStateDefinition(StateContainer.Builder builder) { + super.createBlockStateDefinition(builder); builder.add(ENERGY_TYPE); } @@ -96,12 +96,12 @@ public class ControllerBlock extends BaseBlock { } @Override - public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) { - super.onBlockPlacedBy(world, pos, state, entity, stack); + public void setPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) { + super.setPlacedBy(world, pos, state, entity, stack); - if (!world.isRemote) { + if (!world.isClientSide) { stack.getCapability(CapabilityEnergy.ENERGY).ifPresent(energyFromStack -> { - TileEntity tile = world.getTileEntity(pos); + TileEntity tile = world.getBlockEntity(pos); if (tile != null) { tile.getCapability(CapabilityEnergy.ENERGY).ifPresent(energyFromTile -> energyFromTile.receiveEnergy(energyFromStack.getEnergyStored(), false)); @@ -115,32 +115,32 @@ public class ControllerBlock extends BaseBlock { public void neighborChanged(BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) { super.neighborChanged(state, world, pos, blockIn, fromPos, isMoving); - if (!world.isRemote) { + if (!world.isClientSide) { INetwork network = API.instance().getNetworkManager((ServerWorld) world).getNetwork(pos); if (network instanceof Network) { - ((Network) network).setRedstonePowered(world.isBlockPowered(pos)); + ((Network) network).setRedstonePowered(world.hasNeighborSignal(pos)); } } } @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { - ActionResultType result = super.onBlockActivated(state, world, pos, player, hand, hit); + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + ActionResultType result = super.use(state, world, pos, player, hand, hit); if (result != ActionResultType.PASS) { return result; } ColorMap colorMap = type == NetworkType.CREATIVE ? RSBlocks.CREATIVE_CONTROLLER : RSBlocks.CONTROLLER; - DyeColor color = DyeColor.getColor(player.getHeldItem(hand)); + DyeColor color = DyeColor.getColor(player.getItemInHand(hand)); if (color != null && !state.getBlock().equals(colorMap.get(color).get())) { - BlockState newState = colorMap.get(color).get().getDefaultState().with(ENERGY_TYPE, state.get(ENERGY_TYPE)); + BlockState newState = colorMap.get(color).get().defaultBlockState().setValue(ENERGY_TYPE, state.getValue(ENERGY_TYPE)); - return RSBlocks.CONTROLLER.setBlockState(newState, player.getHeldItem(hand), world, pos, player); + return RSBlocks.CONTROLLER.setBlockState(newState, player.getItemInHand(hand), world, pos, player); } - if (!world.isRemote) { + if (!world.isClientSide) { return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new INamedContainerProvider() { @@ -151,7 +151,7 @@ public class ControllerBlock extends BaseBlock { @Override public Container createMenu(int i, PlayerInventory playerInventory, PlayerEntity player) { - return new ControllerContainer((ControllerTile) world.getTileEntity(pos), player, i); + return new ControllerContainer((ControllerTile) world.getBlockEntity(pos), player, i); } }, pos @@ -162,10 +162,10 @@ public class ControllerBlock extends BaseBlock { } @Override - public void onReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean isMoving) { + public void onRemove(BlockState state, World world, BlockPos pos, BlockState newState, boolean isMoving) { if (newState.getBlock() instanceof ControllerBlock) { return; } - super.onReplaced(state, world, pos, newState, isMoving); + super.onRemove(state, world, pos, newState, isMoving); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java index 51c77564f..8a5f54049 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java @@ -40,14 +40,14 @@ public class CrafterBlock extends ColoredNetworkBlock { } @Override - public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) { - super.onBlockPlacedBy(world, pos, state, placer, stack); + public void setPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) { + super.setPlacedBy(world, pos, state, placer, stack); - if (!world.isRemote) { - TileEntity tile = world.getTileEntity(pos); + if (!world.isClientSide) { + TileEntity tile = world.getBlockEntity(pos); - if (tile instanceof CrafterTile && stack.hasDisplayName()) { - ((CrafterTile) tile).getNode().setDisplayName(stack.getDisplayName()); + if (tile instanceof CrafterTile && stack.hasCustomHoverName()) { + ((CrafterTile) tile).getNode().setDisplayName(stack.getHoverName()); ((CrafterTile) tile).getNode().markDirty(); } } @@ -55,17 +55,17 @@ public class CrafterBlock extends ColoredNetworkBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { - ActionResultType result = RSBlocks.CRAFTER.changeBlockColor(state, player.getHeldItem(hand), world, pos, player); + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + ActionResultType result = RSBlocks.CRAFTER.changeBlockColor(state, player.getItemInHand(hand), world, pos, player); if (result != ActionResultType.PASS) { return result; } - if (!world.isRemote) { + if (!world.isClientSide) { return NetworkUtils.attempt(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( - ((CrafterTile) world.getTileEntity(pos)).getNode().getName(), + ((CrafterTile) world.getBlockEntity(pos)).getNode().getName(), (tile, windowId, inventory, p) -> new CrafterContainer(tile, player, windowId), pos ), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/CrafterManagerBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/CrafterManagerBlock.java index 7df96a15b..af7bfb2c7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/CrafterManagerBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/CrafterManagerBlock.java @@ -38,16 +38,16 @@ public class CrafterManagerBlock extends ColoredNetworkBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { - ActionResultType result = RSBlocks.CRAFTER_MANAGER.changeBlockColor(state, player.getHeldItem(hand), world, pos, player); + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + ActionResultType result = RSBlocks.CRAFTER_MANAGER.changeBlockColor(state, player.getItemInHand(hand), world, pos, player); if (result != ActionResultType.PASS) { return result; } - if (!world.isRemote) { + if (!world.isClientSide) { return NetworkUtils.attempt(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, - new CrafterManagerContainerProvider((CrafterManagerTile) world.getTileEntity(pos)), + new CrafterManagerContainerProvider((CrafterManagerTile) world.getBlockEntity(pos)), buf -> CrafterManagerContainerProvider.writeToBuffer(buf, world, pos) ), Permission.MODIFY, Permission.AUTOCRAFTING); } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java index a3c5073e5..72d94e831 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java @@ -39,14 +39,14 @@ public class CraftingMonitorBlock extends ColoredNetworkBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { - ActionResultType result = RSBlocks.CRAFTING_MONITOR.changeBlockColor(state, player.getHeldItem(hand), world, pos, player); + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + ActionResultType result = RSBlocks.CRAFTING_MONITOR.changeBlockColor(state, player.getItemInHand(hand), world, pos, player); if (result != ActionResultType.PASS) { return result; } - if (!world.isRemote) { - CraftingMonitorTile tile = (CraftingMonitorTile) world.getTileEntity(pos); + if (!world.isClientSide) { + CraftingMonitorTile tile = (CraftingMonitorTile) world.getBlockEntity(pos); return NetworkUtils.attempt(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, diff --git a/src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java index 39f1fee7a..e4b8edd26 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java @@ -28,12 +28,12 @@ import net.minecraftforge.fml.network.NetworkHooks; import javax.annotation.Nullable; public class DestructorBlock extends CableBlock { - private static final VoxelShape HEAD_NORTH = VoxelShapes.or(makeCuboidShape(2, 2, 0, 14, 14, 2), HOLDER_NORTH); - private static final VoxelShape HEAD_EAST = VoxelShapes.or(makeCuboidShape(14, 2, 2, 16, 14, 14), HOLDER_EAST); - private static final VoxelShape HEAD_SOUTH = VoxelShapes.or(makeCuboidShape(2, 2, 14, 14, 14, 16), HOLDER_SOUTH); - private static final VoxelShape HEAD_WEST = VoxelShapes.or(makeCuboidShape(0, 2, 2, 2, 14, 14), HOLDER_WEST); - private static final VoxelShape HEAD_DOWN = VoxelShapes.or(makeCuboidShape(2, 0, 2, 14, 2, 14), HOLDER_DOWN); - private static final VoxelShape HEAD_UP = VoxelShapes.or(makeCuboidShape(2, 14, 2, 14, 16, 14), HOLDER_UP); + private static final VoxelShape HEAD_NORTH = VoxelShapes.or(box(2, 2, 0, 14, 14, 2), HOLDER_NORTH); + private static final VoxelShape HEAD_EAST = VoxelShapes.or(box(14, 2, 2, 16, 14, 14), HOLDER_EAST); + private static final VoxelShape HEAD_SOUTH = VoxelShapes.or(box(2, 2, 14, 14, 14, 16), HOLDER_SOUTH); + private static final VoxelShape HEAD_WEST = VoxelShapes.or(box(0, 2, 2, 2, 14, 14), HOLDER_WEST); + private static final VoxelShape HEAD_DOWN = VoxelShapes.or(box(2, 0, 2, 14, 2, 14), HOLDER_DOWN); + private static final VoxelShape HEAD_UP = VoxelShapes.or(box(2, 14, 2, 14, 16, 14), HOLDER_UP); public DestructorBlock() { super(BlockUtils.DEFAULT_GLASS_PROPERTIES); @@ -62,7 +62,7 @@ public class DestructorBlock extends CableBlock { } private VoxelShape getHeadShape(BlockState state) { - Direction direction = state.get(getDirection().getProperty()); + Direction direction = state.getValue(getDirection().getProperty()); if (direction == Direction.NORTH) { return HEAD_NORTH; @@ -93,8 +93,8 @@ public class DestructorBlock extends CableBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { - if (!world.isRemote && CollisionUtils.isInBounds(getHeadShape(state), pos, hit.getHitVec())) { + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + if (!world.isClientSide && CollisionUtils.isInBounds(getHeadShape(state), pos, hit.getLocation())) { return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( diff --git a/src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java index 953251bc2..5c7ae9e24 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java @@ -32,17 +32,17 @@ import javax.annotation.Nullable; public class DetectorBlock extends ColoredNetworkBlock { public static final BooleanProperty POWERED = BooleanProperty.create("powered"); - private static final VoxelShape SHAPE = makeCuboidShape(0, 0, 0, 16, 5, 16); + private static final VoxelShape SHAPE = box(0, 0, 0, 16, 5, 16); public DetectorBlock() { super(BlockUtils.DEFAULT_ROCK_PROPERTIES); - this.setDefaultState(this.getStateContainer().getBaseState().with(POWERED, false)); + this.registerDefaultState(this.getStateDefinition().any().setValue(POWERED, false)); } @Override - protected void fillStateContainer(StateContainer.Builder builder) { - super.fillStateContainer(builder); + protected void createBlockStateDefinition(StateContainer.Builder builder) { + super.createBlockStateDefinition(builder); builder.add(POWERED); } @@ -55,31 +55,31 @@ public class DetectorBlock extends ColoredNetworkBlock { @Override @SuppressWarnings("deprecation") - public boolean canProvidePower(BlockState state) { + public boolean isSignalSource(BlockState state) { return true; } @Override @SuppressWarnings("deprecation") - public int getWeakPower(BlockState state, IBlockReader world, BlockPos pos, Direction side) { - TileEntity tile = world.getTileEntity(pos); + public int getSignal(BlockState state, IBlockReader world, BlockPos pos, Direction side) { + TileEntity tile = world.getBlockEntity(pos); return (tile instanceof DetectorTile && ((DetectorTile) tile).getNode().isPowered()) ? 15 : 0; } @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { ColorMap colorMap = RSBlocks.DETECTOR; - DyeColor color = DyeColor.getColor(player.getHeldItem(hand)); + DyeColor color = DyeColor.getColor(player.getItemInHand(hand)); if (color != null && !state.getBlock().equals(colorMap.get(color).get())) { - BlockState newState = colorMap.get(color).get().getDefaultState().with(POWERED, state.get(POWERED)); + BlockState newState = colorMap.get(color).get().defaultBlockState().setValue(POWERED, state.getValue(POWERED)); - return RSBlocks.DETECTOR.setBlockState(newState, player.getHeldItem(hand), world, pos, player); + return RSBlocks.DETECTOR.setBlockState(newState, player.getItemInHand(hand), world, pos, player); } - if (!world.isRemote) { + if (!world.isClientSide) { return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( diff --git a/src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java index 28be0d7d6..6379b78f1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java @@ -38,8 +38,8 @@ public class DiskDriveBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult rayTraceResult) { - if (!world.isRemote) { + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult rayTraceResult) { + if (!world.isClientSide) { return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( diff --git a/src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java index 71c78bcbf..f0bb5f651 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java @@ -34,13 +34,13 @@ public class DiskManipulatorBlock extends ColoredNetworkBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult rayTraceResult) { - ActionResultType result = RSBlocks.DISK_MANIPULATOR.changeBlockColor(state, player.getHeldItem(hand), world, pos, player); + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult rayTraceResult) { + ActionResultType result = RSBlocks.DISK_MANIPULATOR.changeBlockColor(state, player.getItemInHand(hand), world, pos, player); if (result != ActionResultType.PASS) { return result; } - if (!world.isRemote) { + if (!world.isClientSide) { return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java index ea67fcbd8..54a3bdbaa 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java @@ -28,34 +28,34 @@ import net.minecraftforge.fml.network.NetworkHooks; import javax.annotation.Nullable; public class ExporterBlock extends CableBlock { - private static final VoxelShape LINE_NORTH_1 = makeCuboidShape(6, 6, 0, 10, 10, 2); - private static final VoxelShape LINE_NORTH_2 = makeCuboidShape(5, 5, 2, 11, 11, 4); - private static final VoxelShape LINE_NORTH_3 = makeCuboidShape(3, 3, 4, 13, 13, 6); + private static final VoxelShape LINE_NORTH_1 = box(6, 6, 0, 10, 10, 2); + private static final VoxelShape LINE_NORTH_2 = box(5, 5, 2, 11, 11, 4); + private static final VoxelShape LINE_NORTH_3 = box(3, 3, 4, 13, 13, 6); private static final VoxelShape LINE_NORTH = VoxelShapes.or(LINE_NORTH_1, LINE_NORTH_2, LINE_NORTH_3); - private static final VoxelShape LINE_EAST_1 = makeCuboidShape(14, 6, 6, 16, 10, 10); - private static final VoxelShape LINE_EAST_2 = makeCuboidShape(12, 5, 5, 14, 11, 11); - private static final VoxelShape LINE_EAST_3 = makeCuboidShape(10, 3, 3, 12, 13, 13); + private static final VoxelShape LINE_EAST_1 = box(14, 6, 6, 16, 10, 10); + private static final VoxelShape LINE_EAST_2 = box(12, 5, 5, 14, 11, 11); + private static final VoxelShape LINE_EAST_3 = box(10, 3, 3, 12, 13, 13); private static final VoxelShape LINE_EAST = VoxelShapes.or(LINE_EAST_1, LINE_EAST_2, LINE_EAST_3); - private static final VoxelShape LINE_SOUTH_1 = makeCuboidShape(6, 6, 14, 10, 10, 16); - private static final VoxelShape LINE_SOUTH_2 = makeCuboidShape(5, 5, 12, 11, 11, 14); - private static final VoxelShape LINE_SOUTH_3 = makeCuboidShape(3, 3, 10, 13, 13, 12); + private static final VoxelShape LINE_SOUTH_1 = box(6, 6, 14, 10, 10, 16); + private static final VoxelShape LINE_SOUTH_2 = box(5, 5, 12, 11, 11, 14); + private static final VoxelShape LINE_SOUTH_3 = box(3, 3, 10, 13, 13, 12); private static final VoxelShape LINE_SOUTH = VoxelShapes.or(LINE_SOUTH_1, LINE_SOUTH_2, LINE_SOUTH_3); - private static final VoxelShape LINE_WEST_1 = makeCuboidShape(0, 6, 6, 2, 10, 10); - private static final VoxelShape LINE_WEST_2 = makeCuboidShape(2, 5, 5, 4, 11, 11); - private static final VoxelShape LINE_WEST_3 = makeCuboidShape(4, 3, 3, 6, 13, 13); + private static final VoxelShape LINE_WEST_1 = box(0, 6, 6, 2, 10, 10); + private static final VoxelShape LINE_WEST_2 = box(2, 5, 5, 4, 11, 11); + private static final VoxelShape LINE_WEST_3 = box(4, 3, 3, 6, 13, 13); private static final VoxelShape LINE_WEST = VoxelShapes.or(LINE_WEST_1, LINE_WEST_2, LINE_WEST_3); - private static final VoxelShape LINE_UP_1 = makeCuboidShape(6, 14, 6, 10, 16, 10); - private static final VoxelShape LINE_UP_2 = makeCuboidShape(5, 12, 5, 11, 14, 11); - private static final VoxelShape LINE_UP_3 = makeCuboidShape(3, 10, 3, 13, 12, 13); + private static final VoxelShape LINE_UP_1 = box(6, 14, 6, 10, 16, 10); + private static final VoxelShape LINE_UP_2 = box(5, 12, 5, 11, 14, 11); + private static final VoxelShape LINE_UP_3 = box(3, 10, 3, 13, 12, 13); private static final VoxelShape LINE_UP = VoxelShapes.or(LINE_UP_1, LINE_UP_2, LINE_UP_3); - private static final VoxelShape LINE_DOWN_1 = makeCuboidShape(6, 0, 6, 10, 2, 10); - private static final VoxelShape LINE_DOWN_2 = makeCuboidShape(5, 2, 5, 11, 4, 11); - private static final VoxelShape LINE_DOWN_3 = makeCuboidShape(3, 4, 3, 13, 6, 13); + private static final VoxelShape LINE_DOWN_1 = box(6, 0, 6, 10, 2, 10); + private static final VoxelShape LINE_DOWN_2 = box(5, 2, 5, 11, 4, 11); + private static final VoxelShape LINE_DOWN_3 = box(3, 4, 3, 13, 6, 13); private static final VoxelShape LINE_DOWN = VoxelShapes.or(LINE_DOWN_1, LINE_DOWN_2, LINE_DOWN_3); public ExporterBlock() { @@ -80,7 +80,7 @@ public class ExporterBlock extends CableBlock { private VoxelShape getLineShape(BlockState state) { - Direction direction = state.get(getDirection().getProperty()); + Direction direction = state.getValue(getDirection().getProperty()); if (direction == Direction.NORTH) { return LINE_NORTH; @@ -117,8 +117,8 @@ public class ExporterBlock extends CableBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { - if (!world.isRemote && CollisionUtils.isInBounds(getLineShape(state), pos, hit.getHitVec())) { + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + if (!world.isClientSide && CollisionUtils.isInBounds(getLineShape(state), pos, hit.getLocation())) { return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java index 67255e7f0..bd8e3a382 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java @@ -32,12 +32,12 @@ import net.minecraftforge.fml.network.NetworkHooks; import javax.annotation.Nullable; public class ExternalStorageBlock extends CableBlock { - private static final VoxelShape HEAD_NORTH = VoxelShapes.or(makeCuboidShape(3, 3, 0, 13, 13, 2), HOLDER_NORTH); - private static final VoxelShape HEAD_EAST = VoxelShapes.or(makeCuboidShape(14, 3, 3, 16, 13, 13), HOLDER_EAST); - private static final VoxelShape HEAD_SOUTH = VoxelShapes.or(makeCuboidShape(3, 3, 14, 13, 13, 16), HOLDER_SOUTH); - private static final VoxelShape HEAD_WEST = VoxelShapes.or(makeCuboidShape(0, 3, 3, 2, 13, 13), HOLDER_WEST); - private static final VoxelShape HEAD_UP = VoxelShapes.or(makeCuboidShape(3, 14, 3, 13, 16, 13), HOLDER_UP); - private static final VoxelShape HEAD_DOWN = VoxelShapes.or(makeCuboidShape(3, 0, 3, 13, 2, 13), HOLDER_DOWN); + private static final VoxelShape HEAD_NORTH = VoxelShapes.or(box(3, 3, 0, 13, 13, 2), HOLDER_NORTH); + private static final VoxelShape HEAD_EAST = VoxelShapes.or(box(14, 3, 3, 16, 13, 13), HOLDER_EAST); + private static final VoxelShape HEAD_SOUTH = VoxelShapes.or(box(3, 3, 14, 13, 13, 16), HOLDER_SOUTH); + private static final VoxelShape HEAD_WEST = VoxelShapes.or(box(0, 3, 3, 2, 13, 13), HOLDER_WEST); + private static final VoxelShape HEAD_UP = VoxelShapes.or(box(3, 14, 3, 13, 16, 13), HOLDER_UP); + private static final VoxelShape HEAD_DOWN = VoxelShapes.or(box(3, 0, 3, 13, 2, 13), HOLDER_DOWN); public ExternalStorageBlock() { super(BlockUtils.DEFAULT_GLASS_PROPERTIES); @@ -60,7 +60,7 @@ public class ExternalStorageBlock extends CableBlock { } private VoxelShape getHeadShape(BlockState state) { - Direction direction = state.get(getDirection().getProperty()); + Direction direction = state.getValue(getDirection().getProperty()); if (direction == Direction.NORTH) { return HEAD_NORTH; @@ -97,8 +97,8 @@ public class ExternalStorageBlock extends CableBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { - if (!world.isRemote && CollisionUtils.isInBounds(getHeadShape(state), pos, hit.getHitVec())) { + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + if (!world.isClientSide && CollisionUtils.isInBounds(getHeadShape(state), pos, hit.getLocation())) { return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( @@ -118,12 +118,12 @@ public class ExternalStorageBlock extends CableBlock { public void neighborChanged(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos, boolean isMoving) { super.neighborChanged(state, world, pos, block, fromPos, isMoving); - if (!world.isRemote) { - INetworkNode node = NetworkUtils.getNodeFromTile(world.getTileEntity(pos)); + if (!world.isClientSide) { + INetworkNode node = NetworkUtils.getNodeFromTile(world.getBlockEntity(pos)); if (node instanceof ExternalStorageNetworkNode && node.getNetwork() != null && - fromPos.equals(pos.offset(((ExternalStorageNetworkNode) node).getDirection()))) { + fromPos.equals(pos.relative(((ExternalStorageNetworkNode) node).getDirection()))) { ((ExternalStorageNetworkNode) node).updateStorage(node.getNetwork(), InvalidateCause.NEIGHBOR_CHANGED); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java index 8be626ac4..baf68823a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java @@ -34,8 +34,8 @@ public class FluidInterfaceBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { - if (!world.isRemote) { + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + if (!world.isClientSide) { return NetworkUtils.attempt(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( diff --git a/src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java index 46883b32e..9be49bd93 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java @@ -37,19 +37,19 @@ public class FluidStorageBlock extends NetworkNodeBlock { } @Override - public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity player, ItemStack stack) { - if (!world.isRemote) { - FluidStorageNetworkNode storage = ((FluidStorageTile) world.getTileEntity(pos)).getNode(); + public void setPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity player, ItemStack stack) { + if (!world.isClientSide) { + FluidStorageNetworkNode storage = ((FluidStorageTile) world.getBlockEntity(pos)).getNode(); - if (stack.hasTag() && stack.getTag().hasUniqueId(FluidStorageNetworkNode.NBT_ID)) { - storage.setStorageId(stack.getTag().getUniqueId(FluidStorageNetworkNode.NBT_ID)); + if (stack.hasTag() && stack.getTag().hasUUID(FluidStorageNetworkNode.NBT_ID)) { + storage.setStorageId(stack.getTag().getUUID(FluidStorageNetworkNode.NBT_ID)); } storage.loadStorage(player instanceof PlayerEntity ? (PlayerEntity) player : null); } // Call this after loading the storage, so the network discovery can use the loaded storage. - super.onBlockPlacedBy(world, pos, state, player, stack); + super.setPlacedBy(world, pos, state, player, stack); } @Nullable @@ -60,10 +60,10 @@ public class FluidStorageBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { - if (!world.isRemote) { + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + if (!world.isClientSide) { return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui((ServerPlayerEntity) player, new PositionalTileContainerProvider( - ((FluidStorageTile) world.getTileEntity(pos)).getNode().getTitle(), + ((FluidStorageTile) world.getBlockEntity(pos)).getNode().getTitle(), (tile, windowId, inventory, p) -> new FluidStorageContainer(tile, player, windowId), pos ), pos)); diff --git a/src/main/java/com/refinedmods/refinedstorage/block/GridBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/GridBlock.java index 9d55a0bcc..d4b8e3d9b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/GridBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/GridBlock.java @@ -48,7 +48,7 @@ public class GridBlock extends ColoredNetworkBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { ColorMap map; switch (type) { case FLUID: @@ -67,12 +67,12 @@ public class GridBlock extends ColoredNetworkBlock { throw new IllegalStateException("Unexpected value: " + type); } - ActionResultType result = map.changeBlockColor(state, player.getHeldItem(hand), world, pos, player); + ActionResultType result = map.changeBlockColor(state, player.getItemInHand(hand), world, pos, player); if (result != ActionResultType.PASS) { return result; } - if (!world.isRemote) { + if (!world.isClientSide) { return NetworkUtils.attemptModify(world, pos, player, () -> API.instance().getGridManager().openGrid(GridBlockGridFactory.ID, (ServerPlayerEntity) player, pos)); } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java index 7df60ec7f..2ce978652 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java @@ -28,34 +28,34 @@ import net.minecraftforge.fml.network.NetworkHooks; import javax.annotation.Nullable; public class ImporterBlock extends CableBlock { - private static final VoxelShape LINE_NORTH_1 = makeCuboidShape(6, 6, 4, 10, 10, 6); - private static final VoxelShape LINE_NORTH_2 = makeCuboidShape(5, 5, 2, 11, 11, 4); - private static final VoxelShape LINE_NORTH_3 = makeCuboidShape(3, 3, 0, 13, 13, 2); + private static final VoxelShape LINE_NORTH_1 = box(6, 6, 4, 10, 10, 6); + private static final VoxelShape LINE_NORTH_2 = box(5, 5, 2, 11, 11, 4); + private static final VoxelShape LINE_NORTH_3 = box(3, 3, 0, 13, 13, 2); private static final VoxelShape LINE_NORTH = VoxelShapes.or(LINE_NORTH_1, LINE_NORTH_2, LINE_NORTH_3); - private static final VoxelShape LINE_EAST_1 = makeCuboidShape(10, 6, 6, 12, 10, 10); - private static final VoxelShape LINE_EAST_2 = makeCuboidShape(12, 5, 5, 14, 11, 11); - private static final VoxelShape LINE_EAST_3 = makeCuboidShape(14, 3, 3, 16, 13, 13); + private static final VoxelShape LINE_EAST_1 = box(10, 6, 6, 12, 10, 10); + private static final VoxelShape LINE_EAST_2 = box(12, 5, 5, 14, 11, 11); + private static final VoxelShape LINE_EAST_3 = box(14, 3, 3, 16, 13, 13); private static final VoxelShape LINE_EAST = VoxelShapes.or(LINE_EAST_1, LINE_EAST_2, LINE_EAST_3); - private static final VoxelShape LINE_SOUTH_1 = makeCuboidShape(6, 6, 10, 10, 10, 12); - private static final VoxelShape LINE_SOUTH_2 = makeCuboidShape(5, 5, 12, 11, 11, 14); - private static final VoxelShape LINE_SOUTH_3 = makeCuboidShape(3, 3, 14, 13, 13, 16); + private static final VoxelShape LINE_SOUTH_1 = box(6, 6, 10, 10, 10, 12); + private static final VoxelShape LINE_SOUTH_2 = box(5, 5, 12, 11, 11, 14); + private static final VoxelShape LINE_SOUTH_3 = box(3, 3, 14, 13, 13, 16); private static final VoxelShape LINE_SOUTH = VoxelShapes.or(LINE_SOUTH_1, LINE_SOUTH_2, LINE_SOUTH_3); - private static final VoxelShape LINE_WEST_1 = makeCuboidShape(4, 6, 6, 6, 10, 10); - private static final VoxelShape LINE_WEST_2 = makeCuboidShape(2, 5, 5, 4, 11, 11); - private static final VoxelShape LINE_WEST_3 = makeCuboidShape(0, 3, 3, 2, 13, 13); + private static final VoxelShape LINE_WEST_1 = box(4, 6, 6, 6, 10, 10); + private static final VoxelShape LINE_WEST_2 = box(2, 5, 5, 4, 11, 11); + private static final VoxelShape LINE_WEST_3 = box(0, 3, 3, 2, 13, 13); private static final VoxelShape LINE_WEST = VoxelShapes.or(LINE_WEST_1, LINE_WEST_2, LINE_WEST_3); - private static final VoxelShape LINE_UP_1 = makeCuboidShape(6, 10, 6, 10, 12, 10); - private static final VoxelShape LINE_UP_2 = makeCuboidShape(5, 12, 5, 11, 14, 11); - private static final VoxelShape LINE_UP_3 = makeCuboidShape(3, 14, 3, 13, 16, 13); + private static final VoxelShape LINE_UP_1 = box(6, 10, 6, 10, 12, 10); + private static final VoxelShape LINE_UP_2 = box(5, 12, 5, 11, 14, 11); + private static final VoxelShape LINE_UP_3 = box(3, 14, 3, 13, 16, 13); private static final VoxelShape LINE_UP = VoxelShapes.or(LINE_UP_1, LINE_UP_2, LINE_UP_3); - private static final VoxelShape LINE_DOWN_1 = makeCuboidShape(6, 4, 6, 10, 6, 10); - private static final VoxelShape LINE_DOWN_2 = makeCuboidShape(5, 2, 5, 11, 4, 11); - private static final VoxelShape LINE_DOWN_3 = makeCuboidShape(3, 0, 3, 13, 2, 13); + private static final VoxelShape LINE_DOWN_1 = box(6, 4, 6, 10, 6, 10); + private static final VoxelShape LINE_DOWN_2 = box(5, 2, 5, 11, 4, 11); + private static final VoxelShape LINE_DOWN_3 = box(3, 0, 3, 13, 2, 13); private static final VoxelShape LINE_DOWN = VoxelShapes.or(LINE_DOWN_1, LINE_DOWN_2, LINE_DOWN_3); public ImporterBlock() { @@ -79,7 +79,7 @@ public class ImporterBlock extends CableBlock { } private VoxelShape getLineShape(BlockState state) { - Direction direction = state.get(getDirection().getProperty()); + Direction direction = state.getValue(getDirection().getProperty()); if (direction == Direction.NORTH) { return LINE_NORTH; @@ -116,8 +116,8 @@ public class ImporterBlock extends CableBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { - if (!world.isRemote && CollisionUtils.isInBounds(getLineShape(state), pos, hit.getHitVec())) { + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + if (!world.isClientSide && CollisionUtils.isInBounds(getLineShape(state), pos, hit.getLocation())) { return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( diff --git a/src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java index 4e5a305bf..056173c09 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java @@ -34,8 +34,8 @@ public class InterfaceBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { - if (!world.isRemote) { + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + if (!world.isClientSide) { return NetworkUtils.attempt(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( diff --git a/src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java index 2509ca66e..928b0881d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java @@ -27,7 +27,7 @@ public abstract class NetworkNodeBlock extends BaseBlock { super(props); if (hasConnectedState()) { - this.setDefaultState(this.getStateContainer().getBaseState().with(CONNECTED, false)); + this.registerDefaultState(this.getStateDefinition().any().setValue(CONNECTED, false)); } } @@ -36,19 +36,19 @@ public abstract class NetworkNodeBlock extends BaseBlock { public void neighborChanged(BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) { super.neighborChanged(state, world, pos, blockIn, fromPos, isMoving); - if (!world.isRemote) { + if (!world.isClientSide) { INetworkNode node = API.instance().getNetworkNodeManager((ServerWorld) world).getNode(pos); if (node instanceof NetworkNode) { - ((NetworkNode) node).setRedstonePowered(world.isBlockPowered(pos)); + ((NetworkNode) node).setRedstonePowered(world.hasNeighborSignal(pos)); } } } @Override @SuppressWarnings("deprecation") - public void onReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean isMoving) { + public void onRemove(BlockState state, World world, BlockPos pos, BlockState newState, boolean isMoving) { if (state.getBlock() != newState.getBlock()) { - TileEntity tile = world.getTileEntity(pos); + TileEntity tile = world.getBlockEntity(pos); if (tile instanceof NetworkNodeTile) { IItemHandler handler = ((NetworkNodeTile) tile).getNode().getDrops(); @@ -60,20 +60,20 @@ public abstract class NetworkNodeBlock extends BaseBlock { drops.add(handler.getStackInSlot(i)); } - InventoryHelper.dropItems(world, pos, drops); + InventoryHelper.dropContents(world, pos, drops); } } } // Call onReplaced after the drops check so the tile still exists - super.onReplaced(state, world, pos, newState, isMoving); + super.onRemove(state, world, pos, newState, isMoving); } @Override protected void onDirectionChanged(World world, BlockPos pos, Direction newDirection) { super.onDirectionChanged(world, pos, newDirection); - TileEntity tile = world.getTileEntity(pos); + TileEntity tile = world.getBlockEntity(pos); if (tile instanceof INetworkNodeProxy) { INetworkNode node = ((INetworkNodeProxy) tile).getNode(); @@ -84,8 +84,8 @@ public abstract class NetworkNodeBlock extends BaseBlock { } @Override - protected void fillStateContainer(StateContainer.Builder builder) { - super.fillStateContainer(builder); + protected void createBlockStateDefinition(StateContainer.Builder builder) { + super.createBlockStateDefinition(builder); if (hasConnectedState()) { builder.add(CONNECTED); diff --git a/src/main/java/com/refinedmods/refinedstorage/block/NetworkReceiverBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/NetworkReceiverBlock.java index db502dab7..55d3ac8e0 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/NetworkReceiverBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/NetworkReceiverBlock.java @@ -32,7 +32,7 @@ public class NetworkReceiverBlock extends ColoredNetworkBlock { } @Override - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { - return RSBlocks.NETWORK_RECEIVER.changeBlockColor(state, player.getHeldItem(hand), world, pos, player); + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + return RSBlocks.NETWORK_RECEIVER.changeBlockColor(state, player.getItemInHand(hand), world, pos, player); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java index a86d5032b..293f684b3 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java @@ -34,13 +34,13 @@ public class NetworkTransmitterBlock extends ColoredNetworkBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { - ActionResultType result = RSBlocks.NETWORK_TRANSMITTER.changeBlockColor(state, player.getHeldItem(hand), world, pos, player); + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + ActionResultType result = RSBlocks.NETWORK_TRANSMITTER.changeBlockColor(state, player.getItemInHand(hand), world, pos, player); if (result != ActionResultType.PASS) { return result; } - if (!world.isRemote) { + if (!world.isClientSide) { return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( diff --git a/src/main/java/com/refinedmods/refinedstorage/block/PortableGridBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/PortableGridBlock.java index 2e964dc2a..3ec111f04 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/PortableGridBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/PortableGridBlock.java @@ -31,7 +31,7 @@ public class PortableGridBlock extends BaseBlock { public static final EnumProperty DISK_STATE = EnumProperty.create("disk_state", PortableGridDiskState.class); public static final BooleanProperty ACTIVE = BooleanProperty.create("active"); - private static final VoxelShape SHAPE = makeCuboidShape(0, 0, 0, 16, 13.2, 16); + private static final VoxelShape SHAPE = box(0, 0, 0, 16, 13.2, 16); private final PortableGridBlockItem.Type type; @@ -39,12 +39,12 @@ public class PortableGridBlock extends BaseBlock { super(BlockUtils.DEFAULT_ROCK_PROPERTIES); this.type = type; - this.setDefaultState(getDefaultState().with(DISK_STATE, PortableGridDiskState.NONE).with(ACTIVE, false)); + this.registerDefaultState(defaultBlockState().setValue(DISK_STATE, PortableGridDiskState.NONE).setValue(ACTIVE, false)); } @Override - protected void fillStateContainer(StateContainer.Builder builder) { - super.fillStateContainer(builder); + protected void createBlockStateDefinition(StateContainer.Builder builder) { + super.createBlockStateDefinition(builder); builder.add(DISK_STATE); builder.add(ACTIVE); @@ -74,23 +74,23 @@ public class PortableGridBlock extends BaseBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { - if (!world.isRemote) { + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + if (!world.isClientSide) { API.instance().getGridManager().openGrid(PortableGridBlockGridFactory.ID, (ServerPlayerEntity) player, pos); - ((PortableGridTile) world.getTileEntity(pos)).onOpened(); + ((PortableGridTile) world.getBlockEntity(pos)).onOpened(); } return ActionResultType.SUCCESS; } @Override - public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) { - super.onBlockPlacedBy(world, pos, state, placer, stack); + public void setPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) { + super.setPlacedBy(world, pos, state, placer, stack); - if (!world.isRemote) { - ((PortableGridTile) world.getTileEntity(pos)).applyDataFromItemToTile(stack); - ((PortableGridTile) world.getTileEntity(pos)).updateState(); + if (!world.isClientSide) { + ((PortableGridTile) world.getBlockEntity(pos)).applyDataFromItemToTile(stack); + ((PortableGridTile) world.getBlockEntity(pos)).updateState(); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java index 8d7f0455e..c8f2795ce 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java @@ -34,13 +34,13 @@ public class RelayBlock extends ColoredNetworkBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { - ActionResultType result = RSBlocks.RELAY.changeBlockColor(state, player.getHeldItem(hand), world, pos, player); + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + ActionResultType result = RSBlocks.RELAY.changeBlockColor(state, player.getItemInHand(hand), world, pos, player); if (result != ActionResultType.PASS) { return result; } - if (!world.isRemote) { + if (!world.isClientSide) { return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( diff --git a/src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java index a3137ed6a..551428a1d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java @@ -34,13 +34,13 @@ public class SecurityManagerBlock extends ColoredNetworkBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { - ActionResultType result = RSBlocks.SECURITY_MANAGER.changeBlockColor(state, player.getHeldItem(hand), world, pos, player); + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + ActionResultType result = RSBlocks.SECURITY_MANAGER.changeBlockColor(state, player.getItemInHand(hand), world, pos, player); if (result != ActionResultType.PASS) { return result; } - if (!world.isRemote) { + if (!world.isClientSide) { Runnable action = () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( @@ -51,7 +51,7 @@ public class SecurityManagerBlock extends ColoredNetworkBlock { pos ); - if (player.getGameProfile().getId().equals(((SecurityManagerTile) world.getTileEntity(pos)).getNode().getOwner())) { + if (player.getGameProfile().getId().equals(((SecurityManagerTile) world.getBlockEntity(pos)).getNode().getOwner())) { action.run(); } else { return NetworkUtils.attempt(world, pos, player, action, Permission.MODIFY, Permission.SECURITY); diff --git a/src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java index 968cbb4d5..e2d5112d0 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java @@ -37,19 +37,19 @@ public class StorageBlock extends NetworkNodeBlock { } @Override - public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) { - if (!world.isRemote) { - StorageNetworkNode storage = ((StorageTile) world.getTileEntity(pos)).getNode(); + public void setPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) { + if (!world.isClientSide) { + StorageNetworkNode storage = ((StorageTile) world.getBlockEntity(pos)).getNode(); - if (stack.hasTag() && stack.getTag().hasUniqueId(StorageNetworkNode.NBT_ID)) { - storage.setStorageId(stack.getTag().getUniqueId(StorageNetworkNode.NBT_ID)); + if (stack.hasTag() && stack.getTag().hasUUID(StorageNetworkNode.NBT_ID)) { + storage.setStorageId(stack.getTag().getUUID(StorageNetworkNode.NBT_ID)); } storage.loadStorage(entity instanceof PlayerEntity ? (PlayerEntity) entity : null); } // Call this after loading the storage, so the network discovery can use the loaded storage. - super.onBlockPlacedBy(world, pos, state, entity, stack); + super.setPlacedBy(world, pos, state, entity, stack); } @Nullable @@ -60,10 +60,10 @@ public class StorageBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { - if (!world.isRemote) { + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + if (!world.isClientSide) { return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui((ServerPlayerEntity) player, new PositionalTileContainerProvider( - ((StorageTile) world.getTileEntity(pos)).getNode().getTitle(), + ((StorageTile) world.getBlockEntity(pos)).getNode().getTitle(), (tile, windowId, inventory, p) -> new StorageContainer(tile, player, windowId), pos ), pos)); diff --git a/src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java index 7869aed4d..7e7e1660a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java @@ -42,9 +42,9 @@ public class StorageMonitorBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { - if (!world.isRemote) { - ItemStack held = player.inventory.getCurrentItem(); + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { + if (!world.isClientSide) { + ItemStack held = player.inventory.getSelected(); if (player.isCrouching()) { return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( @@ -57,7 +57,7 @@ public class StorageMonitorBlock extends NetworkNodeBlock { pos )); } else { - StorageMonitorNetworkNode storageMonitor = ((StorageMonitorTile) world.getTileEntity(pos)).getNode(); + StorageMonitorNetworkNode storageMonitor = ((StorageMonitorTile) world.getBlockEntity(pos)).getNode(); if (!held.isEmpty()) { return storageMonitor.deposit(player, held); @@ -72,17 +72,17 @@ public class StorageMonitorBlock extends NetworkNodeBlock { @Override @SuppressWarnings("deprecation") - public void onBlockClicked(BlockState state, World world, BlockPos pos, PlayerEntity player) { - super.onBlockClicked(state, world, pos, player); + public void attack(BlockState state, World world, BlockPos pos, PlayerEntity player) { + super.attack(state, world, pos, player); - if (!world.isRemote) { + if (!world.isClientSide) { RayTraceResult result = WorldUtils.rayTracePlayer(world, player); if (!(result instanceof BlockRayTraceResult)) { return; } - ((StorageMonitorTile) world.getTileEntity(pos)).getNode().extract(player, ((BlockRayTraceResult) result).getFace()); + ((StorageMonitorTile) world.getBlockEntity(pos)).getNode().extract(player, ((BlockRayTraceResult) result).getDirection()); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java index 64e4c4577..e10db03b5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java @@ -25,12 +25,12 @@ import net.minecraftforge.fml.network.NetworkHooks; import javax.annotation.Nullable; public class WirelessTransmitterBlock extends ColoredNetworkBlock { - private static final VoxelShape SHAPE_DOWN = makeCuboidShape(6.0D, 0.0D, 6.0D, 10.0D, 10.0D, 10.0D); - private static final VoxelShape SHAPE_UP = makeCuboidShape(6.0D, 6.0D, 6.0D, 10.0D, 16.0D, 10.0D); - private static final VoxelShape SHAPE_EAST = makeCuboidShape(6.0D, 6.0D, 6.0D, 16.0D, 10.0D, 10.0D); - private static final VoxelShape SHAPE_WEST = makeCuboidShape(0.0D, 6.0D, 6.0D, 10.0D, 10.0D, 10.0D); - private static final VoxelShape SHAPE_NORTH = makeCuboidShape(6.0D, 6.0D, 0.0D, 10.0D, 10.0D, 10.0D); - private static final VoxelShape SHAPE_SOUTH = makeCuboidShape(6.0D, 6.0D, 6.0D, 10.0D, 10.0D, 16.0D); + private static final VoxelShape SHAPE_DOWN = box(6.0D, 0.0D, 6.0D, 10.0D, 10.0D, 10.0D); + private static final VoxelShape SHAPE_UP = box(6.0D, 6.0D, 6.0D, 10.0D, 16.0D, 10.0D); + private static final VoxelShape SHAPE_EAST = box(6.0D, 6.0D, 6.0D, 16.0D, 10.0D, 10.0D); + private static final VoxelShape SHAPE_WEST = box(0.0D, 6.0D, 6.0D, 10.0D, 10.0D, 10.0D); + private static final VoxelShape SHAPE_NORTH = box(6.0D, 6.0D, 0.0D, 10.0D, 10.0D, 10.0D); + private static final VoxelShape SHAPE_SOUTH = box(6.0D, 6.0D, 6.0D, 10.0D, 10.0D, 16.0D); public WirelessTransmitterBlock() { super(BlockUtils.DEFAULT_ROCK_PROPERTIES); @@ -55,7 +55,7 @@ public class WirelessTransmitterBlock extends ColoredNetworkBlock { @Override @SuppressWarnings("deprecation") public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext context) { - switch (state.get(getDirection().getProperty())) { + switch (state.getValue(getDirection().getProperty())) { case DOWN: return SHAPE_DOWN; case UP: @@ -75,13 +75,13 @@ public class WirelessTransmitterBlock extends ColoredNetworkBlock { @Override @SuppressWarnings("deprecation") - public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { - ActionResultType result = RSBlocks.WIRELESS_TRANSMITTER.changeBlockColor(state, player.getHeldItem(hand), world, pos, player); + public ActionResultType use(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + ActionResultType result = RSBlocks.WIRELESS_TRANSMITTER.changeBlockColor(state, player.getItemInHand(hand), world, pos, player); if (result != ActionResultType.PASS) { return result; } - if (!world.isRemote) { + if (!world.isClientSide) { return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( diff --git a/src/main/java/com/refinedmods/refinedstorage/command/disk/CreateDiskCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/disk/CreateDiskCommand.java index ed58f4fc2..7ebb57659 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/disk/CreateDiskCommand.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/disk/CreateDiskCommand.java @@ -25,9 +25,9 @@ import java.util.UUID; public class CreateDiskCommand implements Command { public static ArgumentBuilder register() { return Commands.literal("create") - .requires(cs -> cs.hasPermissionLevel(2)) + .requires(cs -> cs.hasPermission(2)) .then(Commands.argument("player", EntityArgument.player()) - .then(Commands.argument("id", UUIDArgument.func_239194_a_()).suggests(new StorageDiskIdSuggestionProvider()) + .then(Commands.argument("id", UUIDArgument.uuid()).suggests(new StorageDiskIdSuggestionProvider()) .executes(new CreateDiskCommand()) ) ); @@ -36,11 +36,11 @@ public class CreateDiskCommand implements Command { @Override public int run(CommandContext context) throws CommandSyntaxException { PlayerEntity player = EntityArgument.getPlayer(context, "player"); - UUID id = UUIDArgument.func_239195_a_(context, "id"); + UUID id = UUIDArgument.getUuid(context, "id"); - IStorageDisk disk = API.instance().getStorageDiskManager(context.getSource().getWorld()).get(id); + IStorageDisk disk = API.instance().getStorageDiskManager(context.getSource().getLevel()).get(id); if (disk == null) { - context.getSource().sendErrorMessage(new TranslationTextComponent("commands.refinedstorage.disk.create.error.disk_not_found", id)); + context.getSource().sendFailure(new TranslationTextComponent("commands.refinedstorage.disk.create.error.disk_not_found", id)); } else { IStorageDiskFactory factory = API.instance().getStorageDiskRegistry().get(disk.getFactoryId()); @@ -48,29 +48,29 @@ public class CreateDiskCommand implements Command { ItemStack stack = factory.createDiskItem(disk, id); // @Volatile: From GiveCommand - boolean flag = player.inventory.addItemStackToInventory(stack); + boolean flag = player.inventory.add(stack); if (flag && stack.isEmpty()) { stack.setCount(1); - ItemEntity itemEntity = player.dropItem(stack, false); + ItemEntity itemEntity = player.drop(stack, false); if (itemEntity != null) { itemEntity.makeFakeItem(); } - player.world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 0.2F, ((player.getRNG().nextFloat() - player.getRNG().nextFloat()) * 0.7F + 1.0F) * 2.0F); - player.container.detectAndSendChanges(); + player.level.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.ITEM_PICKUP, SoundCategory.PLAYERS, 0.2F, ((player.getRandom().nextFloat() - player.getRandom().nextFloat()) * 0.7F + 1.0F) * 2.0F); + player.inventoryMenu.broadcastChanges(); } else { - ItemEntity itemEntity = player.dropItem(stack, false); + ItemEntity itemEntity = player.drop(stack, false); if (itemEntity != null) { - itemEntity.setNoPickupDelay(); - itemEntity.setOwnerId(player.getUniqueID()); + itemEntity.setNoPickUpDelay(); + itemEntity.setOwner(player.getUUID()); } } - context.getSource().sendFeedback(new TranslationTextComponent( + context.getSource().sendSuccess(new TranslationTextComponent( "commands.refinedstorage.disk.create.success", new StringTextComponent(id.toString()).setStyle(Styles.YELLOW), - context.getSource().getDisplayName().deepCopy().setStyle(Styles.YELLOW) + context.getSource().getDisplayName().copy().setStyle(Styles.YELLOW) ), false); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/command/disk/ListDiskCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/disk/ListDiskCommand.java index 7e47166f8..792911324 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/disk/ListDiskCommand.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/disk/ListDiskCommand.java @@ -11,17 +11,17 @@ import net.minecraft.util.text.StringTextComponent; public class ListDiskCommand implements Command { public static ArgumentBuilder register() { return Commands.literal("list") - .requires(cs -> cs.hasPermissionLevel(2)) + .requires(cs -> cs.hasPermission(2)) .executes(new ListDiskCommand()) .then(ListDiskForPlayerCommand.register()); } @Override public int run(CommandContext context) { - API.instance().getStorageDiskManager(context.getSource().getWorld()) + API.instance().getStorageDiskManager(context.getSource().getLevel()) .getAll() .keySet() - .forEach(id -> context.getSource().sendFeedback(new StringTextComponent(id.toString()), false)); + .forEach(id -> context.getSource().sendSuccess(new StringTextComponent(id.toString()), false)); return 0; } diff --git a/src/main/java/com/refinedmods/refinedstorage/command/disk/ListDiskForPlayerCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/disk/ListDiskForPlayerCommand.java index ddcc9dbaf..8e166fd46 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/disk/ListDiskForPlayerCommand.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/disk/ListDiskForPlayerCommand.java @@ -22,13 +22,13 @@ public class ListDiskForPlayerCommand implements Command { public int run(CommandContext context) throws CommandSyntaxException { PlayerEntity player = EntityArgument.getPlayer(context, "player"); - API.instance().getStorageDiskManager(context.getSource().getWorld()) + API.instance().getStorageDiskManager(context.getSource().getLevel()) .getAll() .entrySet() .stream() .filter(entry -> player.getGameProfile().getId().equals(entry.getValue().getOwner())) .map(Map.Entry::getKey) - .forEach(id -> context.getSource().sendFeedback(new StringTextComponent(id.toString()), false)); + .forEach(id -> context.getSource().sendSuccess(new StringTextComponent(id.toString()), false)); return 0; } diff --git a/src/main/java/com/refinedmods/refinedstorage/command/disk/StorageDiskIdSuggestionProvider.java b/src/main/java/com/refinedmods/refinedstorage/command/disk/StorageDiskIdSuggestionProvider.java index cf307b2c5..6cbb9e166 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/disk/StorageDiskIdSuggestionProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/disk/StorageDiskIdSuggestionProvider.java @@ -12,7 +12,7 @@ import java.util.concurrent.CompletableFuture; public class StorageDiskIdSuggestionProvider implements SuggestionProvider { @Override public CompletableFuture getSuggestions(CommandContext context, SuggestionsBuilder builder) { - API.instance().getStorageDiskManager(context.getSource().getWorld()) + API.instance().getStorageDiskManager(context.getSource().getLevel()) .getAll() .keySet() .forEach(id -> builder.suggest(id.toString())); diff --git a/src/main/java/com/refinedmods/refinedstorage/command/network/GetNetworkCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/network/GetNetworkCommand.java index d06db4261..b8da12c42 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/network/GetNetworkCommand.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/network/GetNetworkCommand.java @@ -14,8 +14,8 @@ import net.minecraft.command.arguments.DimensionArgument; public class GetNetworkCommand extends NetworkCommand { public static ArgumentBuilder register() { return Commands.literal("get") - .requires(cs -> cs.hasPermissionLevel(2)) - .then(Commands.argument("dimension", DimensionArgument.getDimension()) + .requires(cs -> cs.hasPermission(2)) + .then(Commands.argument("dimension", DimensionArgument.dimension()) .then(Commands.argument("pos", BlockPosArgument.blockPos()).suggests(new NetworkPositionSuggestionProvider()) .executes(new GetNetworkCommand()) .then(Commands.literal("autocrafting") diff --git a/src/main/java/com/refinedmods/refinedstorage/command/network/ListNetworkCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/network/ListNetworkCommand.java index f66138ffe..a10ea8d5c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/network/ListNetworkCommand.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/network/ListNetworkCommand.java @@ -22,14 +22,14 @@ public class ListNetworkCommand implements Command { public static ArgumentBuilder register() { return Commands.literal("list") - .requires(cs -> cs.hasPermissionLevel(2)) - .then(Commands.argument("dimension", DimensionArgument.getDimension()) + .requires(cs -> cs.hasPermission(2)) + .then(Commands.argument("dimension", DimensionArgument.dimension()) .executes(new ListNetworkCommand())); } @Override public int run(CommandContext context) throws CommandSyntaxException { - ServerWorld world = DimensionArgument.getDimensionArgument(context, "dimension"); + ServerWorld world = DimensionArgument.getDimension(context, "dimension"); API.instance().getNetworkManager(world) .all() @@ -63,31 +63,31 @@ public class ListNetworkCommand implements Command { } public static void sendInfo(CommandContext context, NetworkInList listItem, boolean detailed) { - context.getSource().sendFeedback( + context.getSource().sendSuccess( new TranslationTextComponent( "commands.refinedstorage.network.list.pos", listItem.network.getPosition().getX(), listItem.network.getPosition().getY(), listItem.network.getPosition().getZ() ) - .appendString(" [") - .appendSibling(new TranslationTextComponent( + .append(" [") + .append(new TranslationTextComponent( "commands.refinedstorage.network.list.tick_times", new StringTextComponent(TIME_FORMATTER.format(listItem.tickTime)).setStyle(Styles.YELLOW), new StringTextComponent(TIME_FORMATTER.format(listItem.tps)).setStyle(Styles.YELLOW) )) - .appendString("]"), false); + .append("]"), false); if (detailed) { - context.getSource().sendFeedback(new TranslationTextComponent("commands.refinedstorage.network.list.autocrafting_tasks", + context.getSource().sendSuccess(new TranslationTextComponent("commands.refinedstorage.network.list.autocrafting_tasks", new StringTextComponent(listItem.network.getCraftingManager().getTasks().size() + "").setStyle(Styles.YELLOW) ), false); - context.getSource().sendFeedback(new TranslationTextComponent("commands.refinedstorage.network.list.nodes", + context.getSource().sendSuccess(new TranslationTextComponent("commands.refinedstorage.network.list.nodes", new StringTextComponent(listItem.network.getNodeGraph().all().size() + "").setStyle(Styles.YELLOW) ), false); - context.getSource().sendFeedback(new TranslationTextComponent("commands.refinedstorage.network.list.energy_usage", + context.getSource().sendSuccess(new TranslationTextComponent("commands.refinedstorage.network.list.energy_usage", new StringTextComponent(listItem.network.getEnergyUsage() + "").setStyle(Styles.YELLOW) ), false); } diff --git a/src/main/java/com/refinedmods/refinedstorage/command/network/NetworkCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/network/NetworkCommand.java index 373ea49ce..afcd58bc0 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/network/NetworkCommand.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/network/NetworkCommand.java @@ -15,13 +15,13 @@ import net.minecraft.world.server.ServerWorld; public abstract class NetworkCommand implements Command { @Override public int run(CommandContext context) throws CommandSyntaxException { - ServerWorld world = DimensionArgument.getDimensionArgument(context, "dimension"); - BlockPos pos = BlockPosArgument.getBlockPos(context, "pos"); + ServerWorld world = DimensionArgument.getDimension(context, "dimension"); + BlockPos pos = BlockPosArgument.getOrLoadBlockPos(context, "pos"); INetwork network = API.instance().getNetworkManager(world).getNetwork(pos); if (network == null) { - context.getSource().sendErrorMessage(new TranslationTextComponent("commands.refinedstorage.network.get.error.not_found")); + context.getSource().sendFailure(new TranslationTextComponent("commands.refinedstorage.network.get.error.not_found")); return 0; } else { return run(context, network); diff --git a/src/main/java/com/refinedmods/refinedstorage/command/network/NetworkPositionSuggestionProvider.java b/src/main/java/com/refinedmods/refinedstorage/command/network/NetworkPositionSuggestionProvider.java index 09eb0005c..46143fedb 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/network/NetworkPositionSuggestionProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/network/NetworkPositionSuggestionProvider.java @@ -15,7 +15,7 @@ import java.util.concurrent.CompletableFuture; public class NetworkPositionSuggestionProvider implements SuggestionProvider { @Override public CompletableFuture getSuggestions(CommandContext context, SuggestionsBuilder builder) throws CommandSyntaxException { - ServerWorld world = DimensionArgument.getDimensionArgument(context, "dimension"); + ServerWorld world = DimensionArgument.getDimension(context, "dimension"); API.instance().getNetworkManager(world).all().forEach(network -> builder.suggest(network.getPosition().getX() + " " + network.getPosition().getY() + " " + network.getPosition().getZ())); diff --git a/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/AutocraftingIdSuggestionProvider.java b/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/AutocraftingIdSuggestionProvider.java index 23fb22bef..689a8bd72 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/AutocraftingIdSuggestionProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/AutocraftingIdSuggestionProvider.java @@ -18,8 +18,8 @@ import java.util.concurrent.CompletableFuture; public class AutocraftingIdSuggestionProvider implements SuggestionProvider { @Override public CompletableFuture getSuggestions(CommandContext context, SuggestionsBuilder builder) throws CommandSyntaxException { - ServerWorld world = DimensionArgument.getDimensionArgument(context, "dimension"); - BlockPos pos = BlockPosArgument.getBlockPos(context, "pos"); + ServerWorld world = DimensionArgument.getDimension(context, "dimension"); + BlockPos pos = BlockPosArgument.getOrLoadBlockPos(context, "pos"); INetwork network = API.instance().getNetworkManager(world).getNetwork(pos); if (network != null) { diff --git a/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/CancelAllAutocraftingCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/CancelAllAutocraftingCommand.java index 1015c22f7..6966f437d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/CancelAllAutocraftingCommand.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/CancelAllAutocraftingCommand.java @@ -34,6 +34,6 @@ public class CancelAllAutocraftingCommand extends NetworkCommand { translationKey = "commands.refinedstorage.network.autocrafting.cancel.single"; } - context.getSource().sendFeedback(new TranslationTextComponent(translationKey, new StringTextComponent("" + count).setStyle(Styles.YELLOW)), false); + context.getSource().sendSuccess(new TranslationTextComponent(translationKey, new StringTextComponent("" + count).setStyle(Styles.YELLOW)), false); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/CancelSingleAutocraftingCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/CancelSingleAutocraftingCommand.java index 9bfcec6a0..95a868ca7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/CancelSingleAutocraftingCommand.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/CancelSingleAutocraftingCommand.java @@ -13,13 +13,13 @@ import java.util.UUID; public class CancelSingleAutocraftingCommand extends NetworkCommand { public static ArgumentBuilder register() { - return Commands.argument("id", UUIDArgument.func_239194_a_()).suggests(new AutocraftingIdSuggestionProvider()) + return Commands.argument("id", UUIDArgument.uuid()).suggests(new AutocraftingIdSuggestionProvider()) .executes(new CancelSingleAutocraftingCommand()); } @Override protected int run(CommandContext context, INetwork network) { - UUID id = UUIDArgument.func_239195_a_(context, "id"); + UUID id = UUIDArgument.getUuid(context, "id"); int count = 0; diff --git a/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/GetAutocraftingCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/GetAutocraftingCommand.java index 29c171128..4be87b923 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/GetAutocraftingCommand.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/GetAutocraftingCommand.java @@ -15,18 +15,18 @@ import java.util.UUID; public class GetAutocraftingCommand extends NetworkCommand { public static ArgumentBuilder register() { return Commands.literal("get").then( - Commands.argument("id", UUIDArgument.func_239194_a_()).suggests(new AutocraftingIdSuggestionProvider()) + Commands.argument("id", UUIDArgument.uuid()).suggests(new AutocraftingIdSuggestionProvider()) .executes(new GetAutocraftingCommand()) ); } @Override protected int run(CommandContext context, INetwork network) { - UUID id = UUIDArgument.func_239195_a_(context, "id"); + UUID id = UUIDArgument.getUuid(context, "id"); ICraftingTask task = network.getCraftingManager().getTask(id); if (task == null) { - context.getSource().sendErrorMessage(new TranslationTextComponent("commands.refinedstorage.network.autocrafting.get.error.not_found")); + context.getSource().sendFailure(new TranslationTextComponent("commands.refinedstorage.network.autocrafting.get.error.not_found")); } else { ListAutocraftingCommand.addInfo(context, task); } diff --git a/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/ListAutocraftingCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/ListAutocraftingCommand.java index 666838eea..ba04379c4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/ListAutocraftingCommand.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/network/autocrafting/ListAutocraftingCommand.java @@ -24,13 +24,13 @@ public class ListAutocraftingCommand extends NetworkCommand { } public static void addInfo(CommandContext context, ICraftingTask task) { - context.getSource().sendFeedback( + context.getSource().sendSuccess( new StringTextComponent(getAmount(task.getRequested()) + "x ") - .appendSibling(getName(task.getRequested()).deepCopy().setStyle(Styles.YELLOW)) - .appendString(" ") - .appendString("(" + task.getCompletionPercentage() + "%)") - .appendString(" ") - .appendSibling(new StringTextComponent("[" + task.getId().toString() + "]").setStyle(Styles.GRAY)), + .append(getName(task.getRequested()).copy().setStyle(Styles.YELLOW)) + .append(" ") + .append("(" + task.getCompletionPercentage() + "%)") + .append(" ") + .append(new StringTextComponent("[" + task.getId().toString() + "]").setStyle(Styles.GRAY)), false ); } @@ -49,7 +49,7 @@ public class ListAutocraftingCommand extends NetworkCommand { private static ITextComponent getName(ICraftingRequestInfo info) { if (info.getItem() != null) { - return info.getItem().getDisplayName(); + return info.getItem().getHoverName(); } if (info.getFluid() != null) { diff --git a/src/main/java/com/refinedmods/refinedstorage/command/pattern/PatternDumpCommand.java b/src/main/java/com/refinedmods/refinedstorage/command/pattern/PatternDumpCommand.java index 41db4e012..b2db2f457 100644 --- a/src/main/java/com/refinedmods/refinedstorage/command/pattern/PatternDumpCommand.java +++ b/src/main/java/com/refinedmods/refinedstorage/command/pattern/PatternDumpCommand.java @@ -23,80 +23,80 @@ public class PatternDumpCommand implements Command { @Override public int run(CommandContext context) throws CommandSyntaxException { - ItemStack stack = context.getSource().asPlayer().inventory.getCurrentItem(); + ItemStack stack = context.getSource().getPlayerOrException().inventory.getSelected(); if (stack.getItem() instanceof PatternItem) { boolean processing = PatternItem.isProcessing(stack); boolean exact = PatternItem.isExact(stack); AllowedTagList allowedTagList = PatternItem.getAllowedTags(stack); - ICraftingPattern pattern = PatternItem.fromCache(context.getSource().getWorld(), stack); + ICraftingPattern pattern = PatternItem.fromCache(context.getSource().getLevel(), stack); - context.getSource().sendFeedback(new StringTextComponent("Crafting task factory ID: ").setStyle(Styles.YELLOW).appendSibling(new StringTextComponent(pattern.getCraftingTaskFactoryId().toString()).setStyle(Styles.WHITE)), false); + context.getSource().sendSuccess(new StringTextComponent("Crafting task factory ID: ").setStyle(Styles.YELLOW).append(new StringTextComponent(pattern.getCraftingTaskFactoryId().toString()).setStyle(Styles.WHITE)), false); if (!pattern.isValid()) { - context.getSource().sendErrorMessage(new StringTextComponent("Pattern is invalid! Reason: ").appendSibling(pattern.getErrorMessage())); + context.getSource().sendFailure(new StringTextComponent("Pattern is invalid! Reason: ").append(pattern.getErrorMessage())); } else { - context.getSource().sendFeedback(new StringTextComponent("Processing: ").setStyle(Styles.YELLOW).appendSibling(new StringTextComponent(String.valueOf(processing)).setStyle(Styles.WHITE)), false); - context.getSource().sendFeedback(new StringTextComponent("Exact: ").setStyle(Styles.YELLOW).appendSibling(new StringTextComponent(String.valueOf(exact)).setStyle(Styles.WHITE)), false); - context.getSource().sendFeedback(new StringTextComponent("Has allowed tag list: ").setStyle(Styles.YELLOW).appendSibling(new StringTextComponent(String.valueOf(allowedTagList != null)).setStyle(Styles.WHITE)), false); + context.getSource().sendSuccess(new StringTextComponent("Processing: ").setStyle(Styles.YELLOW).append(new StringTextComponent(String.valueOf(processing)).setStyle(Styles.WHITE)), false); + context.getSource().sendSuccess(new StringTextComponent("Exact: ").setStyle(Styles.YELLOW).append(new StringTextComponent(String.valueOf(exact)).setStyle(Styles.WHITE)), false); + context.getSource().sendSuccess(new StringTextComponent("Has allowed tag list: ").setStyle(Styles.YELLOW).append(new StringTextComponent(String.valueOf(allowedTagList != null)).setStyle(Styles.WHITE)), false); if (pattern.isProcessing()) { for (int i = 0; i < pattern.getInputs().size(); ++i) { if (!pattern.getInputs().get(i).isEmpty()) { - context.getSource().sendFeedback(new StringTextComponent("Item inputs in slot " + i + ":").setStyle(Styles.YELLOW), false); + context.getSource().sendSuccess(new StringTextComponent("Item inputs in slot " + i + ":").setStyle(Styles.YELLOW), false); for (int j = 0; j < pattern.getInputs().get(i).size(); ++j) { - context.getSource().sendFeedback(new StringTextComponent("- Possibility #" + j + ": " + pattern.getInputs().get(i).get(j).getCount() + "x ").appendSibling(pattern.getInputs().get(i).get(j).getDisplayName()), false); + context.getSource().sendSuccess(new StringTextComponent("- Possibility #" + j + ": " + pattern.getInputs().get(i).get(j).getCount() + "x ").append(pattern.getInputs().get(i).get(j).getHoverName()), false); } } if (allowedTagList != null) { for (ResourceLocation allowed : allowedTagList.getAllowedItemTags().get(i)) { - context.getSource().sendFeedback(new StringTextComponent("- Allowed item tag: " + allowed.toString()), false); + context.getSource().sendSuccess(new StringTextComponent("- Allowed item tag: " + allowed.toString()), false); } } } for (int i = 0; i < pattern.getFluidInputs().size(); ++i) { if (!pattern.getFluidInputs().get(i).isEmpty()) { - context.getSource().sendFeedback(new StringTextComponent("Fluid inputs in slot " + i + ":").setStyle(Styles.YELLOW), false); + context.getSource().sendSuccess(new StringTextComponent("Fluid inputs in slot " + i + ":").setStyle(Styles.YELLOW), false); for (int j = 0; j < pattern.getFluidInputs().get(i).size(); ++j) { - context.getSource().sendFeedback(new StringTextComponent("- Possibility #" + j + ": " + pattern.getFluidInputs().get(i).get(j).getAmount() + " mB ").appendSibling(pattern.getFluidInputs().get(i).get(j).getDisplayName()), false); + context.getSource().sendSuccess(new StringTextComponent("- Possibility #" + j + ": " + pattern.getFluidInputs().get(i).get(j).getAmount() + " mB ").append(pattern.getFluidInputs().get(i).get(j).getDisplayName()), false); } } if (allowedTagList != null) { for (ResourceLocation allowed : allowedTagList.getAllowedFluidTags().get(i)) { - context.getSource().sendFeedback(new StringTextComponent("- Allowed fluid tag: " + allowed.toString()), false); + context.getSource().sendSuccess(new StringTextComponent("- Allowed fluid tag: " + allowed.toString()), false); } } } - context.getSource().sendFeedback(new StringTextComponent("Outputs").setStyle(Styles.YELLOW), false); + context.getSource().sendSuccess(new StringTextComponent("Outputs").setStyle(Styles.YELLOW), false); for (ItemStack output : pattern.getOutputs()) { - context.getSource().sendFeedback(new StringTextComponent("- " + output.getCount() + "x ").appendSibling(output.getDisplayName()), false); + context.getSource().sendSuccess(new StringTextComponent("- " + output.getCount() + "x ").append(output.getHoverName()), false); } - context.getSource().sendFeedback(new StringTextComponent("Fluid outputs").setStyle(Styles.YELLOW), false); + context.getSource().sendSuccess(new StringTextComponent("Fluid outputs").setStyle(Styles.YELLOW), false); for (FluidStack output : pattern.getFluidOutputs()) { - context.getSource().sendFeedback(new StringTextComponent("- " + output.getAmount() + " mB ").appendSibling(output.getDisplayName()), false); + context.getSource().sendSuccess(new StringTextComponent("- " + output.getAmount() + " mB ").append(output.getDisplayName()), false); } } else { for (int i = 0; i < pattern.getInputs().size(); ++i) { if (!pattern.getInputs().get(i).isEmpty()) { - context.getSource().sendFeedback(new StringTextComponent("Inputs in slot " + i + ":").setStyle(Styles.YELLOW), false); + context.getSource().sendSuccess(new StringTextComponent("Inputs in slot " + i + ":").setStyle(Styles.YELLOW), false); for (int j = 0; j < pattern.getInputs().get(i).size(); ++j) { - context.getSource().sendFeedback(new StringTextComponent("- Possibility #" + j + ": " + pattern.getInputs().get(i).get(j).getCount() + "x ").appendSibling(pattern.getInputs().get(i).get(j).getDisplayName()), false); + context.getSource().sendSuccess(new StringTextComponent("- Possibility #" + j + ": " + pattern.getInputs().get(i).get(j).getCount() + "x ").append(pattern.getInputs().get(i).get(j).getHoverName()), false); } } } - context.getSource().sendFeedback(new StringTextComponent("Outputs").setStyle(Styles.YELLOW), false); + context.getSource().sendSuccess(new StringTextComponent("Outputs").setStyle(Styles.YELLOW), false); for (ItemStack output : pattern.getOutputs()) { - context.getSource().sendFeedback(new StringTextComponent("- " + output.getCount() + "x ").appendSibling(output.getDisplayName()), false); + context.getSource().sendSuccess(new StringTextComponent("- " + output.getCount() + "x ").append(output.getHoverName()), false); } boolean anyByproducts = false; @@ -104,18 +104,18 @@ public class PatternDumpCommand implements Command { for (ItemStack byproduct : pattern.getByproducts()) { if (!byproduct.isEmpty()) { if (!anyByproducts) { - context.getSource().sendFeedback(new StringTextComponent("Byproducts").setStyle(Styles.YELLOW), false); + context.getSource().sendSuccess(new StringTextComponent("Byproducts").setStyle(Styles.YELLOW), false); anyByproducts = true; } - context.getSource().sendFeedback(new StringTextComponent("- " + byproduct.getCount() + "x ").appendSibling(byproduct.getDisplayName()), false); + context.getSource().sendSuccess(new StringTextComponent("- " + byproduct.getCount() + "x ").append(byproduct.getHoverName()), false); } } } } } else { - context.getSource().sendErrorMessage(new StringTextComponent("You need to be holding a pattern in your hand.")); + context.getSource().sendFailure(new StringTextComponent("You need to be holding a pattern in your hand.")); } return 0; diff --git a/src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java index 2971aed61..f22c1d1ce 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java @@ -95,7 +95,7 @@ public abstract class BaseContainer extends Container { } @Override - public ItemStack slotClick(int id, int dragType, ClickType clickType, PlayerEntity player) { + public ItemStack clicked(int id, int dragType, ClickType clickType, PlayerEntity player) { Slot slot = id >= 0 ? getSlot(id) : null; int disabledSlotNumber = getDisabledSlotNumber(); @@ -110,71 +110,71 @@ public abstract class BaseContainer extends Container { if (slot instanceof FilterSlot) { if (((FilterSlot) slot).isSizeAllowed()) { if (clickType == ClickType.QUICK_MOVE) { - slot.putStack(ItemStack.EMPTY); - } else if (!player.inventory.getItemStack().isEmpty()) { - slot.putStack(player.inventory.getItemStack().copy()); + slot.set(ItemStack.EMPTY); + } else if (!player.inventory.getCarried().isEmpty()) { + slot.set(player.inventory.getCarried().copy()); } - } else if (player.inventory.getItemStack().isEmpty()) { - slot.putStack(ItemStack.EMPTY); - } else if (slot.isItemValid(player.inventory.getItemStack())) { - slot.putStack(player.inventory.getItemStack().copy()); + } else if (player.inventory.getCarried().isEmpty()) { + slot.set(ItemStack.EMPTY); + } else if (slot.mayPlace(player.inventory.getCarried())) { + slot.set(player.inventory.getCarried().copy()); } - return player.inventory.getItemStack(); + return player.inventory.getCarried(); } else if (slot instanceof FluidFilterSlot) { if (((FluidFilterSlot) slot).isSizeAllowed()) { if (clickType == ClickType.QUICK_MOVE) { ((FluidFilterSlot) slot).onContainerClicked(ItemStack.EMPTY); - } else if (!player.inventory.getItemStack().isEmpty()) { - ((FluidFilterSlot) slot).onContainerClicked(player.inventory.getItemStack()); + } else if (!player.inventory.getCarried().isEmpty()) { + ((FluidFilterSlot) slot).onContainerClicked(player.inventory.getCarried()); } - } else if (player.inventory.getItemStack().isEmpty()) { + } else if (player.inventory.getCarried().isEmpty()) { ((FluidFilterSlot) slot).onContainerClicked(ItemStack.EMPTY); } else { - ((FluidFilterSlot) slot).onContainerClicked(player.inventory.getItemStack()); + ((FluidFilterSlot) slot).onContainerClicked(player.inventory.getCarried()); } - return player.inventory.getItemStack(); + return player.inventory.getCarried(); } else if (slot instanceof LegacyFilterSlot) { - if (player.inventory.getItemStack().isEmpty()) { - slot.putStack(ItemStack.EMPTY); - } else if (slot.isItemValid(player.inventory.getItemStack())) { - slot.putStack(player.inventory.getItemStack().copy()); + if (player.inventory.getCarried().isEmpty()) { + slot.set(ItemStack.EMPTY); + } else if (slot.mayPlace(player.inventory.getCarried())) { + slot.set(player.inventory.getCarried().copy()); } - return player.inventory.getItemStack(); + return player.inventory.getCarried(); } else if (slot instanceof LegacyDisabledSlot) { return ItemStack.EMPTY; } - return super.slotClick(id, dragType, clickType, player); + return super.clicked(id, dragType, clickType, player); } @Override - public ItemStack transferStackInSlot(PlayerEntity player, int slotIndex) { + public ItemStack quickMoveStack(PlayerEntity player, int slotIndex) { return transferManager.transfer(slotIndex); } @Override - public boolean canInteractWith(PlayerEntity player) { + public boolean stillValid(PlayerEntity player) { return isTileStillThere(); } private boolean isTileStillThere() { if (tile != null) { - return tile.getWorld().getTileEntity(tile.getPos()) == tile; + return tile.getLevel().getBlockEntity(tile.getBlockPos()) == tile; } return true; } @Override - public boolean canMergeSlot(ItemStack stack, Slot slot) { + public boolean canTakeItemForPickAll(ItemStack stack, Slot slot) { if (slot instanceof FilterSlot || slot instanceof FluidFilterSlot || slot instanceof LegacyFilterSlot) { return false; } - return super.canMergeSlot(stack, slot); + return super.canTakeItemForPickAll(stack, slot); } protected int getDisabledSlotNumber() { @@ -192,8 +192,8 @@ public abstract class BaseContainer extends Container { } @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); + public void broadcastChanges() { + super.broadcastChanges(); // Prevent sending changes about a tile that doesn't exist anymore. // This prevents crashes when sending network node data (network node would crash because it no longer exists and we're querying it from the various tile data parameters). @@ -211,15 +211,15 @@ public abstract class BaseContainer extends Container { if (!API.instance().getComparer().isEqual(cached, actual, IComparer.COMPARE_QUANTITY | IComparer.COMPARE_NBT)) { this.fluids.set(i, actual.copy()); - RS.NETWORK_HANDLER.sendTo((ServerPlayerEntity) getPlayer(), new FluidFilterSlotUpdateMessage(slot.slotNumber, actual)); + RS.NETWORK_HANDLER.sendTo((ServerPlayerEntity) getPlayer(), new FluidFilterSlotUpdateMessage(((Slot)slot).index, actual)); } } } } @Override - public void onContainerClosed(PlayerEntity player) { - super.onContainerClosed(player); + public void removed(PlayerEntity player) { + super.removed(player); if (listener != null) { listener.onClosed(); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainer.java index 364f84726..34d1ba676 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainer.java @@ -63,8 +63,8 @@ public class CrafterManagerContainer extends BaseContainer { this.containerData = data; } - this.inventorySlots.clear(); - this.inventoryItemStacks.clear(); + this.slots.clear(); + this.lastSlots.clear(); this.headings.clear(); this.rows = 0; @@ -91,7 +91,7 @@ public class CrafterManagerContainer extends BaseContainer { @Nonnull @Override public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { - if (new PatternItemValidator(getPlayer().getEntityWorld()).test(stack)) { + if (new PatternItemValidator(getPlayer().getCommandSenderWorld()).test(stack)) { return super.insertItem(slot, stack, simulate); } @@ -170,28 +170,28 @@ public class CrafterManagerContainer extends BaseContainer { } @Override - public ItemStack transferStackInSlot(PlayerEntity player, int index) { + public ItemStack quickMoveStack(PlayerEntity player, int index) { ItemStack stack = ItemStack.EMPTY; Slot slot = getSlot(index); - if (slot.getHasStack()) { - stack = slot.getStack(); - if (!new PatternItemValidator(getPlayer().getEntityWorld()).test(stack)) { + if (slot.hasItem()) { + stack = slot.getItem(); + if (!new PatternItemValidator(getPlayer().getCommandSenderWorld()).test(stack)) { return ItemStack.EMPTY; } if (index < 9 * 4) { - if (!mergeItemStack(stack, 9 * 4, inventorySlots.size(), false)) { + if (!moveItemStackTo(stack, 9 * 4, slots.size(), false)) { return ItemStack.EMPTY; } - } else if (!mergeItemStack(stack, 0, 9 * 4, false)) { + } else if (!moveItemStackTo(stack, 0, 9 * 4, false)) { return ItemStack.EMPTY; } if (stack.getCount() == 0) { - slot.putStack(ItemStack.EMPTY); + slot.set(ItemStack.EMPTY); } else { - slot.onSlotChanged(); + slot.setChanged(); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainer.java index 07e6b3c9d..8edab88d9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainer.java @@ -25,10 +25,10 @@ public class CraftingMonitorContainer extends BaseContainer implements ICrafting } @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); + public void broadcastChanges() { + super.broadcastChanges(); - if (!getPlayer().world.isRemote) { + if (!getPlayer().level.isClientSide) { ICraftingManager manager = craftingMonitor.getCraftingManager(); if (manager != null && !addedListener) { @@ -42,10 +42,10 @@ public class CraftingMonitorContainer extends BaseContainer implements ICrafting } @Override - public void onContainerClosed(PlayerEntity player) { - super.onContainerClosed(player); + public void removed(PlayerEntity player) { + super.removed(player); - if (!player.getEntityWorld().isRemote) { + if (!player.getCommandSenderWorld().isClientSide) { craftingMonitor.onClosed(player); ICraftingManager manager = craftingMonitor.getCraftingManager(); @@ -61,26 +61,26 @@ public class CraftingMonitorContainer extends BaseContainer implements ICrafting } @Override - public ItemStack transferStackInSlot(PlayerEntity player, int index) { + public ItemStack quickMoveStack(PlayerEntity player, int index) { ItemStack stack = ItemStack.EMPTY; Slot slot = getSlot(index); - if (slot.getHasStack()) { - stack = slot.getStack(); + if (slot.hasItem()) { + stack = slot.getItem(); if (index < 4) { - if (!mergeItemStack(stack, 4, inventorySlots.size(), false)) { + if (!moveItemStackTo(stack, 4, slots.size(), false)) { return ItemStack.EMPTY; } - } else if (!mergeItemStack(stack, 0, 4, false)) { + } else if (!moveItemStackTo(stack, 0, 4, false)) { return ItemStack.EMPTY; } if (stack.getCount() == 0) { - slot.putStack(ItemStack.EMPTY); + slot.set(ItemStack.EMPTY); } else { - slot.onSlotChanged(); + slot.setChanged(); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/ExporterContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/ExporterContainer.java index af628df31..511356b2f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/ExporterContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/ExporterContainer.java @@ -27,8 +27,8 @@ public class ExporterContainer extends BaseContainer { } @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); + public void broadcastChanges() { + super.broadcastChanges(); boolean updatedHasRegulatorMode = hasRegulatorMode(); if (hasRegulatorMode != updatedHasRegulatorMode) { @@ -39,8 +39,8 @@ public class ExporterContainer extends BaseContainer { } public void initSlots() { - this.inventorySlots.clear(); - this.inventoryItemStacks.clear(); + this.slots.clear(); + this.lastSlots.clear(); this.transferManager.clearTransfers(); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/FilterContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/FilterContainer.java index ff871e837..54dd7602e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/FilterContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/FilterContainer.java @@ -53,6 +53,6 @@ public class FilterContainer extends BaseContainer { @Override protected int getDisabledSlotNumber() { - return getPlayer().inventory.currentItem; + return getPlayer().inventory.selected; } } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/GridContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/GridContainer.java index 7555d3a82..34adde057 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/GridContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/GridContainer.java @@ -61,8 +61,8 @@ public class GridContainer extends BaseContainer implements ICraftingGridListene } public void initSlots() { - this.inventorySlots.clear(); - this.inventoryItemStacks.clear(); + this.slots.clear(); + this.lastSlots.clear(); this.transferManager.clearTransfers(); @@ -79,33 +79,33 @@ public class GridContainer extends BaseContainer implements ICraftingGridListene } transferManager.setNotFoundHandler(slotIndex -> { - if (!getPlayer().getEntityWorld().isRemote) { - Slot slot = inventorySlots.get(slotIndex); + if (!getPlayer().getCommandSenderWorld().isClientSide) { + Slot slot = slots.get(slotIndex); if (grid instanceof IPortableGrid && slot instanceof SlotItemHandler && ((SlotItemHandler) slot).getItemHandler().equals(((IPortableGrid) grid).getDiskInventory())) { return ItemStack.EMPTY; } - if (slot.getHasStack()) { + if (slot.hasItem()) { if (slot == craftingResultSlot) { grid.onCraftedShift(getPlayer()); - detectAndSendChanges(); + broadcastChanges(); } else { - ItemStack stack = slot.getStack(); + ItemStack stack = slot.getItem(); if (grid.getGridType() == GridType.FLUID) { IFluidGridHandler fluidHandler = grid.getFluidHandler(); if (fluidHandler != null) { - slot.putStack(fluidHandler.onInsert((ServerPlayerEntity) getPlayer(), stack)); + slot.set(fluidHandler.onInsert((ServerPlayerEntity) getPlayer(), stack)); } } else { IItemGridHandler itemHandler = grid.getItemHandler(); if (itemHandler != null) { - slot.putStack(itemHandler.onInsert((ServerPlayerEntity) getPlayer(), stack, false)); - } else if (slot instanceof CraftingGridSlot && mergeItemStack(stack, 14, 14 + (9 * 4), false)) { - slot.onSlotChanged(); + slot.set(itemHandler.onInsert((ServerPlayerEntity) getPlayer(), stack, false)); + } else if (slot instanceof CraftingGridSlot && moveItemStackTo(stack, 14, 14 + (9 * 4), false)) { + slot.setChanged(); // This is needed because when a grid is disconnected, // and a player shift clicks from the matrix to the inventory (this if case), @@ -114,7 +114,7 @@ public class GridContainer extends BaseContainer implements ICraftingGridListene } } - detectAndSendChanges(); + broadcastChanges(); } } } @@ -237,7 +237,7 @@ public class GridContainer extends BaseContainer implements ICraftingGridListene } if (item) { - if (itemPatternSlots.get(i).getHasStack()) { + if (itemPatternSlots.get(i).hasItem()) { return true; } @@ -251,7 +251,7 @@ public class GridContainer extends BaseContainer implements ICraftingGridListene return true; } - if (itemPatternSlots.get(i).getHasStack()) { + if (itemPatternSlots.get(i).hasItem()) { return false; } @@ -273,14 +273,14 @@ public class GridContainer extends BaseContainer implements ICraftingGridListene @Override public void onCraftingMatrixChanged() { - for (int i = 0; i < inventorySlots.size(); ++i) { - Slot slot = inventorySlots.get(i); + for (int i = 0; i < slots.size(); ++i) { + Slot slot = slots.get(i); if (slot instanceof CraftingGridSlot || slot == craftingResultSlot || slot == patternResultSlot) { - for (IContainerListener listener : listeners) { + for (IContainerListener listener : containerListeners) { // @Volatile: We can't use IContainerListener#sendSlotContents since ServerPlayerEntity blocks CraftingResultSlot changes... if (listener instanceof ServerPlayerEntity) { - ((ServerPlayerEntity) listener).connection.sendPacket(new SSetSlotPacket(windowId, i, slot.getStack())); + ((ServerPlayerEntity) listener).connection.send(new SSetSlotPacket(containerId, i, slot.getItem())); } } } @@ -288,8 +288,8 @@ public class GridContainer extends BaseContainer implements ICraftingGridListene } @Override - public void detectAndSendChanges() { - if (!getPlayer().world.isRemote) { + public void broadcastChanges() { + if (!getPlayer().level.isClientSide) { // The grid is offline. if (grid.getStorageCache() == null) { // The grid just went offline, there is still a listener. @@ -308,14 +308,14 @@ public class GridContainer extends BaseContainer implements ICraftingGridListene } } - super.detectAndSendChanges(); + super.broadcastChanges(); } @Override - public void onContainerClosed(PlayerEntity player) { - super.onContainerClosed(player); + public void removed(PlayerEntity player) { + super.removed(player); - if (!player.getEntityWorld().isRemote) { + if (!player.getCommandSenderWorld().isClientSide) { grid.onClosed(player); if (storageCache != null && storageCacheListener != null) { @@ -327,12 +327,12 @@ public class GridContainer extends BaseContainer implements ICraftingGridListene } @Override - public boolean canMergeSlot(ItemStack stack, Slot slot) { + public boolean canTakeItemForPickAll(ItemStack stack, Slot slot) { if (slot == craftingResultSlot || slot == patternResultSlot) { return false; } - return super.canMergeSlot(stack, slot); + return super.canTakeItemForPickAll(stack, slot); } @Override @@ -352,8 +352,8 @@ public class GridContainer extends BaseContainer implements ICraftingGridListene } if (isVisible(i)) { - itemPatternSlots.get(i).yPos = yPosition; - fluidPatternSlots.get(i).yPos = yPosition; + itemPatternSlots.get(i).y = yPosition; + fluidPatternSlots.get(i).y = yPosition; if ((i + 1) % 3 == 0) { yPosition += 18; } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerFactory.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerFactory.java index 6e57c5685..b1e5ecb5f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerFactory.java @@ -21,10 +21,10 @@ public class CrafterManagerContainerFactory implements IContainerFactory> containerData = ((CrafterManagerTile) world.getTileEntity(pos)).getNode().getNetwork().getCraftingManager().getNamedContainers(); + Map> containerData = ((CrafterManagerTile) world.getBlockEntity(pos)).getNode().getNetwork().getCraftingManager().getNamedContainers(); buf.writeInt(containerData.size()); for (Map.Entry> entry : containerData.entrySet()) { - buf.writeTextComponent(entry.getKey()); + buf.writeComponent(entry.getKey()); int slots = 0; for (IItemHandlerModifiable handler : entry.getValue()) { diff --git a/src/main/java/com/refinedmods/refinedstorage/container/factory/CraftingMonitorContainerFactory.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/CraftingMonitorContainerFactory.java index 57b05cafa..f60ce1ea7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/factory/CraftingMonitorContainerFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/CraftingMonitorContainerFactory.java @@ -13,7 +13,7 @@ public class CraftingMonitorContainerFactory implements IContainerFactory { } if (data.readBoolean()) { - stack = data.readItemStack(); + stack = data.readItem(); } PlayerSlot slot = new PlayerSlot(data); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/factory/PositionalTileContainerFactory.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/PositionalTileContainerFactory.java index ad4318c4d..ec30bc480 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/factory/PositionalTileContainerFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/PositionalTileContainerFactory.java @@ -22,7 +22,7 @@ public class PositionalTileContainerFactory implements IN @Nullable @Override public Container createMenu(int windowId, PlayerInventory inventory, PlayerEntity player) { - T tile = (T) player.world.getTileEntity(pos); + T tile = (T) player.level.getBlockEntity(pos); return provider.create(tile, windowId, inventory, player); } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/slot/BaseSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/BaseSlot.java index 2a679f946..1fdf0bfe8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/slot/BaseSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/BaseSlot.java @@ -19,7 +19,7 @@ public class BaseSlot extends SlotItemHandler { } @Override - public boolean isEnabled() { + public boolean isActive() { return enableHandler.getAsBoolean(); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/slot/CrafterManagerSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/CrafterManagerSlot.java index d92e99f40..8a9cd72b7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/slot/CrafterManagerSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/CrafterManagerSlot.java @@ -18,7 +18,7 @@ public class CrafterManagerSlot extends BaseSlot { } @Override - public boolean isEnabled() { - return yPos >= display.getTopHeight() && yPos < display.getTopHeight() + 18 * display.getVisibleRows() && visible && crafterManager.isActiveOnClient(); + public boolean isActive() { + return y >= display.getTopHeight() && y < display.getTopHeight() + 18 * display.getVisibleRows() && visible && crafterManager.isActiveOnClient(); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/slot/DisabledSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/DisabledSlot.java index e682172df..eb43eb171 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/slot/DisabledSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/DisabledSlot.java @@ -11,7 +11,7 @@ public class DisabledSlot extends BaseSlot { } @Override - public boolean isItemValid(@Nonnull ItemStack stack) { + public boolean mayPlace(@Nonnull ItemStack stack) { return false; } } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/slot/OutputSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/OutputSlot.java index 0f3fa6878..d4f33ba73 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/slot/OutputSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/OutputSlot.java @@ -11,7 +11,7 @@ public class OutputSlot extends BaseSlot { } @Override - public boolean isItemValid(@Nonnull ItemStack stack) { + public boolean mayPlace(@Nonnull ItemStack stack) { return false; } } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FilterSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FilterSlot.java index 6a4255bed..193b03159 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FilterSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FilterSlot.java @@ -26,8 +26,8 @@ public class FilterSlot extends BaseSlot { } @Override - public boolean isItemValid(@Nonnull ItemStack stack) { - if (super.isItemValid(stack)) { + public boolean mayPlace(@Nonnull ItemStack stack) { + if (super.mayPlace(stack)) { if (isBlockAllowed()) { return stack.getItem() instanceof BlockItem; } @@ -39,16 +39,16 @@ public class FilterSlot extends BaseSlot { } @Override - public void putStack(@Nonnull ItemStack stack) { + public void set(@Nonnull ItemStack stack) { if (!stack.isEmpty() && !isSizeAllowed()) { stack.setCount(1); } - super.putStack(stack); + super.set(stack); } @Override - public boolean canTakeStack(PlayerEntity playerIn) { + public boolean mayPickup(PlayerEntity playerIn) { return false; } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FluidFilterSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FluidFilterSlot.java index 673c4d5ee..5a9391d13 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FluidFilterSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FluidFilterSlot.java @@ -28,7 +28,7 @@ public class FluidFilterSlot extends BaseSlot { } @Override - public boolean isItemValid(@Nonnull ItemStack stack) { + public boolean mayPlace(@Nonnull ItemStack stack) { return false; } @@ -37,7 +37,7 @@ public class FluidFilterSlot extends BaseSlot { } @Override - public boolean canTakeStack(PlayerEntity playerIn) { + public boolean mayPickup(PlayerEntity playerIn) { return false; } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/slot/grid/ResultCraftingGridSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/grid/ResultCraftingGridSlot.java index b44351b9b..68d4c772b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/slot/grid/ResultCraftingGridSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/grid/ResultCraftingGridSlot.java @@ -22,10 +22,10 @@ public class ResultCraftingGridSlot extends CraftingResultSlot { @Override @Nonnull public ItemStack onTake(PlayerEntity player, @Nonnull ItemStack stack) { - onCrafting(stack); + checkTakeAchievements(stack); ForgeHooks.setCraftingPlayer(player); - if (!player.getEntityWorld().isRemote) { + if (!player.getCommandSenderWorld().isClientSide) { grid.onCrafted(player, null, null); } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/slot/legacy/LegacyBaseSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/legacy/LegacyBaseSlot.java index b9dcac2ac..983566561 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/slot/legacy/LegacyBaseSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/legacy/LegacyBaseSlot.java @@ -19,7 +19,7 @@ public class LegacyBaseSlot extends Slot { } @Override - public boolean isEnabled() { + public boolean isActive() { return enableHandler.getAsBoolean(); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/slot/legacy/LegacyDisabledSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/legacy/LegacyDisabledSlot.java index be3a8a3c0..63dc6c339 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/slot/legacy/LegacyDisabledSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/legacy/LegacyDisabledSlot.java @@ -11,7 +11,7 @@ public class LegacyDisabledSlot extends LegacyBaseSlot { } @Override - public boolean isItemValid(@Nonnull ItemStack stack) { + public boolean mayPlace(@Nonnull ItemStack stack) { return false; } } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/slot/legacy/LegacyFilterSlot.java b/src/main/java/com/refinedmods/refinedstorage/container/slot/legacy/LegacyFilterSlot.java index a25db5f3e..a8ceb0cde 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/slot/legacy/LegacyFilterSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/slot/legacy/LegacyFilterSlot.java @@ -13,21 +13,21 @@ public class LegacyFilterSlot extends LegacyBaseSlot { } @Override - public boolean canTakeStack(PlayerEntity player) { + public boolean mayPickup(PlayerEntity player) { return false; } @Override - public boolean isItemValid(ItemStack stack) { + public boolean mayPlace(ItemStack stack) { return true; } @Override - public void putStack(@Nonnull ItemStack stack) { + public void set(@Nonnull ItemStack stack) { if (!stack.isEmpty()) { stack.setCount(1); } - super.putStack(stack); + super.set(stack); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/transfer/InventoryInventoryWrapper.java b/src/main/java/com/refinedmods/refinedstorage/container/transfer/InventoryInventoryWrapper.java index fd0a3bde7..3726500e8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/transfer/InventoryInventoryWrapper.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/transfer/InventoryInventoryWrapper.java @@ -19,7 +19,7 @@ class InventoryInventoryWrapper implements IInventoryWrapper { if (inventory instanceof PlayerInventory) { // Don't use PlayerMainInvWrapper to avoid stack animations. - this.wrapper = new RangedWrapper(new InvWrapper(inventory), 0, ((PlayerInventory) inventory).mainInventory.size()); + this.wrapper = new RangedWrapper(new InvWrapper(inventory), 0, ((PlayerInventory) inventory).items.size()); } else { this.wrapper = new InvWrapper(inventory); } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/transfer/TransferManager.java b/src/main/java/com/refinedmods/refinedstorage/container/transfer/TransferManager.java index 4156f85ad..c443fd021 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/transfer/TransferManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/transfer/TransferManager.java @@ -79,15 +79,15 @@ public class TransferManager { if (slot instanceof SlotItemHandler) { key = new ItemHandlerInventoryWrapper(((SlotItemHandler) slot).getItemHandler()); } else { - key = new InventoryInventoryWrapper(slot.inventory); + key = new InventoryInventoryWrapper(slot.container); } List toList = fromToMap.get(key); if (toList != null) { - ItemStack initial = slot.getStack().copy(); + ItemStack initial = slot.getItem().copy(); - ItemStack remainder = slot.getStack(); + ItemStack remainder = slot.getItem(); for (IInventoryWrapper to : toList) { InsertionResult result = to.insert(remainder); @@ -103,8 +103,8 @@ public class TransferManager { } } - slot.putStack(remainder); - slot.onSlotChanged(); + slot.set(remainder); + slot.setChanged(); if (API.instance().getComparer().isEqual(remainder, initial) && notFoundHandler != null) { return notFoundHandler.apply(index); diff --git a/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModelGenerator.java b/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModelGenerator.java index d173687da..d907fed77 100644 --- a/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModelGenerator.java +++ b/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModelGenerator.java @@ -49,7 +49,7 @@ public class BlockModelGenerator extends BlockStateProvider { String folderName = RSBlocks.WIRELESS_TRANSMITTER.get(ColorMap.DEFAULT_COLOR).getId().getPath(); models.wirelessTransmitterBlock(block, state -> { - if (Boolean.FALSE.equals(state.get(NetworkNodeBlock.CONNECTED))) { + if (Boolean.FALSE.equals(state.getValue(NetworkNodeBlock.CONNECTED))) { return models.createWirelessTransmitterModel( "block/" + folderName + "/disconnected", resourceLocation(folderName, "cutouts/disconnected") @@ -73,7 +73,7 @@ public class BlockModelGenerator extends BlockStateProvider { String folderName = RSBlocks.DETECTOR.get(ColorMap.DEFAULT_COLOR).getId().getPath(); models.simpleBlockStateModel(block, state -> { - if (Boolean.FALSE.equals(state.get(DetectorBlock.POWERED))) { + if (Boolean.FALSE.equals(state.getValue(DetectorBlock.POWERED))) { return models.createDetectorModel( "block/" + folderName + "/off", resourceLocation(folderName, "cutouts/off") @@ -97,7 +97,7 @@ public class BlockModelGenerator extends BlockStateProvider { String folderName = RSBlocks.SECURITY_MANAGER.get(ColorMap.DEFAULT_COLOR).getId().getPath(); models.horizontalRSBlock(block, state -> { - if (Boolean.FALSE.equals(state.get(NetworkNodeBlock.CONNECTED))) { + if (Boolean.FALSE.equals(state.getValue(NetworkNodeBlock.CONNECTED))) { return models.createCubeCutoutModel( "block/" + folderName + "/disconnected", BOTTOM, @@ -143,7 +143,7 @@ public class BlockModelGenerator extends BlockStateProvider { String folderName = blockMap.get(ColorMap.DEFAULT_COLOR).getId().getPath(); models.simpleBlockStateModel(block, state -> { - if (Boolean.FALSE.equals(state.get(NetworkNodeBlock.CONNECTED))) { + if (Boolean.FALSE.equals(state.getValue(NetworkNodeBlock.CONNECTED))) { return models.createCubeAllCutoutModel( "block/" + folderName + "/disconnected", resourceLocation(folderName, folderName), @@ -171,7 +171,7 @@ public class BlockModelGenerator extends BlockStateProvider { String folderName = RSBlocks.CRAFTER.get(ColorMap.DEFAULT_COLOR).getId().getPath(); models.anyDirectionalRSBlock(block, state -> { - if (Boolean.FALSE.equals(state.get(NetworkNodeBlock.CONNECTED))) { + if (Boolean.FALSE.equals(state.getValue(NetworkNodeBlock.CONNECTED))) { return models.createCubeCutoutModel( "block/" + folderName + "/disconnected", BOTTOM, @@ -217,14 +217,14 @@ public class BlockModelGenerator extends BlockStateProvider { String folderName = RSBlocks.CONTROLLER.get(ColorMap.DEFAULT_COLOR).getId().getPath(); models.simpleBlockStateModel(block, state -> { - if (state.get(ControllerBlock.ENERGY_TYPE).equals(ControllerBlock.EnergyType.OFF)) { + if (state.getValue(ControllerBlock.ENERGY_TYPE).equals(ControllerBlock.EnergyType.OFF)) { return models.createCubeAllCutoutModel( "block/" + folderName + "/off", resourceLocation(folderName, "off"), resourceLocation(folderName, "off"), resourceLocation(folderName, "cutouts/off") ); - } else if (state.get(ControllerBlock.ENERGY_TYPE).equals(ControllerBlock.EnergyType.NEARLY_OFF)) { + } else if (state.getValue(ControllerBlock.ENERGY_TYPE).equals(ControllerBlock.EnergyType.NEARLY_OFF)) { return models.createControllerNearlyCutoutModel( "block/" + folderName + "/nearly_off", resourceLocation(folderName, "off"), @@ -232,7 +232,7 @@ public class BlockModelGenerator extends BlockStateProvider { resourceLocation(folderName, "cutouts/nearly_off"), resourceLocation(folderName, "cutouts/nearly_off_gray") ); - } else if (state.get(ControllerBlock.ENERGY_TYPE).equals(ControllerBlock.EnergyType.NEARLY_ON)) { + } else if (state.getValue(ControllerBlock.ENERGY_TYPE).equals(ControllerBlock.EnergyType.NEARLY_ON)) { return models.createControllerNearlyCutoutModel( "block/" + folderName + "/nearly_on", resourceLocation(folderName, "off"), @@ -261,7 +261,7 @@ public class BlockModelGenerator extends BlockStateProvider { String folderName = blockMap.get(ColorMap.DEFAULT_COLOR).getId().getPath(); models.horizontalRSBlock(block, state -> { - if (Boolean.FALSE.equals(state.get(NetworkNodeBlock.CONNECTED))) { + if (Boolean.FALSE.equals(state.getValue(NetworkNodeBlock.CONNECTED))) { return models.createCubeNorthCutoutModel( "block/" + folderName + "/disconnected", BOTTOM, diff --git a/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModels.java b/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModels.java index 818779288..962ba6af9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModels.java +++ b/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModels.java @@ -26,7 +26,7 @@ public class BlockModels { public void anyDirectionalRSBlock(Block block, Function modelFunc, int angleOffset) { generator.getVariantBuilder(block) .forAllStates(state -> { - Direction dir = state.get(BlockDirection.ANY.getProperty()); + Direction dir = state.getValue(BlockDirection.ANY.getProperty()); int xRotation = 0; if (dir == Direction.DOWN) { @@ -39,7 +39,7 @@ public class BlockModels { return ConfiguredModel.builder() .modelFile(modelFunc.apply(state)) .rotationX(xRotation) - .rotationY(dir.getAxis().isVertical() ? 0 : (((int) dir.getHorizontalAngle()) + angleOffset) % 360) + .rotationY(dir.getAxis().isVertical() ? 0 : (((int) dir.toYRot()) + angleOffset) % 360) .build(); }); } @@ -47,7 +47,7 @@ public class BlockModels { public void wirelessTransmitterBlock(Block block, Function modelFunc, int angleOffset) { generator.getVariantBuilder(block) .forAllStates(state -> { - Direction dir = state.get(BlockDirection.ANY.getProperty()); + Direction dir = state.getValue(BlockDirection.ANY.getProperty()); int xRotation; if (dir.getAxis() == Direction.Axis.Y) { @@ -59,7 +59,7 @@ public class BlockModels { return ConfiguredModel.builder() .modelFile(modelFunc.apply(state)) .rotationX(xRotation) - .rotationY(dir.getAxis().isVertical() ? 0 : (((int) dir.getHorizontalAngle()) + angleOffset) % 360) + .rotationY(dir.getAxis().isVertical() ? 0 : (((int) dir.toYRot()) + angleOffset) % 360) .build(); }); } @@ -68,7 +68,7 @@ public class BlockModels { generator.getVariantBuilder(block) .forAllStates(state -> ConfiguredModel.builder() .modelFile(modelFunc.apply(state)) - .rotationY(((int) state.get(BlockDirection.HORIZONTAL.getProperty()).getHorizontalAngle() + angleOffset) % 360) + .rotationY(((int) state.getValue(BlockDirection.HORIZONTAL.getProperty()).toYRot() + angleOffset) % 360) .build() ); } diff --git a/src/main/java/com/refinedmods/refinedstorage/datageneration/LootTableGenerator.java b/src/main/java/com/refinedmods/refinedstorage/datageneration/LootTableGenerator.java index 9b7084cf9..e02cf8125 100644 --- a/src/main/java/com/refinedmods/refinedstorage/datageneration/LootTableGenerator.java +++ b/src/main/java/com/refinedmods/refinedstorage/datageneration/LootTableGenerator.java @@ -46,21 +46,21 @@ public class LootTableGenerator extends LootTableProvider { @Override protected void addTables() { RSBlocks.CONTROLLER.values().forEach(block -> genBlockItemLootTableWithFunction(block.get(), ControllerLootFunction.builder())); - RSBlocks.CREATIVE_CONTROLLER.values().forEach(block -> registerDropSelfLootTable(block.get())); + RSBlocks.CREATIVE_CONTROLLER.values().forEach(block -> dropSelf(block.get())); RSBlocks.CRAFTER.values().forEach(block -> genBlockItemLootTableWithFunction(block.get(), CrafterLootFunction.builder())); - RSBlocks.GRID.values().forEach(block -> registerDropSelfLootTable(block.get())); - RSBlocks.CRAFTING_GRID.values().forEach(block -> registerDropSelfLootTable(block.get())); - RSBlocks.FLUID_GRID.values().forEach(block -> registerDropSelfLootTable(block.get())); - RSBlocks.PATTERN_GRID.values().forEach(block -> registerDropSelfLootTable(block.get())); - RSBlocks.SECURITY_MANAGER.values().forEach(block -> registerDropSelfLootTable(block.get())); - RSBlocks.WIRELESS_TRANSMITTER.values().forEach(block -> registerDropSelfLootTable(block.get())); - RSBlocks.RELAY.values().forEach(block -> registerDropSelfLootTable(block.get())); - RSBlocks.NETWORK_TRANSMITTER.values().forEach(block -> registerDropSelfLootTable(block.get())); - RSBlocks.NETWORK_RECEIVER.values().forEach(block -> registerDropSelfLootTable(block.get())); - RSBlocks.DISK_MANIPULATOR.values().forEach(block -> registerDropSelfLootTable(block.get())); - RSBlocks.CRAFTING_MONITOR.values().forEach(block -> registerDropSelfLootTable(block.get())); - RSBlocks.CRAFTER_MANAGER.values().forEach(block -> registerDropSelfLootTable(block.get())); - RSBlocks.DETECTOR.values().forEach(block -> registerDropSelfLootTable(block.get())); + RSBlocks.GRID.values().forEach(block -> dropSelf(block.get())); + RSBlocks.CRAFTING_GRID.values().forEach(block -> dropSelf(block.get())); + RSBlocks.FLUID_GRID.values().forEach(block -> dropSelf(block.get())); + RSBlocks.PATTERN_GRID.values().forEach(block -> dropSelf(block.get())); + RSBlocks.SECURITY_MANAGER.values().forEach(block -> dropSelf(block.get())); + RSBlocks.WIRELESS_TRANSMITTER.values().forEach(block -> dropSelf(block.get())); + RSBlocks.RELAY.values().forEach(block -> dropSelf(block.get())); + RSBlocks.NETWORK_TRANSMITTER.values().forEach(block -> dropSelf(block.get())); + RSBlocks.NETWORK_RECEIVER.values().forEach(block -> dropSelf(block.get())); + RSBlocks.DISK_MANIPULATOR.values().forEach(block -> dropSelf(block.get())); + RSBlocks.CRAFTING_MONITOR.values().forEach(block -> dropSelf(block.get())); + RSBlocks.CRAFTER_MANAGER.values().forEach(block -> dropSelf(block.get())); + RSBlocks.DETECTOR.values().forEach(block -> dropSelf(block.get())); } @Override @@ -69,12 +69,12 @@ public class LootTableGenerator extends LootTableProvider { } private void genBlockItemLootTableWithFunction(Block block, ILootFunction.IBuilder builder) { - registerLootTable(block, LootTable.builder().addLootPool( - LootPool.builder() - .rolls(ConstantRange.of(1)) - .addEntry(ItemLootEntry.builder(block) - .acceptFunction(builder)) - .acceptCondition(SurvivesExplosion.builder()))); + add(block, LootTable.lootTable().withPool( + LootPool.lootPool() + .setRolls(ConstantRange.exactly(1)) + .add(ItemLootEntry.lootTableItem(block) + .apply(builder)) + .when(SurvivesExplosion.survivesExplosion()))); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/datageneration/RecipeGenerator.java b/src/main/java/com/refinedmods/refinedstorage/datageneration/RecipeGenerator.java index 495192f7c..2d3192687 100644 --- a/src/main/java/com/refinedmods/refinedstorage/datageneration/RecipeGenerator.java +++ b/src/main/java/com/refinedmods/refinedstorage/datageneration/RecipeGenerator.java @@ -23,41 +23,41 @@ public class RecipeGenerator extends RecipeProvider { } @Override - protected void registerRecipes(Consumer recipeAcceptor) { + protected void buildShapelessRecipes(Consumer recipeAcceptor) { // Tag + Color -> Colored Block - RSItems.COLORED_ITEM_TAGS.forEach((tag, map) -> map.forEach((color, item) -> ShapelessRecipeBuilder.shapelessRecipe(item.get()) - .addIngredient(tag) - .addIngredient(color.getTag()) - .setGroup(RS.ID) - .addCriterion("refinedstorage:controller", InventoryChangeTrigger.Instance.forItems(RSItems.CONTROLLER.get(ColorMap.DEFAULT_COLOR).get())) - .build(recipeAcceptor, new ResourceLocation(RS.ID, "coloring_recipes/" + item.getId().getPath())) + RSItems.COLORED_ITEM_TAGS.forEach((tag, map) -> map.forEach((color, item) -> ShapelessRecipeBuilder.shapeless(item.get()) + .requires(tag) + .requires(color.getTag()) + .group(RS.ID) + .unlockedBy("refinedstorage:controller", InventoryChangeTrigger.Instance.hasItems(RSItems.CONTROLLER.get(ColorMap.DEFAULT_COLOR).get())) + .save(recipeAcceptor, new ResourceLocation(RS.ID, "coloring_recipes/" + item.getId().getPath())) )); // Crafting Grid - RSItems.CRAFTING_GRID.forEach((color, item) -> ShapelessRecipeBuilder.shapelessRecipe(item.get()) - .addIngredient(RSItems.GRID.get(color).get()) - .addIngredient(RSItems.PROCESSORS.get(ProcessorItem.Type.ADVANCED).get()) - .addIngredient(ItemTags.makeWrapperTag("refinedstorage:crafting_tables")) - .addCriterion(GRID_ID, InventoryChangeTrigger.Instance.forItems(RSItems.GRID.get(ColorMap.DEFAULT_COLOR).get())) - .build(recipeAcceptor, new ResourceLocation(RS.ID, "crafting_grid/" + item.getId().getPath())) + RSItems.CRAFTING_GRID.forEach((color, item) -> ShapelessRecipeBuilder.shapeless(item.get()) + .requires(RSItems.GRID.get(color).get()) + .requires(RSItems.PROCESSORS.get(ProcessorItem.Type.ADVANCED).get()) + .requires(ItemTags.bind("refinedstorage:crafting_tables")) + .unlockedBy(GRID_ID, InventoryChangeTrigger.Instance.hasItems(RSItems.GRID.get(ColorMap.DEFAULT_COLOR).get())) + .save(recipeAcceptor, new ResourceLocation(RS.ID, "crafting_grid/" + item.getId().getPath())) ); // Fluid Grid - RSItems.FLUID_GRID.forEach((color, item) -> ShapelessRecipeBuilder.shapelessRecipe(item.get()) - .addIngredient(RSItems.GRID.get(color).get()) - .addIngredient(RSItems.PROCESSORS.get(ProcessorItem.Type.ADVANCED).get()) - .addIngredient(Items.BUCKET) - .addCriterion(GRID_ID, InventoryChangeTrigger.Instance.forItems(RSItems.GRID.get(ColorMap.DEFAULT_COLOR).get())) - .build(recipeAcceptor, new ResourceLocation(RS.ID, "fluid_grid/" + item.getId().getPath())) + RSItems.FLUID_GRID.forEach((color, item) -> ShapelessRecipeBuilder.shapeless(item.get()) + .requires(RSItems.GRID.get(color).get()) + .requires(RSItems.PROCESSORS.get(ProcessorItem.Type.ADVANCED).get()) + .requires(Items.BUCKET) + .unlockedBy(GRID_ID, InventoryChangeTrigger.Instance.hasItems(RSItems.GRID.get(ColorMap.DEFAULT_COLOR).get())) + .save(recipeAcceptor, new ResourceLocation(RS.ID, "fluid_grid/" + item.getId().getPath())) ); // Pattern Grid - RSItems.PATTERN_GRID.forEach((color, item) -> ShapelessRecipeBuilder.shapelessRecipe(item.get()) - .addIngredient(RSItems.GRID.get(color).get()) - .addIngredient(RSItems.PROCESSORS.get(ProcessorItem.Type.ADVANCED).get()) - .addIngredient(RSItems.PATTERN.get()) - .addCriterion(GRID_ID, InventoryChangeTrigger.Instance.forItems(RSItems.GRID.get(ColorMap.DEFAULT_COLOR).get())) - .build(recipeAcceptor, new ResourceLocation(RS.ID, "pattern_grid/" + item.getId().getPath())) + RSItems.PATTERN_GRID.forEach((color, item) -> ShapelessRecipeBuilder.shapeless(item.get()) + .requires(RSItems.GRID.get(color).get()) + .requires(RSItems.PROCESSORS.get(ProcessorItem.Type.ADVANCED).get()) + .requires(RSItems.PATTERN.get()) + .unlockedBy(GRID_ID, InventoryChangeTrigger.Instance.hasItems(RSItems.GRID.get(ColorMap.DEFAULT_COLOR).get())) + .save(recipeAcceptor, new ResourceLocation(RS.ID, "pattern_grid/" + item.getId().getPath())) ); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/datageneration/TagGenerator.java b/src/main/java/com/refinedmods/refinedstorage/datageneration/TagGenerator.java index 92add959a..07acc266a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/datageneration/TagGenerator.java +++ b/src/main/java/com/refinedmods/refinedstorage/datageneration/TagGenerator.java @@ -14,7 +14,7 @@ public class TagGenerator extends ItemTagsProvider { } @Override - protected void registerTags() { - RSItems.COLORED_ITEM_TAGS.forEach((tag, map) -> map.values().forEach(item -> getOrCreateBuilder(tag).add(item.get()))); + protected void addTags() { + RSItems.COLORED_ITEM_TAGS.forEach((tag, map) -> map.values().forEach(item -> tag(tag).add(item.get()))); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java b/src/main/java/com/refinedmods/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java index 2606db440..d7dffbbbb 100644 --- a/src/main/java/com/refinedmods/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java @@ -45,8 +45,8 @@ public final class CraftingTweaksIntegration { public static class GetGridStartFunction implements Function { @Override public Integer apply(GridContainer containerGrid) { - for (int i = 0; i < containerGrid.inventorySlots.size(); i++) { - if (containerGrid.inventorySlots.get(i) instanceof CraftingGridSlot) { + for (int i = 0; i < containerGrid.slots.size(); i++) { + if (containerGrid.slots.get(i) instanceof CraftingGridSlot) { return i; } } diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/CoverCraftingCategoryExtension.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/CoverCraftingCategoryExtension.java index d18173726..d771ba144 100644 --- a/src/main/java/com/refinedmods/refinedstorage/integration/jei/CoverCraftingCategoryExtension.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/CoverCraftingCategoryExtension.java @@ -34,12 +34,12 @@ public class CoverCraftingCategoryExtension implements ICustomCraftingCategoryEx List input = new ArrayList<>(); List output = new ArrayList<>(); for (Block block : ForgeRegistries.BLOCKS.getValues()) { - Item item = Item.getItemFromBlock(block); + Item item = Item.byBlock(block); if (item == Items.AIR) { continue; } NonNullList subBlocks = NonNullList.create(); - block.fillItemGroup(ItemGroup.SEARCH, subBlocks); + block.fillItemCategory(ItemGroup.TAB_SEARCH, subBlocks); for (ItemStack subBlock : subBlocks) { if (CoverManager.isValidCover(subBlock)) { input.add(subBlock); @@ -49,7 +49,7 @@ public class CoverCraftingCategoryExtension implements ICustomCraftingCategoryEx } } } - ingredients.setInputLists(VanillaTypes.ITEM, Arrays.asList(Tags.Items.NUGGETS_IRON.getAllElements().stream().map(ItemStack::new).collect(Collectors.toList()), input)); + ingredients.setInputLists(VanillaTypes.ITEM, Arrays.asList(Tags.Items.NUGGETS_IRON.getValues().stream().map(ItemStack::new).collect(Collectors.toList()), input)); ingredients.setOutputs(VanillaTypes.ITEM, output); } @@ -69,11 +69,11 @@ public class CoverCraftingCategoryExtension implements ICustomCraftingCategoryEx public void setRecipe(IRecipeLayout recipeLayout, IIngredients ingredients) { ItemStack stack = recipeLayout.getFocus(VanillaTypes.ITEM).getValue(); if (stack.getItem() instanceof CoverItem){ - recipeLayout.getIngredientsGroup(VanillaTypes.ITEM).set(4, Tags.Items.NUGGETS_IRON.getAllElements().stream().map(ItemStack::new).collect(Collectors.toList())); + recipeLayout.getIngredientsGroup(VanillaTypes.ITEM).set(4, Tags.Items.NUGGETS_IRON.getValues().stream().map(ItemStack::new).collect(Collectors.toList())); recipeLayout.getIngredientsGroup(VanillaTypes.ITEM).set(5, CoverItem.getItem(stack)); recipeLayout.getIngredientsGroup(VanillaTypes.ITEM).set(0, stack); } else { - recipeLayout.getIngredientsGroup(VanillaTypes.ITEM).set(4, Tags.Items.NUGGETS_IRON.getAllElements().stream().map(ItemStack::new).collect(Collectors.toList())); + recipeLayout.getIngredientsGroup(VanillaTypes.ITEM).set(4, Tags.Items.NUGGETS_IRON.getValues().stream().map(ItemStack::new).collect(Collectors.toList())); recipeLayout.getIngredientsGroup(VanillaTypes.ITEM).set(5, stack); ItemStack output = new ItemStack(RSItems.COVER.get()); CoverItem.setItem(output, stack); diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/GhostIngredientHandler.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GhostIngredientHandler.java index 68c27ced8..391d206f1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/integration/jei/GhostIngredientHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GhostIngredientHandler.java @@ -18,17 +18,19 @@ import net.minecraftforge.fluids.FluidStack; import java.util.ArrayList; import java.util.List; +import mezz.jei.api.gui.handlers.IGhostIngredientHandler.Target; + public class GhostIngredientHandler implements IGhostIngredientHandler { @Override public List> getTargets(BaseScreen gui, I ingredient, boolean doStart) { List> targets = new ArrayList<>(); - for (Slot slot : gui.getContainer().inventorySlots) { - if (!slot.isEnabled()) { + for (Slot slot : gui.getMenu().slots) { + if (!slot.isActive()) { continue; } - Rectangle2d bounds = new Rectangle2d(gui.getGuiLeft() + slot.xPos, gui.getGuiTop() + slot.yPos, 17, 17); + Rectangle2d bounds = new Rectangle2d(gui.getGuiLeft() + slot.x, gui.getGuiTop() + slot.y, 17, 17); if (ingredient instanceof ItemStack && (slot instanceof LegacyFilterSlot || slot instanceof FilterSlot)) { targets.add(new Target() { @@ -39,9 +41,9 @@ public class GhostIngredientHandler implements IGhostIngredientHandler s.inventory instanceof CraftingInventory).collect(Collectors.toList()) + gridContainer.slots.stream().filter(s -> s.container instanceof CraftingInventory).collect(Collectors.toList()) )); } diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/GuiContainerHandler.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GuiContainerHandler.java index d07891b22..4432db06c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/integration/jei/GuiContainerHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GuiContainerHandler.java @@ -49,11 +49,11 @@ public class GuiContainerHandler implements IGuiContainerHandler message = drawIngredientHighlights(stack, recipeX, recipeY); - Screen currentScreen = Minecraft.getInstance().currentScreen; - GuiUtils.drawHoveringText(ItemStack.EMPTY, stack, message, mouseX, mouseY, currentScreen.width, currentScreen.height, 200, Minecraft.getInstance().fontRenderer); + Screen currentScreen = Minecraft.getInstance().screen; + GuiUtils.drawHoveringText(ItemStack.EMPTY, stack, message, mouseX, mouseY, currentScreen.width, currentScreen.height, 200, Minecraft.getInstance().font); } protected List drawIngredientHighlights(MatrixStack stack, int recipeX, int recipeY) { @@ -58,11 +60,11 @@ public class RecipeTransferCraftingGridError implements IRecipeTransferError { } if (missingMessage) { - message.add(new TranslationTextComponent("jei.tooltip.error.recipe.transfer.missing").mergeStyle(TextFormatting.RED)); + message.add(new TranslationTextComponent("jei.tooltip.error.recipe.transfer.missing").withStyle(TextFormatting.RED)); } if (craftMessage) { - message.add(new TranslationTextComponent("gui.refinedstorage.jei.transfer.request_autocrafting").mergeStyle(TextFormatting.BLUE)); + message.add(new TranslationTextComponent("gui.refinedstorage.jei.transfer.request_autocrafting").withStyle(TextFormatting.BLUE)); } return message; diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/RecipeTransferPatternGridError.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/RecipeTransferPatternGridError.java index d7ec59a19..290eda679 100644 --- a/src/main/java/com/refinedmods/refinedstorage/integration/jei/RecipeTransferPatternGridError.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/RecipeTransferPatternGridError.java @@ -28,7 +28,7 @@ public class RecipeTransferPatternGridError extends RecipeTransferCraftingGridEr } if (craftMessage) { - message.add(new TranslationTextComponent("gui.refinedstorage.jei.transfer.autocrafting_available").mergeStyle(TextFormatting.BLUE)); + message.add(new TranslationTextComponent("gui.refinedstorage.jei.transfer.autocrafting_available").withStyle(TextFormatting.BLUE)); } return message; diff --git a/src/main/java/com/refinedmods/refinedstorage/inventory/fluid/ProxyFluidHandler.java b/src/main/java/com/refinedmods/refinedstorage/inventory/fluid/ProxyFluidHandler.java index a0768e32b..7dc5d433f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/inventory/fluid/ProxyFluidHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/fluid/ProxyFluidHandler.java @@ -6,6 +6,8 @@ import net.minecraftforge.fluids.capability.templates.FluidTank; import javax.annotation.Nonnull; +import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction; + public class ProxyFluidHandler implements IFluidHandler { private final FluidTank insertHandler; private final FluidTank extractHandler; diff --git a/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterItemHandler.java b/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterItemHandler.java index b59cce4bd..15f3f5289 100644 --- a/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterItemHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/item/FilterItemHandler.java @@ -75,7 +75,7 @@ public class FilterItemHandler extends BaseItemHandler { if (icon.isEmpty() && fluidIcon.isEmpty()) { filters.addAll(foundFilters); } else { - tabs.add(new GridTab(foundFilters, FilterItem.getName(filterItem), icon, fluidIcon)); + tabs.add(new GridTab(foundFilters, FilterItem.getFilterName(filterItem), icon, fluidIcon)); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/inventory/listener/TileInventoryListener.java b/src/main/java/com/refinedmods/refinedstorage/inventory/listener/TileInventoryListener.java index 8a5d24724..25b3bee01 100644 --- a/src/main/java/com/refinedmods/refinedstorage/inventory/listener/TileInventoryListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/listener/TileInventoryListener.java @@ -13,7 +13,7 @@ public class TileInventoryListener implements InventoryListener @Override public void onChanged(BaseItemHandler handler, int slot, boolean reading) { if (!reading) { - tile.markDirty(); + tile.setChanged(); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/inventory/player/PlayerSlot.java b/src/main/java/com/refinedmods/refinedstorage/inventory/player/PlayerSlot.java index 080c25bdc..a0de77916 100644 --- a/src/main/java/com/refinedmods/refinedstorage/inventory/player/PlayerSlot.java +++ b/src/main/java/com/refinedmods/refinedstorage/inventory/player/PlayerSlot.java @@ -36,7 +36,7 @@ public class PlayerSlot { public ItemStack getStackFromSlot(PlayerEntity player) { if (curioSlot == null || !CuriosIntegration.isLoaded()) { - return player.inventory.getStackInSlot(slot); + return player.inventory.getItem(slot); } LazyOptional curiosHandler = CuriosApi.getCuriosHelper().getCuriosHandler(player); @@ -54,7 +54,7 @@ public class PlayerSlot { buffer.writeInt(slot); buffer.writeBoolean(curioSlot != null); if (curioSlot != null) { - buffer.writeString(curioSlot); + buffer.writeUtf(curioSlot); } } @@ -67,7 +67,7 @@ public class PlayerSlot { public static PlayerSlot getSlotForHand(PlayerEntity player, Hand hand) { if (hand == Hand.MAIN_HAND) { - return new PlayerSlot(player.inventory.currentItem); + return new PlayerSlot(player.inventory.selected); } //@Volatile Offhand Slot, could use -1 as we aren't using this anywhere. diff --git a/src/main/java/com/refinedmods/refinedstorage/item/CoreItem.java b/src/main/java/com/refinedmods/refinedstorage/item/CoreItem.java index 6e4f4df9d..a77ff5351 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/CoreItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/CoreItem.java @@ -10,6 +10,6 @@ public class CoreItem extends Item { } public CoreItem() { - super(new Item.Properties().group(RS.MAIN_GROUP)); + super(new Item.Properties().tab(RS.MAIN_GROUP)); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/CoverItem.java b/src/main/java/com/refinedmods/refinedstorage/item/CoverItem.java index ebf0409f2..0455ae53d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/CoverItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/CoverItem.java @@ -41,7 +41,7 @@ public class CoverItem extends Item { public CoverItem() { - super(new Item.Properties().group(RS.MAIN_GROUP)); + super(new Item.Properties().tab(RS.MAIN_GROUP)); } public static void setItem(ItemStack cover, ItemStack item) { @@ -59,22 +59,22 @@ public class CoverItem extends Item { return ItemStack.EMPTY; } - return ItemStack.read(cover.getTag().getCompound(NBT_ITEM)); + return ItemStack.of(cover.getTag().getCompound(NBT_ITEM)); } @Override - public void addInformation(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { - super.addInformation(stack, worldIn, tooltip, flagIn); + public void appendHoverText(ItemStack stack, @Nullable World worldIn, List tooltip, ITooltipFlag flagIn) { + super.appendHoverText(stack, worldIn, tooltip, flagIn); ItemStack item = getItem(stack); if (!item.isEmpty()) { - tooltip.add(((TextComponent) item.getItem().getDisplayName(item)).mergeStyle(TextFormatting.GRAY)); + tooltip.add(((TextComponent) item.getItem().getName(item)).withStyle(TextFormatting.GRAY)); } } @Override - public void fillItemGroup(ItemGroup group, NonNullList items) { - if (this.isInGroup(group)) { //Changed from 1.12: to use 1.16 configs + public void fillItemCategory(ItemGroup group, NonNullList items) { + if (this.allowdedIn(group)) { //Changed from 1.12: to use 1.16 configs if (!RS.CLIENT_CONFIG.getCover().showAllRecipesInJEI()) { ItemStack stack = new ItemStack(this); @@ -85,7 +85,7 @@ public class CoverItem extends Item { return; } for (Block block : ForgeRegistries.BLOCKS.getValues()) { - Item item = Item.getItemFromBlock(block); + Item item = Item.byBlock(block); if (item == Items.AIR) { continue; @@ -93,7 +93,7 @@ public class CoverItem extends Item { NonNullList subBlocks = NonNullList.create(); - block.fillItemGroup(ItemGroup.SEARCH, subBlocks); + block.fillItemCategory(ItemGroup.TAB_SEARCH, subBlocks); for (ItemStack subBlock : subBlocks) { if (CoverManager.isValidCover(subBlock)) { @@ -109,26 +109,26 @@ public class CoverItem extends Item { } @Override - public ActionResultType onItemUse(ItemUseContext context) { - BlockPos pos = context.getPos(); - Direction facing = context.getFace(); - World world = context.getWorld(); + public ActionResultType useOn(ItemUseContext context) { + BlockPos pos = context.getClickedPos(); + Direction facing = context.getClickedFace(); + World world = context.getLevel(); - ItemStack stack = context.getPlayer().getHeldItem(context.getHand()); + ItemStack stack = context.getPlayer().getItemInHand(context.getHand()); - TileEntity tile = world.getTileEntity(pos); + TileEntity tile = world.getBlockEntity(pos); // Support placing on the bottom side without too much hassle. if (!canPlaceOn(world, pos, facing)) { - pos = pos.up(); + pos = pos.above(); facing = Direction.DOWN; - tile = world.getTileEntity(pos); + tile = world.getBlockEntity(pos); } if (canPlaceOn(world, pos, facing)) { - if (world.isRemote) { + if (world.isClientSide) { ModelDataManager.requestModelDataRefresh(tile); return ActionResultType.SUCCESS; } @@ -142,7 +142,7 @@ public class CoverItem extends Item { } if (((ICoverable) node).getCoverManager().setCover(facing, createCover(getItem(stack)))) { - context.getPlayer().getHeldItem(context.getHand()).shrink(1); + context.getPlayer().getItemInHand(context.getHand()).shrink(1); WorldUtils.updateBlock(world, pos); API.instance().getNetworkNodeManager((ServerWorld) world).markForSaving(); @@ -157,7 +157,7 @@ public class CoverItem extends Item { private boolean canPlaceOn(World world, BlockPos pos, Direction facing) { - return world.getTileEntity(pos) instanceof NetworkNodeTile && ((NetworkNodeTile) world.getTileEntity(pos)).getNode() instanceof ICoverable && !CableBlock.hasVisualConnectionOnSide(world.getBlockState(pos), facing); + return world.getBlockEntity(pos) instanceof NetworkNodeTile && ((NetworkNodeTile) world.getBlockEntity(pos)).getNode() instanceof ICoverable && !CableBlock.hasVisualConnectionOnSide(world.getBlockState(pos), facing); } protected Cover createCover(ItemStack stack) { diff --git a/src/main/java/com/refinedmods/refinedstorage/item/EnergyItem.java b/src/main/java/com/refinedmods/refinedstorage/item/EnergyItem.java index 2076d69cc..64ad09cc3 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/EnergyItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/EnergyItem.java @@ -56,12 +56,12 @@ public abstract class EnergyItem extends Item { return super.getRGBDurabilityForDisplay(stack); } - return MathHelper.hsvToRGB(Math.max(0.0F, (float) energy.getEnergyStored() / (float) energy.getMaxEnergyStored()) / 3.0F, 1.0F, 1.0F); + return MathHelper.hsvToRgb(Math.max(0.0F, (float) energy.getEnergyStored() / (float) energy.getMaxEnergyStored()) / 3.0F, 1.0F, 1.0F); } @Override - public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.appendHoverText(stack, world, tooltip, flag); if (!creative) { stack.getCapability(CapabilityEnergy.ENERGY, null).ifPresent(energy -> tooltip.add(new TranslationTextComponent("misc.refinedstorage.energy_stored", energy.getEnergyStored(), energy.getMaxEnergyStored()).setStyle(Styles.GRAY))); diff --git a/src/main/java/com/refinedmods/refinedstorage/item/FilterItem.java b/src/main/java/com/refinedmods/refinedstorage/item/FilterItem.java index dab1f86d2..50ff925f2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/FilterItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/FilterItem.java @@ -41,19 +41,19 @@ public class FilterItem extends Item { public static final String NBT_FLUID_FILTERS = "FluidFilters"; public FilterItem() { - super(new Item.Properties().group(RS.MAIN_GROUP).maxStackSize(1)); + super(new Item.Properties().tab(RS.MAIN_GROUP).stacksTo(1)); } @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); + public ActionResult use(World world, PlayerEntity player, Hand hand) { + ItemStack stack = player.getItemInHand(hand); - if (!world.isRemote) { + if (!world.isClientSide) { if (player.isCrouching()) { return new ActionResult<>(ActionResultType.SUCCESS, new ItemStack(RSItems.FILTER.get())); } - player.openContainer(new INamedContainerProvider() { + player.openMenu(new INamedContainerProvider() { @Override public ITextComponent getDisplayName() { return new TranslationTextComponent("gui.refinedstorage.filter"); @@ -61,7 +61,7 @@ public class FilterItem extends Item { @Override public Container createMenu(int windowId, PlayerInventory inventory, PlayerEntity player) { - return new FilterContainer(player, inventory.getCurrentItem(), windowId); + return new FilterContainer(player, inventory.getSelected(), windowId); } }); } @@ -70,8 +70,8 @@ public class FilterItem extends Item { } @Override - public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.appendHoverText(stack, world, tooltip, flag); tooltip.add(new TranslationTextComponent("sidebutton.refinedstorage.mode." + (getMode(stack) == IFilter.MODE_WHITELIST ? "whitelist" : "blacklist")).setStyle(Styles.YELLOW)); @@ -124,7 +124,7 @@ public class FilterItem extends Item { stack.getTag().putBoolean(NBT_MOD_FILTER, modFilter); } - public static String getName(ItemStack stack) { + public static String getFilterName(ItemStack stack) { return stack.hasTag() && stack.getTag().contains(NBT_NAME) ? stack.getTag().getString(NBT_NAME) : ""; } @@ -138,7 +138,7 @@ public class FilterItem extends Item { @Nonnull public static ItemStack getIcon(ItemStack stack) { - return stack.hasTag() && stack.getTag().contains(NBT_ICON) ? ItemStack.read(stack.getTag().getCompound(NBT_ICON)) : ItemStack.EMPTY; + return stack.hasTag() && stack.getTag().contains(NBT_ICON) ? ItemStack.of(stack.getTag().getCompound(NBT_ICON)) : ItemStack.EMPTY; } public static void setIcon(ItemStack stack, ItemStack icon) { diff --git a/src/main/java/com/refinedmods/refinedstorage/item/FluidStorageDiskItem.java b/src/main/java/com/refinedmods/refinedstorage/item/FluidStorageDiskItem.java index 563f3d478..830f97375 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/FluidStorageDiskItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/FluidStorageDiskItem.java @@ -35,7 +35,7 @@ public class FluidStorageDiskItem extends Item implements IStorageDiskProvider { private final FluidStorageType type; public FluidStorageDiskItem(FluidStorageType type) { - super(new Item.Properties().group(RS.MAIN_GROUP).maxStackSize(1)); + super(new Item.Properties().tab(RS.MAIN_GROUP).stacksTo(1)); this.type = type; } @@ -44,7 +44,7 @@ public class FluidStorageDiskItem extends Item implements IStorageDiskProvider { public void inventoryTick(ItemStack stack, World world, Entity entity, int slot, boolean selected) { super.inventoryTick(stack, world, entity, slot, selected); - if (!world.isRemote && !stack.hasTag() && entity instanceof PlayerEntity) { + if (!world.isClientSide && !stack.hasTag() && entity instanceof PlayerEntity) { UUID id = UUID.randomUUID(); API.instance().getStorageDiskManager((ServerWorld) world).set(id, API.instance().createDefaultFluidDisk((ServerWorld) world, getCapacity(stack), (PlayerEntity) entity)); @@ -55,8 +55,8 @@ public class FluidStorageDiskItem extends Item implements IStorageDiskProvider { } @Override - public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.appendHoverText(stack, world, tooltip, flag); if (isValid(stack)) { UUID id = getId(stack); @@ -79,17 +79,17 @@ public class FluidStorageDiskItem extends Item implements IStorageDiskProvider { } @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack diskStack = player.getHeldItem(hand); + public ActionResult use(World world, PlayerEntity player, Hand hand) { + ItemStack diskStack = player.getItemInHand(hand); - if (!world.isRemote && player.isCrouching() && type != FluidStorageType.CREATIVE) { + if (!world.isClientSide && player.isCrouching() && type != FluidStorageType.CREATIVE) { IStorageDisk disk = API.instance().getStorageDiskManager((ServerWorld) world).getByStack(diskStack); if (disk != null && disk.getStored() == 0) { ItemStack storagePart = new ItemStack(FluidStoragePartItem.getByType(type), diskStack.getCount()); - if (!player.inventory.addItemStackToInventory(storagePart.copy())) { - InventoryHelper.spawnItemStack(world, player.getPosX(), player.getPosY(), player.getPosZ(), storagePart); + if (!player.inventory.add(storagePart.copy())) { + InventoryHelper.dropItemStack(world, player.getX(), player.getY(), player.getZ(), storagePart); } API.instance().getStorageDiskManager((ServerWorld) world).remove(getId(diskStack)); @@ -109,18 +109,18 @@ public class FluidStorageDiskItem extends Item implements IStorageDiskProvider { @Override public UUID getId(ItemStack disk) { - return disk.getTag().getUniqueId(NBT_ID); + return disk.getTag().getUUID(NBT_ID); } @Override public void setId(ItemStack disk, UUID id) { disk.setTag(new CompoundNBT()); - disk.getTag().putUniqueId(NBT_ID, id); + disk.getTag().putUUID(NBT_ID, id); } @Override public boolean isValid(ItemStack disk) { - return disk.hasTag() && disk.getTag().hasUniqueId(NBT_ID); + return disk.hasTag() && disk.getTag().hasUUID(NBT_ID); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/item/FluidStoragePartItem.java b/src/main/java/com/refinedmods/refinedstorage/item/FluidStoragePartItem.java index 3a19f6dfe..a468eb123 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/FluidStoragePartItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/FluidStoragePartItem.java @@ -7,7 +7,7 @@ import net.minecraft.item.Item; public class FluidStoragePartItem extends Item { public FluidStoragePartItem() { - super(new Item.Properties().group(RS.MAIN_GROUP)); + super(new Item.Properties().tab(RS.MAIN_GROUP)); } public static FluidStoragePartItem getByType(FluidStorageType type) { diff --git a/src/main/java/com/refinedmods/refinedstorage/item/NetworkCardItem.java b/src/main/java/com/refinedmods/refinedstorage/item/NetworkCardItem.java index b1ae5e486..2f60548ad 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/NetworkCardItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/NetworkCardItem.java @@ -28,22 +28,22 @@ public class NetworkCardItem extends Item { private static final String NBT_DIMENSION = "Dimension"; public NetworkCardItem() { - super(new Item.Properties().group(RS.MAIN_GROUP).maxStackSize(1)); + super(new Item.Properties().tab(RS.MAIN_GROUP).stacksTo(1)); } @Override - public ActionResultType onItemUse(ItemUseContext ctx) { - Block block = ctx.getWorld().getBlockState(ctx.getPos()).getBlock(); + public ActionResultType useOn(ItemUseContext ctx) { + Block block = ctx.getLevel().getBlockState(ctx.getClickedPos()).getBlock(); if (block instanceof NetworkReceiverBlock) { CompoundNBT tag = new CompoundNBT(); - tag.putInt(NBT_RECEIVER_X, ctx.getPos().getX()); - tag.putInt(NBT_RECEIVER_Y, ctx.getPos().getY()); - tag.putInt(NBT_RECEIVER_Z, ctx.getPos().getZ()); - tag.putString(NBT_DIMENSION, ctx.getWorld().getDimensionKey().getLocation().toString()); + tag.putInt(NBT_RECEIVER_X, ctx.getClickedPos().getX()); + tag.putInt(NBT_RECEIVER_Y, ctx.getClickedPos().getY()); + tag.putInt(NBT_RECEIVER_Z, ctx.getClickedPos().getZ()); + tag.putString(NBT_DIMENSION, ctx.getLevel().dimension().location().toString()); - ctx.getPlayer().getHeldItem(ctx.getHand()).setTag(tag); + ctx.getPlayer().getItemInHand(ctx.getHand()).setTag(tag); return ActionResultType.SUCCESS; } @@ -52,8 +52,8 @@ public class NetworkCardItem extends Item { } @Override - public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.appendHoverText(stack, world, tooltip, flag); BlockPos pos = getReceiver(stack); RegistryKey type = getDimension(stack); @@ -64,7 +64,7 @@ public class NetworkCardItem extends Item { pos.getX(), pos.getY(), pos.getZ(), - type.getLocation().toString() + type.location().toString() ).setStyle(Styles.GRAY)); } } @@ -88,12 +88,12 @@ public class NetworkCardItem extends Item { @Nullable public static RegistryKey getDimension(ItemStack stack) { if (stack.hasTag() && stack.getTag().contains(NBT_DIMENSION)) { - ResourceLocation name = ResourceLocation.tryCreate(stack.getTag().getString(NBT_DIMENSION)); + ResourceLocation name = ResourceLocation.tryParse(stack.getTag().getString(NBT_DIMENSION)); if (name == null) { return null; } - return RegistryKey.getOrCreateKey(Registry.WORLD_KEY, name); + return RegistryKey.create(Registry.DIMENSION_REGISTRY, name); } return null; diff --git a/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java index 486773e5a..03793c816 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java @@ -36,14 +36,14 @@ public abstract class NetworkItem extends EnergyItem implements INetworkItemProv } @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); + public ActionResult use(World world, PlayerEntity player, Hand hand) { + ItemStack stack = player.getItemInHand(hand); - if (!world.isRemote) { - applyNetwork(world.getServer(), stack, n -> n.getNetworkItemManager().open(player, player.getHeldItem(hand), PlayerSlot.getSlotForHand(player, hand)), err -> player.sendMessage(err, player.getUniqueID())); + if (!world.isClientSide) { + applyNetwork(world.getServer(), stack, n -> n.getNetworkItemManager().open(player, player.getItemInHand(hand), PlayerSlot.getSlotForHand(player, hand)), err -> player.sendMessage(err, player.getUUID())); } - return ActionResult.resultSuccess(stack); + return ActionResult.success(stack); } public void applyNetwork(MinecraftServer server, ItemStack stack, Consumer onNetwork, Consumer onError) { @@ -60,13 +60,13 @@ public abstract class NetworkItem extends EnergyItem implements INetworkItemProv return; } - World nodeWorld = server.getWorld(dimension); + World nodeWorld = server.getLevel(dimension); if (nodeWorld == null) { onError.accept(notFound); return; } - INetwork network = NetworkUtils.getNetworkFromNode(NetworkUtils.getNodeFromTile(nodeWorld.getTileEntity(new BlockPos(getX(stack), getY(stack), getZ(stack))))); + INetwork network = NetworkUtils.getNetworkFromNode(NetworkUtils.getNodeFromTile(nodeWorld.getBlockEntity(new BlockPos(getX(stack), getY(stack), getZ(stack))))); if (network == null) { onError.accept(notFound); return; @@ -76,8 +76,8 @@ public abstract class NetworkItem extends EnergyItem implements INetworkItemProv } @Override - public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.appendHoverText(stack, world, tooltip, flag); if (isValid(stack)) { tooltip.add(new TranslationTextComponent("misc.refinedstorage.network_item.tooltip", getX(stack), getY(stack), getZ(stack)).setStyle(Styles.GRAY)); @@ -85,15 +85,15 @@ public abstract class NetworkItem extends EnergyItem implements INetworkItemProv } @Override - public ActionResultType itemInteractionForEntity(ItemStack stack, PlayerEntity playerIn, LivingEntity target, Hand hand) { - return super.itemInteractionForEntity(stack, playerIn, target, hand); + public ActionResultType interactLivingEntity(ItemStack stack, PlayerEntity playerIn, LivingEntity target, Hand hand) { + return super.interactLivingEntity(stack, playerIn, target, hand); } @Override - public ActionResultType onItemUse(ItemUseContext ctx) { - ItemStack stack = ctx.getPlayer().getHeldItem(ctx.getHand()); + public ActionResultType useOn(ItemUseContext ctx) { + ItemStack stack = ctx.getPlayer().getItemInHand(ctx.getHand()); - INetwork network = NetworkUtils.getNetworkFromNode(NetworkUtils.getNodeFromTile(ctx.getWorld().getTileEntity(ctx.getPos()))); + INetwork network = NetworkUtils.getNetworkFromNode(NetworkUtils.getNodeFromTile(ctx.getLevel().getBlockEntity(ctx.getClickedPos()))); if (network != null) { CompoundNBT tag = stack.getTag(); @@ -104,7 +104,7 @@ public abstract class NetworkItem extends EnergyItem implements INetworkItemProv tag.putInt(NBT_NODE_X, network.getPosition().getX()); tag.putInt(NBT_NODE_Y, network.getPosition().getY()); tag.putInt(NBT_NODE_Z, network.getPosition().getZ()); - tag.putString(NBT_DIMENSION, ctx.getWorld().getDimensionKey().getLocation().toString()); + tag.putString(NBT_DIMENSION, ctx.getLevel().dimension().location().toString()); stack.setTag(tag); @@ -117,12 +117,12 @@ public abstract class NetworkItem extends EnergyItem implements INetworkItemProv @Nullable public static RegistryKey getDimension(ItemStack stack) { if (stack.hasTag() && stack.getTag().contains(NBT_DIMENSION)) { - ResourceLocation name = ResourceLocation.tryCreate(stack.getTag().getString(NBT_DIMENSION)); + ResourceLocation name = ResourceLocation.tryParse(stack.getTag().getString(NBT_DIMENSION)); if (name == null) { return null; } - return RegistryKey.getOrCreateKey(Registry.WORLD_KEY, name); + return RegistryKey.create(Registry.DIMENSION_REGISTRY, name); } return null; diff --git a/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java b/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java index 80c4aff0d..572ff2569 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/PatternItem.java @@ -51,7 +51,7 @@ public class PatternItem extends Item implements ICraftingPatternProvider { private static final int VERSION = 1; public PatternItem() { - super(new Item.Properties().group(RS.MAIN_GROUP).setISTER(() -> PatternItemStackTileRenderer::new)); + super(new Item.Properties().tab(RS.MAIN_GROUP).setISTER(() -> PatternItemStackTileRenderer::new)); } public static ICraftingPattern fromCache(World world, ItemStack stack) { @@ -70,8 +70,8 @@ public class PatternItem extends Item implements ICraftingPatternProvider { } @Override - public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.appendHoverText(stack, world, tooltip, flag); if (!stack.hasTag()) { return; @@ -105,7 +105,7 @@ public class PatternItem extends Item implements ICraftingPatternProvider { } } else { tooltip.add(new TranslationTextComponent("misc.refinedstorage.pattern.invalid").setStyle(Styles.RED)); - tooltip.add(pattern.getErrorMessage().copyRaw().setStyle(Styles.GRAY)); + tooltip.add(pattern.getErrorMessage().plainCopy().setStyle(Styles.GRAY)); } } @@ -117,7 +117,7 @@ public class PatternItem extends Item implements ICraftingPatternProvider { tooltip.add(new TranslationTextComponent( "misc.refinedstorage.pattern.allowed_item_tag", tag.toString(), - pattern.getInputs().get(i).get(0).getDisplayName() + pattern.getInputs().get(i).get(0).getHoverName() ).setStyle(Styles.AQUA)); } } @@ -136,12 +136,12 @@ public class PatternItem extends Item implements ICraftingPatternProvider { } @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - if (!world.isRemote && player.isCrouching()) { - return new ActionResult<>(ActionResultType.SUCCESS, new ItemStack(RSItems.PATTERN.get(), player.getHeldItem(hand).getCount())); + public ActionResult use(World world, PlayerEntity player, Hand hand) { + if (!world.isClientSide && player.isCrouching()) { + return new ActionResult<>(ActionResultType.SUCCESS, new ItemStack(RSItems.PATTERN.get(), player.getItemInHand(hand).getCount())); } - return new ActionResult<>(ActionResultType.PASS, player.getHeldItem(hand)); + return new ActionResult<>(ActionResultType.PASS, player.getItemInHand(hand)); } @Override @@ -166,7 +166,7 @@ public class PatternItem extends Item implements ICraftingPatternProvider { return ItemStack.EMPTY; } - return ItemStack.read(pattern.getTag().getCompound(id)); + return ItemStack.of(pattern.getTag().getCompound(id)); } public static void setOutputSlot(ItemStack pattern, int slot, ItemStack stack) { @@ -185,7 +185,7 @@ public class PatternItem extends Item implements ICraftingPatternProvider { return ItemStack.EMPTY; } - return ItemStack.read(pattern.getTag().getCompound(id)); + return ItemStack.of(pattern.getTag().getCompound(id)); } public static void setFluidInputSlot(ItemStack pattern, int slot, FluidStack stack) { diff --git a/src/main/java/com/refinedmods/refinedstorage/item/ProcessorBindingItem.java b/src/main/java/com/refinedmods/refinedstorage/item/ProcessorBindingItem.java index 654a4ce24..ce1e11ce2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/ProcessorBindingItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/ProcessorBindingItem.java @@ -5,6 +5,6 @@ import net.minecraft.item.Item; public class ProcessorBindingItem extends Item { public ProcessorBindingItem() { - super(new Item.Properties().group(RS.MAIN_GROUP)); + super(new Item.Properties().tab(RS.MAIN_GROUP)); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/ProcessorItem.java b/src/main/java/com/refinedmods/refinedstorage/item/ProcessorItem.java index 6f16d7f03..64c26aafe 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/ProcessorItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/ProcessorItem.java @@ -24,6 +24,6 @@ public class ProcessorItem extends Item { } public ProcessorItem() { - super(new Item.Properties().group(RS.MAIN_GROUP)); + super(new Item.Properties().tab(RS.MAIN_GROUP)); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/QuartzEnrichedIronItem.java b/src/main/java/com/refinedmods/refinedstorage/item/QuartzEnrichedIronItem.java index 4e978227d..2f0b00a31 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/QuartzEnrichedIronItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/QuartzEnrichedIronItem.java @@ -5,6 +5,6 @@ import net.minecraft.item.Item; public class QuartzEnrichedIronItem extends Item { public QuartzEnrichedIronItem() { - super(new Item.Properties().group(RS.MAIN_GROUP)); + super(new Item.Properties().tab(RS.MAIN_GROUP)); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/SecurityCardItem.java b/src/main/java/com/refinedmods/refinedstorage/item/SecurityCardItem.java index 9b8e6511a..774034dc7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/SecurityCardItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/SecurityCardItem.java @@ -25,21 +25,21 @@ public class SecurityCardItem extends Item { private static final String NBT_PERMISSION = "Permission_%d"; public SecurityCardItem() { - super(new Item.Properties().group(RS.MAIN_GROUP).maxStackSize(1)); + super(new Item.Properties().tab(RS.MAIN_GROUP).stacksTo(1)); } @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); + public ActionResult use(World world, PlayerEntity player, Hand hand) { + ItemStack stack = player.getItemInHand(hand); - if (!world.isRemote) { + if (!world.isClientSide) { stack.setTag(new CompoundNBT()); stack.getTag().putString(NBT_OWNER, player.getGameProfile().getId().toString()); stack.getTag().putString(NBT_OWNER_NAME, player.getGameProfile().getName()); } - return ActionResult.resultSuccess(stack); + return ActionResult.success(stack); } @Nullable @@ -74,8 +74,8 @@ public class SecurityCardItem extends Item { } @Override - public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.appendHoverText(stack, world, tooltip, flag); if (stack.hasTag() && stack.getTag().contains(NBT_OWNER_NAME)) { tooltip.add(new TranslationTextComponent("item.refinedstorage.security_card.owner", stack.getTag().getString(NBT_OWNER_NAME)).setStyle(Styles.GRAY)); @@ -83,7 +83,7 @@ public class SecurityCardItem extends Item { for (Permission permission : Permission.values()) { if (hasPermission(stack, permission)) { - tooltip.add(new StringTextComponent("- ").appendSibling(new TranslationTextComponent("gui.refinedstorage.security_manager.permission." + permission.getId())).setStyle(Styles.GRAY)); + tooltip.add(new StringTextComponent("- ").append(new TranslationTextComponent("gui.refinedstorage.security_manager.permission." + permission.getId())).setStyle(Styles.GRAY)); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/SiliconItem.java b/src/main/java/com/refinedmods/refinedstorage/item/SiliconItem.java index 8a5ab2630..b64792aa1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/SiliconItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/SiliconItem.java @@ -5,6 +5,6 @@ import net.minecraft.item.Item; public class SiliconItem extends Item { public SiliconItem() { - super(new Item.Properties().group(RS.MAIN_GROUP)); + super(new Item.Properties().tab(RS.MAIN_GROUP)); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/StorageDiskItem.java b/src/main/java/com/refinedmods/refinedstorage/item/StorageDiskItem.java index b0007d10f..009086d52 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/StorageDiskItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/StorageDiskItem.java @@ -35,7 +35,7 @@ public class StorageDiskItem extends Item implements IStorageDiskProvider { private final ItemStorageType type; public StorageDiskItem(ItemStorageType type) { - super(new Item.Properties().group(RS.MAIN_GROUP).maxStackSize(1)); + super(new Item.Properties().tab(RS.MAIN_GROUP).stacksTo(1)); this.type = type; } @@ -44,7 +44,7 @@ public class StorageDiskItem extends Item implements IStorageDiskProvider { public void inventoryTick(ItemStack stack, World world, Entity entity, int slot, boolean selected) { super.inventoryTick(stack, world, entity, slot, selected); - if (!world.isRemote && !stack.hasTag() && entity instanceof PlayerEntity) { + if (!world.isClientSide && !stack.hasTag() && entity instanceof PlayerEntity) { UUID id = UUID.randomUUID(); API.instance().getStorageDiskManager((ServerWorld) world).set(id, API.instance().createDefaultItemDisk((ServerWorld) world, getCapacity(stack), (PlayerEntity) entity)); @@ -55,8 +55,8 @@ public class StorageDiskItem extends Item implements IStorageDiskProvider { } @Override - public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.appendHoverText(stack, world, tooltip, flag); if (isValid(stack)) { UUID id = getId(stack); @@ -79,17 +79,17 @@ public class StorageDiskItem extends Item implements IStorageDiskProvider { } @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack diskStack = player.getHeldItem(hand); + public ActionResult use(World world, PlayerEntity player, Hand hand) { + ItemStack diskStack = player.getItemInHand(hand); - if (!world.isRemote && player.isCrouching() && type != ItemStorageType.CREATIVE) { + if (!world.isClientSide && player.isCrouching() && type != ItemStorageType.CREATIVE) { IStorageDisk disk = API.instance().getStorageDiskManager((ServerWorld) world).getByStack(diskStack); if (disk != null && disk.getStored() == 0) { ItemStack storagePart = new ItemStack(StoragePartItem.getByType(type), diskStack.getCount()); - if (!player.inventory.addItemStackToInventory(storagePart.copy())) { - InventoryHelper.spawnItemStack(world, player.getPosX(), player.getPosY(), player.getPosZ(), storagePart); + if (!player.inventory.add(storagePart.copy())) { + InventoryHelper.dropItemStack(world, player.getX(), player.getY(), player.getZ(), storagePart); } API.instance().getStorageDiskManager((ServerWorld) world).remove(getId(diskStack)); @@ -109,18 +109,18 @@ public class StorageDiskItem extends Item implements IStorageDiskProvider { @Override public UUID getId(ItemStack disk) { - return disk.getTag().getUniqueId(NBT_ID); + return disk.getTag().getUUID(NBT_ID); } @Override public void setId(ItemStack disk, UUID id) { disk.setTag(new CompoundNBT()); - disk.getTag().putUniqueId(NBT_ID, id); + disk.getTag().putUUID(NBT_ID, id); } @Override public boolean isValid(ItemStack disk) { - return disk.hasTag() && disk.getTag().hasUniqueId(NBT_ID); + return disk.hasTag() && disk.getTag().hasUUID(NBT_ID); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/item/StorageHousingItem.java b/src/main/java/com/refinedmods/refinedstorage/item/StorageHousingItem.java index 488ba9752..43385fa4a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/StorageHousingItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/StorageHousingItem.java @@ -5,6 +5,6 @@ import net.minecraft.item.Item; public class StorageHousingItem extends Item { public StorageHousingItem() { - super(new Item.Properties().group(RS.MAIN_GROUP)); + super(new Item.Properties().tab(RS.MAIN_GROUP)); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/StoragePartItem.java b/src/main/java/com/refinedmods/refinedstorage/item/StoragePartItem.java index 82a08987c..ab05b4dd6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/StoragePartItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/StoragePartItem.java @@ -7,7 +7,7 @@ import net.minecraft.item.Item; public class StoragePartItem extends Item { public StoragePartItem() { - super(new Item.Properties().group(RS.MAIN_GROUP)); + super(new Item.Properties().tab(RS.MAIN_GROUP)); } public static StoragePartItem getByType(ItemStorageType type) { diff --git a/src/main/java/com/refinedmods/refinedstorage/item/UpgradeItem.java b/src/main/java/com/refinedmods/refinedstorage/item/UpgradeItem.java index b3e51e72f..38f23efea 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/UpgradeItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/UpgradeItem.java @@ -79,27 +79,27 @@ public class UpgradeItem extends Item { private final Type type; public UpgradeItem(Type type) { - super(new Item.Properties().group(RS.MAIN_GROUP)); + super(new Item.Properties().tab(RS.MAIN_GROUP)); this.type = type; } @Override - public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.appendHoverText(stack, world, tooltip, flag); if (type.getFortuneLevel() > 0) { tooltip.add( new TranslationTextComponent("enchantment.minecraft.fortune") - .appendString(" ") - .appendSibling(new TranslationTextComponent("enchantment.level." + type.getFortuneLevel())) + .append(" ") + .append(new TranslationTextComponent("enchantment.level." + type.getFortuneLevel())) .setStyle(Styles.GRAY) ); } } @Override - public boolean hasEffect(ItemStack stack) { + public boolean isFoil(ItemStack stack) { return type == Type.SILK_TOUCH || type == Type.FORTUNE_1 || type == Type.FORTUNE_2 || diff --git a/src/main/java/com/refinedmods/refinedstorage/item/WirelessCraftingMonitorItem.java b/src/main/java/com/refinedmods/refinedstorage/item/WirelessCraftingMonitorItem.java index 273a4ff35..fd4adbcfd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/WirelessCraftingMonitorItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/WirelessCraftingMonitorItem.java @@ -26,7 +26,7 @@ public class WirelessCraftingMonitorItem extends NetworkItem { private final Type type; public WirelessCraftingMonitorItem(Type type) { - super(new Item.Properties().group(RS.MAIN_GROUP).maxStackSize(1), type == Type.CREATIVE, () -> RS.SERVER_CONFIG.getWirelessCraftingMonitor().getCapacity()); + super(new Item.Properties().tab(RS.MAIN_GROUP).stacksTo(1), type == Type.CREATIVE, () -> RS.SERVER_CONFIG.getWirelessCraftingMonitor().getCapacity()); this.type = type; } @@ -42,8 +42,8 @@ public class WirelessCraftingMonitorItem extends NetworkItem { } public static Optional getTabSelected(ItemStack stack) { - if (stack.hasTag() && stack.getTag().hasUniqueId(NBT_TAB_SELECTED)) { - return Optional.of(stack.getTag().getUniqueId(NBT_TAB_SELECTED)); + if (stack.hasTag() && stack.getTag().hasUUID(NBT_TAB_SELECTED)) { + return Optional.of(stack.getTag().getUUID(NBT_TAB_SELECTED)); } return Optional.empty(); @@ -55,7 +55,7 @@ public class WirelessCraftingMonitorItem extends NetworkItem { } if (tabSelected.isPresent()) { - stack.getTag().putUniqueId(NBT_TAB_SELECTED, tabSelected.get()); + stack.getTag().putUUID(NBT_TAB_SELECTED, tabSelected.get()); } else { stack.getTag().remove(NBT_TAB_SELECTED + "Least"); stack.getTag().remove(NBT_TAB_SELECTED + "Most"); diff --git a/src/main/java/com/refinedmods/refinedstorage/item/WirelessFluidGridItem.java b/src/main/java/com/refinedmods/refinedstorage/item/WirelessFluidGridItem.java index 9770fd0f8..ddbe5f05b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/WirelessFluidGridItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/WirelessFluidGridItem.java @@ -22,7 +22,7 @@ public class WirelessFluidGridItem extends NetworkItem { private final Type type; public WirelessFluidGridItem(Type type) { - super(new Item.Properties().group(RS.MAIN_GROUP).maxStackSize(1), type == Type.CREATIVE, () -> RS.SERVER_CONFIG.getWirelessFluidGrid().getCapacity()); + super(new Item.Properties().tab(RS.MAIN_GROUP).stacksTo(1), type == Type.CREATIVE, () -> RS.SERVER_CONFIG.getWirelessFluidGrid().getCapacity()); this.type = type; } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/WirelessGridItem.java b/src/main/java/com/refinedmods/refinedstorage/item/WirelessGridItem.java index cd532c767..3bc9f06fe 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/WirelessGridItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/WirelessGridItem.java @@ -22,7 +22,7 @@ public class WirelessGridItem extends NetworkItem { private final Type type; public WirelessGridItem(Type type) { - super(new Item.Properties().group(RS.MAIN_GROUP).maxStackSize(1), type == Type.CREATIVE, () -> RS.SERVER_CONFIG.getWirelessGrid().getCapacity()); + super(new Item.Properties().tab(RS.MAIN_GROUP).stacksTo(1), type == Type.CREATIVE, () -> RS.SERVER_CONFIG.getWirelessGrid().getCapacity()); this.type = type; } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/WrenchItem.java b/src/main/java/com/refinedmods/refinedstorage/item/WrenchItem.java index feb331842..b7ad26070 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/WrenchItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/WrenchItem.java @@ -19,37 +19,37 @@ import net.minecraftforge.items.ItemHandlerHelper; public class WrenchItem extends Item { public WrenchItem() { - super(new Item.Properties().group(RS.MAIN_GROUP).maxStackSize(1)); + super(new Item.Properties().tab(RS.MAIN_GROUP).stacksTo(1)); } @Override public ActionResultType onItemUseFirst(ItemStack stack, ItemUseContext ctx) { - if (ctx.getWorld().isRemote) { + if (ctx.getLevel().isClientSide) { return ActionResultType.CONSUME; } - INetworkNode node = NetworkUtils.getNodeFromTile(ctx.getWorld().getTileEntity(ctx.getPos())); + INetworkNode node = NetworkUtils.getNodeFromTile(ctx.getLevel().getBlockEntity(ctx.getClickedPos())); INetwork network = NetworkUtils.getNetworkFromNode(node); if (network != null && !network.getSecurityManager().hasPermission(Permission.BUILD, ctx.getPlayer())) { WorldUtils.sendNoPermissionMessage(ctx.getPlayer()); return ActionResultType.FAIL; } - BlockState state = ctx.getWorld().getBlockState(ctx.getPos()); + BlockState state = ctx.getLevel().getBlockState(ctx.getClickedPos()); - if (node instanceof ICoverable && ((ICoverable) node).getCoverManager().hasCover(ctx.getFace())){ - Cover cover = ((ICoverable) node).getCoverManager().removeCover(ctx.getFace()); + if (node instanceof ICoverable && ((ICoverable) node).getCoverManager().hasCover(ctx.getClickedFace())){ + Cover cover = ((ICoverable) node).getCoverManager().removeCover(ctx.getClickedFace()); if (cover != null){ ItemStack stack1 = cover.getType().createStack(); CoverItem.setItem(stack1, cover.getStack()); ItemHandlerHelper.giveItemToPlayer(ctx.getPlayer(), stack1); - ctx.getWorld().notifyBlockUpdate(ctx.getPos(), state, state, 3); - ctx.getWorld().notifyNeighborsOfStateChange(ctx.getPos(), ctx.getWorld().getBlockState(ctx.getPos()).getBlock()); + ctx.getLevel().sendBlockUpdated(ctx.getClickedPos(), state, state, 3); + ctx.getLevel().updateNeighborsAt(ctx.getClickedPos(), ctx.getLevel().getBlockState(ctx.getClickedPos()).getBlock()); return ActionResultType.SUCCESS; } } - ctx.getWorld().setBlockState(ctx.getPos(), state.rotate(ctx.getWorld(), ctx.getPos(), Rotation.CLOCKWISE_90)); + ctx.getLevel().setBlockAndUpdate(ctx.getClickedPos(), state.rotate(ctx.getLevel(), ctx.getClickedPos(), Rotation.CLOCKWISE_90)); return ActionResultType.CONSUME; } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/BaseBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/BaseBlockItem.java index 47f0291e2..a6a92afbf 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/BaseBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/BaseBlockItem.java @@ -6,6 +6,8 @@ import net.minecraft.block.BlockState; import net.minecraft.item.BlockItem; import net.minecraft.item.BlockItemUseContext; +import net.minecraft.item.Item.Properties; + public class BaseBlockItem extends BlockItem { private final BaseBlock block; @@ -20,9 +22,9 @@ public class BaseBlockItem extends BlockItem { boolean result = super.placeBlock(context, state); if (result && block.getDirection() != BlockDirection.NONE) { - context.getWorld().setBlockState(context.getPos(), state.with(block.getDirection().getProperty(), block.getDirection().getFrom( - context.getFace(), - context.getPos(), + context.getLevel().setBlockAndUpdate(context.getClickedPos(), state.setValue(block.getDirection().getProperty(), block.getDirection().getFrom( + context.getClickedFace(), + context.getClickedPos(), context.getPlayer() ))); } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/ColoredBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/ColoredBlockItem.java index af485b931..7a2a5a611 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/ColoredBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/ColoredBlockItem.java @@ -7,6 +7,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.item.Item.Properties; + public class ColoredBlockItem extends BaseBlockItem { private final ITextComponent displayName; @@ -14,9 +16,9 @@ public class ColoredBlockItem extends BaseBlockItem { super(block, builder); if (color != ColorMap.DEFAULT_COLOR) { - this.displayName = new TranslationTextComponent("color.minecraft." + color.getTranslationKey()) - .appendString(" ") - .appendSibling(displayName); + this.displayName = new TranslationTextComponent("color.minecraft." + color.getName()) + .append(" ") + .append(displayName); } else { this.displayName = displayName; } @@ -24,7 +26,7 @@ public class ColoredBlockItem extends BaseBlockItem { } @Override - public ITextComponent getDisplayName(ItemStack stack) { + public ITextComponent getName(ItemStack stack) { return displayName; } } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/ControllerBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/ControllerBlockItem.java index fa23402c0..c7d3a424f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/ControllerBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/ControllerBlockItem.java @@ -14,12 +14,12 @@ public class ControllerBlockItem extends EnergyBlockItem { private final ITextComponent displayName; public ControllerBlockItem(ControllerBlock block, DyeColor color, ITextComponent displayName) { - super(block, new Item.Properties().group(RS.MAIN_GROUP).maxStackSize(1), block.getType() == NetworkType.CREATIVE, () -> RS.SERVER_CONFIG.getController().getCapacity()); + super(block, new Item.Properties().tab(RS.MAIN_GROUP).stacksTo(1), block.getType() == NetworkType.CREATIVE, () -> RS.SERVER_CONFIG.getController().getCapacity()); if (color != ColorMap.DEFAULT_COLOR) { - this.displayName = new TranslationTextComponent("color.minecraft." + color.getTranslationKey()) - .appendString(" ") - .appendSibling(displayName); + this.displayName = new TranslationTextComponent("color.minecraft." + color.getName()) + .append(" ") + .append(displayName); } else { this.displayName = displayName; } @@ -27,7 +27,7 @@ public class ControllerBlockItem extends EnergyBlockItem { } @Override - public ITextComponent getDisplayName(ItemStack stack) { + public ITextComponent getName(ItemStack stack) { return displayName; } } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/EnergyBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/EnergyBlockItem.java index 3dcb60fef..043c5c5f7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/EnergyBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/EnergyBlockItem.java @@ -57,12 +57,12 @@ public abstract class EnergyBlockItem extends BaseBlockItem { return super.getRGBDurabilityForDisplay(stack); } - return MathHelper.hsvToRGB(Math.max(0.0F, (float) energy.getEnergyStored() / (float) energy.getMaxEnergyStored()) / 3.0F, 1.0F, 1.0F); + return MathHelper.hsvToRgb(Math.max(0.0F, (float) energy.getEnergyStored() / (float) energy.getMaxEnergyStored()) / 3.0F, 1.0F, 1.0F); } @Override - public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.appendHoverText(stack, world, tooltip, flag); if (!creative) { stack.getCapability(CapabilityEnergy.ENERGY, null).ifPresent(energy -> tooltip.add(new TranslationTextComponent("misc.refinedstorage.energy_stored", energy.getEnergyStored(), energy.getMaxEnergyStored()).setStyle(Styles.GRAY))); diff --git a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/FluidStorageBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/FluidStorageBlockItem.java index 570bacba0..8da347ec2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/FluidStorageBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/FluidStorageBlockItem.java @@ -35,14 +35,14 @@ public class FluidStorageBlockItem extends BaseBlockItem { private final FluidStorageType type; public FluidStorageBlockItem(FluidStorageBlock block) { - super(block, new Item.Properties().group(RS.MAIN_GROUP)); + super(block, new Item.Properties().tab(RS.MAIN_GROUP)); this.type = block.getType(); } @Override - public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.appendHoverText(stack, world, tooltip, flag); if (isValid(stack)) { UUID id = getId(stack); @@ -65,10 +65,10 @@ public class FluidStorageBlockItem extends BaseBlockItem { } @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack storageStack = player.getHeldItem(hand); + public ActionResult use(World world, PlayerEntity player, Hand hand) { + ItemStack storageStack = player.getItemInHand(hand); - if (!world.isRemote && player.isCrouching() && type != FluidStorageType.CREATIVE) { + if (!world.isClientSide && player.isCrouching() && type != FluidStorageType.CREATIVE) { UUID diskId = null; IStorageDisk disk = null; @@ -81,20 +81,20 @@ public class FluidStorageBlockItem extends BaseBlockItem { if (disk == null || disk.getStored() == 0) { ItemStack fluidStoragePart = new ItemStack(FluidStoragePartItem.getByType(type)); - if (!player.inventory.addItemStackToInventory(fluidStoragePart.copy())) { - InventoryHelper.spawnItemStack(world, player.getPosX(), player.getPosY(), player.getPosZ(), fluidStoragePart); + if (!player.inventory.add(fluidStoragePart.copy())) { + InventoryHelper.dropItemStack(world, player.getX(), player.getY(), player.getZ(), fluidStoragePart); } ItemStack processor = new ItemStack(RSItems.PROCESSORS.get(ProcessorItem.Type.BASIC).get()); - if (!player.inventory.addItemStackToInventory(processor.copy())) { - InventoryHelper.spawnItemStack(world, player.getPosX(), player.getPosY(), player.getPosZ(), processor); + if (!player.inventory.add(processor.copy())) { + InventoryHelper.dropItemStack(world, player.getX(), player.getY(), player.getZ(), processor); } ItemStack bucket = new ItemStack(Items.BUCKET); - if (!player.inventory.addItemStackToInventory(bucket.copy())) { - InventoryHelper.spawnItemStack(world, player.getPosX(), player.getPosY(), player.getPosZ(), bucket); + if (!player.inventory.add(bucket.copy())) { + InventoryHelper.dropItemStack(world, player.getX(), player.getY(), player.getZ(), bucket); } if (disk != null) { @@ -115,10 +115,10 @@ public class FluidStorageBlockItem extends BaseBlockItem { } private UUID getId(ItemStack disk) { - return disk.getTag().getUniqueId(FluidStorageNetworkNode.NBT_ID); + return disk.getTag().getUUID(FluidStorageNetworkNode.NBT_ID); } private boolean isValid(ItemStack disk) { - return disk.hasTag() && disk.getTag().hasUniqueId(FluidStorageNetworkNode.NBT_ID); + return disk.hasTag() && disk.getTag().hasUUID(FluidStorageNetworkNode.NBT_ID); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/PortableGridBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/PortableGridBlockItem.java index 1b0e178aa..ac158c0ed 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/PortableGridBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/PortableGridBlockItem.java @@ -34,7 +34,7 @@ public class PortableGridBlockItem extends EnergyBlockItem { public PortableGridBlockItem(Type type) { super( type == Type.CREATIVE ? RSBlocks.CREATIVE_PORTABLE_GRID.get() : RSBlocks.PORTABLE_GRID.get(), - new Item.Properties().group(RS.MAIN_GROUP).maxStackSize(1), + new Item.Properties().tab(RS.MAIN_GROUP).stacksTo(1), type == Type.CREATIVE, () -> RS.SERVER_CONFIG.getPortableGrid().getCapacity() ); @@ -47,37 +47,37 @@ public class PortableGridBlockItem extends EnergyBlockItem { } @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack stack = player.getHeldItem(hand); + public ActionResult use(World world, PlayerEntity player, Hand hand) { + ItemStack stack = player.getItemInHand(hand); - if (!world.isRemote) { + if (!world.isClientSide) { API.instance().getGridManager().openGrid(PortableGridGridFactory.ID, (ServerPlayerEntity) player, stack, PlayerSlot.getSlotForHand(player, hand)); } - return ActionResult.resultSuccess(stack); + return ActionResult.success(stack); } @Override - public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.appendHoverText(stack, world, tooltip, flag); tooltip.add(new TranslationTextComponent("block.refinedstorage.portable_grid.tooltip").setStyle(Styles.GRAY)); } @Override - public ActionResultType onItemUse(ItemUseContext context) { + public ActionResultType useOn(ItemUseContext context) { if (context.getPlayer() == null) { return ActionResultType.FAIL; } //Place if (context.getPlayer().isCrouching()) { - return super.onItemUse(context); + return super.useOn(context); } - ItemStack stack = context.getPlayer().getHeldItem(context.getHand()); + ItemStack stack = context.getPlayer().getItemInHand(context.getHand()); - if (!context.getWorld().isRemote) { + if (!context.getLevel().isClientSide) { API.instance().getGridManager().openGrid(PortableGridGridFactory.ID, (ServerPlayerEntity) context.getPlayer(), stack, PlayerSlot.getSlotForHand(context.getPlayer(), context.getHand())); } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/StorageBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/StorageBlockItem.java index 0be01389f..9837e7a68 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/StorageBlockItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/StorageBlockItem.java @@ -32,14 +32,14 @@ public class StorageBlockItem extends BaseBlockItem { private final ItemStorageType type; public StorageBlockItem(StorageBlock block) { - super(block, new Item.Properties().group(RS.MAIN_GROUP)); + super(block, new Item.Properties().tab(RS.MAIN_GROUP)); this.type = block.getType(); } @Override - public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, world, tooltip, flag); + public void appendHoverText(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.appendHoverText(stack, world, tooltip, flag); if (isValid(stack)) { UUID id = getId(stack); @@ -62,11 +62,11 @@ public class StorageBlockItem extends BaseBlockItem { } @Override - public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { - ItemStack storageStack = player.getHeldItem(hand); + public ActionResult use(World world, PlayerEntity player, Hand hand) { + ItemStack storageStack = player.getItemInHand(hand); int count = storageStack.getCount(); - if (!world.isRemote && player.isCrouching() && type != ItemStorageType.CREATIVE) { + if (!world.isClientSide && player.isCrouching() && type != ItemStorageType.CREATIVE) { UUID diskId = null; IStorageDisk disk = null; @@ -80,8 +80,8 @@ public class StorageBlockItem extends BaseBlockItem { ItemStack storagePart = new ItemStack(StoragePartItem.getByType(type)); storagePart.setCount(count); - if (!player.inventory.addItemStackToInventory(storagePart.copy())) { - InventoryHelper.spawnItemStack(world, player.getPosX(), player.getPosY(), player.getPosZ(), storagePart); + if (!player.inventory.add(storagePart.copy())) { + InventoryHelper.dropItemStack(world, player.getX(), player.getY(), player.getZ(), storagePart); } if (disk != null) { @@ -104,10 +104,10 @@ public class StorageBlockItem extends BaseBlockItem { } private UUID getId(ItemStack disk) { - return disk.getTag().getUniqueId(StorageNetworkNode.NBT_ID); + return disk.getTag().getUUID(StorageNetworkNode.NBT_ID); } private boolean isValid(ItemStack disk) { - return disk.hasTag() && disk.getTag().hasUniqueId(StorageNetworkNode.NBT_ID); + return disk.hasTag() && disk.getTag().hasUUID(StorageNetworkNode.NBT_ID); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/item/group/MainItemGroup.java b/src/main/java/com/refinedmods/refinedstorage/item/group/MainItemGroup.java index c1a7333df..33d639a79 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/group/MainItemGroup.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/group/MainItemGroup.java @@ -12,7 +12,7 @@ public class MainItemGroup extends ItemGroup { } @Override - public ItemStack createIcon() { + public ItemStack makeIcon() { return new ItemStack(RSBlocks.CREATIVE_CONTROLLER.get(ColorMap.DEFAULT_COLOR).get()); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/loottable/ControllerLootFunction.java b/src/main/java/com/refinedmods/refinedstorage/loottable/ControllerLootFunction.java index d9dc3a1a7..2151a9d5b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/loottable/ControllerLootFunction.java +++ b/src/main/java/com/refinedmods/refinedstorage/loottable/ControllerLootFunction.java @@ -20,8 +20,8 @@ public class ControllerLootFunction extends LootFunction { } @Override - protected ItemStack doApply(ItemStack itemStack, LootContext lootContext) { - TileEntity tile = lootContext.get(LootParameters.BLOCK_ENTITY); + protected ItemStack run(ItemStack itemStack, LootContext lootContext) { + TileEntity tile = lootContext.getParamOrNull(LootParameters.BLOCK_ENTITY); if (tile instanceof ControllerTile) { INetwork network = ((ControllerTile) tile).getRemovedNetwork() == null ? ((ControllerTile) tile).getNetwork() : ((ControllerTile) tile).getRemovedNetwork(); @@ -33,12 +33,12 @@ public class ControllerLootFunction extends LootFunction { } @Override - public LootFunctionType getFunctionType() { + public LootFunctionType getType() { return RSLootFunctions.getController(); } public static LootFunction.Builder builder() { - return builder(ControllerLootFunction::new); + return simpleBuilder(ControllerLootFunction::new); } public static class Serializer extends LootFunction.Serializer { diff --git a/src/main/java/com/refinedmods/refinedstorage/loottable/CrafterLootFunction.java b/src/main/java/com/refinedmods/refinedstorage/loottable/CrafterLootFunction.java index 3f8fa4e9d..8fc468016 100644 --- a/src/main/java/com/refinedmods/refinedstorage/loottable/CrafterLootFunction.java +++ b/src/main/java/com/refinedmods/refinedstorage/loottable/CrafterLootFunction.java @@ -19,8 +19,8 @@ public class CrafterLootFunction extends LootFunction { } @Override - public ItemStack doApply(ItemStack stack, LootContext lootContext) { - TileEntity tile = lootContext.get(LootParameters.BLOCK_ENTITY); + public ItemStack run(ItemStack stack, LootContext lootContext) { + TileEntity tile = lootContext.getParamOrNull(LootParameters.BLOCK_ENTITY); CrafterNetworkNode removedNode = ((CrafterTile) tile).getRemovedNode(); if (removedNode == null) { @@ -28,19 +28,19 @@ public class CrafterLootFunction extends LootFunction { } if (removedNode.getDisplayName() != null) { - stack.setDisplayName(removedNode.getDisplayName()); + stack.setHoverName(removedNode.getDisplayName()); } return stack; } @Override - public LootFunctionType getFunctionType() { + public LootFunctionType getType() { return RSLootFunctions.getCrafter(); } public static LootFunction.Builder builder() { - return builder(CrafterLootFunction::new); + return simpleBuilder(CrafterLootFunction::new); } public static class Serializer extends LootFunction.Serializer { diff --git a/src/main/java/com/refinedmods/refinedstorage/loottable/PortableGridBlockLootFunction.java b/src/main/java/com/refinedmods/refinedstorage/loottable/PortableGridBlockLootFunction.java index 7c4267ae9..58b1cab84 100644 --- a/src/main/java/com/refinedmods/refinedstorage/loottable/PortableGridBlockLootFunction.java +++ b/src/main/java/com/refinedmods/refinedstorage/loottable/PortableGridBlockLootFunction.java @@ -18,8 +18,8 @@ public class PortableGridBlockLootFunction extends LootFunction { } @Override - public ItemStack doApply(ItemStack stack, LootContext lootContext) { - TileEntity tile = lootContext.get(LootParameters.BLOCK_ENTITY); + public ItemStack run(ItemStack stack, LootContext lootContext) { + TileEntity tile = lootContext.getParamOrNull(LootParameters.BLOCK_ENTITY); if (tile instanceof PortableGridTile) { ((PortableGridTile) tile).applyDataFromTileToItem(stack); @@ -29,7 +29,7 @@ public class PortableGridBlockLootFunction extends LootFunction { } @Override - public LootFunctionType getFunctionType() { + public LootFunctionType getType() { return RSLootFunctions.getPortableGrid(); } diff --git a/src/main/java/com/refinedmods/refinedstorage/loottable/StorageBlockLootFunction.java b/src/main/java/com/refinedmods/refinedstorage/loottable/StorageBlockLootFunction.java index 4716ab3b3..f231ca62b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/loottable/StorageBlockLootFunction.java +++ b/src/main/java/com/refinedmods/refinedstorage/loottable/StorageBlockLootFunction.java @@ -22,8 +22,8 @@ public class StorageBlockLootFunction extends LootFunction { } @Override - public ItemStack doApply(ItemStack stack, LootContext lootContext) { - TileEntity tile = lootContext.get(LootParameters.BLOCK_ENTITY); + public ItemStack run(ItemStack stack, LootContext lootContext) { + TileEntity tile = lootContext.getParamOrNull(LootParameters.BLOCK_ENTITY); // This code needs to work without the node being removed as well. // For example: the Destructor calls getDrops before the node has been removed. @@ -35,7 +35,7 @@ public class StorageBlockLootFunction extends LootFunction { } stack.setTag(new CompoundNBT()); - stack.getTag().putUniqueId(StorageNetworkNode.NBT_ID, removedNode.getStorageId()); + stack.getTag().putUUID(StorageNetworkNode.NBT_ID, removedNode.getStorageId()); } else if (tile instanceof FluidStorageTile) { FluidStorageNetworkNode removedNode = ((FluidStorageTile) tile).getRemovedNode(); if (removedNode == null) { @@ -43,14 +43,14 @@ public class StorageBlockLootFunction extends LootFunction { } stack.setTag(new CompoundNBT()); - stack.getTag().putUniqueId(FluidStorageNetworkNode.NBT_ID, removedNode.getStorageId()); + stack.getTag().putUUID(FluidStorageNetworkNode.NBT_ID, removedNode.getStorageId()); } return stack; } @Override - public LootFunctionType getFunctionType() { + public LootFunctionType getType() { return RSLootFunctions.getStorageBlock(); } diff --git a/src/main/java/com/refinedmods/refinedstorage/network/ClientProxy.java b/src/main/java/com/refinedmods/refinedstorage/network/ClientProxy.java index 37dc9be9a..06ed522f3 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/ClientProxy.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/ClientProxy.java @@ -15,13 +15,13 @@ public class ClientProxy { } public static void onReceivedCraftingPreviewResponseMessage(GridCraftingPreviewResponseMessage message) { - Screen screen = Minecraft.getInstance().currentScreen; + Screen screen = Minecraft.getInstance().screen; if (screen instanceof CraftingSettingsScreen) { screen = ((CraftingSettingsScreen) screen).getParent(); } - Minecraft.getInstance().displayGuiScreen(new CraftingPreviewScreen( + Minecraft.getInstance().setScreen(new CraftingPreviewScreen( screen, message.getElements(), message.getId(), @@ -32,7 +32,7 @@ public class ClientProxy { } public static void onReceivedCraftingStartResponseMessage() { - Screen screen = Minecraft.getInstance().currentScreen; + Screen screen = Minecraft.getInstance().screen; if (screen instanceof CraftingSettingsScreen) { ((CraftingSettingsScreen) screen).close(); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/FilterUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/FilterUpdateMessage.java index efbd3ee10..34b250871 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/FilterUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/FilterUpdateMessage.java @@ -38,20 +38,20 @@ public class FilterUpdateMessage { buf.writeInt(message.compare); buf.writeInt(message.mode); buf.writeBoolean(message.modFilter); - buf.writeString(message.name); + buf.writeUtf(message.name); buf.writeInt(message.type); } public static void handle(FilterUpdateMessage message, Supplier ctx) { PlayerEntity player = ctx.get().getSender(); - if (player != null && player.openContainer instanceof FilterContainer) { + if (player != null && player.containerMenu instanceof FilterContainer) { ctx.get().enqueueWork(() -> { - FilterItem.setCompare(((FilterContainer) player.openContainer).getFilterItem(), message.compare); - FilterItem.setMode(((FilterContainer) player.openContainer).getFilterItem(), message.mode); - FilterItem.setModFilter(((FilterContainer) player.openContainer).getFilterItem(), message.modFilter); - FilterItem.setName(((FilterContainer) player.openContainer).getFilterItem(), message.name); - FilterItem.setType(((FilterContainer) player.openContainer).getFilterItem(), message.type); + FilterItem.setCompare(((FilterContainer) player.containerMenu).getFilterItem(), message.compare); + FilterItem.setMode(((FilterContainer) player.containerMenu).getFilterItem(), message.mode); + FilterItem.setModFilter(((FilterContainer) player.containerMenu).getFilterItem(), message.modFilter); + FilterItem.setName(((FilterContainer) player.containerMenu).getFilterItem(), message.name); + FilterItem.setType(((FilterContainer) player.containerMenu).getFilterItem(), message.type); }); } diff --git a/src/main/java/com/refinedmods/refinedstorage/network/FluidFilterSlotUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/FluidFilterSlotUpdateMessage.java index 788ff53af..187547d12 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/FluidFilterSlotUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/FluidFilterSlotUpdateMessage.java @@ -29,8 +29,8 @@ public class FluidFilterSlotUpdateMessage { public static void handle(FluidFilterSlotUpdateMessage message, Supplier ctx) { BaseScreen.executeLater(gui -> { - if (message.containerSlot >= 0 && message.containerSlot < gui.getContainer().inventorySlots.size()) { - Slot slot = gui.getContainer().getSlot(message.containerSlot); + if (message.containerSlot >= 0 && message.containerSlot < gui.getMenu().slots.size()) { + Slot slot = gui.getMenu().getSlot(message.containerSlot); if (slot instanceof FluidFilterSlot) { ((FluidFilterSlot) slot).getFluidInventory().setFluid(slot.getSlotIndex(), message.stack); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/OpenNetworkItemMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/OpenNetworkItemMessage.java index b67dae092..63d31d9a5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/OpenNetworkItemMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/OpenNetworkItemMessage.java @@ -39,7 +39,7 @@ public class OpenNetworkItemMessage { } if (stack.getItem() instanceof NetworkItem) { - ((NetworkItem) stack.getItem()).applyNetwork(player.getServer(), stack, n -> n.getNetworkItemManager().open(player, stack, message.slot), err -> player.sendMessage(err, player.getUniqueID())); + ((NetworkItem) stack.getItem()).applyNetwork(player.getServer(), stack, n -> n.getNetworkItemManager().open(player, stack, message.slot), err -> player.sendMessage(err, player.getUUID())); } else if (stack.getItem() instanceof PortableGridBlockItem) { API.instance().getGridManager().openGrid(PortableGridGridFactory.ID, player, stack, message.slot); } diff --git a/src/main/java/com/refinedmods/refinedstorage/network/SecurityManagerUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/SecurityManagerUpdateMessage.java index 1ea701ab6..774a9e898 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/SecurityManagerUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/SecurityManagerUpdateMessage.java @@ -50,7 +50,7 @@ public class SecurityManagerUpdateMessage { if (player != null) { ctx.get().enqueueWork(() -> { - TileEntity tile = player.getEntityWorld().getTileEntity(message.pos); + TileEntity tile = player.getCommandSenderWorld().getBlockEntity(message.pos); if (tile instanceof SecurityManagerTile) { ((SecurityManagerTile) tile).getNode().updatePermission(message.permission, message.state); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/SetFilterSlotMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/SetFilterSlotMessage.java index 84b3de30e..b54099614 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/SetFilterSlotMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/SetFilterSlotMessage.java @@ -27,12 +27,12 @@ public class SetFilterSlotMessage { } public static SetFilterSlotMessage decode(PacketBuffer buf) { - return new SetFilterSlotMessage(buf.readInt(), buf.readItemStack()); + return new SetFilterSlotMessage(buf.readInt(), buf.readItem()); } public static void encode(SetFilterSlotMessage message, PacketBuffer buf) { buf.writeInt(message.containerSlot); - buf.writeItemStack(message.stack); + buf.writeItem(message.stack); } public static void handle(SetFilterSlotMessage message, Supplier ctx) { @@ -41,9 +41,9 @@ public class SetFilterSlotMessage { if (player != null) { ctx.get().enqueueWork(() -> { - Container container = player.openContainer; + Container container = player.containerMenu; - if (container != null && message.containerSlot >= 0 && message.containerSlot < container.inventorySlots.size()) { + if (container != null && message.containerSlot >= 0 && message.containerSlot < container.slots.size()) { handle(message, container); } }); @@ -74,7 +74,7 @@ public class SetFilterSlotMessage { } } - slot.putStack(message.stack); + slot.set(message.stack); postAction.run(); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/network/SetFluidFilterSlotMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/SetFluidFilterSlotMessage.java index fe04aba57..36886fb84 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/SetFluidFilterSlotMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/SetFluidFilterSlotMessage.java @@ -40,9 +40,9 @@ public class SetFluidFilterSlotMessage { if (player != null) { ctx.get().enqueueWork(() -> { - Container container = player.openContainer; + Container container = player.containerMenu; - if (container != null && message.containerSlot >= 0 && message.containerSlot < container.inventorySlots.size()) { + if (container != null && message.containerSlot >= 0 && message.containerSlot < container.slots.size()) { handle(message, container); } }); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorCancelMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorCancelMessage.java index 47ca5386e..1c4aef84c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorCancelMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorCancelMessage.java @@ -18,14 +18,14 @@ public class CraftingMonitorCancelMessage { } public static CraftingMonitorCancelMessage decode(PacketBuffer buf) { - return new CraftingMonitorCancelMessage(buf.readBoolean() ? buf.readUniqueId() : null); + return new CraftingMonitorCancelMessage(buf.readBoolean() ? buf.readUUID() : null); } public static void encode(CraftingMonitorCancelMessage message, PacketBuffer buf) { buf.writeBoolean(message.taskId != null); if (message.taskId != null) { - buf.writeUniqueId(message.taskId); + buf.writeUUID(message.taskId); } } @@ -34,8 +34,8 @@ public class CraftingMonitorCancelMessage { if (player != null) { ctx.get().enqueueWork(() -> { - if (player.openContainer instanceof CraftingMonitorContainer) { - ((CraftingMonitorContainer) player.openContainer).getCraftingMonitor().onCancelled(player, message.taskId); + if (player.containerMenu instanceof CraftingMonitorContainer) { + ((CraftingMonitorContainer) player.containerMenu).getCraftingMonitor().onCancelled(player, message.taskId); } }); } diff --git a/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorUpdateMessage.java index 060229a8f..1adc1b6c4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorUpdateMessage.java @@ -45,11 +45,11 @@ public class CraftingMonitorUpdateMessage { List tasks = new ArrayList<>(); for (int i = 0; i < size; ++i) { - UUID id = buf.readUniqueId(); + UUID id = buf.readUUID(); ICraftingRequestInfo requested = null; try { - requested = API.instance().createCraftingRequestInfo(buf.readCompoundTag()); + requested = API.instance().createCraftingRequestInfo(buf.readNbt()); } catch (CraftingTaskReadException e) { LOGGER.error("Could not create crafting request info", e); } @@ -80,8 +80,8 @@ public class CraftingMonitorUpdateMessage { buf.writeInt(message.craftingMonitor.getTasks().size()); for (ICraftingTask task : message.craftingMonitor.getTasks()) { - buf.writeUniqueId(task.getId()); - buf.writeCompoundTag(task.getRequested().writeToNbt()); + buf.writeUUID(task.getId()); + buf.writeNbt(task.getRequested().writeToNbt()); buf.writeInt(task.getQuantity()); buf.writeLong(task.getStartTime()); buf.writeInt(task.getCompletionPercentage()); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/WirelessCraftingMonitorSettingsUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/WirelessCraftingMonitorSettingsUpdateMessage.java index 64ebeec63..1dfb69446 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/WirelessCraftingMonitorSettingsUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/WirelessCraftingMonitorSettingsUpdateMessage.java @@ -23,7 +23,7 @@ public class WirelessCraftingMonitorSettingsUpdateMessage { Optional tabSelected = Optional.empty(); if (buf.readBoolean()) { - tabSelected = Optional.of(buf.readUniqueId()); + tabSelected = Optional.of(buf.readUUID()); } int tabPage = buf.readInt(); @@ -34,7 +34,7 @@ public class WirelessCraftingMonitorSettingsUpdateMessage { public static void encode(WirelessCraftingMonitorSettingsUpdateMessage message, PacketBuffer buf) { buf.writeBoolean(message.tabSelected.isPresent()); - message.tabSelected.ifPresent(buf::writeUniqueId); + message.tabSelected.ifPresent(buf::writeUUID); buf.writeInt(message.tabPage); } @@ -44,8 +44,8 @@ public class WirelessCraftingMonitorSettingsUpdateMessage { if (player != null) { ctx.get().enqueueWork(() -> { - if (player.openContainer instanceof CraftingMonitorContainer) { - ((WirelessCraftingMonitor) ((CraftingMonitorContainer) player.openContainer).getCraftingMonitor()).setSettings(message.tabSelected, message.tabPage); + if (player.containerMenu instanceof CraftingMonitorContainer) { + ((WirelessCraftingMonitor) ((CraftingMonitorContainer) player.containerMenu).getCraftingMonitor()).setSettings(message.tabSelected, message.tabPage); } }); } diff --git a/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeRequestMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeRequestMessage.java index 83bef0928..6cfdaf6cc 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeRequestMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeRequestMessage.java @@ -17,16 +17,16 @@ public class StorageDiskSizeRequestMessage { } public static StorageDiskSizeRequestMessage decode(PacketBuffer buf) { - return new StorageDiskSizeRequestMessage(buf.readUniqueId()); + return new StorageDiskSizeRequestMessage(buf.readUUID()); } public static void encode(StorageDiskSizeRequestMessage message, PacketBuffer buf) { - buf.writeUniqueId(message.id); + buf.writeUUID(message.id); } public static void handle(StorageDiskSizeRequestMessage message, Supplier ctx) { ctx.get().enqueueWork(() -> { - IStorageDisk disk = API.instance().getStorageDiskManager(ctx.get().getSender().getServerWorld()).get(message.id); + IStorageDisk disk = API.instance().getStorageDiskManager(ctx.get().getSender().getLevel()).get(message.id); if (disk != null) { RS.NETWORK_HANDLER.sendTo(ctx.get().getSender(), new StorageDiskSizeResponseMessage(message.id, disk.getStored(), disk.getCapacity())); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeResponseMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeResponseMessage.java index d93d78644..dae9faf17 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeResponseMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/disk/StorageDiskSizeResponseMessage.java @@ -21,13 +21,13 @@ public class StorageDiskSizeResponseMessage { } public static void encode(StorageDiskSizeResponseMessage message, PacketBuffer buf) { - buf.writeUniqueId(message.id); + buf.writeUUID(message.id); buf.writeInt(message.stored); buf.writeInt(message.capacity); } public static StorageDiskSizeResponseMessage decode(PacketBuffer buf) { - return new StorageDiskSizeResponseMessage(buf.readUniqueId(), buf.readInt(), buf.readInt()); + return new StorageDiskSizeResponseMessage(buf.readUUID(), buf.readInt(), buf.readInt()); } public static void handle(StorageDiskSizeResponseMessage message, Supplier ctx) { diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridClearMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridClearMessage.java index 077660a42..2abc79e44 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridClearMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridClearMessage.java @@ -13,7 +13,7 @@ public class GridClearMessage { if (player != null) { ctx.get().enqueueWork(() -> { - Container container = player.openContainer; + Container container = player.containerMenu; if (container instanceof GridContainer) { ((GridContainer) container).getGrid().onClear(player); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewRequestMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewRequestMessage.java index 45519db2e..6080f337b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewRequestMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewRequestMessage.java @@ -25,7 +25,7 @@ public class GridCraftingPreviewRequestMessage { public static GridCraftingPreviewRequestMessage decode(PacketBuffer buf) { return new GridCraftingPreviewRequestMessage( - buf.readUniqueId(), + buf.readUUID(), buf.readInt(), buf.readBoolean(), buf.readBoolean() @@ -33,7 +33,7 @@ public class GridCraftingPreviewRequestMessage { } public static void encode(GridCraftingPreviewRequestMessage message, PacketBuffer buf) { - buf.writeUniqueId(message.id); + buf.writeUUID(message.id); buf.writeInt(message.quantity); buf.writeBoolean(message.noPreview); buf.writeBoolean(message.fluids); @@ -44,7 +44,7 @@ public class GridCraftingPreviewRequestMessage { if (player != null) { ctx.get().enqueueWork(() -> { - Container container = player.openContainer; + Container container = player.containerMenu; if (container instanceof GridContainer) { IGrid grid = ((GridContainer) container).getGrid(); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewResponseMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewResponseMessage.java index e41fdc222..99bf166c6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewResponseMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewResponseMessage.java @@ -42,7 +42,7 @@ public class GridCraftingPreviewResponseMessage { } public static GridCraftingPreviewResponseMessage decode(PacketBuffer buf) { - UUID id = buf.readUniqueId(); + UUID id = buf.readUUID(); int quantity = buf.readInt(); boolean fluids = buf.readBoolean(); @@ -59,7 +59,7 @@ public class GridCraftingPreviewResponseMessage { } public static void encode(GridCraftingPreviewResponseMessage message, PacketBuffer buf) { - buf.writeUniqueId(message.id); + buf.writeUUID(message.id); buf.writeInt(message.quantity); buf.writeBoolean(message.fluids); buf.writeInt(message.elements.size()); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartRequestMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartRequestMessage.java index 840360e23..0c1a80869 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartRequestMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartRequestMessage.java @@ -23,14 +23,14 @@ public class GridCraftingStartRequestMessage { public static GridCraftingStartRequestMessage decode(PacketBuffer buf) { return new GridCraftingStartRequestMessage( - buf.readUniqueId(), + buf.readUUID(), buf.readInt(), buf.readBoolean() ); } public static void encode(GridCraftingStartRequestMessage message, PacketBuffer buf) { - buf.writeUniqueId(message.id); + buf.writeUUID(message.id); buf.writeInt(message.quantity); buf.writeBoolean(message.fluids); } @@ -40,7 +40,7 @@ public class GridCraftingStartRequestMessage { if (player != null) { ctx.get().enqueueWork(() -> { - Container container = player.openContainer; + Container container = player.containerMenu; if (container instanceof GridContainer) { IGrid grid = ((GridContainer) container).getGrid(); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidInsertHeldMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidInsertHeldMessage.java index f15bd13be..22e936bf2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidInsertHeldMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidInsertHeldMessage.java @@ -14,7 +14,7 @@ public class GridFluidInsertHeldMessage { if (player != null) { ctx.get().enqueueWork(() -> { - Container container = player.openContainer; + Container container = player.containerMenu; if (container instanceof GridContainer) { IGrid grid = ((GridContainer) container).getGrid(); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidPullMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidPullMessage.java index 1f8979ab4..373afd2f5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidPullMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidPullMessage.java @@ -20,11 +20,11 @@ public class GridFluidPullMessage { } public static GridFluidPullMessage decode(PacketBuffer buf) { - return new GridFluidPullMessage(buf.readUniqueId(), buf.readBoolean()); + return new GridFluidPullMessage(buf.readUUID(), buf.readBoolean()); } public static void encode(GridFluidPullMessage message, PacketBuffer buf) { - buf.writeUniqueId(message.id); + buf.writeUUID(message.id); buf.writeBoolean(message.shift); } @@ -33,7 +33,7 @@ public class GridFluidPullMessage { if (player != null) { ctx.get().enqueueWork(() -> { - Container container = player.openContainer; + Container container = player.containerMenu; if (container instanceof GridContainer) { IGrid grid = ((GridContainer) container).getGrid(); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemGridScrollMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemGridScrollMessage.java index b6257e3a2..8cd47cfe6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemGridScrollMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemGridScrollMessage.java @@ -21,14 +21,14 @@ public class GridItemGridScrollMessage { } public static GridItemGridScrollMessage decode(PacketBuffer buf) { - return new GridItemGridScrollMessage(buf.readBoolean() ? buf.readUniqueId() : null, buf.readBoolean(), buf.readBoolean()); + return new GridItemGridScrollMessage(buf.readBoolean() ? buf.readUUID() : null, buf.readBoolean(), buf.readBoolean()); } public static void encode(GridItemGridScrollMessage message, PacketBuffer buf) { boolean hasId = message.id != null; buf.writeBoolean(hasId); if (hasId) { - buf.writeUniqueId(message.id); + buf.writeUUID(message.id); } buf.writeBoolean(message.shift); @@ -38,8 +38,8 @@ public class GridItemGridScrollMessage { public static void handle(GridItemGridScrollMessage message, Supplier ctx) { ctx.get().enqueueWork(() -> { ServerPlayerEntity player = ctx.get().getSender(); - if (player != null && player.openContainer instanceof GridContainer && ((GridContainer) player.openContainer).getGrid().getItemHandler() != null) { - ((GridContainer) player.openContainer).getGrid().getItemHandler().onGridScroll(player, message.id, message.shift, message.up); + if (player != null && player.containerMenu instanceof GridContainer && ((GridContainer) player.containerMenu).getGrid().getItemHandler() != null) { + ((GridContainer) player.containerMenu).getGrid().getItemHandler().onGridScroll(player, message.id, message.shift, message.up); } }); ctx.get().setPacketHandled(true); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInsertHeldMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInsertHeldMessage.java index 9ceddd4df..4469cda89 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInsertHeldMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInsertHeldMessage.java @@ -29,7 +29,7 @@ public class GridItemInsertHeldMessage { if (player != null) { ctx.get().enqueueWork(() -> { - Container container = player.openContainer; + Container container = player.containerMenu; if (container instanceof GridContainer) { IGrid grid = ((GridContainer) container).getGrid(); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInventoryScrollMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInventoryScrollMessage.java index 71daaf9ca..9e07c1946 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInventoryScrollMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInventoryScrollMessage.java @@ -31,8 +31,8 @@ public class GridItemInventoryScrollMessage { public static void handle(GridItemInventoryScrollMessage message, Supplier ctx) { ctx.get().enqueueWork(() -> { ServerPlayerEntity player = ctx.get().getSender(); - if (player != null && player.openContainer instanceof GridContainer && ((GridContainer) player.openContainer).getGrid().getItemHandler() != null) { - ((GridContainer) player.openContainer).getGrid().getItemHandler().onInventoryScroll(player, message.slot, message.shift, message.up); + if (player != null && player.containerMenu instanceof GridContainer && ((GridContainer) player.containerMenu).getGrid().getItemHandler() != null) { + ((GridContainer) player.containerMenu).getGrid().getItemHandler().onInventoryScroll(player, message.slot, message.shift, message.up); } }); ctx.get().setPacketHandled(true); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemPullMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemPullMessage.java index e4a028157..300926300 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemPullMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemPullMessage.java @@ -20,11 +20,11 @@ public class GridItemPullMessage { } public static GridItemPullMessage decode(PacketBuffer buf) { - return new GridItemPullMessage(buf.readUniqueId(), buf.readInt()); + return new GridItemPullMessage(buf.readUUID(), buf.readInt()); } public static void encode(GridItemPullMessage message, PacketBuffer buf) { - buf.writeUniqueId(message.id); + buf.writeUUID(message.id); buf.writeInt(message.flags); } @@ -33,7 +33,7 @@ public class GridItemPullMessage { if (player != null) { ctx.get().enqueueWork(() -> { - Container container = player.openContainer; + Container container = player.containerMenu; if (container instanceof GridContainer) { IGrid grid = ((GridContainer) container).getGrid(); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridPatternCreateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridPatternCreateMessage.java index 2e75c68df..50db365e5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridPatternCreateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridPatternCreateMessage.java @@ -30,7 +30,7 @@ public class GridPatternCreateMessage { if (player != null) { ctx.get().enqueueWork(() -> { - TileEntity tile = player.getEntityWorld().getTileEntity(message.pos); + TileEntity tile = player.getCommandSenderWorld().getBlockEntity(message.pos); if (tile instanceof GridTile && ((GridTile) tile).getNode().getGridType() == GridType.PATTERN) { ((GridTile) tile).getNode().onCreatePattern(); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridProcessingTransferMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridProcessingTransferMessage.java index 751064f9d..b6873b845 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridProcessingTransferMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridProcessingTransferMessage.java @@ -98,8 +98,8 @@ public class GridProcessingTransferMessage { if (player != null) { ctx.get().enqueueWork(() -> { - if (player.openContainer instanceof GridContainer) { - IGrid grid = ((GridContainer) player.openContainer).getGrid(); + if (player.containerMenu instanceof GridContainer) { + IGrid grid = ((GridContainer) player.containerMenu).getGrid(); if (grid.getGridType() == GridType.PATTERN) { BaseItemHandler handler = ((GridNetworkNode) grid).getProcessingMatrix(); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridTransferMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridTransferMessage.java index 684dd5bc4..3ad88c052 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridTransferMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridTransferMessage.java @@ -77,8 +77,8 @@ public class GridTransferMessage { if (player != null) { ctx.get().enqueueWork(() -> { - if (player.openContainer instanceof GridContainer) { - IGrid grid = ((GridContainer) player.openContainer).getGrid(); + if (player.containerMenu instanceof GridContainer) { + IGrid grid = ((GridContainer) player.containerMenu).getGrid(); if (grid.getGridType() == GridType.CRAFTING || grid.getGridType() == GridType.PATTERN) { grid.onRecipeTransfer(player, message.recipe); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridSettingsUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridSettingsUpdateMessage.java index cdada1a2b..74956a63a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridSettingsUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridSettingsUpdateMessage.java @@ -58,8 +58,8 @@ public class PortableGridSettingsUpdateMessage { if (player != null) { ctx.get().enqueueWork(() -> { - if (player.openContainer instanceof GridContainer) { - IGrid grid = ((GridContainer) player.openContainer).getGrid(); + if (player.containerMenu instanceof GridContainer) { + IGrid grid = ((GridContainer) player.containerMenu).getGrid(); if (grid instanceof PortableGrid) { ItemStack stack = ((PortableGrid) grid).getStack(); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessFluidGridSettingsUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessFluidGridSettingsUpdateMessage.java index bd820a5d1..f3067af6c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessFluidGridSettingsUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessFluidGridSettingsUpdateMessage.java @@ -53,8 +53,8 @@ public class WirelessFluidGridSettingsUpdateMessage { if (player != null) { ctx.get().enqueueWork(() -> { - if (player.openContainer instanceof GridContainer) { - IGrid grid = ((GridContainer) player.openContainer).getGrid(); + if (player.containerMenu instanceof GridContainer) { + IGrid grid = ((GridContainer) player.containerMenu).getGrid(); if (grid instanceof WirelessFluidGrid) { ItemStack stack = ((WirelessFluidGrid) grid).getStack(); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessGridSettingsUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessGridSettingsUpdateMessage.java index f30795214..f8ce0d27d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessGridSettingsUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessGridSettingsUpdateMessage.java @@ -58,8 +58,8 @@ public class WirelessGridSettingsUpdateMessage { if (player != null) { ctx.get().enqueueWork(() -> { - if (player.openContainer instanceof GridContainer) { - IGrid grid = ((GridContainer) player.openContainer).getGrid(); + if (player.containerMenu instanceof GridContainer) { + IGrid grid = ((GridContainer) player.containerMenu).getGrid(); if (grid instanceof WirelessGrid) { ItemStack stack = ((WirelessGrid) grid).getStack(); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterUpdateMessage.java index ff5a6454a..5bd9c6818 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterUpdateMessage.java @@ -44,7 +44,7 @@ public class TileDataParameterUpdateMessage { public static void handle(TileDataParameterUpdateMessage message, Supplier ctx) { ctx.get().enqueueWork(() -> { - Container c = ctx.get().getSender().openContainer; + Container c = ctx.get().getSender().containerMenu; if (c instanceof BaseContainer) { BiConsumer consumer = message.parameter.getValueConsumer(); diff --git a/src/main/java/com/refinedmods/refinedstorage/recipe/CoverRecipe.java b/src/main/java/com/refinedmods/refinedstorage/recipe/CoverRecipe.java index 01d055a38..a158fcd4a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/recipe/CoverRecipe.java +++ b/src/main/java/com/refinedmods/refinedstorage/recipe/CoverRecipe.java @@ -45,13 +45,13 @@ public class CoverRecipe extends SpecialRecipe { } public static ItemStack getResult(ItemStack first, ItemStack second){ - if (first.getItem().isIn(Tags.Items.NUGGETS_IRON)){ + if (first.getItem().is(Tags.Items.NUGGETS_IRON)){ ItemStack stack = new ItemStack(RSItems.COVER.get()); CoverItem.setItem(stack, second); stack.setCount(6); return stack; } - if (second.getItem().isIn(Tags.Items.NUGGETS_IRON)){ + if (second.getItem().is(Tags.Items.NUGGETS_IRON)){ ItemStack stack = new ItemStack(RSItems.COVER.get()); CoverItem.setItem(stack, first); stack.setCount(6); @@ -64,11 +64,11 @@ public class CoverRecipe extends SpecialRecipe { public boolean matches(CraftingInventory inv, World worldIn) { List list = Lists.newArrayList(); int ingots = 0; - for (int i = 0; i < inv.getSizeInventory(); ++i) { - ItemStack itemstack = inv.getStackInSlot(i); + for (int i = 0; i < inv.getContainerSize(); ++i) { + ItemStack itemstack = inv.getItem(i); if (!itemstack.isEmpty()) { list.add(itemstack); - if (itemstack.getItem().isIn(Tags.Items.NUGGETS_IRON)){ + if (itemstack.getItem().is(Tags.Items.NUGGETS_IRON)){ ++ingots; } else if (!stackMatches(itemstack)){ return false; @@ -79,14 +79,14 @@ public class CoverRecipe extends SpecialRecipe { } @Override - public ItemStack getCraftingResult(CraftingInventory inv) { + public ItemStack assemble(CraftingInventory inv) { List list = Lists.newArrayList(); int ingots = 0; - for (int i = 0; i < inv.getSizeInventory(); ++i) { - ItemStack itemstack = inv.getStackInSlot(i); + for (int i = 0; i < inv.getContainerSize(); ++i) { + ItemStack itemstack = inv.getItem(i); if (!itemstack.isEmpty()) { list.add(itemstack); - if (itemstack.getItem().isIn(Tags.Items.NUGGETS_IRON)){ + if (itemstack.getItem().is(Tags.Items.NUGGETS_IRON)){ ++ingots; } else if (!stackMatches(itemstack)){ return ItemStack.EMPTY; @@ -100,7 +100,7 @@ public class CoverRecipe extends SpecialRecipe { } @Override - public boolean canFit(int width, int height) { + public boolean canCraftInDimensions(int width, int height) { return width * height >= 2; } diff --git a/src/main/java/com/refinedmods/refinedstorage/recipe/HollowCoverRecipe.java b/src/main/java/com/refinedmods/refinedstorage/recipe/HollowCoverRecipe.java index e7cdd997a..c7157abe9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/recipe/HollowCoverRecipe.java +++ b/src/main/java/com/refinedmods/refinedstorage/recipe/HollowCoverRecipe.java @@ -50,8 +50,8 @@ public class HollowCoverRecipe extends SpecialRecipe { @Override public boolean matches(CraftingInventory inv, World worldIn) { List list = Lists.newArrayList(); - for (int i = 0; i < inv.getSizeInventory(); ++i) { - ItemStack itemstack = inv.getStackInSlot(i); + for (int i = 0; i < inv.getContainerSize(); ++i) { + ItemStack itemstack = inv.getItem(i); if (!itemstack.isEmpty()) { list.add(itemstack); if (!stackMatches(itemstack)){ @@ -63,10 +63,10 @@ public class HollowCoverRecipe extends SpecialRecipe { } @Override - public ItemStack getCraftingResult(CraftingInventory inv) { + public ItemStack assemble(CraftingInventory inv) { List list = Lists.newArrayList(); - for (int i = 0; i < inv.getSizeInventory(); ++i) { - ItemStack itemstack = inv.getStackInSlot(i); + for (int i = 0; i < inv.getContainerSize(); ++i) { + ItemStack itemstack = inv.getItem(i); if (!itemstack.isEmpty()) { list.add(itemstack); if (!stackMatches(itemstack)){ @@ -78,7 +78,7 @@ public class HollowCoverRecipe extends SpecialRecipe { } @Override - public boolean canFit(int width, int height) { + public boolean canCraftInDimensions(int width, int height) { return width * height >= 2; } diff --git a/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java b/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java index b93286949..20524198d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java +++ b/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java @@ -22,16 +22,16 @@ public class UpgradeWithEnchantedBookRecipe extends ShapedRecipe { private final ItemStack result; public UpgradeWithEnchantedBookRecipe(ResourceLocation recipeId, Enchantment enchantment, int enchantmentLevel, ItemStack result) { - super(recipeId, "", 3, 3, NonNullList.from(Ingredient.EMPTY, - Ingredient.fromStacks(new ItemStack(RSItems.QUARTZ_ENRICHED_IRON.get())), - Ingredient.fromStacks(EnchantedBookItem.getEnchantedItemStack(new EnchantmentData(enchantment, enchantmentLevel))), - Ingredient.fromStacks(new ItemStack(RSItems.QUARTZ_ENRICHED_IRON.get())), - Ingredient.fromStacks(new ItemStack(Blocks.BOOKSHELF)), - Ingredient.fromStacks(new ItemStack(RSItems.UPGRADE_ITEMS.get(UpgradeItem.Type.NORMAL).get())), - Ingredient.fromStacks(new ItemStack(Blocks.BOOKSHELF)), - Ingredient.fromStacks(new ItemStack(RSItems.QUARTZ_ENRICHED_IRON.get())), - Ingredient.fromStacks(new ItemStack(RSItems.QUARTZ_ENRICHED_IRON.get())), - Ingredient.fromStacks(new ItemStack(RSItems.QUARTZ_ENRICHED_IRON.get())) + super(recipeId, "", 3, 3, NonNullList.of(Ingredient.EMPTY, + Ingredient.of(new ItemStack(RSItems.QUARTZ_ENRICHED_IRON.get())), + Ingredient.of(EnchantedBookItem.createForEnchantment(new EnchantmentData(enchantment, enchantmentLevel))), + Ingredient.of(new ItemStack(RSItems.QUARTZ_ENRICHED_IRON.get())), + Ingredient.of(new ItemStack(Blocks.BOOKSHELF)), + Ingredient.of(new ItemStack(RSItems.UPGRADE_ITEMS.get(UpgradeItem.Type.NORMAL).get())), + Ingredient.of(new ItemStack(Blocks.BOOKSHELF)), + Ingredient.of(new ItemStack(RSItems.QUARTZ_ENRICHED_IRON.get())), + Ingredient.of(new ItemStack(RSItems.QUARTZ_ENRICHED_IRON.get())), + Ingredient.of(new ItemStack(RSItems.QUARTZ_ENRICHED_IRON.get())) ), result); this.enchant = new EnchantmentData(enchantment, enchantmentLevel); @@ -49,14 +49,14 @@ public class UpgradeWithEnchantedBookRecipe extends ShapedRecipe { @Override public boolean matches(CraftingInventory inv, World world) { if (super.matches(inv, world)) { - ListNBT enchantments = EnchantedBookItem.getEnchantments(inv.getStackInSlot(1)); + ListNBT enchantments = EnchantedBookItem.getEnchantments(inv.getItem(1)); for (int i = 0; i < enchantments.size(); ++i) { CompoundNBT enchantmentNbt = enchantments.getCompound(i); // @Volatile: NBT tags from EnchantedBookItem if (ForgeRegistries.ENCHANTMENTS.getValue(new ResourceLocation(enchantmentNbt.getString("id"))) == enchant.enchantment && - enchantmentNbt.getShort("lvl") == enchant.enchantmentLevel) { + enchantmentNbt.getShort("lvl") == enchant.level) { return true; } } diff --git a/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipeSerializer.java b/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipeSerializer.java index 4ee989c0a..f226a6aee 100644 --- a/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipeSerializer.java +++ b/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipeSerializer.java @@ -13,7 +13,7 @@ import javax.annotation.Nullable; public class UpgradeWithEnchantedBookRecipeSerializer extends ForgeRegistryEntry> implements IRecipeSerializer { @Override - public UpgradeWithEnchantedBookRecipe read(ResourceLocation recipeId, JsonObject json) { + public UpgradeWithEnchantedBookRecipe fromJson(ResourceLocation recipeId, JsonObject json) { JsonObject enchantmentInfo = json.getAsJsonObject("enchantment"); ItemStack result = new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(json.getAsJsonPrimitive("result").getAsString()))); @@ -29,8 +29,8 @@ public class UpgradeWithEnchantedBookRecipeSerializer extends ForgeRegistryEntry @Nullable @Override - public UpgradeWithEnchantedBookRecipe read(ResourceLocation recipeId, PacketBuffer buffer) { - ItemStack result = buffer.readItemStack(); + public UpgradeWithEnchantedBookRecipe fromNetwork(ResourceLocation recipeId, PacketBuffer buffer) { + ItemStack result = buffer.readItem(); Enchantment enchantment = ForgeRegistries.ENCHANTMENTS.getValue(buffer.readResourceLocation()); int level = buffer.readInt(); @@ -38,9 +38,9 @@ public class UpgradeWithEnchantedBookRecipeSerializer extends ForgeRegistryEntry } @Override - public void write(PacketBuffer buffer, UpgradeWithEnchantedBookRecipe recipe) { - buffer.writeItemStack(recipe.getResult()); + public void toNetwork(PacketBuffer buffer, UpgradeWithEnchantedBookRecipe recipe) { + buffer.writeItem(recipe.getResult()); buffer.writeResourceLocation(recipe.getEnchant().enchantment.getRegistryName()); - buffer.writeInt(recipe.getEnchant().enchantmentLevel); + buffer.writeInt(recipe.getEnchant().level); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/render/ConstantsCable.java b/src/main/java/com/refinedmods/refinedstorage/render/ConstantsCable.java index 0cfc2d3c9..1660fcae0 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/ConstantsCable.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/ConstantsCable.java @@ -77,7 +77,7 @@ public class ConstantsCable { public static VoxelShape addCoverVoxelShapes(VoxelShape shape, IBlockReader world, BlockPos pos){ if (world != null) { - TileEntity entity = world.getTileEntity(pos); + TileEntity entity = world.getBlockEntity(pos); if (entity instanceof NetworkNodeTile && ((NetworkNodeTile) entity).getNode() instanceof ICoverable) { CoverManager coverManager = ((ICoverable) ((NetworkNodeTile) entity).getNode()).getCoverManager(); for (Direction value : Direction.values()) { diff --git a/src/main/java/com/refinedmods/refinedstorage/render/FluidRenderer.java b/src/main/java/com/refinedmods/refinedstorage/render/FluidRenderer.java index 345300420..88aa67a93 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/FluidRenderer.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/FluidRenderer.java @@ -77,8 +77,8 @@ public class FluidRenderer { private void drawTiledSprite(MatrixStack matrixStack, final int xPosition, final int yPosition, final int tiledWidth, final int tiledHeight, int color, int scaledAmount, TextureAtlasSprite sprite) { Minecraft minecraft = Minecraft.getInstance(); - minecraft.getTextureManager().bindTexture(PlayerContainer.LOCATION_BLOCKS_TEXTURE); - Matrix4f matrix = matrixStack.getLast().getMatrix(); + minecraft.getTextureManager().bind(PlayerContainer.BLOCK_ATLAS); + Matrix4f matrix = matrixStack.last().pose(); setGLColorFromInt(color); final int xTileCount = tiledWidth / TEX_WIDTH; @@ -109,7 +109,7 @@ public class FluidRenderer { Fluid fluid = fluidStack.getFluid(); FluidAttributes attributes = fluid.getAttributes(); ResourceLocation fluidStill = attributes.getStillTexture(fluidStack); - return minecraft.getAtlasSpriteGetter(PlayerContainer.LOCATION_BLOCKS_TEXTURE).apply(fluidStill); + return minecraft.getTextureAtlas(PlayerContainer.BLOCK_ATLAS).apply(fluidStill); } private static void setGLColorFromInt(int color) { @@ -122,20 +122,20 @@ public class FluidRenderer { } private static void drawTextureWithMasking(Matrix4f matrix, float xCoord, float yCoord, TextureAtlasSprite textureSprite, int maskTop, int maskRight, float zLevel) { - float uMin = textureSprite.getMinU(); - float uMax = textureSprite.getMaxU(); - float vMin = textureSprite.getMinV(); - float vMax = textureSprite.getMaxV(); + float uMin = textureSprite.getU0(); + float uMax = textureSprite.getU1(); + float vMin = textureSprite.getV0(); + float vMax = textureSprite.getV1(); uMax = uMax - (maskRight / 16F * (uMax - uMin)); vMax = vMax - (maskTop / 16F * (vMax - vMin)); Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder bufferBuilder = tessellator.getBuffer(); + BufferBuilder bufferBuilder = tessellator.getBuilder(); bufferBuilder.begin(7, DefaultVertexFormats.POSITION_TEX); - bufferBuilder.pos(matrix, xCoord, yCoord + 16, zLevel).tex(uMin, vMax).endVertex(); - bufferBuilder.pos(matrix, xCoord + 16 - maskRight, yCoord + 16, zLevel).tex(uMax, vMax).endVertex(); - bufferBuilder.pos(matrix, xCoord + 16 - maskRight, yCoord + maskTop, zLevel).tex(uMax, vMin).endVertex(); - bufferBuilder.pos(matrix, xCoord, yCoord + maskTop, zLevel).tex(uMin, vMin).endVertex(); - tessellator.draw(); + bufferBuilder.vertex(matrix, xCoord, yCoord + 16, zLevel).uv(uMin, vMax).endVertex(); + bufferBuilder.vertex(matrix, xCoord + 16 - maskRight, yCoord + 16, zLevel).uv(uMax, vMax).endVertex(); + bufferBuilder.vertex(matrix, xCoord + 16 - maskRight, yCoord + maskTop, zLevel).uv(uMax, vMin).endVertex(); + bufferBuilder.vertex(matrix, xCoord, yCoord + maskTop, zLevel).uv(uMin, vMin).endVertex(); + tessellator.end(); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/render/Styles.java b/src/main/java/com/refinedmods/refinedstorage/render/Styles.java index ed046cc34..f0b5b3f58 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/Styles.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/Styles.java @@ -5,12 +5,12 @@ import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; public final class Styles { - public static final Style WHITE = Style.EMPTY.setColor(Color.fromTextFormatting(TextFormatting.WHITE)); - public static final Style GRAY = Style.EMPTY.setColor(Color.fromTextFormatting(TextFormatting.GRAY)); - public static final Style YELLOW = Style.EMPTY.setColor(Color.fromTextFormatting(TextFormatting.YELLOW)); - public static final Style RED = Style.EMPTY.setColor(Color.fromTextFormatting(TextFormatting.RED)); - public static final Style BLUE = Style.EMPTY.setColor(Color.fromTextFormatting(TextFormatting.BLUE)); - public static final Style AQUA = Style.EMPTY.setColor(Color.fromTextFormatting(TextFormatting.AQUA)); + public static final Style WHITE = Style.EMPTY.withColor(Color.fromLegacyFormat(TextFormatting.WHITE)); + public static final Style GRAY = Style.EMPTY.withColor(Color.fromLegacyFormat(TextFormatting.GRAY)); + public static final Style YELLOW = Style.EMPTY.withColor(Color.fromLegacyFormat(TextFormatting.YELLOW)); + public static final Style RED = Style.EMPTY.withColor(Color.fromLegacyFormat(TextFormatting.RED)); + public static final Style BLUE = Style.EMPTY.withColor(Color.fromLegacyFormat(TextFormatting.BLUE)); + public static final Style AQUA = Style.EMPTY.withColor(Color.fromLegacyFormat(TextFormatting.AQUA)); private Styles() { } diff --git a/src/main/java/com/refinedmods/refinedstorage/render/color/PatternItemColor.java b/src/main/java/com/refinedmods/refinedstorage/render/color/PatternItemColor.java index 8726759a6..3914020a3 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/color/PatternItemColor.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/color/PatternItemColor.java @@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack; public class PatternItemColor implements IItemColor { @Override public int getColor(ItemStack stack, int tintIndex) { - ICraftingPattern pattern = PatternItem.fromCache(Minecraft.getInstance().world, stack); + ICraftingPattern pattern = PatternItem.fromCache(Minecraft.getInstance().level, stack); if (PatternBakedModel.canDisplayOutput(stack, pattern)) { int color = Minecraft.getInstance().getItemColors().getColor(pattern.getOutputs().get(0), tintIndex); diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/BakedModelCableCover.java b/src/main/java/com/refinedmods/refinedstorage/render/model/BakedModelCableCover.java index da2364919..7928ef2ef 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/BakedModelCableCover.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/BakedModelCableCover.java @@ -60,7 +60,7 @@ public class BakedModelCableCover extends DelegateBakedModel{ return 6; } - if (block.getDirection() != null && state.get(block.getDirection().getProperty()) == coverSide) { + if (block.getDirection() != null && state.getValue(block.getDirection().getProperty()) == coverSide) { if (block == RSBlocks.EXPORTER.get()) { return 6; } else if (block == RSBlocks.EXTERNAL_STORAGE.get() || block == RSBlocks.IMPORTER.get()) { @@ -138,11 +138,11 @@ public class BakedModelCableCover extends DelegateBakedModel{ } HashMap spriteCache = new HashMap<>(); //Changed from 1.12: to improve sprite getting for each side - quads.addAll(new CubeBuilder().from(from.getX(), from.getY(), from.getZ()).to(to.getX(), to.getY(), to.getZ()).addFaces(face -> new CubeBuilder.Face(face, spriteCache.computeIfAbsent(face, direction -> RenderUtils.getSprite(Minecraft.getInstance().getBlockRendererDispatcher().getModelForState(state), state, direction, random)))).bake()); + quads.addAll(new CubeBuilder().from(from.x(), from.y(), from.z()).to(to.x(), to.y(), to.z()).addFaces(face -> new CubeBuilder.Face(face, spriteCache.computeIfAbsent(face, direction -> RenderUtils.getSprite(Minecraft.getInstance().getBlockRenderer().getBlockModel(state), state, direction, random)))).bake()); if (handle) { if (BORDER_SPRITE == null) { - BORDER_SPRITE = Minecraft.getInstance().getAtlasSpriteGetter(AtlasTexture.LOCATION_BLOCKS_TEXTURE).apply(new ResourceLocation(RS.ID , "block/cable_part_border")); + BORDER_SPRITE = Minecraft.getInstance().getTextureAtlas(AtlasTexture.LOCATION_BLOCKS).apply(new ResourceLocation(RS.ID , "block/cable_part_border")); } bounds = ConstantsCable.getHolderBounds(coverSide); @@ -150,7 +150,7 @@ public class BakedModelCableCover extends DelegateBakedModel{ from = new Vector3f((float) bounds.minX * 16, (float) bounds.minY * 16, (float) bounds.minZ * 16); to = new Vector3f((float) bounds.maxX * 16, (float) bounds.maxY * 16, (float) bounds.maxZ * 16); - quads.addAll(new CubeBuilder().from(from.getX(), from.getY(), from.getZ()).to(to.getX(), to.getY(), to.getZ()).addFaces(face -> new CubeBuilder.Face(face, BORDER_SPRITE)).bake()); + quads.addAll(new CubeBuilder().from(from.x(), from.y(), from.z()).to(to.x(), to.y(), to.z()).addFaces(face -> new CubeBuilder.Face(face, BORDER_SPRITE)).bake()); } } @@ -199,9 +199,9 @@ public class BakedModelCableCover extends DelegateBakedModel{ } HashMap spriteCache = new HashMap<>(); //Changed from 1.12: to improve sprite getting for each side quads.addAll(new CubeBuilder() - .from(from.getX(), from.getY(), from.getZ()) - .to(to.getX(), to.getY(), to.getZ()) - .addFaces(face -> new CubeBuilder.Face(face, spriteCache.computeIfAbsent(face, direction -> RenderUtils.getSprite(Minecraft.getInstance().getBlockRendererDispatcher().getModelForState(state), state, direction, random)))) + .from(from.x(), from.y(), from.z()) + .to(to.x(), to.y(), to.z()) + .addFaces(face -> new CubeBuilder.Face(face, spriteCache.computeIfAbsent(face, direction -> RenderUtils.getSprite(Minecraft.getInstance().getBlockRenderer().getBlockModel(state), state, direction, random)))) .bake() ); @@ -234,9 +234,9 @@ public class BakedModelCableCover extends DelegateBakedModel{ } quads.addAll(new CubeBuilder() - .from(from.getX(), from.getY(), from.getZ()) - .to(to.getX(), to.getY(), to.getZ()) - .addFaces(face -> new CubeBuilder.Face(face, spriteCache.computeIfAbsent(face, direction -> RenderUtils.getSprite(Minecraft.getInstance().getBlockRendererDispatcher().getModelForState(state), state, direction, random)))) + .from(from.x(), from.y(), from.z()) + .to(to.x(), to.y(), to.z()) + .addFaces(face -> new CubeBuilder.Face(face, spriteCache.computeIfAbsent(face, direction -> RenderUtils.getSprite(Minecraft.getInstance().getBlockRenderer().getBlockModel(state), state, direction, random)))) .bake() ); @@ -294,9 +294,9 @@ public class BakedModelCableCover extends DelegateBakedModel{ } quads.addAll(new CubeBuilder() - .from(from.getX(), from.getY(), from.getZ()) - .to(to.getX(), to.getY(), to.getZ()) - .addFaces(face -> new CubeBuilder.Face(face, spriteCache.computeIfAbsent(face, direction -> RenderUtils.getSprite(Minecraft.getInstance().getBlockRendererDispatcher().getModelForState(state), state, direction, random)))) + .from(from.x(), from.y(), from.z()) + .to(to.x(), to.y(), to.z()) + .addFaces(face -> new CubeBuilder.Face(face, spriteCache.computeIfAbsent(face, direction -> RenderUtils.getSprite(Minecraft.getInstance().getBlockRenderer().getBlockModel(state), state, direction, random)))) .bake() ); @@ -354,9 +354,9 @@ public class BakedModelCableCover extends DelegateBakedModel{ } quads.addAll(new CubeBuilder() - .from(from.getX(), from.getY(), from.getZ()) - .to(to.getX(), to.getY(), to.getZ()) - .addFaces(face -> new CubeBuilder.Face(face, spriteCache.computeIfAbsent(face, direction -> RenderUtils.getSprite(Minecraft.getInstance().getBlockRendererDispatcher().getModelForState(state), state, direction, random)))) + .from(from.x(), from.y(), from.z()) + .to(to.x(), to.y(), to.z()) + .addFaces(face -> new CubeBuilder.Face(face, spriteCache.computeIfAbsent(face, direction -> RenderUtils.getSprite(Minecraft.getInstance().getBlockRenderer().getBlockModel(state), state, direction, random)))) .bake() ); } diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/BakedModelCover.java b/src/main/java/com/refinedmods/refinedstorage/render/model/BakedModelCover.java index 28bb80fb2..64049c85b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/BakedModelCover.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/BakedModelCover.java @@ -100,7 +100,7 @@ public class BakedModelCover extends BakedModelCableCover{ public ItemOverrideList getOverrides() { return new ItemOverrideList() { @Override - public IBakedModel getOverrideModel(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity) { + public IBakedModel resolve(IBakedModel originalModel, ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity) { return new BakedModelCover(stack, type); } }; @@ -114,7 +114,7 @@ public class BakedModelCover extends BakedModelCableCover{ } @Override - public boolean isAmbientOcclusion() { + public boolean useAmbientOcclusion() { return true; } @@ -124,12 +124,12 @@ public class BakedModelCover extends BakedModelCableCover{ } @Override - public boolean isBuiltInRenderer() { + public boolean isCustomRenderer() { return false; } @Override - public TextureAtlasSprite getParticleTexture() { + public TextureAtlasSprite getParticleIcon() { return null; } @@ -140,12 +140,12 @@ public class BakedModelCover extends BakedModelCableCover{ @Override @SuppressWarnings("deprecation") - public ItemCameraTransforms getItemCameraTransforms() { - return ItemCameraTransforms.DEFAULT; + public ItemCameraTransforms getTransforms() { + return ItemCameraTransforms.NO_TRANSFORMS; } @Override - public boolean isSideLit() { + public boolean usesBlockLight() { return true; } } diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/CubeBuilder.java b/src/main/java/com/refinedmods/refinedstorage/render/model/CubeBuilder.java index feb54adb5..2939d9029 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/CubeBuilder.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/CubeBuilder.java @@ -117,44 +117,44 @@ public class CubeBuilder { builder.setQuadTint(-1); builder.setApplyDiffuseLighting(true); - Uv uv = getDefaultUv(facing, cubeFace.sprite, from.getX(), from.getY(), from.getZ(), to.getX(), to.getY(), to.getZ()); + Uv uv = getDefaultUv(facing, cubeFace.sprite, from.x(), from.y(), from.z(), to.x(), to.y(), to.z()); switch (facing) { case DOWN: - addVertexTopRight(builder, cubeFace, to.getX(), from.getY(), from.getZ(), uv); - addVertexBottomRight(builder, cubeFace, to.getX(), from.getY(), to.getZ(), uv); - addVertexBottomLeft(builder, cubeFace, from.getX(), from.getY(), to.getZ(), uv); - addVertexTopLeft(builder, cubeFace, from.getX(), from.getY(), from.getZ(), uv); + addVertexTopRight(builder, cubeFace, to.x(), from.y(), from.z(), uv); + addVertexBottomRight(builder, cubeFace, to.x(), from.y(), to.z(), uv); + addVertexBottomLeft(builder, cubeFace, from.x(), from.y(), to.z(), uv); + addVertexTopLeft(builder, cubeFace, from.x(), from.y(), from.z(), uv); break; case UP: - addVertexTopLeft(builder, cubeFace, from.getX(), to.getY(), from.getZ(), uv); - addVertexBottomLeft(builder, cubeFace, from.getX(), to.getY(), to.getZ(), uv); - addVertexBottomRight(builder, cubeFace, to.getX(), to.getY(), to.getZ(), uv); - addVertexTopRight(builder, cubeFace, to.getX(), to.getY(), from.getZ(), uv); + addVertexTopLeft(builder, cubeFace, from.x(), to.y(), from.z(), uv); + addVertexBottomLeft(builder, cubeFace, from.x(), to.y(), to.z(), uv); + addVertexBottomRight(builder, cubeFace, to.x(), to.y(), to.z(), uv); + addVertexTopRight(builder, cubeFace, to.x(), to.y(), from.z(), uv); break; case NORTH: - addVertexBottomRight(builder, cubeFace, to.getX(), to.getY(), from.getZ(), uv); - addVertexTopRight(builder, cubeFace, to.getX(), from.getY(), from.getZ(), uv); - addVertexTopLeft(builder, cubeFace, from.getX(), from.getY(), from.getZ(), uv); - addVertexBottomLeft(builder, cubeFace, from.getX(), to.getY(), from.getZ(), uv); + addVertexBottomRight(builder, cubeFace, to.x(), to.y(), from.z(), uv); + addVertexTopRight(builder, cubeFace, to.x(), from.y(), from.z(), uv); + addVertexTopLeft(builder, cubeFace, from.x(), from.y(), from.z(), uv); + addVertexBottomLeft(builder, cubeFace, from.x(), to.y(), from.z(), uv); break; case SOUTH: - addVertexBottomLeft(builder, cubeFace, from.getX(), to.getY(), to.getZ(), uv); - addVertexTopLeft(builder, cubeFace, from.getX(), from.getY(), to.getZ(), uv); - addVertexTopRight(builder, cubeFace, to.getX(), from.getY(), to.getZ(), uv); - addVertexBottomRight(builder, cubeFace, to.getX(), to.getY(), to.getZ(), uv); + addVertexBottomLeft(builder, cubeFace, from.x(), to.y(), to.z(), uv); + addVertexTopLeft(builder, cubeFace, from.x(), from.y(), to.z(), uv); + addVertexTopRight(builder, cubeFace, to.x(), from.y(), to.z(), uv); + addVertexBottomRight(builder, cubeFace, to.x(), to.y(), to.z(), uv); break; case WEST: - addVertexTopLeft(builder, cubeFace, from.getX(), from.getY(), from.getZ(), uv); - addVertexTopRight(builder, cubeFace, from.getX(), from.getY(), to.getZ(), uv); - addVertexBottomRight(builder, cubeFace, from.getX(), to.getY(), to.getZ(), uv); - addVertexBottomLeft(builder, cubeFace, from.getX(), to.getY(), from.getZ(), uv); + addVertexTopLeft(builder, cubeFace, from.x(), from.y(), from.z(), uv); + addVertexTopRight(builder, cubeFace, from.x(), from.y(), to.z(), uv); + addVertexBottomRight(builder, cubeFace, from.x(), to.y(), to.z(), uv); + addVertexBottomLeft(builder, cubeFace, from.x(), to.y(), from.z(), uv); break; case EAST: - addVertexBottomRight(builder, cubeFace, to.getX(), to.getY(), from.getZ(), uv); - addVertexBottomLeft(builder, cubeFace, to.getX(), to.getY(), to.getZ(), uv); - addVertexTopLeft(builder, cubeFace, to.getX(), from.getY(), to.getZ(), uv); - addVertexTopRight(builder, cubeFace, to.getX(), from.getY(), from.getZ(), uv); + addVertexBottomRight(builder, cubeFace, to.x(), to.y(), from.z(), uv); + addVertexBottomLeft(builder, cubeFace, to.x(), to.y(), to.z(), uv); + addVertexTopLeft(builder, cubeFace, to.x(), from.y(), to.z(), uv); + addVertexTopRight(builder, cubeFace, to.x(), from.y(), from.z(), uv); break; } @@ -166,40 +166,40 @@ public class CubeBuilder { switch (face) { case DOWN: - uv.xFrom = texture.getInterpolatedU(fromX * 16); - uv.yFrom = texture.getInterpolatedV(16 - fromZ * 16); - uv.xTo = texture.getInterpolatedU(toX * 16); - uv.yTo = texture.getInterpolatedV(16 - toZ * 16); + uv.xFrom = texture.getU(fromX * 16); + uv.yFrom = texture.getV(16 - fromZ * 16); + uv.xTo = texture.getU(toX * 16); + uv.yTo = texture.getV(16 - toZ * 16); break; case UP: - uv.xFrom = texture.getInterpolatedU(fromX * 16); - uv.yFrom = texture.getInterpolatedV(fromZ * 16); - uv.xTo = texture.getInterpolatedU(toX * 16); - uv.yTo = texture.getInterpolatedV(toZ * 16); + uv.xFrom = texture.getU(fromX * 16); + uv.yFrom = texture.getV(fromZ * 16); + uv.xTo = texture.getU(toX * 16); + uv.yTo = texture.getV(toZ * 16); break; case NORTH: - uv.xFrom = texture.getInterpolatedU(16 - fromX * 16); - uv.yFrom = texture.getInterpolatedV(16 - fromY * 16); - uv.xTo = texture.getInterpolatedU(16 - toX * 16); - uv.yTo = texture.getInterpolatedV(16 - toY * 16); + uv.xFrom = texture.getU(16 - fromX * 16); + uv.yFrom = texture.getV(16 - fromY * 16); + uv.xTo = texture.getU(16 - toX * 16); + uv.yTo = texture.getV(16 - toY * 16); break; case SOUTH: - uv.xFrom = texture.getInterpolatedU(fromX * 16); - uv.yFrom = texture.getInterpolatedV(16 - fromY * 16); - uv.xTo = texture.getInterpolatedU(toX * 16); - uv.yTo = texture.getInterpolatedV(16 - toY * 16); + uv.xFrom = texture.getU(fromX * 16); + uv.yFrom = texture.getV(16 - fromY * 16); + uv.xTo = texture.getU(toX * 16); + uv.yTo = texture.getV(16 - toY * 16); break; case WEST: - uv.xFrom = texture.getInterpolatedU(fromZ * 16); - uv.yFrom = texture.getInterpolatedV(16 - fromY * 16); - uv.xTo = texture.getInterpolatedU(toZ * 16); - uv.yTo = texture.getInterpolatedV(16 - toY * 16); + uv.xFrom = texture.getU(fromZ * 16); + uv.yFrom = texture.getV(16 - fromY * 16); + uv.xTo = texture.getU(toZ * 16); + uv.yTo = texture.getV(16 - toY * 16); break; case EAST: - uv.xFrom = texture.getInterpolatedU(16 - toZ * 16); - uv.yFrom = texture.getInterpolatedV(16 - fromY * 16); - uv.xTo = texture.getInterpolatedU(16 - fromZ * 16); - uv.yTo = texture.getInterpolatedV(16 - toY * 16); + uv.xFrom = texture.getU(16 - toZ * 16); + uv.yFrom = texture.getV(16 - fromY * 16); + uv.xTo = texture.getU(16 - fromZ * 16); + uv.yTo = texture.getV(16 - toY * 16); break; } @@ -325,7 +325,7 @@ public class CubeBuilder { builder.put(i, x, y, z); break; case NORMAL: - builder.put(i, face.face.getXOffset(), face.face.getYOffset(), face.face.getZOffset()); + builder.put(i, face.face.getStepX(), face.face.getStepY(), face.face.getStepZ()); break; case COLOR: float r = (color >> 16 & 0xFF) / 255F; diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/DelegateBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/DelegateBakedModel.java index 1d5b1e4d0..0a963a810 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/DelegateBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/DelegateBakedModel.java @@ -27,8 +27,8 @@ public class DelegateBakedModel implements IBakedModel { } @Override - public boolean isAmbientOcclusion() { - return base.isAmbientOcclusion(); + public boolean useAmbientOcclusion() { + return base.useAmbientOcclusion(); } @Override @@ -37,19 +37,19 @@ public class DelegateBakedModel implements IBakedModel { } @Override - public boolean isSideLit() { - return base.isSideLit(); + public boolean usesBlockLight() { + return base.usesBlockLight(); } @Override - public boolean isBuiltInRenderer() { - return base.isBuiltInRenderer(); + public boolean isCustomRenderer() { + return base.isCustomRenderer(); } @Override @SuppressWarnings("deprecation") - public TextureAtlasSprite getParticleTexture() { - return base.getParticleTexture(); + public TextureAtlasSprite getParticleIcon() { + return base.getParticleIcon(); } @Override @@ -59,8 +59,8 @@ public class DelegateBakedModel implements IBakedModel { @Override @SuppressWarnings("deprecation") - public ItemCameraTransforms getItemCameraTransforms() { - return base.getItemCameraTransforms(); + public ItemCameraTransforms getTransforms() { + return base.getTransforms(); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/DiskDriveBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/DiskDriveBakedModel.java index 3ad7d016b..062230271 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/DiskDriveBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/DiskDriveBakedModel.java @@ -75,7 +75,7 @@ public class DiskDriveBakedModel extends DelegateBakedModel { @Override @SuppressWarnings("deprecation") public List load(CacheKey key) { - Direction facing = key.state.get(RSBlocks.DISK_DRIVE.get().getDirection().getProperty()); + Direction facing = key.state.getValue(RSBlocks.DISK_DRIVE.get().getDirection().getProperty()); List quads = new ArrayList<>(QuadTransformer.getTransformedQuads(base, facing, null, key.state, key.random, key.side)); diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/DiskManipulatorBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/DiskManipulatorBakedModel.java index 8b2f9edef..2b690f343 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/DiskManipulatorBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/DiskManipulatorBakedModel.java @@ -79,8 +79,8 @@ public class DiskManipulatorBakedModel extends DelegateBakedModel { @Override @SuppressWarnings("deprecation") public List load(CacheKey key) { - Direction facing = key.state.get(RSBlocks.DISK_MANIPULATOR.get(ColorMap.DEFAULT_COLOR).get().getDirection().getProperty()); - boolean connected = key.state.get(NetworkNodeBlock.CONNECTED); + Direction facing = key.state.getValue(RSBlocks.DISK_MANIPULATOR.get(ColorMap.DEFAULT_COLOR).get().getDirection().getProperty()); + boolean connected = key.state.getValue(NetworkNodeBlock.CONNECTED); List quads = new ArrayList<>(QuadTransformer.getTransformedQuads( connected ? baseConnected : baseDisconnected, diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/FullbrightBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/FullbrightBakedModel.java index a4e41ae92..d90abcdda 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/FullbrightBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/FullbrightBakedModel.java @@ -66,7 +66,7 @@ public class FullbrightBakedModel extends DelegateBakedModel { } private static BakedQuad transformQuad(BakedQuad quad) { - int[] vertexData = quad.getVertexData().clone(); + int[] vertexData = quad.getVertices().clone(); int step = vertexData.length / 4; // Set lighting to fullbright on all vertices @@ -78,9 +78,9 @@ public class FullbrightBakedModel extends DelegateBakedModel { return new BakedQuad( vertexData, quad.getTintIndex(), - quad.getFace(), + quad.getDirection(), quad.getSprite(), - quad.applyDiffuseLighting() + quad.isShade() ); } diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/PatternBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/PatternBakedModel.java index bd9aceea4..23345db69 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/PatternBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/PatternBakedModel.java @@ -25,18 +25,18 @@ public class PatternBakedModel extends DelegateBakedModel { return new ItemOverrideList() { @Nullable @Override - public IBakedModel getOverrideModel(IBakedModel model, ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity) { + public IBakedModel resolve(IBakedModel model, ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity) { if (entity != null) { - ICraftingPattern pattern = PatternItem.fromCache(entity.world, stack); + ICraftingPattern pattern = PatternItem.fromCache(entity.level, stack); if (canDisplayOutput(stack, pattern)) { ItemStack outputToRender = pattern.getOutputs().get(0); - return Minecraft.getInstance().getItemRenderer().getItemModelWithOverrides(outputToRender, world, entity); + return Minecraft.getInstance().getItemRenderer().getModel(outputToRender, world, entity); } } - return super.getOverrideModel(model, stack, world, entity); + return super.resolve(model, stack, world, entity); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridBakedModel.java index 7b892ae40..f3972b414 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridBakedModel.java @@ -38,9 +38,9 @@ public class PortableGridBakedModel extends DelegateBakedModel { @Override @SuppressWarnings("deprecation") public List load(@Nonnull CacheKey key) { - Direction direction = key.state.get(RSBlocks.PORTABLE_GRID.get().getDirection().getProperty()); - boolean active = key.state.get(PortableGridBlock.ACTIVE); - PortableGridDiskState diskState = key.state.get(PortableGridBlock.DISK_STATE); + Direction direction = key.state.getValue(RSBlocks.PORTABLE_GRID.get().getDirection().getProperty()); + boolean active = key.state.getValue(PortableGridBlock.ACTIVE); + PortableGridDiskState diskState = key.state.getValue(PortableGridBlock.DISK_STATE); List quads = new ArrayList<>(QuadTransformer.getTransformedQuads( active ? baseConnected : baseDisconnected, @@ -111,7 +111,7 @@ public class PortableGridBakedModel extends DelegateBakedModel { private class CustomItemOverrideList extends ItemOverrideList { @Nullable @Override - public IBakedModel getOverrideModel(IBakedModel model, ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity) { + public IBakedModel resolve(IBakedModel model, ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity) { PortableGrid portableGrid = new PortableGrid(null, stack, new PlayerSlot(-1)); if (portableGrid.isGridActive()) { diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridItemBakedModel.java b/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridItemBakedModel.java index 395d8475e..1dc64b7c4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridItemBakedModel.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/PortableGridItemBakedModel.java @@ -31,8 +31,8 @@ public class PortableGridItemBakedModel implements IBakedModel { @Override @SuppressWarnings("deprecation") - public ItemCameraTransforms getItemCameraTransforms() { - return base.getItemCameraTransforms(); + public ItemCameraTransforms getTransforms() { + return base.getTransforms(); } @Override @@ -49,8 +49,8 @@ public class PortableGridItemBakedModel implements IBakedModel { } @Override - public boolean isAmbientOcclusion() { - return base.isAmbientOcclusion(); + public boolean useAmbientOcclusion() { + return base.useAmbientOcclusion(); } @Override @@ -59,18 +59,18 @@ public class PortableGridItemBakedModel implements IBakedModel { } @Override - public boolean isSideLit() { - return base.isSideLit(); + public boolean usesBlockLight() { + return base.usesBlockLight(); } @Override - public boolean isBuiltInRenderer() { - return base.isBuiltInRenderer(); + public boolean isCustomRenderer() { + return base.isCustomRenderer(); } @Override @SuppressWarnings("deprecation") - public TextureAtlasSprite getParticleTexture() { - return base.getParticleTexture(); + public TextureAtlasSprite getParticleIcon() { + return base.getParticleIcon(); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/QuadTransformer.java b/src/main/java/com/refinedmods/refinedstorage/render/model/QuadTransformer.java index 546ad0cd3..9a1ba9c95 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/QuadTransformer.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/QuadTransformer.java @@ -21,16 +21,16 @@ public final class QuadTransformer { } public static List getTransformedQuads(IBakedModel model, Direction facing, @Nullable Vector3f translation, BlockState state, Random rand, Direction side) { - double r = Math.PI * (360 - facing.getOpposite().getHorizontalIndex() * 90) / 180d; + double r = Math.PI * (360 - facing.getOpposite().get2DDataValue() * 90) / 180d; TransformationMatrix transformation = new TransformationMatrix(translation, TransformationHelper.quatFromXYZ(new Vector3f(0, (float) r, 0), false), null, null); ImmutableList.Builder quads = ImmutableList.builder(); - if (side != null && side.getHorizontalIndex() > -1) { - int faceOffset = 4 + Direction.NORTH.getHorizontalIndex() - facing.getHorizontalIndex(); + if (side != null && side.get2DDataValue() > -1) { + int faceOffset = 4 + Direction.NORTH.get2DDataValue() - facing.get2DDataValue(); - side = Direction.byHorizontalIndex((side.getHorizontalIndex() + faceOffset) % 4); + side = Direction.from2DDataValue((side.get2DDataValue() + faceOffset) % 4); } for (BakedQuad quad : model.getQuads(state, side, rand, EmptyModelData.INSTANCE)) { diff --git a/src/main/java/com/refinedmods/refinedstorage/render/resourcepack/RSResourcePackSectionDeserializer.java b/src/main/java/com/refinedmods/refinedstorage/render/resourcepack/RSResourcePackSectionDeserializer.java index 261dc9ed8..d1df12b4a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/resourcepack/RSResourcePackSectionDeserializer.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/resourcepack/RSResourcePackSectionDeserializer.java @@ -5,12 +5,12 @@ import net.minecraft.resources.data.IMetadataSectionSerializer; public class RSResourcePackSectionDeserializer implements IMetadataSectionSerializer { @Override - public String getSectionName() { + public String getMetadataSectionName() { return "refinedstorage"; } @Override - public RSResourcePackSection deserialize(JsonObject json) { + public RSResourcePackSection fromJson(JsonObject json) { int primaryColor = -1; int secondaryColor = -1; diff --git a/src/main/java/com/refinedmods/refinedstorage/render/resourcepack/ResourcePackListener.java b/src/main/java/com/refinedmods/refinedstorage/render/resourcepack/ResourcePackListener.java index e0e28a296..fabce95e6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/resourcepack/ResourcePackListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/resourcepack/ResourcePackListener.java @@ -17,9 +17,9 @@ public class ResourcePackListener extends ReloadListener @Override protected RSResourcePackSection prepare(IResourceManager resourceManager, IProfiler profiler) { - for (ResourcePackInfo info : Minecraft.getInstance().getResourcePackList().getEnabledPacks()) { + for (ResourcePackInfo info : Minecraft.getInstance().getResourcePackRepository().getSelectedPacks()) { try { - RSResourcePackSection section = info.getResourcePack().getMetadata(RSResourcePackSection.DESERIALIZER); + RSResourcePackSection section = info.open().getMetadataSection(RSResourcePackSection.DESERIALIZER); if (section != null) { return section; diff --git a/src/main/java/com/refinedmods/refinedstorage/render/tesr/PatternItemStackTileRenderer.java b/src/main/java/com/refinedmods/refinedstorage/render/tesr/PatternItemStackTileRenderer.java index 1aadf3a74..ca2c71c34 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/tesr/PatternItemStackTileRenderer.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/tesr/PatternItemStackTileRenderer.java @@ -10,11 +10,11 @@ import net.minecraft.item.ItemStack; public class PatternItemStackTileRenderer extends ItemStackTileEntityRenderer { @Override - public void func_239207_a_(ItemStack stack, ItemCameraTransforms.TransformType transformType, MatrixStack matrixStack, IRenderTypeBuffer renderTypeBuffer, int combinedLight, int combinedOverlay) { + public void renderByItem(ItemStack stack, ItemCameraTransforms.TransformType transformType, MatrixStack matrixStack, IRenderTypeBuffer renderTypeBuffer, int combinedLight, int combinedOverlay) { ICraftingPattern pattern = PatternItem.fromCache(null, stack); ItemStack outputStack = pattern.getOutputs().get(0); - outputStack.getItem().getItemStackTileEntityRenderer().func_239207_a_(outputStack, transformType, matrixStack, renderTypeBuffer, combinedLight, combinedOverlay); + outputStack.getItem().getItemStackTileEntityRenderer().renderByItem(outputStack, transformType, matrixStack, renderTypeBuffer, combinedLight, combinedOverlay); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/render/tesr/StorageMonitorTileRenderer.java b/src/main/java/com/refinedmods/refinedstorage/render/tesr/StorageMonitorTileRenderer.java index 6d7ba87f9..2398c8add 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/tesr/StorageMonitorTileRenderer.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/tesr/StorageMonitorTileRenderer.java @@ -40,13 +40,13 @@ public class StorageMonitorTileRenderer extends TileEntityRenderer> 16 & 0xFF; final int colorGreen = fluidColor >> 8 & 0xFF; final int colorBlue = fluidColor & 0xFF; final int colorAlpha = fluidColor >> 24 & 0xFF; - buffer.pos(matrixStack.getLast().getMatrix(), -0.5F, -0.5F, 0F) + buffer.vertex(matrixStack.last().pose(), -0.5F, -0.5F, 0F) .color(colorRed, colorGreen, colorBlue, colorAlpha) - .tex(sprite.getMinU(), sprite.getMinV()) - .lightmap(light) + .uv(sprite.getU0(), sprite.getV0()) + .uv2(light) .endVertex(); - buffer.pos(matrixStack.getLast().getMatrix(), 0.5F, -0.5F, 0F) + buffer.vertex(matrixStack.last().pose(), 0.5F, -0.5F, 0F) .color(colorRed, colorGreen, colorBlue, colorAlpha) - .tex(sprite.getMaxU(), sprite.getMinV()) - .lightmap(light) + .uv(sprite.getU1(), sprite.getV0()) + .uv2(light) .endVertex(); - buffer.pos(matrixStack.getLast().getMatrix(), 0.5F, -1.5F, 0F) + buffer.vertex(matrixStack.last().pose(), 0.5F, -1.5F, 0F) .color(colorRed, colorGreen, colorBlue, colorAlpha) - .tex(sprite.getMaxU(), sprite.getMaxV()) - .lightmap(light) + .uv(sprite.getU1(), sprite.getV1()) + .uv2(light) .endVertex(); - buffer.pos(matrixStack.getLast().getMatrix(), -0.5F, -1.5F, 0F) + buffer.vertex(matrixStack.last().pose(), -0.5F, -1.5F, 0F) .color(colorRed, colorGreen, colorBlue, colorAlpha) - .tex(sprite.getMinU(), sprite.getMaxV()) - .lightmap(light) + .uv(sprite.getU0(), sprite.getV1()) + .uv2(light) .endVertex(); - matrixStack.pop(); + matrixStack.popPose(); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java index c7202b9d4..85c60eb3b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java @@ -57,17 +57,17 @@ public abstract class AmountSpecifyingScreen extends BaseSc okButton = addButton(x + pos.getLeft(), y + pos.getRight(), getOkCancelButtonWidth(), 20, getOkButtonText(), true, true, btn -> onOkButtonPressed(hasShiftDown())); cancelButton = addButton(x + pos.getLeft(), y + pos.getRight() + 24, getOkCancelButtonWidth(), 20, new TranslationTextComponent("gui.cancel"), true, true, btn -> close()); - amountField = new TextFieldWidget(font, x + getAmountPos().getLeft(), y + getAmountPos().getRight(), 69 - 6, font.FONT_HEIGHT, new StringTextComponent("")); - amountField.setEnableBackgroundDrawing(false); + amountField = new TextFieldWidget(font, x + getAmountPos().getLeft(), y + getAmountPos().getRight(), 69 - 6, font.lineHeight, new StringTextComponent("")); + amountField.setBordered(false); amountField.setVisible(true); - amountField.setText(String.valueOf(getDefaultAmount())); + amountField.setValue(String.valueOf(getDefaultAmount())); amountField.setTextColor(RenderSettings.INSTANCE.getSecondaryColor()); amountField.setCanLoseFocus(false); amountField.changeFocus(true); addButton(amountField); - setListener(amountField); + setFocused(amountField); int[] increments = getIncrements(); @@ -97,7 +97,7 @@ public abstract class AmountSpecifyingScreen extends BaseSc text = new StringTextComponent("-1B"); } - addButton(x + xx, y + ySize - 20 - 7, width, 20, text, true, true, btn -> onIncrementButtonClicked(-increment)); + addButton(x + xx, y + imageHeight - 20 - 7, width, 20, text, true, true, btn -> onIncrementButtonClicked(-increment)); xx += width + 3; } @@ -128,7 +128,7 @@ public abstract class AmountSpecifyingScreen extends BaseSc int oldAmount = 0; try { - oldAmount = Integer.parseInt(amountField.getText()); + oldAmount = Integer.parseInt(amountField.getValue()); } catch (NumberFormatException e) { // NO OP } @@ -145,7 +145,7 @@ public abstract class AmountSpecifyingScreen extends BaseSc newAmount = getMaxAmount(); } - amountField.setText(String.valueOf(newAmount)); + amountField.setValue(String.valueOf(newAmount)); } @Override @@ -157,9 +157,9 @@ public abstract class AmountSpecifyingScreen extends BaseSc public void renderBackground(MatrixStack matrixStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, getTexture()); - blit(matrixStack, x, y, 0, 0, xSize, ySize); + blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); - amountField.renderWidget(matrixStack, 0, 0, 0); + amountField.renderButton(matrixStack, 0, 0, 0); } @Override @@ -183,7 +183,7 @@ public abstract class AmountSpecifyingScreen extends BaseSc } public void close() { - minecraft.displayGuiScreen(parent); + minecraft.setScreen(parent); } public BaseScreen getParent() { diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java index ba437dc9d..35b5b9726 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java @@ -60,8 +60,8 @@ public abstract class BaseScreen extends ContainerScreen protected BaseScreen(T container, int xSize, int ySize, PlayerInventory inventory, ITextComponent title) { super(container, inventory, title); - this.xSize = xSize; - this.ySize = ySize; + this.imageWidth = xSize; + this.imageHeight = ySize; } private void runActions() { @@ -82,7 +82,7 @@ public abstract class BaseScreen extends ContainerScreen @Override public void init() { - minecraft.keyboardListener.enableRepeatEvents(true); + minecraft.keyboardHandler.setSendRepeatsToGui(true); onPreInit(); @@ -99,16 +99,16 @@ public abstract class BaseScreen extends ContainerScreen sideButtonY = 6; sideButtons.clear(); - onPostInit(guiLeft, guiTop); + onPostInit(leftPos, topPos); runActions(); } @Override - public void onClose() { - super.onClose(); + public void removed() { + super.removed(); - minecraft.keyboardListener.enableRepeatEvents(false); + minecraft.keyboardHandler.setSendRepeatsToGui(false); } @Override @@ -117,7 +117,7 @@ public abstract class BaseScreen extends ContainerScreen runActions(); - tick(guiLeft, guiTop); + tick(leftPos, topPos); } @Override @@ -126,26 +126,26 @@ public abstract class BaseScreen extends ContainerScreen super.render(matrixStack, mouseX, mouseY, partialTicks); - renderHoveredTooltip(matrixStack, mouseX, mouseY); + renderTooltip(matrixStack, mouseX, mouseY); } @Override - protected void drawGuiContainerBackgroundLayer(MatrixStack matrixStack, float renderPartialTicks, int mouseX, int mouseY) { + protected void renderBg(MatrixStack matrixStack, float renderPartialTicks, int mouseX, int mouseY) { RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); - renderBackground(matrixStack, guiLeft, guiTop, mouseX, mouseY); + renderBackground(matrixStack, leftPos, topPos, mouseX, mouseY); - for (int i = 0; i < this.container.inventorySlots.size(); ++i) { - Slot slot = container.inventorySlots.get(i); + for (int i = 0; i < this.menu.slots.size(); ++i) { + Slot slot = menu.slots.get(i); - if (slot.isEnabled() && slot instanceof FluidFilterSlot) { + if (slot.isActive() && slot instanceof FluidFilterSlot) { FluidStack stack = ((FluidFilterSlot) slot).getFluidInventory().getFluid(slot.getSlotIndex()); if (!stack.isEmpty()) { - FluidRenderer.INSTANCE.render(matrixStack, guiLeft + slot.xPos, guiTop + slot.yPos, stack); + FluidRenderer.INSTANCE.render(matrixStack, leftPos + slot.x, topPos + slot.y, stack); if (((FluidFilterSlot) slot).isSizeAllowed()) { - renderQuantity(matrixStack, guiLeft + slot.xPos, guiTop + slot.yPos, API.instance().getQuantityFormatter().formatInBucketForm(stack.getAmount()), RenderSettings.INSTANCE.getSecondaryColor()); + renderQuantity(matrixStack, leftPos + slot.x, topPos + slot.y, API.instance().getQuantityFormatter().formatInBucketForm(stack.getAmount()), RenderSettings.INSTANCE.getSecondaryColor()); GL11.glDisable(GL11.GL_LIGHTING); } @@ -155,11 +155,11 @@ public abstract class BaseScreen extends ContainerScreen } @Override - protected void drawGuiContainerForegroundLayer(MatrixStack matrixStack, int mouseX, int mouseY) { + protected void renderLabels(MatrixStack matrixStack, int mouseX, int mouseY) { RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); - mouseX -= guiLeft; - mouseY -= guiTop; + mouseX -= leftPos; + mouseY -= topPos; renderForeground(matrixStack, mouseX, mouseY); @@ -169,13 +169,13 @@ public abstract class BaseScreen extends ContainerScreen } } - for (int i = 0; i < this.container.inventorySlots.size(); ++i) { - Slot slot = container.inventorySlots.get(i); + for (int i = 0; i < this.menu.slots.size(); ++i) { + Slot slot = menu.slots.get(i); - if (slot.isEnabled() && slot instanceof FluidFilterSlot) { + if (slot.isActive() && slot instanceof FluidFilterSlot) { FluidStack stack = ((FluidFilterSlot) slot).getFluidInventory().getFluid(slot.getSlotIndex()); - if (!stack.isEmpty() && RenderUtils.inBounds(slot.xPos, slot.yPos, 17, 17, mouseX, mouseY)) { + if (!stack.isEmpty() && RenderUtils.inBounds(slot.x, slot.y, 17, 17, mouseX, mouseY)) { renderTooltip(matrixStack, mouseX, mouseY, stack.getDisplayName().getString()); } } @@ -183,42 +183,42 @@ public abstract class BaseScreen extends ContainerScreen } @Override - protected void handleMouseClick(Slot slot, int slotId, int mouseButton, ClickType type) { - boolean valid = type != ClickType.QUICK_MOVE && minecraft.player.inventory.getItemStack().isEmpty(); + protected void slotClicked(Slot slot, int slotId, int mouseButton, ClickType type) { + boolean valid = type != ClickType.QUICK_MOVE && minecraft.player.inventory.getCarried().isEmpty(); - if (valid && slot instanceof FilterSlot && slot.isEnabled() && ((FilterSlot) slot).isSizeAllowed()) { - if (!slot.getStack().isEmpty()) { + if (valid && slot instanceof FilterSlot && slot.isActive() && ((FilterSlot) slot).isSizeAllowed()) { + if (!slot.getItem().isEmpty()) { if (((FilterSlot) slot).isAlternativesAllowed() && hasControlDown()) { - minecraft.displayGuiScreen(new AlternativesScreen( + minecraft.setScreen(new AlternativesScreen( this, minecraft.player, ALTERNATIVES_TEXT, - slot.getStack(), + slot.getItem(), slot.getSlotIndex() )); } else { - minecraft.displayGuiScreen(new ItemAmountScreen( + minecraft.setScreen(new ItemAmountScreen( this, minecraft.player, - slot.slotNumber, - slot.getStack(), - slot.getSlotStackLimit(), + slot.index, + slot.getItem(), + slot.getMaxStackSize(), ((FilterSlot) slot).isAlternativesAllowed() ? (parent -> new AlternativesScreen( parent, minecraft.player, ALTERNATIVES_TEXT, - slot.getStack(), + slot.getItem(), slot.getSlotIndex() )) : null )); } } - } else if (valid && slot instanceof FluidFilterSlot && slot.isEnabled() && ((FluidFilterSlot) slot).isSizeAllowed()) { + } else if (valid && slot instanceof FluidFilterSlot && slot.isActive() && ((FluidFilterSlot) slot).isSizeAllowed()) { FluidStack stack = ((FluidFilterSlot) slot).getFluidInventory().getFluid(slot.getSlotIndex()); if (!stack.isEmpty()) { if (((FluidFilterSlot) slot).isAlternativesAllowed() && hasControlDown()) { - minecraft.displayGuiScreen(new AlternativesScreen( + minecraft.setScreen(new AlternativesScreen( this, minecraft.player, ALTERNATIVES_TEXT, @@ -226,10 +226,10 @@ public abstract class BaseScreen extends ContainerScreen slot.getSlotIndex() )); } else { - minecraft.displayGuiScreen(new FluidAmountScreen( + minecraft.setScreen(new FluidAmountScreen( this, minecraft.player, - slot.slotNumber, + slot.index, stack, ((FluidFilterSlot) slot).getFluidInventory().getMaxAmount(), ((FluidFilterSlot) slot).isAlternativesAllowed() ? (parent -> new AlternativesScreen( @@ -242,10 +242,10 @@ public abstract class BaseScreen extends ContainerScreen )); } } else { - super.handleMouseClick(slot, slotId, mouseButton, type); + super.slotClicked(slot, slotId, mouseButton, type); } } else { - super.handleMouseClick(slot, slotId, mouseButton, type); + super.slotClicked(slot, slotId, mouseButton, type); } } @@ -269,8 +269,8 @@ public abstract class BaseScreen extends ContainerScreen } public void addSideButton(SideButton button) { - button.x = guiLeft - button.getWidth() - 2; - button.y = guiTop + sideButtonY; + button.x = leftPos - button.getWidth() - 2; + button.y = topPos + sideButtonY; sideButtonY += button.getHeight() + 2; @@ -283,7 +283,7 @@ public abstract class BaseScreen extends ContainerScreen } public void bindTexture(String namespace, String filenameInTexturesFolder) { - minecraft.getTextureManager().bindTexture(TEXTURE_CACHE.computeIfAbsent(namespace + ":" + filenameInTexturesFolder, newId -> new ResourceLocation(namespace, "textures/" + filenameInTexturesFolder))); + minecraft.getTextureManager().bind(TEXTURE_CACHE.computeIfAbsent(namespace + ":" + filenameInTexturesFolder, newId -> new ResourceLocation(namespace, "textures/" + filenameInTexturesFolder))); } public void renderItem(MatrixStack matrixStack, int x, int y, ItemStack stack) { @@ -293,16 +293,16 @@ public abstract class BaseScreen extends ContainerScreen public void renderItem(MatrixStack matrixStack, int x, int y, ItemStack stack, boolean overlay, @Nullable String text, int textColor) { try { setBlitOffset(Z_LEVEL_ITEMS); - itemRenderer.zLevel = Z_LEVEL_ITEMS; + itemRenderer.blitOffset = Z_LEVEL_ITEMS; - itemRenderer.renderItemIntoGUI(stack, x, y); + itemRenderer.renderGuiItem(stack, x, y); if (overlay) { - itemRenderer.renderItemOverlayIntoGUI(font, stack, x, y, ""); + itemRenderer.renderGuiItemDecorations(font, stack, x, y, ""); } setBlitOffset(0); - itemRenderer.zLevel = 0; + itemRenderer.blitOffset = 0; if (text != null) { renderQuantity(matrixStack, x, y, text, textColor); @@ -313,18 +313,18 @@ public abstract class BaseScreen extends ContainerScreen } public void renderQuantity(MatrixStack matrixStack, int x, int y, String qty, int color) { - boolean large = minecraft.getForceUnicodeFont() || RS.CLIENT_CONFIG.getGrid().getLargeFont(); + boolean large = minecraft.isEnforceUnicode() || RS.CLIENT_CONFIG.getGrid().getLargeFont(); - matrixStack.push(); + matrixStack.pushPose(); matrixStack.translate(x, y, Z_LEVEL_QTY); if (!large) { matrixStack.scale(0.5F, 0.5F, 1); } - font.drawStringWithShadow(matrixStack, qty, (large ? 16 : 30) - font.getStringWidth(qty), large ? 8 : 22, color); + font.drawShadow(matrixStack, qty, (large ? 16 : 30) - font.width(qty), large ? 8 : 22, color); - matrixStack.pop(); + matrixStack.popPose(); } public void renderString(MatrixStack matrixStack, int x, int y, String message) { @@ -332,7 +332,7 @@ public abstract class BaseScreen extends ContainerScreen } public void renderString(MatrixStack matrixStack, int x, int y, String message, int color) { - font.drawString(matrixStack, message, x, y, color); + font.draw(matrixStack, message, x, y, color); } public void renderTooltip(MatrixStack matrixStack, int x, int y, String lines) { @@ -352,7 +352,7 @@ public abstract class BaseScreen extends ContainerScreen } public static boolean isKeyDown(KeyBinding keybinding) { - return !keybinding.isInvalid() && InputMappings.isKeyDown(Minecraft.getInstance().getMainWindow().getHandle(), keybinding.getKey().getKeyCode()) && + return !keybinding.isUnbound() && InputMappings.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), keybinding.getKey().getValue()) && keybinding.getKeyConflictContext().isActive() && keybinding.getKeyModifier().isActive(keybinding.getKeyConflictContext()); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java index e9efb858f..65c2c7cf5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java @@ -37,12 +37,12 @@ public class ConstructorScreen extends BaseScreen { public void renderBackground(MatrixStack matrixStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/constructor.png"); - blit(matrixStack, x, y, 0, 0, xSize, ySize); + blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); } @Override public void renderForeground(MatrixStack matrixStack, int mouseX, int mouseY) { renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, 43, I18n.format("container.inventory")); + renderString(matrixStack, 7, 43, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java index 4a08ffff2..614a12c08 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java @@ -47,7 +47,7 @@ public class ControllerScreen extends BaseScreen { public void renderBackground(MatrixStack matrixStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/controller.png"); - blit(matrixStack, x, y, 0, 0, xSize, ySize); + blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); int energyBarHeightNew = Network.getEnergyScaled(ControllerTile.ENERGY_STORED.getValue(), ControllerTile.ENERGY_CAPACITY.getValue(), ENERGY_BAR_HEIGHT); @@ -81,14 +81,14 @@ public class ControllerScreen extends BaseScreen { @Override public void renderForeground(MatrixStack matrixStack, int mouseX, int mouseY) { renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, 87, I18n.format("container.inventory")); + renderString(matrixStack, 7, 87, I18n.get("container.inventory")); int x = 33; int y = 26; int slot = scrollbar.getOffset() * 2; - RenderHelper.setupGui3DDiffuseLighting(); + RenderHelper.setupFor3DItems(); List nodes = ControllerTile.NODES.getValue(); @@ -100,20 +100,20 @@ public class ControllerScreen extends BaseScreen { renderItem(matrixStack, x, y + 5, node.getStack()); - float scale = minecraft.getForceUnicodeFont() ? 1F : 0.5F; + float scale = minecraft.isEnforceUnicode() ? 1F : 0.5F; - matrixStack.push(); + matrixStack.pushPose(); matrixStack.scale(scale, scale, 1); renderString( matrixStack, RenderUtils.getOffsetOnScale(x + 1, scale), RenderUtils.getOffsetOnScale(y - 2, scale), - trimNameIfNeeded(!minecraft.getForceUnicodeFont(), node.getStack().getDisplayName().getString()) + trimNameIfNeeded(!minecraft.isEnforceUnicode(), node.getStack().getHoverName().getString()) ); renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 21, scale), RenderUtils.getOffsetOnScale(y + 10, scale), node.getAmount() + "x"); - matrixStack.pop(); + matrixStack.popPose(); if (RenderUtils.inBounds(x, y, 16, 16, mouseX, mouseY)) { hoveringNode = node; @@ -131,11 +131,11 @@ public class ControllerScreen extends BaseScreen { } if (hoveringNode != null) { - renderTooltip(matrixStack, mouseX, mouseY, I18n.format("misc.refinedstorage.energy_usage_minimal", hoveringNode.getEnergyUsage())); + renderTooltip(matrixStack, mouseX, mouseY, I18n.get("misc.refinedstorage.energy_usage_minimal", hoveringNode.getEnergyUsage())); } if (RenderUtils.inBounds(ENERGY_BAR_X, ENERGY_BAR_Y, ENERGY_BAR_WIDTH, ENERGY_BAR_HEIGHT, mouseX, mouseY)) { - renderTooltip(matrixStack, mouseX, mouseY, I18n.format("misc.refinedstorage.energy_usage", ControllerTile.ENERGY_USAGE.getValue()) + "\n" + I18n.format("misc.refinedstorage.energy_stored", ControllerTile.ENERGY_STORED.getValue(), ControllerTile.ENERGY_CAPACITY.getValue())); + renderTooltip(matrixStack, mouseX, mouseY, I18n.get("misc.refinedstorage.energy_usage", ControllerTile.ENERGY_USAGE.getValue()) + "\n" + I18n.get("misc.refinedstorage.energy_stored", ControllerTile.ENERGY_STORED.getValue(), ControllerTile.ENERGY_CAPACITY.getValue())); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java index 9e5e0c38b..96fbafa2a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java @@ -39,7 +39,7 @@ public class CrafterManagerScreen extends BaseScreen im @Override protected void onPreInit() { - this.ySize = getTopHeight() + getBottomHeight() + (getVisibleRows() * 18); + this.imageHeight = getTopHeight() + getBottomHeight() + (getVisibleRows() * 18); } @Override @@ -49,9 +49,9 @@ public class CrafterManagerScreen extends BaseScreen im addSideButton(new GridSizeSideButton(this, crafterManager::getSize, size -> TileDataManager.setParameter(CrafterManagerTile.SIZE, size))); this.scrollbar = new ScrollbarWidget(this, 174, getTopHeight(), 12, (getVisibleRows() * 18) - 2); - this.scrollbar.addListener((oldOffset, newOffset) -> container.initSlots(null)); + this.scrollbar.addListener((oldOffset, newOffset) -> menu.initSlots(null)); - container.initSlots(null); + menu.initSlots(null); int sx = x + 97 + 1; int sy = y + 6 + 1; @@ -61,7 +61,7 @@ public class CrafterManagerScreen extends BaseScreen im searchField.setResponder(value -> { searchField.updateJei(); - container.initSlots(null); + menu.initSlots(null); }); searchField.setMode(crafterManager.getSearchBoxMode()); } else { @@ -82,7 +82,7 @@ public class CrafterManagerScreen extends BaseScreen im public void renderBackground(MatrixStack matrixStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/crafter_manager.png"); - blit(matrixStack, x, y, 0, 0, xSize, getTopHeight()); + blit(matrixStack, x, y, 0, 0, imageWidth, getTopHeight()); int rows = getVisibleRows(); @@ -100,17 +100,17 @@ public class CrafterManagerScreen extends BaseScreen im } } - blit(matrixStack, x, yy, 0, yTextureStart, xSize, 18); + blit(matrixStack, x, yy, 0, yTextureStart, imageWidth, 18); } yy += 18; - blit(matrixStack, x, yy, 0, getTopHeight() + (18 * 3), xSize, getBottomHeight()); + blit(matrixStack, x, yy, 0, getTopHeight() + (18 * 3), imageWidth, getBottomHeight()); if (crafterManager.isActiveOnClient()) { - for (Slot slot : container.inventorySlots) { - if (slot instanceof CrafterManagerSlot && slot.isEnabled()) { - blit(matrixStack, x + slot.xPos - 1, y + slot.yPos - 1, 0, 193, 18, 18); + for (Slot slot : menu.slots) { + if (slot instanceof CrafterManagerSlot && slot.isActive()) { + blit(matrixStack, x + slot.x - 1, y + slot.y - 1, 0, 193, 18, 18); } } } @@ -123,10 +123,10 @@ public class CrafterManagerScreen extends BaseScreen im @Override public void renderForeground(MatrixStack matrixStack, int mouseX, int mouseY) { renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, getYPlayerInventory() - 12, I18n.format("container.inventory")); + renderString(matrixStack, 7, getYPlayerInventory() - 12, I18n.get("container.inventory")); - if (container != null && crafterManager.isActiveOnClient()) { - for (Map.Entry heading : container.getHeadings().entrySet()) { + if (menu != null && crafterManager.isActiveOnClient()) { + for (Map.Entry heading : menu.getHeadings().entrySet()) { int y = heading.getValue(); if (y >= getTopHeight() - 1 && y < getTopHeight() + getVisibleRows() * 18 - 1) { @@ -137,7 +137,7 @@ public class CrafterManagerScreen extends BaseScreen im blit(matrixStack, 7, y, 0, 174, 18 * 9, 18); - renderString(matrixStack, 7 + 4, y + 6, RenderUtils.shorten(I18n.format(heading.getKey()), 25)); + renderString(matrixStack, 7 + 4, y + 6, RenderUtils.shorten(I18n.get(heading.getKey()), 25)); } } } @@ -163,7 +163,7 @@ public class CrafterManagerScreen extends BaseScreen im @Override public boolean keyPressed(int key, int scanCode, int modifiers) { - if (searchField.keyPressed(key, scanCode, modifiers) || searchField.canWrite()) { + if (searchField.keyPressed(key, scanCode, modifiers) || searchField.canConsumeInput()) { return true; } @@ -225,7 +225,7 @@ public class CrafterManagerScreen extends BaseScreen im @Override public int getRows() { - return !crafterManager.isActiveOnClient() ? 0 : container.getRows(); + return !crafterManager.isActiveOnClient() ? 0 : menu.getRows(); } @Override @@ -235,7 +235,7 @@ public class CrafterManagerScreen extends BaseScreen im @Override public String getSearchFieldText() { - return searchField == null ? "" : searchField.getText(); + return searchField == null ? "" : searchField.getValue(); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterScreen.java index cb5f8ad1d..076370cfb 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterScreen.java @@ -27,12 +27,12 @@ public class CrafterScreen extends BaseScreen { public void renderBackground(MatrixStack matrixStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/crafter.png"); - blit(matrixStack, x, y, 0, 0, xSize, ySize); + blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); } @Override public void renderForeground(MatrixStack matrixStack, int mouseX, int mouseY) { renderString(matrixStack, 7, 7, RenderUtils.shorten(title.getString(), 26)); - renderString(matrixStack, 7, 43, I18n.format("container.inventory")); + renderString(matrixStack, 7, 43, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java index fe2e10a7e..849e3d774 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java @@ -56,7 +56,7 @@ public class CraftingMonitorScreen extends BaseScreen @Override public void drawTooltip(MatrixStack matrixStack, int x, int y, int screenWidth, int screenHeight, FontRenderer fontRenderer) { - List textLines = Lists.newArrayList(requested.getItem() != null ? requested.getItem().getDisplayName() : requested.getFluid().getDisplayName()); + List textLines = Lists.newArrayList(requested.getItem() != null ? requested.getItem().getHoverName() : requested.getFluid().getDisplayName()); List smallTextLines = Lists.newArrayList(); int totalSecs = (int) (System.currentTimeMillis() - executionStarted) / 1000; @@ -64,7 +64,7 @@ public class CraftingMonitorScreen extends BaseScreen int minutes = (totalSecs % 3600) / 60; int seconds = totalSecs % 60; - smallTextLines.add(I18n.format("gui.refinedstorage.crafting_monitor.tooltip.requested", requested.getFluid() != null ? API.instance().getQuantityFormatter().formatInBucketForm(qty) : API.instance().getQuantityFormatter().format(qty))); + smallTextLines.add(I18n.get("gui.refinedstorage.crafting_monitor.tooltip.requested", requested.getFluid() != null ? API.instance().getQuantityFormatter().formatInBucketForm(qty) : API.instance().getQuantityFormatter().format(qty))); if (hours > 0) { smallTextLines.add(String.format("%02d:%02d:%02d", hours, minutes, seconds)); @@ -85,7 +85,7 @@ public class CraftingMonitorScreen extends BaseScreen @Override public void drawIcon(MatrixStack matrixStack, int x, int y, IElementDrawer itemDrawer, IElementDrawer fluidDrawer) { if (requested.getItem() != null) { - RenderHelper.setupGui3DDiffuseLighting(); + RenderHelper.setupFor3DItems(); itemDrawer.draw(matrixStack, x, y, requested.getItem()); } else { @@ -164,7 +164,7 @@ public class CraftingMonitorScreen extends BaseScreen @Override public void onPostInit(int x, int y) { - this.tabs.init(xSize); + this.tabs.init(imageWidth); if (craftingMonitor.getRedstoneModeParameter() != null) { addSideButton(new RedstoneModeSideButton(this, craftingMonitor.getRedstoneModeParameter())); @@ -173,8 +173,8 @@ public class CraftingMonitorScreen extends BaseScreen ITextComponent cancel = new TranslationTextComponent("gui.cancel"); ITextComponent cancelAll = new TranslationTextComponent("misc.refinedstorage.cancel_all"); - int cancelButtonWidth = 14 + font.getStringWidth(cancel.getString()); - int cancelAllButtonWidth = 14 + font.getStringWidth(cancelAll.getString()); + int cancelButtonWidth = 14 + font.width(cancel.getString()); + int cancelAllButtonWidth = 14 + font.width(cancelAll.getString()); this.cancelButton = addButton(x + 7, y + 201 - 20 - 7, cancelButtonWidth, 20, cancel, false, true, btn -> { if (hasValidTabSelected()) { @@ -250,7 +250,7 @@ public class CraftingMonitorScreen extends BaseScreen bindTexture(RS.ID, "gui/crafting_preview.png"); - blit(matrixStack, x, y, 0, 0, xSize, ySize); + blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); scrollbar.render(matrixStack); @@ -263,7 +263,7 @@ public class CraftingMonitorScreen extends BaseScreen int item = scrollbar != null ? scrollbar.getOffset() * 3 : 0; - RenderHelper.setupGui3DDiffuseLighting(); + RenderHelper.setupFor3DItems(); int x = 7; int y = 20; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java index c3970376c..95a749bfc 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java @@ -37,12 +37,12 @@ public class DestructorScreen extends BaseScreen { public void renderBackground(MatrixStack matrixStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/destructor.png"); - blit(matrixStack, x, y, 0, 0, xSize, ySize); + blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); } @Override public void renderForeground(MatrixStack matrixStack, int mouseX, int mouseY) { renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, 43, I18n.format("container.inventory")); + renderString(matrixStack, 7, 43, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java index 4a0d5264d..5776774e6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java @@ -31,12 +31,12 @@ public class DetectorScreen extends BaseScreen { addSideButton(new ExactModeSideButton(this, DetectorTile.COMPARE)); - amountField = new TextFieldWidget(font, x + 41 + 1, y + 23 + 1, 50, font.FONT_HEIGHT, new StringTextComponent("")); - amountField.setText(String.valueOf(DetectorTile.AMOUNT.getValue())); - amountField.setEnableBackgroundDrawing(false); + amountField = new TextFieldWidget(font, x + 41 + 1, y + 23 + 1, 50, font.lineHeight, new StringTextComponent("")); + amountField.setValue(String.valueOf(DetectorTile.AMOUNT.getValue())); + amountField.setBordered(false); amountField.setVisible(true); amountField.setCanLoseFocus(true); - amountField.setFocused2(false); + amountField.setFocus(false); amountField.setTextColor(RenderSettings.INSTANCE.getSecondaryColor()); amountField.setResponder(value -> { try { @@ -52,7 +52,7 @@ public class DetectorScreen extends BaseScreen { } public void updateAmountField(int amount) { - amountField.setText(String.valueOf(amount)); + amountField.setValue(String.valueOf(amount)); } @Override @@ -64,24 +64,24 @@ public class DetectorScreen extends BaseScreen { public void renderBackground(MatrixStack matrixStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/detector.png"); - blit(matrixStack, x, y, 0, 0, xSize, ySize); + blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); } @Override public void renderForeground(MatrixStack matrixStack, int mouseX, int mouseY) { renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, 43, I18n.format("container.inventory")); + renderString(matrixStack, 7, 43, I18n.get("container.inventory")); } @Override public boolean keyPressed(int key, int scanCode, int modifiers) { if (key == GLFW.GLFW_KEY_ESCAPE) { - minecraft.player.closeScreen(); + minecraft.player.closeContainer(); return true; } - if (amountField.keyPressed(key, scanCode, modifiers) || amountField.canWrite()) { + if (amountField.keyPressed(key, scanCode, modifiers) || amountField.canConsumeInput()) { return true; } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java index c4dab7123..1b538fcb6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java @@ -30,7 +30,7 @@ public class DiskDriveScreen extends StorageScreen { @Override public void renderForeground(MatrixStack matrixStack, int mouseX, int mouseY) { - renderString(matrixStack, 79, 42, I18n.format("gui.refinedstorage.disk_drive.disks")); + renderString(matrixStack, 79, 42, I18n.get("gui.refinedstorage.disk_drive.disks")); super.renderForeground(matrixStack, mouseX, mouseY); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java index 8ecfdbef5..f76578858 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java @@ -33,14 +33,14 @@ public class DiskManipulatorScreen extends BaseScreen public void renderBackground(MatrixStack matrixStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/disk_manipulator.png"); - blit(matrixStack, x, y, 0, 0, xSize, ySize); + blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); } @Override public void renderForeground(MatrixStack matrixStack, int mouseX, int mouseY) { renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, 117, I18n.format("container.inventory")); - renderString(matrixStack, 43, 45, I18n.format("gui.refinedstorage.disk_manipulator.in")); - renderString(matrixStack, 115, 45, I18n.format("gui.refinedstorage.disk_manipulator.out")); + renderString(matrixStack, 7, 117, I18n.get("container.inventory")); + renderString(matrixStack, 43, 45, I18n.get("gui.refinedstorage.disk_manipulator.in")); + renderString(matrixStack, 115, 45, I18n.get("gui.refinedstorage.disk_manipulator.out")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ExporterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ExporterScreen.java index 8d1cacf79..ca7e14d82 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ExporterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ExporterScreen.java @@ -23,7 +23,7 @@ public class ExporterScreen extends BaseScreen { } private boolean hasRegulatorMode() { - return ((ExporterTile) container.getTile()).getNode().getUpgrades().hasUpgrade(UpgradeItem.Type.REGULATOR); + return ((ExporterTile) menu.getTile()).getNode().getUpgrades().hasUpgrade(UpgradeItem.Type.REGULATOR); } @Override @@ -41,7 +41,7 @@ public class ExporterScreen extends BaseScreen { if (hasRegulatorMode != updatedHasRegulatorMode) { hasRegulatorMode = updatedHasRegulatorMode; - container.initSlots(); + menu.initSlots(); } } @@ -49,12 +49,12 @@ public class ExporterScreen extends BaseScreen { public void renderBackground(MatrixStack matrixStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/exporter.png"); - blit(matrixStack, x, y, 0, 0, xSize, ySize); + blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); } @Override public void renderForeground(MatrixStack matrixStack, int mouseX, int mouseY) { renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, 43, I18n.format("container.inventory")); + renderString(matrixStack, 7, 43, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java index ded868b21..88f4d955c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java @@ -41,7 +41,7 @@ public class FilterScreen extends BaseScreen { this.compare = FilterItem.getCompare(container.getFilterItem()); this.mode = FilterItem.getMode(container.getFilterItem()); this.modFilter = FilterItem.isModFilter(container.getFilterItem()); - this.name = FilterItem.getName(container.getFilterItem()); + this.name = FilterItem.getFilterName(container.getFilterItem()); this.type = FilterItem.getType(container.getFilterItem()); } @@ -69,12 +69,12 @@ public class FilterScreen extends BaseScreen { updateModeButton(mode); - nameField = new TextFieldWidget(font, x + 34, y + 121, 137 - 6, font.FONT_HEIGHT, new StringTextComponent("")); - nameField.setText(name); - nameField.setEnableBackgroundDrawing(false); + nameField = new TextFieldWidget(font, x + 34, y + 121, 137 - 6, font.lineHeight, new StringTextComponent("")); + nameField.setValue(name); + nameField.setBordered(false); nameField.setVisible(true); nameField.setCanLoseFocus(true); - nameField.setFocused2(false); + nameField.setFocus(false); nameField.setTextColor(RenderSettings.INSTANCE.getSecondaryColor()); nameField.setResponder(content -> sendUpdate()); @@ -88,7 +88,7 @@ public class FilterScreen extends BaseScreen { ? new TranslationTextComponent("sidebutton.refinedstorage.mode.whitelist") : new TranslationTextComponent("sidebutton.refinedstorage.mode.blacklist"); - modeButton.setWidth(font.getStringWidth(text.getString()) + 12); + modeButton.setWidth(font.width(text.getString()) + 12); modeButton.setMessage(text); modFilterCheckBox.x = modeButton.x + modeButton.getWidth() + 4; } @@ -96,12 +96,12 @@ public class FilterScreen extends BaseScreen { @Override public boolean keyPressed(int key, int scanCode, int modifiers) { if (key == GLFW.GLFW_KEY_ESCAPE) { - minecraft.player.closeScreen(); + minecraft.player.closeContainer(); return true; } - if (nameField.keyPressed(key, scanCode, modifiers) || nameField.canWrite()) { + if (nameField.keyPressed(key, scanCode, modifiers) || nameField.canConsumeInput()) { return true; } @@ -117,13 +117,13 @@ public class FilterScreen extends BaseScreen { public void renderBackground(MatrixStack matrixStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/filter.png"); - blit(matrixStack, x, y, 0, 0, xSize, ySize); + blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); } @Override public void renderForeground(MatrixStack matrixStack, int mouseX, int mouseY) { renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, 137, I18n.format("container.inventory")); + renderString(matrixStack, 7, 137, I18n.get("container.inventory")); } public int getType() { @@ -137,6 +137,6 @@ public class FilterScreen extends BaseScreen { } public void sendUpdate() { - RS.NETWORK_HANDLER.sendToServer(new FilterUpdateMessage(compare, mode, modFilter, nameField.getText(), type)); + RS.NETWORK_HANDLER.sendToServer(new FilterUpdateMessage(compare, mode, modFilter, nameField.getValue(), type)); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java index e0b410b4f..367ff0fe7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java @@ -40,7 +40,7 @@ public class FluidAmountScreen extends AmountSpecifyingScreen minecraft.displayGuiScreen(alternativesScreenFactory.apply(this))); + addButton(x + 114, cancelButton.y + 24, getOkCancelButtonWidth(), 20, new TranslationTextComponent("gui.refinedstorage.alternatives"), true, true, btn -> minecraft.setScreen(alternativesScreenFactory.apply(this))); } } @@ -89,7 +89,7 @@ public class FluidAmountScreen extends AmountSpecifyingScreen { public void renderBackground(MatrixStack matrixStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/fluid_interface.png"); - blit(matrixStack, x, y, 0, 0, xSize, ySize); + blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); if (!FluidInterfaceTile.TANK_IN.getValue().isEmpty()) { TANK_RENDERER.render(matrixStack, x + 46, y + 56, FluidInterfaceTile.TANK_IN.getValue()); @@ -50,9 +50,9 @@ public class FluidInterfaceScreen extends BaseScreen { @Override public void renderForeground(MatrixStack matrixStack, int mouseX, int mouseY) { renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 43 + 4, 20, I18n.format("gui.refinedstorage.fluid_interface.in")); - renderString(matrixStack, 115 + 1, 20, I18n.format("gui.refinedstorage.fluid_interface.out")); - renderString(matrixStack, 7, 111, I18n.format("container.inventory")); + renderString(matrixStack, 43 + 4, 20, I18n.get("gui.refinedstorage.fluid_interface.in")); + renderString(matrixStack, 115 + 1, 20, I18n.get("gui.refinedstorage.fluid_interface.out")); + renderString(matrixStack, 7, 111, I18n.get("container.inventory")); if (RenderUtils.inBounds(46, 56, 12, 47, mouseX, mouseY) && !FluidInterfaceTile.TANK_IN.getValue().isEmpty()) { renderTooltip(matrixStack, mouseX, mouseY, FluidInterfaceTile.TANK_IN.getValue().getDisplayName().getString() + "\n" + TextFormatting.GRAY + API.instance().getQuantityFormatter().formatInBucketForm(FluidInterfaceTile.TANK_IN.getValue().getAmount()) + TextFormatting.RESET); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ImporterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ImporterScreen.java index ff7078d97..2c62f0ada 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ImporterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ImporterScreen.java @@ -38,12 +38,12 @@ public class ImporterScreen extends BaseScreen { public void renderBackground(MatrixStack matrixStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/importer.png"); - blit(matrixStack, x, y, 0, 0, xSize, ySize); + blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); } @Override public void renderForeground(MatrixStack matrixStack, int mouseX, int mouseY) { renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, 43, I18n.format("container.inventory")); + renderString(matrixStack, 7, 43, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java index 8c0e69f70..4ebdc4f4d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java @@ -32,13 +32,13 @@ public class InterfaceScreen extends BaseScreen { public void renderBackground(MatrixStack matrixStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/interface.png"); - blit(matrixStack, x, y, 0, 0, xSize, ySize); + blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); } @Override public void renderForeground(MatrixStack matrixStack, int mouseX, int mouseY) { - renderString(matrixStack, 7, 7, I18n.format("gui.refinedstorage.interface.import")); - renderString(matrixStack, 7, 42, I18n.format("gui.refinedstorage.interface.export")); - renderString(matrixStack, 7, 122, I18n.format("container.inventory")); + renderString(matrixStack, 7, 7, I18n.get("gui.refinedstorage.interface.import")); + renderString(matrixStack, 7, 42, I18n.get("gui.refinedstorage.interface.export")); + renderString(matrixStack, 7, 122, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ItemAmountScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ItemAmountScreen.java index 260a692f1..56f7ddbff 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ItemAmountScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ItemAmountScreen.java @@ -40,7 +40,7 @@ public class ItemAmountScreen extends AmountSpecifyingScreen { super.onPostInit(x, y); if (alternativesScreenFactory != null) { - addButton(x + 114, cancelButton.y + 24, getOkCancelButtonWidth(), 20, new TranslationTextComponent("gui.refinedstorage.alternatives"), true, true, btn -> minecraft.displayGuiScreen(alternativesScreenFactory.apply(this))); + addButton(x + 114, cancelButton.y + 24, getOkCancelButtonWidth(), 20, new TranslationTextComponent("gui.refinedstorage.alternatives"), true, true, btn -> minecraft.setScreen(alternativesScreenFactory.apply(this))); } } @@ -89,7 +89,7 @@ public class ItemAmountScreen extends AmountSpecifyingScreen { @Override protected void onOkButtonPressed(boolean shiftDown) { try { - int amount = Integer.parseInt(amountField.getText()); + int amount = Integer.parseInt(amountField.getValue()); RS.NETWORK_HANDLER.sendToServer(new SetFilterSlotMessage(containerSlot, ItemHandlerHelper.copyStackWithSize(stack, amount))); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/KeyInputListener.java b/src/main/java/com/refinedmods/refinedstorage/screen/KeyInputListener.java index 4a271f382..02b40c2dd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/KeyInputListener.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/KeyInputListener.java @@ -26,13 +26,13 @@ public class KeyInputListener { @SubscribeEvent public void onKeyInput(InputEvent.KeyInputEvent e) { if (Minecraft.getInstance().player != null) { - if (RSKeyBindings.OPEN_WIRELESS_GRID.isKeyDown()) { + if (RSKeyBindings.OPEN_WIRELESS_GRID.isDown()) { findAndOpen(RSItems.WIRELESS_GRID.get(), RSItems.CREATIVE_WIRELESS_GRID.get()); - } else if (RSKeyBindings.OPEN_WIRELESS_FLUID_GRID.isKeyDown()) { + } else if (RSKeyBindings.OPEN_WIRELESS_FLUID_GRID.isDown()) { findAndOpen(RSItems.WIRELESS_FLUID_GRID.get(), RSItems.CREATIVE_WIRELESS_FLUID_GRID.get()); - } else if (RSKeyBindings.OPEN_PORTABLE_GRID.isKeyDown()) { + } else if (RSKeyBindings.OPEN_PORTABLE_GRID.isDown()) { findAndOpen(RSItems.PORTABLE_GRID.get(), RSItems.CREATIVE_PORTABLE_GRID.get()); - } else if (RSKeyBindings.OPEN_WIRELESS_CRAFTING_MONITOR.isKeyDown()) { + } else if (RSKeyBindings.OPEN_WIRELESS_CRAFTING_MONITOR.isDown()) { findAndOpen(RSItems.WIRELESS_CRAFTING_MONITOR.get(), RSItems.CREATIVE_WIRELESS_CRAFTING_MONITOR.get()); } } @@ -44,12 +44,12 @@ public class KeyInputListener { IInventory inv = Minecraft.getInstance().player.inventory; int slotFound = -1; - for (int i = 0; i < inv.getSizeInventory(); ++i) { - ItemStack slot = inv.getStackInSlot(i); + for (int i = 0; i < inv.getContainerSize(); ++i) { + ItemStack slot = inv.getItem(i); if (validItems.contains(slot.getItem())) { if (slotFound != -1) { - sendError(new TranslationTextComponent("misc.refinedstorage.network_item.shortcut_duplicate", new TranslationTextComponent(items[0].getTranslationKey()))); + sendError(new TranslationTextComponent("misc.refinedstorage.network_item.shortcut_duplicate", new TranslationTextComponent(items[0].getDescriptionId()))); return; } @@ -67,14 +67,14 @@ public class KeyInputListener { } if (slotFound == -1) { - sendError(new TranslationTextComponent("misc.refinedstorage.network_item.shortcut_not_found", new TranslationTextComponent(items[0].getTranslationKey()))); + sendError(new TranslationTextComponent("misc.refinedstorage.network_item.shortcut_not_found", new TranslationTextComponent(items[0].getDescriptionId()))); } else { RS.NETWORK_HANDLER.sendToServer(new OpenNetworkItemMessage(new PlayerSlot(slotFound))); } } public static void sendError(TranslationTextComponent error) { - Minecraft.getInstance().player.sendMessage(error, Util.DUMMY_UUID); + Minecraft.getInstance().player.sendMessage(error, Util.NIL_UUID); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/NetworkTransmitterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/NetworkTransmitterScreen.java index 8b4a77957..ed5307e8d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/NetworkTransmitterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/NetworkTransmitterScreen.java @@ -32,7 +32,7 @@ public class NetworkTransmitterScreen extends BaseScreen { public PriorityScreen(BaseScreen parent, TileDataParameter priority, PlayerInventory inventory) { super(parent, new Container(null, 0) { @Override - public boolean canInteractWith(PlayerEntity player) { + public boolean stillValid(PlayerEntity player) { return false; } }, 164, 92, inventory, new TranslationTextComponent("misc.refinedstorage.priority")); @@ -69,7 +69,7 @@ public class PriorityScreen extends AmountSpecifyingScreen { @Override protected void onOkButtonPressed(boolean noPreview) { try { - int amount = Integer.parseInt(amountField.getText()); + int amount = Integer.parseInt(amountField.getValue()); TileDataManager.setParameter(priority, amount); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/RelayScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/RelayScreen.java index 26fb1cef9..c90b469a3 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/RelayScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/RelayScreen.java @@ -28,12 +28,12 @@ public class RelayScreen extends BaseScreen { public void renderBackground(MatrixStack matrixStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/relay.png"); - blit(matrixStack, x, y, 0, 0, xSize, ySize); + blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); } @Override public void renderForeground(MatrixStack matrixStack, int mouseX, int mouseY) { renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, 39, I18n.format("container.inventory")); + renderString(matrixStack, 7, 39, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java index ae4afc0e4..dc2af09f9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java @@ -42,7 +42,7 @@ public class SecurityManagerScreen extends BaseScreen } private void handle(int i) { - RS.NETWORK_HANDLER.sendToServer(new SecurityManagerUpdateMessage(securityManager.getPos(), Permission.values()[i], permissions[i].isChecked())); + RS.NETWORK_HANDLER.sendToServer(new SecurityManagerUpdateMessage(securityManager.getBlockPos(), Permission.values()[i], permissions[i].selected())); } @Override @@ -58,21 +58,21 @@ public class SecurityManagerScreen extends BaseScreen public void renderBackground(MatrixStack matrixStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/security_manager.png"); - blit(matrixStack, x, y, 0, 0, xSize, ySize); + blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); } @Override public void renderForeground(MatrixStack matrixStack, int mouseX, int mouseY) { renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, 59, I18n.format("gui.refinedstorage.security_manager.configure")); - renderString(matrixStack, 7, 140, I18n.format("container.inventory")); + renderString(matrixStack, 7, 59, I18n.get("gui.refinedstorage.security_manager.configure")); + renderString(matrixStack, 7, 140, I18n.get("container.inventory")); for (int i = 0; i < permissions.length; ++i) { CheckboxWidget permission = permissions[i]; // getWidth_CLASH => getHeight - if (RenderUtils.inBounds(permission.x - guiLeft, permission.y - guiTop, permission.getWidth(), permission.getHeight(), mouseX, mouseY)) { - renderTooltip(matrixStack, mouseX, mouseY, I18n.format("gui.refinedstorage.security_manager.permission." + i + ".tooltip")); + if (RenderUtils.inBounds(permission.x - leftPos, permission.y - topPos, permission.getWidth(), permission.getHeight(), mouseX, mouseY)) { + renderTooltip(matrixStack, mouseX, mouseY, I18n.get("gui.refinedstorage.security_manager.permission." + i + ".tooltip")); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/StorageMonitorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/StorageMonitorScreen.java index c150b7d79..5d672b594 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/StorageMonitorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/StorageMonitorScreen.java @@ -30,12 +30,12 @@ public class StorageMonitorScreen extends BaseScreen { public void renderBackground(MatrixStack matrixStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/storage_monitor.png"); - blit(matrixStack, x, y, 0, 0, xSize, ySize); + blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); } @Override public void renderForeground(MatrixStack matrixStack, int mouseX, int mouseY) { renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, 43, I18n.format("container.inventory")); + renderString(matrixStack, 7, 43, I18n.get("container.inventory")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/StorageScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/StorageScreen.java index 587ecf01f..8ae51e237 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/StorageScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/StorageScreen.java @@ -62,7 +62,7 @@ public class StorageScreen extends BaseScreen { addSideButton(new AccessTypeSideButton(this, dataParameters.getAccessTypeParameter())); } - int buttonWidth = 10 + font.getStringWidth(I18n.format("misc.refinedstorage.priority")); + int buttonWidth = 10 + font.width(I18n.get("misc.refinedstorage.priority")); addButton( x + 169 - buttonWidth, @@ -71,7 +71,7 @@ public class StorageScreen extends BaseScreen { new TranslationTextComponent("misc.refinedstorage.priority"), true, true, - btn -> minecraft.displayGuiScreen(new PriorityScreen(this, dataParameters.getPriorityParameter(), playerInventory)) + btn -> minecraft.setScreen(new PriorityScreen(this, dataParameters.getPriorityParameter(), inventory)) ); } @@ -84,7 +84,7 @@ public class StorageScreen extends BaseScreen { public void renderBackground(MatrixStack matrixStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, texture); - blit(matrixStack, x, y, 0, 0, xSize, ySize); + blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); int barHeightNew = capacitySupplier.get() < 0 ? 0 : (int) ((float) storedSupplier.get() / (float) capacitySupplier.get() * (float) BAR_HEIGHT); @@ -95,11 +95,11 @@ public class StorageScreen extends BaseScreen { public void renderForeground(MatrixStack matrixStack, int mouseX, int mouseY) { renderString(matrixStack, 7, 7, title.getString()); renderString(matrixStack, 7, 42, capacitySupplier.get() == -1 ? - I18n.format("misc.refinedstorage.storage.stored_minimal", API.instance().getQuantityFormatter().formatWithUnits(storedSupplier.get())) : - I18n.format("misc.refinedstorage.storage.stored_capacity_minimal", API.instance().getQuantityFormatter().formatWithUnits(storedSupplier.get()), API.instance().getQuantityFormatter().formatWithUnits(capacitySupplier.get())) + I18n.get("misc.refinedstorage.storage.stored_minimal", API.instance().getQuantityFormatter().formatWithUnits(storedSupplier.get())) : + I18n.get("misc.refinedstorage.storage.stored_capacity_minimal", API.instance().getQuantityFormatter().formatWithUnits(storedSupplier.get()), API.instance().getQuantityFormatter().formatWithUnits(capacitySupplier.get())) ); - renderString(matrixStack, 7, 129, I18n.format("container.inventory")); + renderString(matrixStack, 7, 129, I18n.get("container.inventory")); if (RenderUtils.inBounds(BAR_X, BAR_Y, BAR_WIDTH, BAR_HEIGHT, mouseX, mouseY)) { int full = 0; @@ -109,9 +109,9 @@ public class StorageScreen extends BaseScreen { } renderTooltip(matrixStack, mouseX, mouseY, (capacitySupplier.get() == -1 ? - I18n.format("misc.refinedstorage.storage.stored_minimal", API.instance().getQuantityFormatter().format(storedSupplier.get())) : - I18n.format("misc.refinedstorage.storage.stored_capacity_minimal", API.instance().getQuantityFormatter().format(storedSupplier.get()), API.instance().getQuantityFormatter().format(capacitySupplier.get())) - ) + "\n" + TextFormatting.GRAY + I18n.format("misc.refinedstorage.storage.full", full)); + I18n.get("misc.refinedstorage.storage.stored_minimal", API.instance().getQuantityFormatter().format(storedSupplier.get())) : + I18n.get("misc.refinedstorage.storage.stored_capacity_minimal", API.instance().getQuantityFormatter().format(storedSupplier.get()), API.instance().getQuantityFormatter().format(capacitySupplier.get())) + ) + "\n" + TextFormatting.GRAY + I18n.get("misc.refinedstorage.storage.full", full)); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/WirelessTransmitterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/WirelessTransmitterScreen.java index fe0e87b05..a90c60f44 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/WirelessTransmitterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/WirelessTransmitterScreen.java @@ -29,13 +29,13 @@ public class WirelessTransmitterScreen extends BaseScreen { if (item != null) { lines.add(new ItemLine(item)); - for (ResourceLocation owningTag : ItemTags.getCollection().getOwningTags(item.getItem())) { + for (ResourceLocation owningTag : ItemTags.getAllTags().getMatchingTags(item.getItem())) { lines.add(new TagLine(owningTag, GridTile.ALLOWED_ITEM_TAGS.getValue().get(slot).contains(owningTag))); int itemCount = 0; ItemListLine line = new ItemListLine(); - for (Item itemInTag : ItemTags.getCollection().get(owningTag).getAllElements()) { + for (Item itemInTag : ItemTags.getAllTags().getTag(owningTag).getValues()) { if (itemCount > 0 && itemCount % 8 == 0) { lines.add(line); line = new ItemListLine(); @@ -101,14 +101,14 @@ public class AlternativesScreen extends BaseScreen { } else if (fluid != null) { lines.add(new FluidLine(fluid)); - for (ResourceLocation owningTag : FluidTags.getCollection().getOwningTags(fluid.getFluid())) { + for (ResourceLocation owningTag : FluidTags.getAllTags().getMatchingTags(fluid.getFluid())) { lines.add(new TagLine(owningTag, GridTile.ALLOWED_FLUID_TAGS.getValue().get(slot).contains(owningTag))); int fluidCount = 0; FluidListLine line = new FluidListLine(); - for (Fluid fluidInTag : FluidTags.getCollection().get(owningTag).getAllElements()) { + for (Fluid fluidInTag : FluidTags.getAllTags().getTag(owningTag).getValues()) { if (fluidCount > 0 && fluidCount % 8 == 0) { lines.add(line); line = new FluidListLine(); @@ -131,7 +131,7 @@ public class AlternativesScreen extends BaseScreen { boolean visible = i >= scrollbar.getOffset() && i < scrollbar.getOffset() + VISIBLE_ROWS; if (visible) { - lines.get(i).layoutDependantControls(true, guiLeft + xx + 3, guiTop + yy + 3); + lines.get(i).layoutDependantControls(true, leftPos + xx + 3, topPos + yy + 3); yy += 18; } @@ -155,7 +155,7 @@ public class AlternativesScreen extends BaseScreen { public void renderBackground(MatrixStack matrixStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/alternatives.png"); - blit(matrixStack, x, y, 0, 0, xSize, ySize); + blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); scrollbar.render(matrixStack); } @@ -171,7 +171,7 @@ public class AlternativesScreen extends BaseScreen { boolean visible = i >= scrollbar.getOffset() && i < scrollbar.getOffset() + VISIBLE_ROWS; if (visible) { - lines.get(i).layoutDependantControls(true, guiLeft + x + 3, guiTop + y + 3); + lines.get(i).layoutDependantControls(true, leftPos + x + 3, topPos + y + 3); lines.get(i).render(matrixStack, x, y); y += 18; @@ -228,7 +228,7 @@ public class AlternativesScreen extends BaseScreen { } private void close() { - minecraft.displayGuiScreen(parent); + minecraft.setScreen(parent); } private void apply() { @@ -238,7 +238,7 @@ public class AlternativesScreen extends BaseScreen { if (line instanceof TagLine) { TagLine tagLine = (TagLine) line; - if (tagLine.widget.isChecked()) { + if (tagLine.widget.selected()) { allowed.add(tagLine.tagName); } } @@ -283,7 +283,7 @@ public class AlternativesScreen extends BaseScreen { public void render(MatrixStack matrixStack, int x, int y) { RenderSystem.color4f(1, 1, 1, 1); renderItem(matrixStack, x + 3, y + 2, item); - renderString(matrixStack, x + 4 + 19, y + 7, item.getDisplayName().getString()); + renderString(matrixStack, x + 4 + 19, y + 7, item.getHoverName().getString()); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingPreviewScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingPreviewScreen.java index 94b2c4d2a..c8319fd7b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingPreviewScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingPreviewScreen.java @@ -55,7 +55,7 @@ public class CraftingPreviewScreen extends BaseScreen { public CraftingPreviewScreen(Screen parent, List elements, UUID id, int quantity, boolean fluids, ITextComponent title) { super(new Container(null, 0) { @Override - public boolean canInteractWith(@Nonnull PlayerEntity player) { + public boolean stillValid(@Nonnull PlayerEntity player) { return false; } }, 254, 201, null, title); @@ -97,7 +97,7 @@ public class CraftingPreviewScreen extends BaseScreen { public void renderBackground(MatrixStack matrixStack, int x, int y, int mouseX, int mouseY) { bindTexture(RS.ID, "gui/crafting_preview.png"); - blit(matrixStack, x, y, 0, 0, xSize, ySize); + blit(matrixStack, x, y, 0, 0, imageWidth, imageHeight); if (getError() != null) { fill(matrixStack, x + 7, y + 20, x + 228, y + 169, 0xFFDBDBDB); @@ -113,7 +113,7 @@ public class CraftingPreviewScreen extends BaseScreen { int x = 7; int y = 15; - float scale = Minecraft.getInstance().getForceUnicodeFont() ? 1F : 0.5F; + float scale = Minecraft.getInstance().isEnforceUnicode() ? 1F : 0.5F; ErrorCraftingPreviewElement error = getError(); if (error != null) { @@ -126,7 +126,7 @@ public class CraftingPreviewScreen extends BaseScreen { private void renderPreview(MatrixStack matrixStack, int mouseX, int mouseY, int x, int y) { int slot = scrollbar != null ? (scrollbar.getOffset() * 3) : 0; - RenderHelper.setupGui3DDiffuseLighting(); + RenderHelper.setupFor3DItems(); RenderSystem.enableDepthTest(); this.hoveringStack = null; @@ -161,10 +161,10 @@ public class CraftingPreviewScreen extends BaseScreen { } private void renderError(MatrixStack matrixStack, int x, int y, float scale, ErrorCraftingPreviewElement errorElement) { - matrixStack.push(); + matrixStack.pushPose(); matrixStack.scale(scale, scale, 1); - renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 11, scale), I18n.format("gui.refinedstorage.crafting_preview.error")); + renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 11, scale), I18n.get("gui.refinedstorage.crafting_preview.error")); switch (errorElement.getType()) { case RECURSIVE: @@ -177,33 +177,33 @@ public class CraftingPreviewScreen extends BaseScreen { break; } - matrixStack.pop(); + matrixStack.popPose(); } private void renderTooComplexError(MatrixStack matrixStack, int x, int y, float scale) { - renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 21, scale), I18n.format("gui.refinedstorage.crafting_preview.error.too_complex.0")); - renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 31, scale), I18n.format("gui.refinedstorage.crafting_preview.error.too_complex.1")); + renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 21, scale), I18n.get("gui.refinedstorage.crafting_preview.error.too_complex.0")); + renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 31, scale), I18n.get("gui.refinedstorage.crafting_preview.error.too_complex.1")); } private void renderRecursiveError(MatrixStack matrixStack, int x, int y, float scale, ItemStack recursedPattern) { - renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 21, scale), I18n.format("gui.refinedstorage.crafting_preview.error.recursive.0")); - renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 31, scale), I18n.format("gui.refinedstorage.crafting_preview.error.recursive.1")); - renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 41, scale), I18n.format("gui.refinedstorage.crafting_preview.error.recursive.2")); - renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 51, scale), I18n.format("gui.refinedstorage.crafting_preview.error.recursive.3")); + renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 21, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.0")); + renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 31, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.1")); + renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 41, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.2")); + renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 51, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.3")); - renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 61, scale), I18n.format("gui.refinedstorage.crafting_preview.error.recursive.4")); + renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 5, scale), RenderUtils.getOffsetOnScale(y + 61, scale), I18n.get("gui.refinedstorage.crafting_preview.error.recursive.4")); - ICraftingPattern pattern = PatternItem.fromCache(parent.getMinecraft().world, recursedPattern); + ICraftingPattern pattern = PatternItem.fromCache(parent.getMinecraft().level, recursedPattern); int yy = 83; for (ItemStack output : pattern.getOutputs()) { if (output != null) { - renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy + 6, scale), output.getDisplayName().getString()); + renderString(matrixStack, RenderUtils.getOffsetOnScale(x + 25, scale), RenderUtils.getOffsetOnScale(yy + 6, scale), output.getHoverName().getString()); - RenderHelper.setupGui3DDiffuseLighting(); + RenderHelper.setupFor3DItems(); RenderSystem.enableDepthTest(); renderItem(matrixStack, x + 5, yy, output); - RenderHelper.disableStandardItemLighting(); + RenderHelper.turnOff(); yy += 17; } @@ -220,9 +220,9 @@ public class CraftingPreviewScreen extends BaseScreen { hoveringStack, mouseX, mouseY, - hoveringStack.getTooltip( + hoveringStack.getTooltipLines( Minecraft.getInstance().player, - Minecraft.getInstance().gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL + Minecraft.getInstance().options.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL ) ); } else if (hoveringFluid != null) { @@ -280,6 +280,6 @@ public class CraftingPreviewScreen extends BaseScreen { } private void close() { - minecraft.displayGuiScreen(parent); + minecraft.setScreen(parent); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java index 088176356..a09d0ccd2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java @@ -64,7 +64,7 @@ public class CraftingSettingsScreen extends AmountSpecifyingScreen implements IScreenInfo protected void onPreInit() { super.onPreInit(); this.doSort = true; - this.ySize = getTopHeight() + getBottomHeight() + (getVisibleRows() * 18); + this.imageHeight = getTopHeight() + getBottomHeight() + (getVisibleRows() * 18); } @Override public void onPostInit(int x, int y) { - this.container.initSlots(); + this.menu.initSlots(); - this.tabs.init(xSize - 32); + this.tabs.init(imageWidth - 32); this.scrollbar = new ScrollbarWidget(this, 174, getTopHeight(), 12, (getVisibleRows() * 18) - 2); @@ -131,7 +131,7 @@ public class GridScreen extends BaseScreen implements IScreenInfo searchQuery = value; }); searchField.setMode(grid.getSearchBoxMode()); - searchField.setText(searchQuery); + searchField.setValue(searchQuery); } else { searchField.x = sx; searchField.y = sy; @@ -154,29 +154,29 @@ public class GridScreen extends BaseScreen implements IScreenInfo patternScrollbar.setMaxOffset(patternScrollOffsetAbsoluteMax); patternScrollbar.setOffset(patternScrollOffset); // keep offset when changing between fluid and item view - container.updatePatternSlotPositions(patternScrollOffset); + menu.updatePatternSlotPositions(patternScrollOffset); patternScrollbar.addListener((oldOffset, newOffset) -> { patternScrollOffset = newOffset; - container.updatePatternSlotPositions(newOffset); + menu.updatePatternSlotPositions(newOffset); }); processingPattern = addCheckBox(x + 7, y + getTopHeight() + (getVisibleRows() * 18) + 60, new TranslationTextComponent("misc.refinedstorage.processing"), GridTile.PROCESSING_PATTERN.getValue(), btn -> { // Rebuild the inventory slots before the slot change packet arrives. - GridTile.PROCESSING_PATTERN.setValue(false, processingPattern.isChecked()); + GridTile.PROCESSING_PATTERN.setValue(false, processingPattern.selected()); ((GridNetworkNode) grid).clearMatrix(); // The server does this but let's do it earlier so the client doesn't notice. - this.container.initSlots(); + this.menu.initSlots(); patternScrollOffset = 0; // reset offset when switching between crafting and processing - TileDataManager.setParameter(GridTile.PROCESSING_PATTERN, processingPattern.isChecked()); + TileDataManager.setParameter(GridTile.PROCESSING_PATTERN, processingPattern.selected()); }); - if (!processingPattern.isChecked()) { + if (!processingPattern.selected()) { exactPattern = addCheckBox( processingPattern.x + processingPattern.getWidth() + 5, y + getTopHeight() + (getVisibleRows() * 18) + 60, new TranslationTextComponent("misc.refinedstorage.exact"), GridTile.EXACT_PATTERN.getValue(), - btn -> TileDataManager.setParameter(GridTile.EXACT_PATTERN, exactPattern.isChecked()) + btn -> TileDataManager.setParameter(GridTile.EXACT_PATTERN, exactPattern.selected()) ); patternScrollbar.setEnabled(false); } else { @@ -266,7 +266,7 @@ public class GridScreen extends BaseScreen implements IScreenInfo @Override public String getSearchFieldText() { - return searchField.getText(); + return searchField.getValue(); } @Override @@ -340,10 +340,10 @@ public class GridScreen extends BaseScreen implements IScreenInfo int yy = y; - blit(matrixStack, x, yy, 0, 0, xSize - 34, getTopHeight()); + blit(matrixStack, x, yy, 0, 0, imageWidth - 34, getTopHeight()); // Filters and/or portable grid disk - blit(matrixStack, x + xSize - 34 + 4, y, 197, 0, 30, grid instanceof IPortableGrid ? 114 : 82); + blit(matrixStack, x + imageWidth - 34 + 4, y, 197, 0, 30, grid instanceof IPortableGrid ? 114 : 82); int rows = getVisibleRows(); @@ -359,17 +359,17 @@ public class GridScreen extends BaseScreen implements IScreenInfo } } - blit(matrixStack, x, yy, 0, yTextureStart, xSize - 34, 18); + blit(matrixStack, x, yy, 0, yTextureStart, imageWidth - 34, 18); } yy += 18; - blit(matrixStack, x, yy, 0, getTopHeight() + (18 * 3), xSize - 34, getBottomHeight()); + blit(matrixStack, x, yy, 0, getTopHeight() + (18 * 3), imageWidth - 34, getBottomHeight()); if (grid.getGridType() == GridType.PATTERN) { int ty = 0; - if (isOverCreatePattern(mouseX - guiLeft, mouseY - guiTop)) { + if (isOverCreatePattern(mouseX - leftPos, mouseY - topPos)) { ty = 1; } @@ -378,7 +378,7 @@ public class GridScreen extends BaseScreen implements IScreenInfo } blit(matrixStack, x + 172, y + getTopHeight() + (getVisibleRows() * 18) + 22, 240, ty * 16, 16, 16); - if (processingPattern.isChecked()) { + if (processingPattern.selected()) { updatePatternScrollbar(); patternScrollbar.render(matrixStack); } @@ -405,7 +405,7 @@ public class GridScreen extends BaseScreen implements IScreenInfo @Override public void renderForeground(MatrixStack matrixStack, int mouseX, int mouseY) { renderString(matrixStack, 7, 7, title.getString()); - renderString(matrixStack, 7, getYPlayerInventory() - 12, I18n.format("container.inventory")); + renderString(matrixStack, 7, getYPlayerInventory() - 12, I18n.get("container.inventory")); int x = 8; int y = 19; @@ -414,7 +414,7 @@ public class GridScreen extends BaseScreen implements IScreenInfo int slot = scrollbar != null ? (scrollbar.getOffset() * 9) : 0; - RenderHelper.setupGui3DDiffuseLighting(); + RenderHelper.setupFor3DItems(); for (int i = 0; i < 9 * getVisibleRows(); ++i) { if (RenderUtils.inBounds(x, y, 16, 16, mouseX, mouseY) || !grid.isGridActive()) { @@ -428,13 +428,13 @@ public class GridScreen extends BaseScreen implements IScreenInfo if (RenderUtils.inBounds(x, y, 16, 16, mouseX, mouseY) || !grid.isGridActive()) { int color = grid.isGridActive() ? -2130706433 : 0xFF5B5B5B; - matrixStack.push(); + matrixStack.pushPose(); RenderSystem.disableLighting(); RenderSystem.disableDepthTest(); RenderSystem.colorMask(true, true, true, false); fillGradient(matrixStack, x, y, x + 16, y + 16, color, color); RenderSystem.colorMask(true, true, true, true); - matrixStack.pop(); + matrixStack.popPose(); } slot++; @@ -448,11 +448,11 @@ public class GridScreen extends BaseScreen implements IScreenInfo } if (isOverClear(mouseX, mouseY)) { - renderTooltip(matrixStack, mouseX, mouseY, I18n.format("misc.refinedstorage.clear")); + renderTooltip(matrixStack, mouseX, mouseY, I18n.get("misc.refinedstorage.clear")); } if (isOverCreatePattern(mouseX, mouseY)) { - renderTooltip(matrixStack, mouseX, mouseY, I18n.format("gui.refinedstorage.grid.pattern_create")); + renderTooltip(matrixStack, mouseX, mouseY, I18n.get("gui.refinedstorage.grid.pattern_create")); } tabs.drawTooltip(matrixStack, font, mouseX, mouseY); @@ -463,7 +463,7 @@ public class GridScreen extends BaseScreen implements IScreenInfo List smallTextLines = Lists.newArrayList(); if (!gridStack.isCraftable()) { - smallTextLines.add(I18n.format("misc.refinedstorage.total", gridStack.getFormattedFullQuantity())); + smallTextLines.add(I18n.get("misc.refinedstorage.total", gridStack.getFormattedFullQuantity())); } if (gridStack.getTrackerEntry() != null) { @@ -488,28 +488,28 @@ public class GridScreen extends BaseScreen implements IScreenInfo return true; } if (RS.CLIENT_CONFIG.getGrid().getPreventSortingWhileShiftIsDown()) { - doSort = !isOverSlotArea(mouseX - guiLeft, mouseY - guiTop) && !isOverCraftingOutputArea(mouseX - guiLeft, mouseY - guiTop); + doSort = !isOverSlotArea(mouseX - leftPos, mouseY - topPos) && !isOverCraftingOutputArea(mouseX - leftPos, mouseY - topPos); } - boolean clickedClear = clickedButton == 0 && isOverClear(mouseX - guiLeft, mouseY - guiTop); - boolean clickedCreatePattern = clickedButton == 0 && isOverCreatePattern(mouseX - guiLeft, mouseY - guiTop); + boolean clickedClear = clickedButton == 0 && isOverClear(mouseX - leftPos, mouseY - topPos); + boolean clickedCreatePattern = clickedButton == 0 && isOverCreatePattern(mouseX - leftPos, mouseY - topPos); if (clickedCreatePattern) { - minecraft.getSoundHandler().play(SimpleSound.master(SoundEvents.UI_BUTTON_CLICK, 1.0F)); + minecraft.getSoundManager().play(SimpleSound.forUI(SoundEvents.UI_BUTTON_CLICK, 1.0F)); RS.NETWORK_HANDLER.sendToServer(new GridPatternCreateMessage(((GridNetworkNode) grid).getPos())); return true; } else if (clickedClear) { - minecraft.getSoundHandler().play(SimpleSound.master(SoundEvents.UI_BUTTON_CLICK, 1.0F)); + minecraft.getSoundManager().play(SimpleSound.forUI(SoundEvents.UI_BUTTON_CLICK, 1.0F)); RS.NETWORK_HANDLER.sendToServer(new GridClearMessage()); return true; } else if (grid.isGridActive()) { - ItemStack held = container.getPlayer().inventory.getItemStack(); + ItemStack held = menu.getPlayer().inventory.getCarried(); - if (isOverSlotArea(mouseX - guiLeft, mouseY - guiTop) && !held.isEmpty() && (clickedButton == 0 || clickedButton == 1)) { + if (isOverSlotArea(mouseX - leftPos, mouseY - topPos) && !held.isEmpty() && (clickedButton == 0 || clickedButton == 1)) { if (grid.getGridType() == GridType.FLUID) { RS.NETWORK_HANDLER.sendToServer(new GridFluidInsertHeldMessage()); } else { @@ -524,9 +524,9 @@ public class GridScreen extends BaseScreen implements IScreenInfo if (held.isEmpty()) { if (view.canCraft() && stack.isCraftable()) { - minecraft.displayGuiScreen(new CraftingSettingsScreen(this, playerInventory.player, stack)); + minecraft.setScreen(new CraftingSettingsScreen(this, inventory.player, stack)); } else if (view.canCraft() && !stack.isCraftable() && stack.getOtherId() != null && hasShiftDown() && hasControlDown()) { - minecraft.displayGuiScreen(new CraftingSettingsScreen(this, playerInventory.player, view.get(stack.getOtherId()))); + minecraft.setScreen(new CraftingSettingsScreen(this, inventory.player, view.get(stack.getOtherId()))); } else if (grid.getGridType() == GridType.FLUID && held.isEmpty()) { RS.NETWORK_HANDLER.sendToServer(new GridFluidPullMessage(view.getStacks().get(slotNumber).getId(), hasShiftDown())); } else if (grid.getGridType() != GridType.FLUID) { @@ -580,12 +580,12 @@ public class GridScreen extends BaseScreen implements IScreenInfo public boolean mouseScrolled(double x, double y, double delta) { if (hasShiftDown() || hasControlDown()) { if (RS.CLIENT_CONFIG.getGrid().getPreventSortingWhileShiftIsDown()) { - doSort = !isOverSlotArea(x - guiLeft, y - guiTop) && !isOverCraftingOutputArea(x - guiLeft, y - guiTop); + doSort = !isOverSlotArea(x - leftPos, y - topPos) && !isOverCraftingOutputArea(x - leftPos, y - topPos); } if (grid.getGridType() != GridType.FLUID) { - if (isOverInventory(x - guiLeft, y - guiTop) && hoveredSlot != null && hoveredSlot.getHasStack() && getContainer().getDisabledSlotNumber() != hoveredSlot.getSlotIndex()) { + if (isOverInventory(x - leftPos, y - topPos) && hoveredSlot != null && hoveredSlot.hasItem() && getMenu().getDisabledSlotNumber() != hoveredSlot.getSlotIndex()) { RS.NETWORK_HANDLER.sendToServer(new GridItemInventoryScrollMessage(hoveredSlot.getSlotIndex(), hasShiftDown(), delta > 0)); - } else if (isOverSlotArea(x - guiLeft, y - guiTop)) { + } else if (isOverSlotArea(x - leftPos, y - topPos)) { RS.NETWORK_HANDLER.sendToServer(new GridItemGridScrollMessage(isOverSlotWithStack() ? view.getStacks().get(slotNumber).getId() : null, hasShiftDown(), delta > 0)); } } @@ -593,7 +593,7 @@ public class GridScreen extends BaseScreen implements IScreenInfo return super.mouseScrolled(x, y, delta); } - if (grid.getGridType() == GridType.PATTERN && isOverPatternArea(x - guiLeft, y - guiTop) && patternScrollbar.mouseScrolled(x, y, delta)) { + if (grid.getGridType() == GridType.PATTERN && isOverPatternArea(x - leftPos, y - topPos) && patternScrollbar.mouseScrolled(x, y, delta)) { return true; } @@ -631,7 +631,7 @@ public class GridScreen extends BaseScreen implements IScreenInfo @Override public boolean keyPressed(int key, int scanCode, int modifiers) { - if (searchField.keyPressed(key, scanCode, modifiers) || searchField.canWrite()) { + if (searchField.keyPressed(key, scanCode, modifiers) || searchField.canConsumeInput()) { return true; } @@ -639,8 +639,8 @@ public class GridScreen extends BaseScreen implements IScreenInfo } @Override - public void onClose() { - super.onClose(); + public void removed() { + super.removed(); if (!RS.CLIENT_CONFIG.getGrid().getRememberSearchQuery()) { searchQuery = ""; @@ -693,12 +693,12 @@ public class GridScreen extends BaseScreen implements IScreenInfo } public void updatePatternScrollbar() { - patternScrollbar.setEnabled(processingPattern.isChecked() && patternScrollOffsetMax > 0); + patternScrollbar.setEnabled(processingPattern.selected() && patternScrollOffsetMax > 0); int oldOffset = patternScrollbar.getOffset(); patternScrollbar.setMaxOffset(Math.min(patternScrollOffsetMax, patternScrollOffsetAbsoluteMax)); if (oldOffset != patternScrollbar.getOffset()) { - container.updatePatternSlotPositions(patternScrollbar.getOffset()); + menu.updatePatternSlotPositions(patternScrollbar.getOffset()); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/IdGridSorter.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/IdGridSorter.java index 938a90815..8ccc081f8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/IdGridSorter.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/sorting/IdGridSorter.java @@ -20,8 +20,8 @@ public class IdGridSorter implements IGridSorter { int rightId = 0; if (left.getIngredient() instanceof ItemStack && right.getIngredient() instanceof ItemStack) { - leftId = Item.getIdFromItem(((ItemStack) left.getIngredient()).getItem()); - rightId = Item.getIdFromItem(((ItemStack) right.getIngredient()).getItem()); + leftId = Item.getId(((ItemStack) left.getIngredient()).getItem()); + rightId = Item.getId(((ItemStack) right.getIngredient()).getItem()); } else if (left.getIngredient() instanceof FluidStack && right.getIngredient() instanceof FluidStack) { leftId = Registry.FLUID.getId(((FluidStack) left.getIngredient()).getFluid()); rightId = Registry.FLUID.getId(((FluidStack) right.getIngredient()).getFluid()); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/FluidGridStack.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/FluidGridStack.java index daefc7261..77a7230fb 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/FluidGridStack.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/FluidGridStack.java @@ -122,7 +122,7 @@ public class FluidGridStack implements IGridStack { if (cachedTags == null) { cachedTags = new HashSet<>(); - for (ResourceLocation owningTag : FluidTags.getCollection().getOwningTags(stack.getFluid())) { + for (ResourceLocation owningTag : FluidTags.getAllTags().getMatchingTags(stack.getFluid())) { cachedTags.add(owningTag.getPath()); } } @@ -187,7 +187,7 @@ public class FluidGridStack implements IGridStack { text = "0"; color = 16733525; } else if (isCraftable()) { - text = I18n.format("gui.refinedstorage.grid.craft"); + text = I18n.get("gui.refinedstorage.grid.craft"); } else { text = API.instance().getQuantityFormatter().formatInBucketFormWithOnlyTrailingDigitsIfZero(getQuantity()); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/ItemGridStack.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/ItemGridStack.java index 7af3d3013..eb6b59dd7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/ItemGridStack.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/stack/ItemGridStack.java @@ -92,7 +92,7 @@ public class ItemGridStack implements IGridStack { public String getName() { if (cachedName == null) { try { - cachedName = stack.getDisplayName().getString(); + cachedName = stack.getHoverName().getString(); } catch (Throwable t) { logger.warn("Could not retrieve item name of {}", stack.getItem().getRegistryName()); @@ -136,7 +136,7 @@ public class ItemGridStack implements IGridStack { if (cachedTags == null) { cachedTags = new HashSet<>(); - for (ResourceLocation owningTag : ItemTags.getCollection().getOwningTags(stack.getItem())) { + for (ResourceLocation owningTag : ItemTags.getAllTags().getMatchingTags(stack.getItem())) { cachedTags.add(owningTag.getPath()); } } @@ -200,7 +200,7 @@ public class ItemGridStack implements IGridStack { text = "0"; color = 16733525; } else if (craftable) { - text = I18n.format("gui.refinedstorage.grid.craft"); + text = I18n.get("gui.refinedstorage.grid.craft"); } else if (stack.getCount() > 1) { text = API.instance().getQuantityFormatter().formatWithUnits(getQuantity()); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/CheckboxWidget.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/CheckboxWidget.java index 729b12112..d3d6485c4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/CheckboxWidget.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/CheckboxWidget.java @@ -22,7 +22,7 @@ public class CheckboxWidget extends CheckboxButton { super( x, y, - Minecraft.getInstance().fontRenderer.getStringWidth(text.getString()) + BOX_WIDTH, + Minecraft.getInstance().font.width(text.getString()) + BOX_WIDTH, 10, text, isChecked @@ -43,22 +43,22 @@ public class CheckboxWidget extends CheckboxButton { } public void setChecked(boolean value) { - this.checked = value; + this.selected = value; } @Override - public void renderWidget(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { + public void renderButton(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { Minecraft minecraft = Minecraft.getInstance(); - minecraft.getTextureManager().bindTexture(TEXTURE); + minecraft.getTextureManager().bind(TEXTURE); RenderSystem.enableDepthTest(); - FontRenderer fontRenderer = minecraft.fontRenderer; + FontRenderer fontRenderer = minecraft.font; RenderSystem.color4f(1.0F, 1.0F, 1.0F, this.alpha); RenderSystem.enableBlend(); RenderSystem.defaultBlendFunc(); RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA); float textureX = (this.isFocused() ? 10.0F : 0.0F); - float textureY = (this.checked ? 10.0F : 0.0F); + float textureY = (this.selected ? 10.0F : 0.0F); int width = 10; int height = 10; @@ -78,7 +78,7 @@ public class CheckboxWidget extends CheckboxButton { if (shadow) { drawString(matrixStack, fontRenderer, this.getMessage(), this.x + 13, this.y + (this.height - 8) / 2, color); } else { - fontRenderer.drawString(matrixStack, this.getMessage().getString(), (float) this.x + 13, this.y + (this.height - 8) / 2F, color); + fontRenderer.draw(matrixStack, this.getMessage().getString(), (float) this.x + 13, this.y + (this.height - 8) / 2F, color); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/SearchWidget.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/SearchWidget.java index 09a75b420..517308e60 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/SearchWidget.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/SearchWidget.java @@ -22,16 +22,16 @@ public class SearchWidget extends TextFieldWidget { private int historyIndex = -1; public SearchWidget(FontRenderer fontRenderer, int x, int y, int width) { - super(fontRenderer, x, y, width, fontRenderer.FONT_HEIGHT, new StringTextComponent("")); + super(fontRenderer, x, y, width, fontRenderer.lineHeight, new StringTextComponent("")); - this.setEnableBackgroundDrawing(false); + this.setBordered(false); this.setVisible(true); this.setTextColor(RenderSettings.INSTANCE.getSecondaryColor()); } public void updateJei() { if (canSyncToJEINow()) { - RSJeiPlugin.getRuntime().getIngredientFilter().setFilterText(getText()); + RSJeiPlugin.getRuntime().getIngredientFilter().setFilterText(getValue()); } } @@ -54,7 +54,7 @@ public class SearchWidget extends TextFieldWidget { boolean clickedWidget = mouseX >= this.x && mouseX < this.x + this.width && mouseY >= this.y && mouseY < this.y + this.height; if (clickedWidget && mouseButton == 1) { - setText(""); + setValue(""); setFocused(true); } else if (wasFocused != isFocused()) { saveHistory(); @@ -135,22 +135,22 @@ public class SearchWidget extends TextFieldWidget { historyIndex = HISTORY.size() - 1; if (delta == 1) { - setText(""); + setValue(""); return; } } - setText(HISTORY.get(historyIndex)); + setValue(HISTORY.get(historyIndex)); } private void saveHistory() { - if (!HISTORY.isEmpty() && HISTORY.get(HISTORY.size() - 1).equals(getText())) { + if (!HISTORY.isEmpty() && HISTORY.get(HISTORY.size() - 1).equals(getValue())) { return; } - if (!getText().trim().isEmpty()) { - HISTORY.add(getText()); + if (!getValue().trim().isEmpty()) { + HISTORY.add(getValue()); } } @@ -167,16 +167,16 @@ public class SearchWidget extends TextFieldWidget { private void setTextFromJEI() { final String filterText = RSJeiPlugin.getRuntime().getIngredientFilter().getFilterText(); - if (!getText().equals(filterText)) { - setText(filterText); + if (!getValue().equals(filterText)) { + setValue(filterText); } } @Override - public void renderWidget(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { + public void renderButton(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { if (canSyncFromJEINow() && RSJeiPlugin.getRuntime().getIngredientListOverlay().hasKeyboardFocus()) { setTextFromJEI(); } - super.renderWidget(matrixStack, mouseX, mouseY, partialTicks); + super.renderButton(matrixStack, mouseX, mouseY, partialTicks); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java index a30201f0d..2280189ae 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/AccessTypeSideButton.java @@ -25,7 +25,7 @@ public class AccessTypeSideButton extends SideButton { @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage.access_type") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.access_type." + parameter.getValue().getId()); + return I18n.get("sidebutton.refinedstorage.access_type") + "\n" + TextFormatting.GRAY + I18n.get("sidebutton.refinedstorage.access_type." + parameter.getValue().getId()); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java index aa1057123..0e585e914 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java @@ -20,7 +20,7 @@ public class ConstructorDropSideButton extends SideButton { @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage.constructor.drop") + "\n" + TextFormatting.GRAY + I18n.format(Boolean.TRUE.equals(ConstructorTile.DROP.getValue()) ? "gui.yes" : "gui.no"); + return I18n.get("sidebutton.refinedstorage.constructor.drop") + "\n" + TextFormatting.GRAY + I18n.get(Boolean.TRUE.equals(ConstructorTile.DROP.getValue()) ? "gui.yes" : "gui.no"); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java index 8c3ecef1f..13a3e98b9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java @@ -15,7 +15,7 @@ public class CrafterModeSideButton extends SideButton { @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage.crafter_mode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.crafter_mode." + CrafterTile.MODE.getValue()); + return I18n.get("sidebutton.refinedstorage.crafter_mode") + "\n" + TextFormatting.GRAY + I18n.get("sidebutton.refinedstorage.crafter_mode." + CrafterTile.MODE.getValue()); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java index 811944c24..c09d8879e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java @@ -20,7 +20,7 @@ public class DestructorPickupSideButton extends SideButton { @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage.destructor.pickup") + "\n" + TextFormatting.GRAY + I18n.format(Boolean.TRUE.equals(DestructorTile.PICKUP.getValue()) ? "gui.yes" : "gui.no"); + return I18n.get("sidebutton.refinedstorage.destructor.pickup") + "\n" + TextFormatting.GRAY + I18n.get(Boolean.TRUE.equals(DestructorTile.PICKUP.getValue()) ? "gui.yes" : "gui.no"); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java index bb9305d0c..1ec8439ad 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java @@ -16,7 +16,7 @@ public class DetectorModeSideButton extends SideButton { @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage.detector.mode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.detector.mode." + DetectorTile.MODE.getValue()); + return I18n.get("sidebutton.refinedstorage.detector.mode") + "\n" + TextFormatting.GRAY + I18n.get("sidebutton.refinedstorage.detector.mode." + DetectorTile.MODE.getValue()); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java index e556edb66..f179740bf 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ExactModeSideButton.java @@ -21,12 +21,12 @@ public class ExactModeSideButton extends SideButton { @Override public String getTooltip() { - String tooltip = I18n.format("sidebutton.refinedstorage.exact_mode") + "\n" + TextFormatting.GRAY; + String tooltip = I18n.get("sidebutton.refinedstorage.exact_mode") + "\n" + TextFormatting.GRAY; if ((parameter.getValue() & MASK) == MASK) { - tooltip += I18n.format("sidebutton.refinedstorage.exact_mode.on"); + tooltip += I18n.get("sidebutton.refinedstorage.exact_mode.on"); } else { - tooltip += I18n.format("sidebutton.refinedstorage.exact_mode.off"); + tooltip += I18n.get("sidebutton.refinedstorage.exact_mode.off"); } return tooltip; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java index 87e1e233c..94a157328 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/FilterTypeSideButton.java @@ -17,7 +17,7 @@ public class FilterTypeSideButton extends SideButton { @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage.type") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.type." + filterScreen.getType()); + return I18n.get("sidebutton.refinedstorage.type") + "\n" + TextFormatting.GRAY + I18n.get("sidebutton.refinedstorage.type." + filterScreen.getType()); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java index 7428c6008..374d6e3b2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSizeSideButton.java @@ -21,7 +21,7 @@ public class GridSizeSideButton extends SideButton { @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage.grid.size") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.grid.size." + this.sizeSupplier.get()); + return I18n.get("sidebutton.refinedstorage.grid.size") + "\n" + TextFormatting.GRAY + I18n.get("sidebutton.refinedstorage.grid.size." + this.sizeSupplier.get()); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java index 8ca42cb42..2be06ed2d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java @@ -18,7 +18,7 @@ public class GridSortingDirectionSideButton extends SideButton { @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage.grid.sorting.direction") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.grid.sorting.direction." + grid.getSortingDirection()); + return I18n.get("sidebutton.refinedstorage.grid.sorting.direction") + "\n" + TextFormatting.GRAY + I18n.get("sidebutton.refinedstorage.grid.sorting.direction." + grid.getSortingDirection()); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java index f0590fe2b..7bebdff79 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java @@ -20,7 +20,7 @@ public class GridSortingTypeSideButton extends SideButton { @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage.grid.sorting.type") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.grid.sorting.type." + grid.getSortingType()); + return I18n.get("sidebutton.refinedstorage.grid.sorting.type") + "\n" + TextFormatting.GRAY + I18n.get("sidebutton.refinedstorage.grid.sorting.type." + grid.getSortingType()); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java index 2cc5a8f7a..59be3d183 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java @@ -18,7 +18,7 @@ public class GridViewTypeSideButton extends SideButton { @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage.grid.view_type") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.grid.view_type." + grid.getViewType()); + return I18n.get("sidebutton.refinedstorage.grid.view_type") + "\n" + TextFormatting.GRAY + I18n.get("sidebutton.refinedstorage.grid.view_type." + grid.getViewType()); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java index d1c9ce42a..869c48c0b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java @@ -16,7 +16,7 @@ public class IoModeSideButton extends SideButton { @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage.iomode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.iomode." + (DiskManipulatorTile.IO_MODE.getValue() == DiskManipulatorNetworkNode.IO_MODE_INSERT ? "insert" : "extract")); + return I18n.get("sidebutton.refinedstorage.iomode") + "\n" + TextFormatting.GRAY + I18n.get("sidebutton.refinedstorage.iomode." + (DiskManipulatorTile.IO_MODE.getValue() == DiskManipulatorNetworkNode.IO_MODE_INSERT ? "insert" : "extract")); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java index b8ffba9bc..05f212e22 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/RedstoneModeSideButton.java @@ -18,7 +18,7 @@ public class RedstoneModeSideButton extends SideButton { @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage.redstone_mode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.redstone_mode." + parameter.getValue()); + return I18n.get("sidebutton.refinedstorage.redstone_mode") + "\n" + TextFormatting.GRAY + I18n.get("sidebutton.refinedstorage.redstone_mode." + parameter.getValue()); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SearchBoxModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SearchBoxModeSideButton.java index 0077e40c7..72e2540a8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SearchBoxModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SearchBoxModeSideButton.java @@ -31,7 +31,7 @@ public abstract class SearchBoxModeSideButton extends SideButton { @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage.grid.search_box_mode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.grid.search_box_mode." + getSearchBoxMode()); + return I18n.get("sidebutton.refinedstorage.grid.search_box_mode") + "\n" + TextFormatting.GRAY + I18n.get("sidebutton.refinedstorage.grid.search_box_mode." + getSearchBoxMode()); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java index 4c6d2c12e..822c38d25 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java @@ -25,7 +25,7 @@ public abstract class SideButton extends Button { } @Override - public void renderWidget(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { + public void renderButton(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); RenderSystem.enableAlphaTest(); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/TypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/TypeSideButton.java index 1319f0ded..2a3649430 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/TypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/TypeSideButton.java @@ -19,7 +19,7 @@ public class TypeSideButton extends SideButton { @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage.type") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.type." + type.getValue()); + return I18n.get("sidebutton.refinedstorage.type") + "\n" + TextFormatting.GRAY + I18n.get("sidebutton.refinedstorage.type." + type.getValue()); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java index 89aa86567..576e70ebf 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/WhitelistBlacklistSideButton.java @@ -19,7 +19,7 @@ public class WhitelistBlacklistSideButton extends SideButton { @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage.mode") + "\n" + TextFormatting.GRAY + I18n.format("sidebutton.refinedstorage.mode." + (parameter.getValue() == IWhitelistBlacklist.WHITELIST ? "whitelist" : "blacklist")); + return I18n.get("sidebutton.refinedstorage.mode") + "\n" + TextFormatting.GRAY + I18n.get("sidebutton.refinedstorage.mode." + (parameter.getValue() == IWhitelistBlacklist.WHITELIST ? "whitelist" : "blacklist")); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java b/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java index 579d66fca..e203aca1f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java +++ b/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java @@ -160,11 +160,11 @@ public class ClientSetup { API.instance().addPatternRenderHandler(pattern -> Screen.hasShiftDown()); API.instance().addPatternRenderHandler(pattern -> { - Container container = Minecraft.getInstance().player.openContainer; + Container container = Minecraft.getInstance().player.containerMenu; if (container instanceof CrafterManagerContainer) { - for (Slot slot : container.inventorySlots) { - if (slot instanceof CrafterManagerSlot && slot.getStack() == pattern) { + for (Slot slot : container.slots) { + if (slot instanceof CrafterManagerSlot && slot.getItem() == pattern) { return true; } } @@ -174,11 +174,11 @@ public class ClientSetup { }); API.instance().addPatternRenderHandler(pattern -> { - Container container = Minecraft.getInstance().player.openContainer; + Container container = Minecraft.getInstance().player.containerMenu; if (container instanceof CrafterContainer) { for (int i = 0; i < 9; ++i) { - if (container.getSlot(i).getStack() == pattern) { + if (container.getSlot(i).getItem() == pattern) { return true; } } @@ -207,30 +207,30 @@ public class ClientSetup { public void onClientSetup(FMLClientSetupEvent e) { MinecraftForge.EVENT_BUS.register(new KeyInputListener()); - ScreenManager.registerFactory(RSContainers.FILTER, FilterScreen::new); - ScreenManager.registerFactory(RSContainers.CONTROLLER, ControllerScreen::new); - ScreenManager.registerFactory(RSContainers.DISK_DRIVE, DiskDriveScreen::new); - ScreenManager.registerFactory(RSContainers.GRID, new GridScreenFactory()); - ScreenManager.registerFactory(RSContainers.STORAGE_BLOCK, StorageBlockScreen::new); - ScreenManager.registerFactory(RSContainers.FLUID_STORAGE_BLOCK, FluidStorageBlockScreen::new); - ScreenManager.registerFactory(RSContainers.EXTERNAL_STORAGE, ExternalStorageScreen::new); - ScreenManager.registerFactory(RSContainers.IMPORTER, ImporterScreen::new); - ScreenManager.registerFactory(RSContainers.EXPORTER, ExporterScreen::new); - ScreenManager.registerFactory(RSContainers.NETWORK_TRANSMITTER, NetworkTransmitterScreen::new); - ScreenManager.registerFactory(RSContainers.RELAY, RelayScreen::new); - ScreenManager.registerFactory(RSContainers.DETECTOR, DetectorScreen::new); - ScreenManager.registerFactory(RSContainers.SECURITY_MANAGER, SecurityManagerScreen::new); - ScreenManager.registerFactory(RSContainers.INTERFACE, InterfaceScreen::new); - ScreenManager.registerFactory(RSContainers.FLUID_INTERFACE, FluidInterfaceScreen::new); - ScreenManager.registerFactory(RSContainers.WIRELESS_TRANSMITTER, WirelessTransmitterScreen::new); - ScreenManager.registerFactory(RSContainers.STORAGE_MONITOR, StorageMonitorScreen::new); - ScreenManager.registerFactory(RSContainers.CONSTRUCTOR, ConstructorScreen::new); - ScreenManager.registerFactory(RSContainers.DESTRUCTOR, DestructorScreen::new); - ScreenManager.registerFactory(RSContainers.DISK_MANIPULATOR, DiskManipulatorScreen::new); - ScreenManager.registerFactory(RSContainers.CRAFTER, CrafterScreen::new); - ScreenManager.registerFactory(RSContainers.CRAFTER_MANAGER, new CrafterManagerScreenFactory()); - ScreenManager.registerFactory(RSContainers.CRAFTING_MONITOR, CraftingMonitorScreen::new); - ScreenManager.registerFactory(RSContainers.WIRELESS_CRAFTING_MONITOR, CraftingMonitorScreen::new); + ScreenManager.register(RSContainers.FILTER, FilterScreen::new); + ScreenManager.register(RSContainers.CONTROLLER, ControllerScreen::new); + ScreenManager.register(RSContainers.DISK_DRIVE, DiskDriveScreen::new); + ScreenManager.register(RSContainers.GRID, new GridScreenFactory()); + ScreenManager.register(RSContainers.STORAGE_BLOCK, StorageBlockScreen::new); + ScreenManager.register(RSContainers.FLUID_STORAGE_BLOCK, FluidStorageBlockScreen::new); + ScreenManager.register(RSContainers.EXTERNAL_STORAGE, ExternalStorageScreen::new); + ScreenManager.register(RSContainers.IMPORTER, ImporterScreen::new); + ScreenManager.register(RSContainers.EXPORTER, ExporterScreen::new); + ScreenManager.register(RSContainers.NETWORK_TRANSMITTER, NetworkTransmitterScreen::new); + ScreenManager.register(RSContainers.RELAY, RelayScreen::new); + ScreenManager.register(RSContainers.DETECTOR, DetectorScreen::new); + ScreenManager.register(RSContainers.SECURITY_MANAGER, SecurityManagerScreen::new); + ScreenManager.register(RSContainers.INTERFACE, InterfaceScreen::new); + ScreenManager.register(RSContainers.FLUID_INTERFACE, FluidInterfaceScreen::new); + ScreenManager.register(RSContainers.WIRELESS_TRANSMITTER, WirelessTransmitterScreen::new); + ScreenManager.register(RSContainers.STORAGE_MONITOR, StorageMonitorScreen::new); + ScreenManager.register(RSContainers.CONSTRUCTOR, ConstructorScreen::new); + ScreenManager.register(RSContainers.DESTRUCTOR, DestructorScreen::new); + ScreenManager.register(RSContainers.DISK_MANIPULATOR, DiskManipulatorScreen::new); + ScreenManager.register(RSContainers.CRAFTER, CrafterScreen::new); + ScreenManager.register(RSContainers.CRAFTER_MANAGER, new CrafterManagerScreenFactory()); + ScreenManager.register(RSContainers.CRAFTING_MONITOR, CraftingMonitorScreen::new); + ScreenManager.register(RSContainers.WIRELESS_CRAFTING_MONITOR, CraftingMonitorScreen::new); ClientRegistry.registerKeyBinding(RSKeyBindings.FOCUS_SEARCH_BAR); ClientRegistry.registerKeyBinding(RSKeyBindings.CLEAR_GRID_CRAFTING_MATRIX); @@ -239,46 +239,46 @@ public class ClientSetup { ClientRegistry.registerKeyBinding(RSKeyBindings.OPEN_WIRELESS_CRAFTING_MONITOR); ClientRegistry.registerKeyBinding(RSKeyBindings.OPEN_PORTABLE_GRID); - RSBlocks.CONTROLLER.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.getCutout())); - RSBlocks.CREATIVE_CONTROLLER.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.getCutout())); - RSBlocks.CRAFTER.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.getCutout())); - RSBlocks.CRAFTER_MANAGER.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.getCutout())); - RSBlocks.CRAFTING_MONITOR.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.getCutout())); - RSBlocks.DETECTOR.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.getCutout())); - RSBlocks.DISK_MANIPULATOR.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.getCutout())); - RSBlocks.GRID.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.getCutout())); - RSBlocks.CRAFTING_GRID.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.getCutout())); - RSBlocks.PATTERN_GRID.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.getCutout())); - RSBlocks.FLUID_GRID.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.getCutout())); - RSBlocks.NETWORK_RECEIVER.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.getCutout())); - RSBlocks.NETWORK_TRANSMITTER.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.getCutout())); - RSBlocks.RELAY.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.getCutout())); - RSBlocks.SECURITY_MANAGER.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.getCutout())); - RSBlocks.WIRELESS_TRANSMITTER.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.getCutout())); - RenderTypeLookup.setRenderLayer(RSBlocks.CABLE.get(), RenderType.getCutout()); - RenderTypeLookup.setRenderLayer(RSBlocks.IMPORTER.get(), RenderType.getCutout()); - RenderTypeLookup.setRenderLayer(RSBlocks.EXPORTER.get(), RenderType.getCutout()); - RenderTypeLookup.setRenderLayer(RSBlocks.EXTERNAL_STORAGE.get(), RenderType.getCutout()); - RenderTypeLookup.setRenderLayer(RSBlocks.CONSTRUCTOR.get(), RenderType.getCutout()); - RenderTypeLookup.setRenderLayer(RSBlocks.DESTRUCTOR.get(), RenderType.getCutout()); + RSBlocks.CONTROLLER.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.cutout())); + RSBlocks.CREATIVE_CONTROLLER.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.cutout())); + RSBlocks.CRAFTER.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.cutout())); + RSBlocks.CRAFTER_MANAGER.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.cutout())); + RSBlocks.CRAFTING_MONITOR.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.cutout())); + RSBlocks.DETECTOR.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.cutout())); + RSBlocks.DISK_MANIPULATOR.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.cutout())); + RSBlocks.GRID.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.cutout())); + RSBlocks.CRAFTING_GRID.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.cutout())); + RSBlocks.PATTERN_GRID.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.cutout())); + RSBlocks.FLUID_GRID.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.cutout())); + RSBlocks.NETWORK_RECEIVER.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.cutout())); + RSBlocks.NETWORK_TRANSMITTER.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.cutout())); + RSBlocks.RELAY.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.cutout())); + RSBlocks.SECURITY_MANAGER.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.cutout())); + RSBlocks.WIRELESS_TRANSMITTER.values().forEach(block -> RenderTypeLookup.setRenderLayer(block.get(), RenderType.cutout())); + RenderTypeLookup.setRenderLayer(RSBlocks.CABLE.get(), RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.IMPORTER.get(), RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.EXPORTER.get(), RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.EXTERNAL_STORAGE.get(), RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.CONSTRUCTOR.get(), RenderType.cutout()); + RenderTypeLookup.setRenderLayer(RSBlocks.DESTRUCTOR.get(), RenderType.cutout()); ClientRegistry.bindTileEntityRenderer(RSTiles.STORAGE_MONITOR, StorageMonitorTileRenderer::new); e.getMinecraftSupplier().get().getItemColors().register(new PatternItemColor(), RSItems.PATTERN.get()); - ItemModelsProperties.registerProperty(RSItems.SECURITY_CARD.get(), new ResourceLocation("active"), new SecurityCardItemPropertyGetter()); + ItemModelsProperties.register(RSItems.SECURITY_CARD.get(), new ResourceLocation("active"), new SecurityCardItemPropertyGetter()); - RSItems.CONTROLLER.values().forEach(controller -> ItemModelsProperties.registerProperty(controller.get(), new ResourceLocation("energy_type"), new ControllerItemPropertyGetter())); - RSItems.CREATIVE_CONTROLLER.values().forEach(controller -> ItemModelsProperties.registerProperty(controller.get(), new ResourceLocation("energy_type"), new ControllerItemPropertyGetter())); + RSItems.CONTROLLER.values().forEach(controller -> ItemModelsProperties.register(controller.get(), new ResourceLocation("energy_type"), new ControllerItemPropertyGetter())); + RSItems.CREATIVE_CONTROLLER.values().forEach(controller -> ItemModelsProperties.register(controller.get(), new ResourceLocation("energy_type"), new ControllerItemPropertyGetter())); - ItemModelsProperties.registerProperty(RSItems.WIRELESS_CRAFTING_MONITOR.get(), CONNECTED, new NetworkItemPropertyGetter()); - ItemModelsProperties.registerProperty(RSItems.CREATIVE_WIRELESS_CRAFTING_MONITOR.get(), CONNECTED, new NetworkItemPropertyGetter()); + ItemModelsProperties.register(RSItems.WIRELESS_CRAFTING_MONITOR.get(), CONNECTED, new NetworkItemPropertyGetter()); + ItemModelsProperties.register(RSItems.CREATIVE_WIRELESS_CRAFTING_MONITOR.get(), CONNECTED, new NetworkItemPropertyGetter()); - ItemModelsProperties.registerProperty(RSItems.WIRELESS_GRID.get(), CONNECTED, new NetworkItemPropertyGetter()); - ItemModelsProperties.registerProperty(RSItems.CREATIVE_WIRELESS_GRID.get(), CONNECTED, new NetworkItemPropertyGetter()); + ItemModelsProperties.register(RSItems.WIRELESS_GRID.get(), CONNECTED, new NetworkItemPropertyGetter()); + ItemModelsProperties.register(RSItems.CREATIVE_WIRELESS_GRID.get(), CONNECTED, new NetworkItemPropertyGetter()); - ItemModelsProperties.registerProperty(RSItems.WIRELESS_FLUID_GRID.get(), CONNECTED, new NetworkItemPropertyGetter()); - ItemModelsProperties.registerProperty(RSItems.CREATIVE_WIRELESS_FLUID_GRID.get(), CONNECTED, new NetworkItemPropertyGetter()); + ItemModelsProperties.register(RSItems.WIRELESS_FLUID_GRID.get(), CONNECTED, new NetworkItemPropertyGetter()); + ItemModelsProperties.register(RSItems.CREATIVE_WIRELESS_FLUID_GRID.get(), CONNECTED, new NetworkItemPropertyGetter()); } @SubscribeEvent @@ -322,7 +322,7 @@ public class ClientSetup { @SubscribeEvent public void onTextureStitch(TextureStitchEvent.Pre event){ - if (event.getMap().getTextureLocation().equals(AtlasTexture.LOCATION_BLOCKS_TEXTURE)) + if (event.getMap().location().equals(AtlasTexture.LOCATION_BLOCKS)) event.addSprite(new ResourceLocation(RS.ID ,"block/cable_part_border")); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/setup/CommonSetup.java b/src/main/java/com/refinedmods/refinedstorage/setup/CommonSetup.java index 6d9aa8b3a..34749227e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/setup/CommonSetup.java +++ b/src/main/java/com/refinedmods/refinedstorage/setup/CommonSetup.java @@ -150,48 +150,48 @@ public class CommonSetup { @SubscribeEvent public void onRegisterTiles(RegistryEvent.Register> e) { - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new ControllerTile(NetworkType.NORMAL), RSBlocks.CONTROLLER.getBlocks()).build(null).setRegistryName(RS.ID, "controller"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new ControllerTile(NetworkType.CREATIVE), RSBlocks.CREATIVE_CONTROLLER.getBlocks()).build(null).setRegistryName(RS.ID, "creative_controller"))); - e.getRegistry().register(TileEntityType.Builder.create(CableTile::new, RSBlocks.CABLE.get()).build(null).setRegistryName(RS.ID, "cable")); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(DiskDriveTile::new, RSBlocks.DISK_DRIVE.get()).build(null).setRegistryName(RS.ID, "disk_drive"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new GridTile(GridType.NORMAL), RSBlocks.GRID.getBlocks()).build(null).setRegistryName(RS.ID, "grid"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new GridTile(GridType.CRAFTING), RSBlocks.CRAFTING_GRID.getBlocks()).build(null).setRegistryName(RS.ID, "crafting_grid"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new GridTile(GridType.PATTERN), RSBlocks.PATTERN_GRID.getBlocks()).build(null).setRegistryName(RS.ID, "pattern_grid"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new GridTile(GridType.FLUID), RSBlocks.FLUID_GRID.getBlocks()).build(null).setRegistryName(RS.ID, "fluid_grid"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(() -> new ControllerTile(NetworkType.NORMAL), RSBlocks.CONTROLLER.getBlocks()).build(null).setRegistryName(RS.ID, "controller"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(() -> new ControllerTile(NetworkType.CREATIVE), RSBlocks.CREATIVE_CONTROLLER.getBlocks()).build(null).setRegistryName(RS.ID, "creative_controller"))); + e.getRegistry().register(TileEntityType.Builder.of(CableTile::new, RSBlocks.CABLE.get()).build(null).setRegistryName(RS.ID, "cable")); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(DiskDriveTile::new, RSBlocks.DISK_DRIVE.get()).build(null).setRegistryName(RS.ID, "disk_drive"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(() -> new GridTile(GridType.NORMAL), RSBlocks.GRID.getBlocks()).build(null).setRegistryName(RS.ID, "grid"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(() -> new GridTile(GridType.CRAFTING), RSBlocks.CRAFTING_GRID.getBlocks()).build(null).setRegistryName(RS.ID, "crafting_grid"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(() -> new GridTile(GridType.PATTERN), RSBlocks.PATTERN_GRID.getBlocks()).build(null).setRegistryName(RS.ID, "pattern_grid"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(() -> new GridTile(GridType.FLUID), RSBlocks.FLUID_GRID.getBlocks()).build(null).setRegistryName(RS.ID, "fluid_grid"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new StorageTile(ItemStorageType.ONE_K), RSBlocks.STORAGE_BLOCKS.get(ItemStorageType.ONE_K).get()).build(null).setRegistryName(RS.ID, "1k_storage_block"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new StorageTile(ItemStorageType.FOUR_K), RSBlocks.STORAGE_BLOCKS.get(ItemStorageType.FOUR_K).get()).build(null).setRegistryName(RS.ID, "4k_storage_block"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new StorageTile(ItemStorageType.SIXTEEN_K), RSBlocks.STORAGE_BLOCKS.get(ItemStorageType.SIXTEEN_K).get()).build(null).setRegistryName(RS.ID, "16k_storage_block"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new StorageTile(ItemStorageType.SIXTY_FOUR_K), RSBlocks.STORAGE_BLOCKS.get(ItemStorageType.SIXTY_FOUR_K).get()).build(null).setRegistryName(RS.ID, "64k_storage_block"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new StorageTile(ItemStorageType.CREATIVE), RSBlocks.STORAGE_BLOCKS.get(ItemStorageType.CREATIVE).get()).build(null).setRegistryName(RS.ID, "creative_storage_block"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(() -> new StorageTile(ItemStorageType.ONE_K), RSBlocks.STORAGE_BLOCKS.get(ItemStorageType.ONE_K).get()).build(null).setRegistryName(RS.ID, "1k_storage_block"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(() -> new StorageTile(ItemStorageType.FOUR_K), RSBlocks.STORAGE_BLOCKS.get(ItemStorageType.FOUR_K).get()).build(null).setRegistryName(RS.ID, "4k_storage_block"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(() -> new StorageTile(ItemStorageType.SIXTEEN_K), RSBlocks.STORAGE_BLOCKS.get(ItemStorageType.SIXTEEN_K).get()).build(null).setRegistryName(RS.ID, "16k_storage_block"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(() -> new StorageTile(ItemStorageType.SIXTY_FOUR_K), RSBlocks.STORAGE_BLOCKS.get(ItemStorageType.SIXTY_FOUR_K).get()).build(null).setRegistryName(RS.ID, "64k_storage_block"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(() -> new StorageTile(ItemStorageType.CREATIVE), RSBlocks.STORAGE_BLOCKS.get(ItemStorageType.CREATIVE).get()).build(null).setRegistryName(RS.ID, "creative_storage_block"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new FluidStorageTile(FluidStorageType.SIXTY_FOUR_K), RSBlocks.FLUID_STORAGE_BLOCKS.get(FluidStorageType.SIXTY_FOUR_K).get()).build(null).setRegistryName(RS.ID, "64k_fluid_storage_block"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new FluidStorageTile(FluidStorageType.TWO_HUNDRED_FIFTY_SIX_K), RSBlocks.FLUID_STORAGE_BLOCKS.get(FluidStorageType.TWO_HUNDRED_FIFTY_SIX_K).get()).build(null).setRegistryName(RS.ID, "256k_fluid_storage_block"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new FluidStorageTile(FluidStorageType.THOUSAND_TWENTY_FOUR_K), RSBlocks.FLUID_STORAGE_BLOCKS.get(FluidStorageType.THOUSAND_TWENTY_FOUR_K).get()).build(null).setRegistryName(RS.ID, "1024k_fluid_storage_block"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new FluidStorageTile(FluidStorageType.FOUR_THOUSAND_NINETY_SIX_K), RSBlocks.FLUID_STORAGE_BLOCKS.get(FluidStorageType.FOUR_THOUSAND_NINETY_SIX_K).get()).build(null).setRegistryName(RS.ID, "4096k_fluid_storage_block"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new FluidStorageTile(FluidStorageType.CREATIVE), RSBlocks.FLUID_STORAGE_BLOCKS.get(FluidStorageType.CREATIVE).get()).build(null).setRegistryName(RS.ID, "creative_fluid_storage_block"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(() -> new FluidStorageTile(FluidStorageType.SIXTY_FOUR_K), RSBlocks.FLUID_STORAGE_BLOCKS.get(FluidStorageType.SIXTY_FOUR_K).get()).build(null).setRegistryName(RS.ID, "64k_fluid_storage_block"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(() -> new FluidStorageTile(FluidStorageType.TWO_HUNDRED_FIFTY_SIX_K), RSBlocks.FLUID_STORAGE_BLOCKS.get(FluidStorageType.TWO_HUNDRED_FIFTY_SIX_K).get()).build(null).setRegistryName(RS.ID, "256k_fluid_storage_block"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(() -> new FluidStorageTile(FluidStorageType.THOUSAND_TWENTY_FOUR_K), RSBlocks.FLUID_STORAGE_BLOCKS.get(FluidStorageType.THOUSAND_TWENTY_FOUR_K).get()).build(null).setRegistryName(RS.ID, "1024k_fluid_storage_block"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(() -> new FluidStorageTile(FluidStorageType.FOUR_THOUSAND_NINETY_SIX_K), RSBlocks.FLUID_STORAGE_BLOCKS.get(FluidStorageType.FOUR_THOUSAND_NINETY_SIX_K).get()).build(null).setRegistryName(RS.ID, "4096k_fluid_storage_block"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(() -> new FluidStorageTile(FluidStorageType.CREATIVE), RSBlocks.FLUID_STORAGE_BLOCKS.get(FluidStorageType.CREATIVE).get()).build(null).setRegistryName(RS.ID, "creative_fluid_storage_block"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(ExternalStorageTile::new, RSBlocks.EXTERNAL_STORAGE.get()).build(null).setRegistryName(RS.ID, "external_storage"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(ImporterTile::new, RSBlocks.IMPORTER.get()).build(null).setRegistryName(RS.ID, "importer"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(ExporterTile::new, RSBlocks.EXPORTER.get()).build(null).setRegistryName(RS.ID, "exporter"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(NetworkReceiverTile::new, RSBlocks.NETWORK_RECEIVER.getBlocks()).build(null).setRegistryName(RS.ID, "network_receiver"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(NetworkTransmitterTile::new, RSBlocks.NETWORK_TRANSMITTER.getBlocks()).build(null).setRegistryName(RS.ID, "network_transmitter"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(RelayTile::new, RSBlocks.RELAY.getBlocks()).build(null).setRegistryName(RS.ID, "relay"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(DetectorTile::new, RSBlocks.DETECTOR.getBlocks()).build(null).setRegistryName(RS.ID, "detector"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(SecurityManagerTile::new, RSBlocks.SECURITY_MANAGER.getBlocks()).build(null).setRegistryName(RS.ID, "security_manager"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(InterfaceTile::new, RSBlocks.INTERFACE.get()).build(null).setRegistryName(RS.ID, "interface"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(FluidInterfaceTile::new, RSBlocks.FLUID_INTERFACE.get()).build(null).setRegistryName(RS.ID, "fluid_interface"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(WirelessTransmitterTile::new, RSBlocks.WIRELESS_TRANSMITTER.getBlocks()).build(null).setRegistryName(RS.ID, "wireless_transmitter"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(StorageMonitorTile::new, RSBlocks.STORAGE_MONITOR.get()).build(null).setRegistryName(RS.ID, "storage_monitor"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(ConstructorTile::new, RSBlocks.CONSTRUCTOR.get()).build(null).setRegistryName(RS.ID, "constructor"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(DestructorTile::new, RSBlocks.DESTRUCTOR.get()).build(null).setRegistryName(RS.ID, "destructor"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(DiskManipulatorTile::new, RSBlocks.DISK_MANIPULATOR.getBlocks()).build(null).setRegistryName(RS.ID, "disk_manipulator"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(CrafterTile::new, RSBlocks.CRAFTER.getBlocks()).build(null).setRegistryName(RS.ID, "crafter"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(CrafterManagerTile::new, RSBlocks.CRAFTER_MANAGER.getBlocks()).build(null).setRegistryName(RS.ID, "crafter_manager"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(CraftingMonitorTile::new, RSBlocks.CRAFTING_MONITOR.getBlocks()).build(null).setRegistryName(RS.ID, "crafting_monitor"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(ExternalStorageTile::new, RSBlocks.EXTERNAL_STORAGE.get()).build(null).setRegistryName(RS.ID, "external_storage"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(ImporterTile::new, RSBlocks.IMPORTER.get()).build(null).setRegistryName(RS.ID, "importer"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(ExporterTile::new, RSBlocks.EXPORTER.get()).build(null).setRegistryName(RS.ID, "exporter"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(NetworkReceiverTile::new, RSBlocks.NETWORK_RECEIVER.getBlocks()).build(null).setRegistryName(RS.ID, "network_receiver"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(NetworkTransmitterTile::new, RSBlocks.NETWORK_TRANSMITTER.getBlocks()).build(null).setRegistryName(RS.ID, "network_transmitter"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(RelayTile::new, RSBlocks.RELAY.getBlocks()).build(null).setRegistryName(RS.ID, "relay"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(DetectorTile::new, RSBlocks.DETECTOR.getBlocks()).build(null).setRegistryName(RS.ID, "detector"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(SecurityManagerTile::new, RSBlocks.SECURITY_MANAGER.getBlocks()).build(null).setRegistryName(RS.ID, "security_manager"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(InterfaceTile::new, RSBlocks.INTERFACE.get()).build(null).setRegistryName(RS.ID, "interface"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(FluidInterfaceTile::new, RSBlocks.FLUID_INTERFACE.get()).build(null).setRegistryName(RS.ID, "fluid_interface"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(WirelessTransmitterTile::new, RSBlocks.WIRELESS_TRANSMITTER.getBlocks()).build(null).setRegistryName(RS.ID, "wireless_transmitter"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(StorageMonitorTile::new, RSBlocks.STORAGE_MONITOR.get()).build(null).setRegistryName(RS.ID, "storage_monitor"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(ConstructorTile::new, RSBlocks.CONSTRUCTOR.get()).build(null).setRegistryName(RS.ID, "constructor"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(DestructorTile::new, RSBlocks.DESTRUCTOR.get()).build(null).setRegistryName(RS.ID, "destructor"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(DiskManipulatorTile::new, RSBlocks.DISK_MANIPULATOR.getBlocks()).build(null).setRegistryName(RS.ID, "disk_manipulator"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(CrafterTile::new, RSBlocks.CRAFTER.getBlocks()).build(null).setRegistryName(RS.ID, "crafter"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(CrafterManagerTile::new, RSBlocks.CRAFTER_MANAGER.getBlocks()).build(null).setRegistryName(RS.ID, "crafter_manager"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(CraftingMonitorTile::new, RSBlocks.CRAFTING_MONITOR.getBlocks()).build(null).setRegistryName(RS.ID, "crafting_monitor"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new PortableGridTile(PortableGridBlockItem.Type.CREATIVE), RSBlocks.CREATIVE_PORTABLE_GRID.get()).build(null).setRegistryName(RS.ID, "creative_portable_grid"))); - e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.create(() -> new PortableGridTile(PortableGridBlockItem.Type.NORMAL), RSBlocks.PORTABLE_GRID.get()).build(null).setRegistryName(RS.ID, "portable_grid"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(() -> new PortableGridTile(PortableGridBlockItem.Type.CREATIVE), RSBlocks.CREATIVE_PORTABLE_GRID.get()).build(null).setRegistryName(RS.ID, "creative_portable_grid"))); + e.getRegistry().register(registerTileDataParameters(TileEntityType.Builder.of(() -> new PortableGridTile(PortableGridBlockItem.Type.NORMAL), RSBlocks.PORTABLE_GRID.get()).build(null).setRegistryName(RS.ID, "portable_grid"))); } private TileEntityType registerTileDataParameters(TileEntityType t) { @@ -204,7 +204,7 @@ public class CommonSetup { @SubscribeEvent public void onRegisterContainers(RegistryEvent.Register> e) { - e.getRegistry().register(IForgeContainerType.create((windowId, inv, data) -> new FilterContainer(inv.player, inv.getCurrentItem(), windowId)).setRegistryName(RS.ID, "filter")); + e.getRegistry().register(IForgeContainerType.create((windowId, inv, data) -> new FilterContainer(inv.player, inv.getSelected(), windowId)).setRegistryName(RS.ID, "filter")); e.getRegistry().register(IForgeContainerType.create(((windowId, inv, data) -> new ControllerContainer(null, inv.player, windowId))).setRegistryName(RS.ID, "controller")); e.getRegistry().register(IForgeContainerType.create(new PositionalTileContainerFactory((windowId, inv, tile) -> new DiskDriveContainer(tile, inv.player, windowId))).setRegistryName(RS.ID, "disk_drive")); e.getRegistry().register(IForgeContainerType.create(new GridContainerFactory()).setRegistryName(RS.ID, "grid")); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/BaseTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/BaseTile.java index 3fca5c2f4..4c7a80cf7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/BaseTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/BaseTile.java @@ -33,26 +33,26 @@ public abstract class BaseTile extends TileEntity { @Override public final SUpdateTileEntityPacket getUpdatePacket() { - return new SUpdateTileEntityPacket(pos, 1, getUpdateTag()); + return new SUpdateTileEntityPacket(worldPosition, 1, getUpdateTag()); } @Override public final void onDataPacket(NetworkManager net, SUpdateTileEntityPacket packet) { - readUpdate(packet.getNbtCompound()); + readUpdate(packet.getTag()); } @Override public void handleUpdateTag(BlockState state, CompoundNBT tag) { - super.read(state, tag); + super.load(state, tag); readUpdate(tag); } // @Volatile: Copied with some changes from the super method (avoid sending neighbor updates, it's not needed) @Override - public void markDirty() { - if (world != null) { - world.markChunkDirty(pos, this); + public void setChanged() { + if (level != null) { + level.blockEntityChanged(worldPosition, this); } } } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/CableTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/CableTile.java index b211a84bd..7408547f4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/CableTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/CableTile.java @@ -30,7 +30,7 @@ import java.util.HashMap; public class CableTile extends NetworkNodeTile { - public static final TileDataParameter COVER_MANAGER = new TileDataParameter<>(DataSerializers.COMPOUND_NBT, new CompoundNBT(), + public static final TileDataParameter COVER_MANAGER = new TileDataParameter<>(DataSerializers.COMPOUND_TAG, new CompoundNBT(), t -> t.getNode().getCoverManager().writeToNbt(), (t, v) -> t.getNode().getCoverManager().readFromNbt(v), (initial, p) -> {}); @@ -69,7 +69,7 @@ public class CableTile extends NetworkNodeTile { requestModelDataUpdate(); - WorldUtils.updateBlock(world, pos); + WorldUtils.updateBlock(level, worldPosition); } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/ConstructorTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/ConstructorTile.java index 90d4deeca..ac2c256b7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/ConstructorTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/ConstructorTile.java @@ -26,7 +26,7 @@ public class ConstructorTile extends NetworkNodeTile { t.getNode().markDirty(); }); - public static final TileDataParameter COVER_MANAGER = new TileDataParameter<>(DataSerializers.COMPOUND_NBT, new CompoundNBT(), + public static final TileDataParameter COVER_MANAGER = new TileDataParameter<>(DataSerializers.COMPOUND_TAG, new CompoundNBT(), t -> t.getNode().getCoverManager().writeToNbt(), (t, v) -> t.getNode().getCoverManager().readFromNbt(v), (initial, p) -> {}); @@ -69,6 +69,6 @@ public class ConstructorTile extends NetworkNodeTile { requestModelDataUpdate(); - WorldUtils.updateBlock(world, pos); + WorldUtils.updateBlock(level, worldPosition); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/ControllerTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/ControllerTile.java index 5fb4a606d..f2da94ddb 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/ControllerTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/ControllerTile.java @@ -32,9 +32,9 @@ import java.util.List; public class ControllerTile extends BaseTile implements INetworkNodeProxy, IRedstoneConfigurable { public static final TileDataParameter REDSTONE_MODE = RedstoneMode.createParameter(); - public static final TileDataParameter ENERGY_USAGE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNetwork().getEnergyUsage()); - public static final TileDataParameter ENERGY_STORED = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNetwork().getEnergyStorage().getEnergyStored()); - public static final TileDataParameter ENERGY_CAPACITY = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNetwork().getEnergyStorage().getMaxEnergyStored()); + public static final TileDataParameter ENERGY_USAGE = new TileDataParameter<>(DataSerializers.INT, 0, t -> t.getNetwork().getEnergyUsage()); + public static final TileDataParameter ENERGY_STORED = new TileDataParameter<>(DataSerializers.INT, 0, t -> t.getNetwork().getEnergyStorage().getEnergyStored()); + public static final TileDataParameter ENERGY_CAPACITY = new TileDataParameter<>(DataSerializers.INT, 0, t -> t.getNetwork().getEnergyStorage().getMaxEnergyStored()); public static final TileDataParameter, ControllerTile> NODES = new TileDataParameter<>(RSSerializers.CLIENT_NODE_SERIALIZER, new ArrayList<>(), ControllerTile::collectClientNodes); private static final String NBT_ENERGY_TYPE = "EnergyType"; @@ -72,56 +72,56 @@ public class ControllerTile extends BaseTile implements INetworkNodeProxy { - public static final TileDataParameter SIZE = new TileDataParameter<>(DataSerializers.VARINT, IGrid.SIZE_STRETCH, t -> t.getNode().getSize(), (t, v) -> { + public static final TileDataParameter SIZE = new TileDataParameter<>(DataSerializers.INT, IGrid.SIZE_STRETCH, t -> t.getNode().getSize(), (t, v) -> { if (IGrid.isValidSize(v)) { t.getNode().setSize(v); t.getNode().markDirty(); } }, (initial, p) -> BaseScreen.executeLater(CrafterManagerScreen.class, BaseScreen::init)); - public static final TileDataParameter SEARCH_BOX_MODE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getSearchBoxMode(), (t, v) -> { + public static final TileDataParameter SEARCH_BOX_MODE = new TileDataParameter<>(DataSerializers.INT, 0, t -> t.getNode().getSearchBoxMode(), (t, v) -> { if (IGrid.isValidSearchBoxMode(v)) { t.getNode().setSearchBoxMode(v); t.getNode().markDirty(); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/CrafterTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/CrafterTile.java index f258ab43d..85c2e47e9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/CrafterTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/CrafterTile.java @@ -17,7 +17,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; public class CrafterTile extends NetworkNodeTile { - public static final TileDataParameter MODE = new TileDataParameter<>(DataSerializers.VARINT, CrafterNetworkNode.CrafterMode.IGNORE.ordinal(), t -> t.getNode().getMode().ordinal(), (t, v) -> t.getNode().setMode(CrafterNetworkNode.CrafterMode.getById(v))); + public static final TileDataParameter MODE = new TileDataParameter<>(DataSerializers.INT, CrafterNetworkNode.CrafterMode.IGNORE.ordinal(), t -> t.getNode().getMode().ordinal(), (t, v) -> t.getNode().setMode(CrafterNetworkNode.CrafterMode.getById(v))); private static final TileDataParameter HAS_ROOT = new TileDataParameter<>(DataSerializers.BOOLEAN, false, t -> t.getNode().getRootContainerNotSelf().isPresent(), null, (t, v) -> new CrafterTileDataParameterClientListener().onChanged(t, v)); private final LazyOptional patternsCapability = LazyOptional.of(() -> getNode().getPatternInventory()); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/DestructorTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/DestructorTile.java index ba382fc1c..a98da6750 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/DestructorTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/DestructorTile.java @@ -28,7 +28,7 @@ public class DestructorTile extends NetworkNodeTile { t.getNode().markDirty(); }); - public static final TileDataParameter COVER_MANAGER = new TileDataParameter<>(DataSerializers.COMPOUND_NBT, new CompoundNBT(), + public static final TileDataParameter COVER_MANAGER = new TileDataParameter<>(DataSerializers.COMPOUND_TAG, new CompoundNBT(), t -> t.getNode().getCoverManager().writeToNbt(), (t, v) -> t.getNode().getCoverManager().readFromNbt(v), (initial, p) -> {}); @@ -72,6 +72,6 @@ public class DestructorTile extends NetworkNodeTile { requestModelDataUpdate(); - WorldUtils.updateBlock(world, pos); + WorldUtils.updateBlock(level, worldPosition); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/DetectorTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/DetectorTile.java index 1678eb751..3d37f0c38 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/DetectorTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/DetectorTile.java @@ -17,13 +17,13 @@ import javax.annotation.Nonnull; public class DetectorTile extends NetworkNodeTile { public static final TileDataParameter COMPARE = IComparable.createParameter(); public static final TileDataParameter TYPE = IType.createParameter(); - public static final TileDataParameter MODE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getMode(), (t, v) -> { + public static final TileDataParameter MODE = new TileDataParameter<>(DataSerializers.INT, 0, t -> t.getNode().getMode(), (t, v) -> { if (v == DetectorNetworkNode.MODE_UNDER || v == DetectorNetworkNode.MODE_EQUAL || v == DetectorNetworkNode.MODE_ABOVE) { t.getNode().setMode(v); t.getNode().markDirty(); } }); - public static final TileDataParameter AMOUNT = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getAmount(), (t, v) -> { + public static final TileDataParameter AMOUNT = new TileDataParameter<>(DataSerializers.INT, 0, t -> t.getNode().getAmount(), (t, v) -> { t.getNode().setAmount(v); t.getNode().markDirty(); }, (initial, value) -> BaseScreen.executeLater(DetectorScreen.class, detectorScreen -> detectorScreen.updateAmountField(value))); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/DiskDriveTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/DiskDriveTile.java index 8fd85eea9..96dd2199a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/DiskDriveTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/DiskDriveTile.java @@ -126,7 +126,7 @@ public class DiskDriveTile extends NetworkNodeTile { requestModelDataUpdate(); - WorldUtils.updateBlock(world, pos); + WorldUtils.updateBlock(level, worldPosition); } @Nonnull diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/DiskManipulatorTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/DiskManipulatorTile.java index ae5d0568d..b44853121 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/DiskManipulatorTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/DiskManipulatorTile.java @@ -32,7 +32,7 @@ public class DiskManipulatorTile extends NetworkNodeTile COMPARE = IComparable.createParameter(); public static final TileDataParameter WHITELIST_BLACKLIST = IWhitelistBlacklist.createParameter(); public static final TileDataParameter TYPE = IType.createParameter(); - public static final TileDataParameter IO_MODE = new TileDataParameter<>(DataSerializers.VARINT, DiskManipulatorNetworkNode.IO_MODE_INSERT, t -> t.getNode().getIoMode(), (t, v) -> { + public static final TileDataParameter IO_MODE = new TileDataParameter<>(DataSerializers.INT, DiskManipulatorNetworkNode.IO_MODE_INSERT, t -> t.getNode().getIoMode(), (t, v) -> { t.getNode().setIoMode(v); t.getNode().markDirty(); }); @@ -83,7 +83,7 @@ public class DiskManipulatorTile extends NetworkNodeTile { - public static final TileDataParameter COVER_MANAGER = new TileDataParameter<>(DataSerializers.COMPOUND_NBT, new CompoundNBT(), + public static final TileDataParameter COVER_MANAGER = new TileDataParameter<>(DataSerializers.COMPOUND_TAG, new CompoundNBT(), t -> t.getNode().getCoverManager().writeToNbt(), (t, v) -> t.getNode().getCoverManager().readFromNbt(v), (initial, p) -> {}); @@ -65,6 +65,6 @@ public class ExporterTile extends NetworkNodeTile { requestModelDataUpdate(); - WorldUtils.updateBlock(world, pos); + WorldUtils.updateBlock(level, worldPosition); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/ExternalStorageTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/ExternalStorageTile.java index b0831ab6e..4c34c9440 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/ExternalStorageTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/ExternalStorageTile.java @@ -55,7 +55,7 @@ public class ExternalStorageTile extends NetworkNodeTile COVER_MANAGER = new TileDataParameter<>(DataSerializers.COMPOUND_NBT, new CompoundNBT(), + public static final TileDataParameter COVER_MANAGER = new TileDataParameter<>(DataSerializers.COMPOUND_TAG, new CompoundNBT(), t -> t.getNode().getCoverManager().writeToNbt(), (t, v) -> t.getNode().getCoverManager().readFromNbt(v), (initial, p) -> {}); @@ -102,6 +102,6 @@ public class ExternalStorageTile extends NetworkNodeTile { public static final TileDataParameter WHITELIST_BLACKLIST = IWhitelistBlacklist.createParameter(); public static final TileDataParameter TYPE = IType.createParameter(); - public static final TileDataParameter COVER_MANAGER = new TileDataParameter<>(DataSerializers.COMPOUND_NBT, new CompoundNBT(), + public static final TileDataParameter COVER_MANAGER = new TileDataParameter<>(DataSerializers.COMPOUND_TAG, new CompoundNBT(), t -> t.getNode().getCoverManager().writeToNbt(), (t, v) -> t.getNode().getCoverManager().readFromNbt(v), (initial, p) -> {}); @@ -67,6 +67,6 @@ public class ImporterTile extends NetworkNodeTile { requestModelDataUpdate(); - WorldUtils.updateBlock(world, pos); + WorldUtils.updateBlock(level, worldPosition); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/NetworkNodeTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/NetworkNodeTile.java index cb4e27272..a6a4bc63f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/NetworkNodeTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/NetworkNodeTile.java @@ -49,53 +49,53 @@ public abstract class NetworkNodeTile extends BaseTile im @Nonnull @SuppressWarnings("unchecked") public N getNode() { - if (world.isRemote) { + if (level.isClientSide) { if (clientNode == null) { - clientNode = createNode(world, pos); + clientNode = createNode(level, worldPosition); } return clientNode; } - INetworkNodeManager manager = API.instance().getNetworkNodeManager((ServerWorld) world); + INetworkNodeManager manager = API.instance().getNetworkNodeManager((ServerWorld) level); - INetworkNode node = manager.getNode(pos); + INetworkNode node = manager.getNode(worldPosition); if (node == null) { - throw new IllegalStateException("No network node present at " + pos.toString() + ", consider removing the block at this position"); + throw new IllegalStateException("No network node present at " + worldPosition.toString() + ", consider removing the block at this position"); } return (N) node; } @Override - public void validate() { - super.validate(); + public void clearRemoved() { + super.clearRemoved(); - if (!world.isRemote) { - INetworkNodeManager manager = API.instance().getNetworkNodeManager((ServerWorld) world); + if (!level.isClientSide) { + INetworkNodeManager manager = API.instance().getNetworkNodeManager((ServerWorld) level); - if (manager.getNode(pos) == null) { - manager.setNode(pos, createNode(world, pos)); + if (manager.getNode(worldPosition) == null) { + manager.setNode(worldPosition, createNode(level, worldPosition)); manager.markForSaving(); } } } @Override - public void remove() { - super.remove(); + public void setRemoved() { + super.setRemoved(); - if (!world.isRemote) { - INetworkNodeManager manager = API.instance().getNetworkNodeManager((ServerWorld) world); + if (!level.isClientSide) { + INetworkNodeManager manager = API.instance().getNetworkNodeManager((ServerWorld) level); - INetworkNode node = manager.getNode(pos); + INetworkNode node = manager.getNode(worldPosition); if (node != null) { removedNode = (N) node; } - manager.removeNode(pos); + manager.removeNode(worldPosition); manager.markForSaving(); if (node != null && node.getNetwork() != null) { diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/NetworkTransmitterTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/NetworkTransmitterTile.java index c89c90e45..190554ff9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/NetworkTransmitterTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/NetworkTransmitterTile.java @@ -19,10 +19,10 @@ import javax.annotation.Nullable; import java.util.Optional; public class NetworkTransmitterTile extends NetworkNodeTile { - public static final TileDataParameter DISTANCE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getDistance()); + public static final TileDataParameter DISTANCE = new TileDataParameter<>(DataSerializers.INT, 0, t -> t.getNode().getDistance()); public static final TileDataParameter, NetworkTransmitterTile> RECEIVER_DIMENSION = new TileDataParameter<>(RSSerializers.OPTIONAL_RESOURCE_LOCATION_SERIALIZER, Optional.empty(), t -> { if (t.getNode().getReceiverDimension() != null) { - return Optional.of(t.getNode().getReceiverDimension().getLocation()); + return Optional.of(t.getNode().getReceiverDimension().location()); } return Optional.empty(); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/StorageMonitorTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/StorageMonitorTile.java index 44523ce71..312aa6d02 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/StorageMonitorTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/StorageMonitorTile.java @@ -48,7 +48,7 @@ public class StorageMonitorTile extends NetworkNodeTile { - public static final TileDataParameter RANGE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getRange()); + public static final TileDataParameter RANGE = new TileDataParameter<>(DataSerializers.INT, 0, t -> t.getNode().getRange()); public WirelessTransmitterTile() { super(RSTiles.WIRELESS_TRANSMITTER); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/config/IComparable.java b/src/main/java/com/refinedmods/refinedstorage/tile/config/IComparable.java index 9facd50af..a0ca90ddd 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/config/IComparable.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/config/IComparable.java @@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity; public interface IComparable { static > TileDataParameter createParameter() { - return new TileDataParameter<>(DataSerializers.VARINT, 0, t -> ((IComparable) t.getNode()).getCompare(), (t, v) -> ((IComparable) t.getNode()).setCompare(v)); + return new TileDataParameter<>(DataSerializers.INT, 0, t -> ((IComparable) t.getNode()).getCompare(), (t, v) -> ((IComparable) t.getNode()).setCompare(v)); } int getCompare(); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/config/IPrioritizable.java b/src/main/java/com/refinedmods/refinedstorage/tile/config/IPrioritizable.java index ccdfef407..e87484fc3 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/config/IPrioritizable.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/config/IPrioritizable.java @@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity; public interface IPrioritizable { static > TileDataParameter createParameter() { - return new TileDataParameter<>(DataSerializers.VARINT, 0, t -> ((IPrioritizable) t.getNode()).getPriority(), (t, v) -> ((IPrioritizable) t.getNode()).setPriority(v)); + return new TileDataParameter<>(DataSerializers.INT, 0, t -> ((IPrioritizable) t.getNode()).getPriority(), (t, v) -> ((IPrioritizable) t.getNode()).setPriority(v)); } int getPriority(); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/config/IType.java b/src/main/java/com/refinedmods/refinedstorage/tile/config/IType.java index c73fa29e0..59713fa47 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/config/IType.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/config/IType.java @@ -15,7 +15,7 @@ public interface IType { int FLUIDS = 1; static > TileDataParameter createParameter(@Nullable TileDataParameterClientListener clientListener) { - return new TileDataParameter<>(DataSerializers.VARINT, ITEMS, t -> ((IType) t.getNode()).getType(), (t, v) -> { + return new TileDataParameter<>(DataSerializers.INT, ITEMS, t -> ((IType) t.getNode()).getType(), (t, v) -> { if (v == IType.ITEMS || v == IType.FLUIDS) { ((IType) t.getNode()).setType(v); } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/config/IWhitelistBlacklist.java b/src/main/java/com/refinedmods/refinedstorage/tile/config/IWhitelistBlacklist.java index fa0603b00..82de079ad 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/config/IWhitelistBlacklist.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/config/IWhitelistBlacklist.java @@ -15,7 +15,7 @@ public interface IWhitelistBlacklist { int BLACKLIST = 1; static > TileDataParameter createParameter() { - return new TileDataParameter<>(DataSerializers.VARINT, 0, t -> ((IWhitelistBlacklist) t.getNode()).getWhitelistBlacklistMode(), (t, v) -> { + return new TileDataParameter<>(DataSerializers.INT, 0, t -> ((IWhitelistBlacklist) t.getNode()).getWhitelistBlacklistMode(), (t, v) -> { if (v == WHITELIST || v == BLACKLIST) { ((IWhitelistBlacklist) t.getNode()).setWhitelistBlacklistMode(v); } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/config/RedstoneMode.java b/src/main/java/com/refinedmods/refinedstorage/tile/config/RedstoneMode.java index ac2f54b43..b7a8c2c14 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/config/RedstoneMode.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/config/RedstoneMode.java @@ -40,6 +40,6 @@ public enum RedstoneMode { } public static TileDataParameter createParameter() { - return new TileDataParameter<>(DataSerializers.VARINT, IGNORE.ordinal(), t -> t.getRedstoneMode().ordinal(), (t, v) -> t.setRedstoneMode(RedstoneMode.getById(v))); + return new TileDataParameter<>(DataSerializers.INT, IGNORE.ordinal(), t -> t.getRedstoneMode().ordinal(), (t, v) -> t.setRedstoneMode(RedstoneMode.getById(v))); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/CraftingMonitorTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/CraftingMonitorTile.java index d6b7b5949..5038bca84 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/CraftingMonitorTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/CraftingMonitorTile.java @@ -13,7 +13,7 @@ import java.util.Optional; import java.util.UUID; public class CraftingMonitorTile extends NetworkNodeTile { - public static final TileDataParameter, CraftingMonitorTile> TAB_SELECTED = new TileDataParameter<>(DataSerializers.OPTIONAL_UNIQUE_ID, Optional.empty(), t -> t.getNode().getTabSelected(), (t, v) -> { + public static final TileDataParameter, CraftingMonitorTile> TAB_SELECTED = new TileDataParameter<>(DataSerializers.OPTIONAL_UUID, Optional.empty(), t -> t.getNode().getTabSelected(), (t, v) -> { if (v.isPresent() && t.getNode().getTabSelected().isPresent() && v.get().equals(t.getNode().getTabSelected().get())) { t.getNode().setTabSelected(Optional.empty()); } else { @@ -22,7 +22,7 @@ public class CraftingMonitorTile extends NetworkNodeTile TAB_PAGE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getTabPage(), (t, v) -> { + public static final TileDataParameter TAB_PAGE = new TileDataParameter<>(DataSerializers.INT, 0, t -> t.getNode().getTabPage(), (t, v) -> { if (v >= 0) { t.getNode().setTabPage(v); t.getNode().markDirty(); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java b/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java index b2cae2d1e..bd1af13d5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java @@ -98,9 +98,9 @@ public class WirelessCraftingMonitor implements ICraftingMonitor { } private INetwork getNetwork() { - World world = server.getWorld(nodeDimension); + World world = server.getLevel(nodeDimension); if (world != null) { - return NetworkUtils.getNetworkFromNode(NetworkUtils.getNodeFromTile(world.getTileEntity(nodePos))); + return NetworkUtils.getNetworkFromNode(NetworkUtils.getNodeFromTile(world.getBlockEntity(nodePos))); } return null; diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/data/RSSerializers.java b/src/main/java/com/refinedmods/refinedstorage/tile/data/RSSerializers.java index f564bba61..70ea61f48 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/data/RSSerializers.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/data/RSSerializers.java @@ -21,7 +21,7 @@ public final class RSSerializers { buf.writeInt(nodes.size()); for (ClientNode node : nodes) { - buf.writeItemStack(node.getStack()); + buf.writeItem(node.getStack()); buf.writeInt(node.getAmount()); buf.writeInt(node.getEnergyUsage()); } @@ -34,19 +34,19 @@ public final class RSSerializers { int size = buf.readInt(); for (int i = 0; i < size; ++i) { - nodes.add(new ClientNode(buf.readItemStack(), buf.readInt(), buf.readInt())); + nodes.add(new ClientNode(buf.readItem(), buf.readInt(), buf.readInt())); } return nodes; } @Override - public DataParameter> createKey(int id) { + public DataParameter> createAccessor(int id) { return null; } @Override - public List copyValue(List value) { + public List copy(List value) { return value; } }; @@ -63,12 +63,12 @@ public final class RSSerializers { } @Override - public DataParameter createKey(int id) { + public DataParameter createAccessor(int id) { return null; } @Override - public FluidStack copyValue(FluidStack value) { + public FluidStack copy(FluidStack value) { return value; } }; @@ -85,12 +85,12 @@ public final class RSSerializers { } @Override - public DataParameter createKey(int id) { + public DataParameter createAccessor(int id) { return null; } @Override - public AccessType copyValue(AccessType value) { + public AccessType copy(AccessType value) { return value; } }; @@ -107,12 +107,12 @@ public final class RSSerializers { } @Override - public DataParameter createKey(int id) { + public DataParameter createAccessor(int id) { return null; } @Override - public Long copyValue(Long value) { + public Long copy(Long value) { return value; } }; @@ -135,12 +135,12 @@ public final class RSSerializers { } @Override - public DataParameter> createKey(int id) { + public DataParameter> createAccessor(int id) { return null; } @Override - public Optional copyValue(Optional value) { + public Optional copy(Optional value) { return value; } }; @@ -178,12 +178,12 @@ public final class RSSerializers { } @Override - public DataParameter>> createKey(int id) { + public DataParameter>> createAccessor(int id) { return null; } @Override - public List> copyValue(List> value) { + public List> copy(List> value) { return value; } }; diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/GridTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/GridTile.java index 764fa3f1e..724b52591 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/GridTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/GridTile.java @@ -28,41 +28,41 @@ import java.util.List; import java.util.Set; public class GridTile extends NetworkNodeTile { - public static final TileDataParameter VIEW_TYPE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getViewType(), (t, v) -> { + public static final TileDataParameter VIEW_TYPE = new TileDataParameter<>(DataSerializers.INT, 0, t -> t.getNode().getViewType(), (t, v) -> { if (IGrid.isValidViewType(v)) { t.getNode().setViewType(v); t.getNode().markDirty(); } }, (initial, p) -> trySortGrid(initial)); - public static final TileDataParameter SORTING_DIRECTION = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getSortingDirection(), (t, v) -> { + public static final TileDataParameter SORTING_DIRECTION = new TileDataParameter<>(DataSerializers.INT, 0, t -> t.getNode().getSortingDirection(), (t, v) -> { if (IGrid.isValidSortingDirection(v)) { t.getNode().setSortingDirection(v); t.getNode().markDirty(); } }, (initial, p) -> trySortGrid(initial)); - public static final TileDataParameter SORTING_TYPE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getSortingType(), (t, v) -> { + public static final TileDataParameter SORTING_TYPE = new TileDataParameter<>(DataSerializers.INT, 0, t -> t.getNode().getSortingType(), (t, v) -> { if (IGrid.isValidSortingType(v)) { t.getNode().setSortingType(v); t.getNode().markDirty(); } }, (initial, p) -> trySortGrid(initial)); - public static final TileDataParameter SEARCH_BOX_MODE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getSearchBoxMode(), (t, v) -> { + public static final TileDataParameter SEARCH_BOX_MODE = new TileDataParameter<>(DataSerializers.INT, 0, t -> t.getNode().getSearchBoxMode(), (t, v) -> { if (IGrid.isValidSearchBoxMode(v)) { t.getNode().setSearchBoxMode(v); t.getNode().markDirty(); } }, (initial, p) -> BaseScreen.executeLater(GridScreen.class, grid -> grid.getSearchField().setMode(p))); - public static final TileDataParameter SIZE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getSize(), (t, v) -> { + public static final TileDataParameter SIZE = new TileDataParameter<>(DataSerializers.INT, 0, t -> t.getNode().getSize(), (t, v) -> { if (IGrid.isValidSize(v)) { t.getNode().setSize(v); t.getNode().markDirty(); } }, (initial, p) -> BaseScreen.executeLater(GridScreen.class, grid -> grid.resize(grid.getMinecraft(), grid.width, grid.height))); - public static final TileDataParameter TAB_SELECTED = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getTabSelected(), (t, v) -> { + public static final TileDataParameter TAB_SELECTED = new TileDataParameter<>(DataSerializers.INT, 0, t -> t.getNode().getTabSelected(), (t, v) -> { t.getNode().setTabSelected(v == t.getNode().getTabSelected() ? -1 : v); t.getNode().markDirty(); }, (initial, p) -> BaseScreen.executeLater(GridScreen.class, grid -> grid.getView().sort())); - public static final TileDataParameter TAB_PAGE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getTabPage(), (t, v) -> { + public static final TileDataParameter TAB_PAGE = new TileDataParameter<>(DataSerializers.INT, 0, t -> t.getNode().getTabPage(), (t, v) -> { if (v >= 0 && v <= t.getNode().getTotalTabPages()) { t.getNode().setTabPage(v); t.getNode().markDirty(); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessFluidGrid.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessFluidGrid.java index 2e89f47be..c89ac11ab 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessFluidGrid.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessFluidGrid.java @@ -94,9 +94,9 @@ public class WirelessFluidGrid implements INetworkAwareGrid { @Override @Nullable public INetwork getNetwork() { - World world = server.getWorld(nodeDimension); + World world = server.getLevel(nodeDimension); if (world != null) { - return NetworkUtils.getNetworkFromNode(NetworkUtils.getNodeFromTile(world.getTileEntity(nodePos))); + return NetworkUtils.getNetworkFromNode(NetworkUtils.getNodeFromTile(world.getBlockEntity(nodePos))); } return null; diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessGrid.java index f1f9b70c9..2a1c0cfa0 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessGrid.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/WirelessGrid.java @@ -96,9 +96,9 @@ public class WirelessGrid implements INetworkAwareGrid { @Override @Nullable public INetwork getNetwork() { - World world = server.getWorld(nodeDimension); + World world = server.getLevel(nodeDimension); if (world != null) { - return NetworkUtils.getNetworkFromNode(NetworkUtils.getNodeFromTile(world.getTileEntity(nodePos))); + return NetworkUtils.getNetworkFromNode(NetworkUtils.getNodeFromTile(world.getBlockEntity(nodePos))); } return null; diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGrid.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGrid.java index a4fd6be52..e0c5e1e70 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGrid.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGrid.java @@ -105,14 +105,14 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer private final BaseItemHandler disk = new BaseItemHandler(1) .addValidator(new StorageDiskItemValidator()) .addListener(((handler, slot, reading) -> { - if (player != null && !player.world.isRemote) { + if (player != null && !player.level.isClientSide) { ItemStack diskStack = handler.getStackInSlot(slot); if (diskStack.isEmpty()) { storage = null; cache = null; } else { - IStorageDisk diskInSlot = API.instance().getStorageDiskManager((ServerWorld) player.world).getByStack(getDiskInventory().getStackInSlot(0)); + IStorageDisk diskInSlot = API.instance().getStorageDiskManager((ServerWorld) player.level).getByStack(getDiskInventory().getStackInSlot(0)); if (diskInSlot != null) { StorageType type = ((IStorageDiskProvider) getDiskInventory().getStackInSlot(0).getItem()).getType(); @@ -157,26 +157,26 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer } if (player != null) { //baked model does not need a storage tracker if (stack.getTag().contains(NBT_ITEM_STORAGE_TRACKER_ID)) { - itemStorageTrackerId = stack.getTag().getUniqueId(NBT_ITEM_STORAGE_TRACKER_ID); + itemStorageTrackerId = stack.getTag().getUUID(NBT_ITEM_STORAGE_TRACKER_ID); } else { if (stack.getTag().contains(NBT_STORAGE_TRACKER)) { //TODO: remove next version getItemStorageTracker().readFromNbt(stack.getTag().getList(NBT_STORAGE_TRACKER, Constants.NBT.TAG_COMPOUND)); } UUID id = UUID.randomUUID(); - stack.getTag().putUniqueId(NBT_ITEM_STORAGE_TRACKER_ID, id); + stack.getTag().putUUID(NBT_ITEM_STORAGE_TRACKER_ID, id); itemStorageTrackerId = id; } if (stack.getTag().contains(NBT_FLUID_STORAGE_TRACKER_ID)) { - fluidStorageTrackerId = stack.getTag().getUniqueId(NBT_FLUID_STORAGE_TRACKER_ID); + fluidStorageTrackerId = stack.getTag().getUUID(NBT_FLUID_STORAGE_TRACKER_ID); } else { if (stack.getTag().contains(NBT_FLUID_STORAGE_TRACKER)) { //TODO: remove next version getFluidStorageTracker().readFromNbt(stack.getTag().getList(NBT_FLUID_STORAGE_TRACKER, Constants.NBT.TAG_COMPOUND)); } UUID id = UUID.randomUUID(); - stack.getTag().putUniqueId(NBT_FLUID_STORAGE_TRACKER_ID, id); + stack.getTag().putUUID(NBT_FLUID_STORAGE_TRACKER_ID, id); fluidStorageTrackerId = id; } } @@ -397,7 +397,7 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer this.itemStorageTrackerId = UUID.randomUUID(); } - this.itemStorageTracker = (ItemStorageTracker) API.instance().getStorageTrackerManager((ServerWorld) player.world).getOrCreate(itemStorageTrackerId, StorageType.ITEM); + this.itemStorageTracker = (ItemStorageTracker) API.instance().getStorageTrackerManager((ServerWorld) player.level).getOrCreate(itemStorageTrackerId, StorageType.ITEM); } } @@ -412,7 +412,7 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer this.fluidStorageTrackerId = UUID.randomUUID(); } - this.fluidStorageTracker = (FluidStorageTracker) API.instance().getStorageTrackerManager((ServerWorld) player.world).getOrCreate(fluidStorageTrackerId, StorageType.FLUID); + this.fluidStorageTracker = (FluidStorageTracker) API.instance().getStorageTrackerManager((ServerWorld) player.level).getOrCreate(fluidStorageTrackerId, StorageType.FLUID); } } @@ -456,7 +456,7 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer @Override public void onClosed(PlayerEntity player) { - if (!player.getEntityWorld().isRemote) { + if (!player.getCommandSenderWorld().isClientSide) { StackUtils.writeItems(disk, 4, stack.getTag()); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridDiskState.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridDiskState.java index 6b055e0a9..1b058bd9f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridDiskState.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridDiskState.java @@ -22,7 +22,7 @@ public enum PortableGridDiskState implements IStringSerializable { } @Override - public String getString() { + public String getSerializedName() { return type; } diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java index 52282e52c..867e8d6ca 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java @@ -81,38 +81,38 @@ import java.util.UUID; public class PortableGridTile extends BaseTile implements ITickableTileEntity, IGrid, IPortableGrid, IRedstoneConfigurable, IStorageDiskContainerContext { public static final TileDataParameter REDSTONE_MODE = RedstoneMode.createParameter(); - private static final TileDataParameter SORTING_DIRECTION = new TileDataParameter<>(DataSerializers.VARINT, 0, PortableGridTile::getSortingDirection, (t, v) -> { + private static final TileDataParameter SORTING_DIRECTION = new TileDataParameter<>(DataSerializers.INT, 0, PortableGridTile::getSortingDirection, (t, v) -> { if (IGrid.isValidSortingDirection(v)) { t.setSortingDirection(v); - t.markDirty(); + t.setChanged(); } }, (initial, p) -> GridTile.trySortGrid(initial)); - private static final TileDataParameter SORTING_TYPE = new TileDataParameter<>(DataSerializers.VARINT, 0, PortableGridTile::getSortingType, (t, v) -> { + private static final TileDataParameter SORTING_TYPE = new TileDataParameter<>(DataSerializers.INT, 0, PortableGridTile::getSortingType, (t, v) -> { if (IGrid.isValidSortingType(v)) { t.setSortingType(v); - t.markDirty(); + t.setChanged(); } }, (initial, p) -> GridTile.trySortGrid(initial)); - private static final TileDataParameter SEARCH_BOX_MODE = new TileDataParameter<>(DataSerializers.VARINT, 0, PortableGridTile::getSearchBoxMode, (t, v) -> { + private static final TileDataParameter SEARCH_BOX_MODE = new TileDataParameter<>(DataSerializers.INT, 0, PortableGridTile::getSearchBoxMode, (t, v) -> { if (IGrid.isValidSearchBoxMode(v)) { t.setSearchBoxMode(v); - t.markDirty(); + t.setChanged(); } }, (initial, p) -> BaseScreen.executeLater(GridScreen.class, grid -> grid.getSearchField().setMode(p))); - private static final TileDataParameter SIZE = new TileDataParameter<>(DataSerializers.VARINT, 0, PortableGridTile::getSize, (t, v) -> { + private static final TileDataParameter SIZE = new TileDataParameter<>(DataSerializers.INT, 0, PortableGridTile::getSize, (t, v) -> { if (IGrid.isValidSize(v)) { t.setSize(v); - t.markDirty(); + t.setChanged(); } }, (initial, p) -> BaseScreen.executeLater(GridScreen.class, BaseScreen::init)); - private static final TileDataParameter TAB_SELECTED = new TileDataParameter<>(DataSerializers.VARINT, 0, PortableGridTile::getTabSelected, (t, v) -> { + private static final TileDataParameter TAB_SELECTED = new TileDataParameter<>(DataSerializers.INT, 0, PortableGridTile::getTabSelected, (t, v) -> { t.setTabSelected(v == t.getTabSelected() ? -1 : v); - t.markDirty(); + t.setChanged(); }, (initial, p) -> BaseScreen.executeLater(GridScreen.class, grid -> grid.getView().sort())); - private static final TileDataParameter TAB_PAGE = new TileDataParameter<>(DataSerializers.VARINT, 0, PortableGridTile::getTabPage, (t, v) -> { + private static final TileDataParameter TAB_PAGE = new TileDataParameter<>(DataSerializers.INT, 0, PortableGridTile::getTabPage, (t, v) -> { if (v >= 0 && v <= t.getTotalTabPages()) { t.setTabPage(v); - t.markDirty(); + t.setChanged(); } }); @@ -148,13 +148,13 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I .addValidator(new StorageDiskItemValidator()) .addListener(new TileInventoryListener(this)) .addListener((handler, slot, reading) -> { - if (world != null && !world.isRemote) { + if (level != null && !level.isClientSide) { loadStorage(); if (!reading) { updateState(); - WorldUtils.updateBlock(world, pos); // Re-send grid type + WorldUtils.updateBlock(level, worldPosition); // Re-send grid type } } }); @@ -200,7 +200,7 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I this.storage = null; this.cache = null; } else { - IStorageDisk diskInSlot = API.instance().getStorageDiskManager((ServerWorld) world).getByStack(getDiskInventory().getStackInSlot(0)); + IStorageDisk diskInSlot = API.instance().getStorageDiskManager((ServerWorld) level).getByStack(getDiskInventory().getStackInSlot(0)); if (diskInSlot != null) { StorageType diskType = ((IStorageDiskProvider) getDiskInventory().getStackInSlot(0).getItem()).getType(); @@ -253,7 +253,7 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I this.redstoneMode = RedstoneMode.read(stack.getTag()); if (stack.getTag().contains(PortableGrid.NBT_ITEM_STORAGE_TRACKER_ID)) { - itemStorageTrackerId = stack.getTag().getUniqueId(NBT_ITEM_STORAGE_TRACKER_ID); + itemStorageTrackerId = stack.getTag().getUUID(NBT_ITEM_STORAGE_TRACKER_ID); } else { if (stack.getTag().contains(PortableGrid.NBT_STORAGE_TRACKER)) { //TODO: remove next version getItemStorageTracker().readFromNbt(stack.getTag().getList(PortableGrid.NBT_STORAGE_TRACKER, Constants.NBT.TAG_COMPOUND)); @@ -261,7 +261,7 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I } if (stack.getTag().contains(PortableGrid.NBT_FLUID_STORAGE_TRACKER_ID)) { - fluidStorageTrackerId = stack.getTag().getUniqueId(NBT_FLUID_STORAGE_TRACKER_ID); + fluidStorageTrackerId = stack.getTag().getUUID(NBT_FLUID_STORAGE_TRACKER_ID); } else { if (stack.getTag().contains(PortableGrid.NBT_FLUID_STORAGE_TRACKER)) { //TODO: remove next version getFluidStorageTracker().readFromNbt(stack.getTag().getList(PortableGrid.NBT_FLUID_STORAGE_TRACKER, Constants.NBT.TAG_COMPOUND)); @@ -273,7 +273,7 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I } } - markDirty(); + setChanged(); } public void applyDataFromTileToItem(ItemStack stack) { @@ -287,10 +287,10 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I stack.getTag().putInt(GridNetworkNode.NBT_TAB_PAGE, tabPage); if (itemStorageTrackerId != null) { - stack.getTag().putUniqueId(PortableGrid.NBT_ITEM_STORAGE_TRACKER_ID, itemStorageTrackerId); + stack.getTag().putUUID(PortableGrid.NBT_ITEM_STORAGE_TRACKER_ID, itemStorageTrackerId); } if (fluidStorageTrackerId != null) { - stack.getTag().putUniqueId(PortableGrid.NBT_FLUID_STORAGE_TRACKER_ID, fluidStorageTrackerId); + stack.getTag().putUUID(PortableGrid.NBT_FLUID_STORAGE_TRACKER_ID, fluidStorageTrackerId); } if (enchants != null) { @@ -371,27 +371,27 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I @Override public int getSortingType() { - return world.isRemote ? SORTING_TYPE.getValue() : sortingType; + return level.isClientSide ? SORTING_TYPE.getValue() : sortingType; } @Override public int getSortingDirection() { - return world.isRemote ? SORTING_DIRECTION.getValue() : sortingDirection; + return level.isClientSide ? SORTING_DIRECTION.getValue() : sortingDirection; } @Override public int getSearchBoxMode() { - return world.isRemote ? SEARCH_BOX_MODE.getValue() : searchBoxMode; + return level.isClientSide ? SEARCH_BOX_MODE.getValue() : searchBoxMode; } @Override public int getTabSelected() { - return world.isRemote ? TAB_SELECTED.getValue() : tabSelected; + return level.isClientSide ? TAB_SELECTED.getValue() : tabSelected; } @Override public int getTabPage() { - return world.isRemote ? TAB_PAGE.getValue() : Math.min(tabPage, getTotalTabPages()); + return level.isClientSide ? TAB_PAGE.getValue() : Math.min(tabPage, getTotalTabPages()); } @Override @@ -401,7 +401,7 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I @Override public int getSize() { - return world.isRemote ? SIZE.getValue() : size; + return level.isClientSide ? SIZE.getValue() : size; } public void setSortingType(int sortingType) { @@ -487,7 +487,7 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I this.itemStorageTrackerId = UUID.randomUUID(); } - this.itemStorageTracker = (ItemStorageTracker) API.instance().getStorageTrackerManager(ServerLifecycleHooks.getCurrentServer().func_241755_D_()).getOrCreate(itemStorageTrackerId, StorageType.ITEM); + this.itemStorageTracker = (ItemStorageTracker) API.instance().getStorageTrackerManager(ServerLifecycleHooks.getCurrentServer().overworld()).getOrCreate(itemStorageTrackerId, StorageType.ITEM); } return itemStorageTracker; @@ -500,7 +500,7 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I this.fluidStorageTrackerId = UUID.randomUUID(); } - this.fluidStorageTracker = (FluidStorageTracker) API.instance().getStorageTrackerManager(ServerLifecycleHooks.getCurrentServer().func_241755_D_()).getOrCreate(fluidStorageTrackerId, StorageType.FLUID); + this.fluidStorageTracker = (FluidStorageTracker) API.instance().getStorageTrackerManager(ServerLifecycleHooks.getCurrentServer().overworld()).getOrCreate(fluidStorageTrackerId, StorageType.FLUID); } return fluidStorageTracker; @@ -552,11 +552,11 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I @Override public boolean isGridActive() { - if (world.isRemote) { - BlockState state = world.getBlockState(pos); + if (level.isClientSide) { + BlockState state = level.getBlockState(worldPosition); if (state.getBlock() instanceof PortableGridBlock) { - return state.get(PortableGridBlock.ACTIVE); + return state.getValue(PortableGridBlock.ACTIVE); } return false; @@ -572,7 +572,7 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I return false; } - return redstoneMode.isEnabled(world.isBlockPowered(pos)); + return redstoneMode.isEnabled(level.hasNeighborSignal(worldPosition)); } @Override @@ -596,7 +596,7 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I public void drainEnergy(int energy) { if (RS.SERVER_CONFIG.getPortableGrid().getUseEnergy() && type != PortableGridBlockItem.Type.CREATIVE && - redstoneMode.isEnabled(world.isBlockPowered(pos))) { + redstoneMode.isEnabled(level.hasNeighborSignal(worldPosition))) { energyStorage.extractEnergy(energy, false); updateState(); @@ -640,7 +640,7 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I if (this.diskState != newDiskState) { this.diskState = newDiskState; - world.setBlockState(pos, world.getBlockState(pos).with(PortableGridBlock.DISK_STATE, diskState)); + level.setBlockAndUpdate(worldPosition, level.getBlockState(worldPosition).setValue(PortableGridBlock.DISK_STATE, diskState)); } boolean isActive = isGridActive(); @@ -648,7 +648,7 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I if (this.active != isActive) { this.active = isActive; - world.setBlockState(pos, world.getBlockState(pos).with(PortableGridBlock.ACTIVE, active)); + level.setBlockAndUpdate(worldPosition, level.getBlockState(worldPosition).setValue(PortableGridBlock.ACTIVE, active)); } } @@ -658,8 +658,8 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I } @Override - public CompoundNBT write(CompoundNBT tag) { - super.write(tag); + public CompoundNBT save(CompoundNBT tag) { + super.save(tag); tag.putInt(GridNetworkNode.NBT_SORTING_DIRECTION, sortingDirection); tag.putInt(GridNetworkNode.NBT_SORTING_TYPE, sortingType); @@ -676,10 +676,10 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I redstoneMode.write(tag); if (itemStorageTrackerId != null) { - tag.putUniqueId(NBT_ITEM_STORAGE_TRACKER_ID, itemStorageTrackerId); + tag.putUUID(NBT_ITEM_STORAGE_TRACKER_ID, itemStorageTrackerId); } if (fluidStorageTrackerId != null) { - tag.putUniqueId(NBT_FLUID_STORAGE_TRACKER_ID, fluidStorageTrackerId); + tag.putUUID(NBT_FLUID_STORAGE_TRACKER_ID, fluidStorageTrackerId); } if (enchants != null) { @@ -690,8 +690,8 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I } @Override - public void read(BlockState blockState, CompoundNBT tag) { - super.read(blockState, tag); + public void load(BlockState blockState, CompoundNBT tag) { + super.load(blockState, tag); if (tag.contains(GridNetworkNode.NBT_SORTING_DIRECTION)) { sortingDirection = tag.getInt(GridNetworkNode.NBT_SORTING_DIRECTION); @@ -727,7 +727,7 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I redstoneMode = RedstoneMode.read(tag); if (tag.contains(NBT_ITEM_STORAGE_TRACKER_ID)) { - itemStorageTrackerId = tag.getUniqueId(NBT_ITEM_STORAGE_TRACKER_ID); + itemStorageTrackerId = tag.getUUID(NBT_ITEM_STORAGE_TRACKER_ID); } else { if (tag.contains(NBT_STORAGE_TRACKER)) { //TODO: remove next version getItemStorageTracker().readFromNbt(tag.getList(NBT_STORAGE_TRACKER, Constants.NBT.TAG_COMPOUND)); @@ -735,7 +735,7 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I } if (tag.contains(NBT_FLUID_STORAGE_TRACKER_ID)) { - fluidStorageTrackerId = tag.getUniqueId(NBT_FLUID_STORAGE_TRACKER_ID); + fluidStorageTrackerId = tag.getUUID(NBT_FLUID_STORAGE_TRACKER_ID); } else { if (tag.contains(NBT_FLUID_STORAGE_TRACKER)) { //TODO: remove next version getFluidStorageTracker().readFromNbt(tag.getList(NBT_FLUID_STORAGE_TRACKER, Constants.NBT.TAG_COMPOUND)); @@ -784,7 +784,7 @@ public class PortableGridTile extends BaseTile implements ITickableTileEntity, I public void setRedstoneMode(RedstoneMode mode) { this.redstoneMode = mode; - markDirty(); + setChanged(); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/util/BlockUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/BlockUtils.java index aa25854a1..93d908302 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/BlockUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/BlockUtils.java @@ -8,14 +8,14 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TranslationTextComponent; public final class BlockUtils { - public static final AbstractBlock.Properties DEFAULT_ROCK_PROPERTIES = AbstractBlock.Properties.create(Material.ROCK).hardnessAndResistance(1.9F).sound(SoundType.STONE); - public static final AbstractBlock.Properties DEFAULT_GLASS_PROPERTIES = AbstractBlock.Properties.create(Material.GLASS).sound(SoundType.GLASS).hardnessAndResistance(0.35F); + public static final AbstractBlock.Properties DEFAULT_ROCK_PROPERTIES = AbstractBlock.Properties.of(Material.STONE).strength(1.9F).sound(SoundType.STONE); + public static final AbstractBlock.Properties DEFAULT_GLASS_PROPERTIES = AbstractBlock.Properties.of(Material.GLASS).sound(SoundType.GLASS).strength(0.35F); private BlockUtils() { } // Block#getTranslatedName is client only public static ITextComponent getBlockTranslation(Block block) { - return new TranslationTextComponent(block.getTranslationKey()); + return new TranslationTextComponent(block.getDescriptionId()); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/util/CollisionUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/CollisionUtils.java index 8eebc7273..60a99b790 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/CollisionUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/CollisionUtils.java @@ -10,7 +10,7 @@ public final class CollisionUtils { } public static boolean isInBounds(VoxelShape shape, BlockPos pos, Vector3d hit) { - AxisAlignedBB aabb = shape.getBoundingBox().offset(pos); + AxisAlignedBB aabb = shape.bounds().move(pos); return hit.x >= aabb.minX && hit.x <= aabb.maxX diff --git a/src/main/java/com/refinedmods/refinedstorage/util/ColorMap.java b/src/main/java/com/refinedmods/refinedstorage/util/ColorMap.java index 1fc54cb14..faf742c49 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/ColorMap.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/ColorMap.java @@ -95,7 +95,7 @@ public class ColorMap> { block.getId().getPath(), () -> new ColoredBlockItem( block.get(), - new Item.Properties().group(RS.MAIN_GROUP), + new Item.Properties().tab(RS.MAIN_GROUP), color, BlockUtils.getBlockTranslation(translationBlock.get()) ) @@ -112,22 +112,22 @@ public class ColorMap> { } private BlockState getNewState(RegistryObject block, BlockState state) { - BlockState newState = block.get().getDefaultState(); + BlockState newState = block.get().defaultBlockState(); if (((NetworkNodeBlock) block.get()).hasConnectedState()) { - newState = newState.with(NetworkNodeBlock.CONNECTED, state.get(NetworkNodeBlock.CONNECTED)); + newState = newState.setValue(NetworkNodeBlock.CONNECTED, state.getValue(NetworkNodeBlock.CONNECTED)); } if (block.get().getDirection() != BlockDirection.NONE) { - newState = newState.with(block.get().getDirection().getProperty(), state.get(block.get().getDirection().getProperty())); + newState = newState.setValue(block.get().getDirection().getProperty(), state.getValue(block.get().getDirection().getProperty())); } return newState; } public ActionResultType setBlockState(BlockState newState, ItemStack heldItem, World world, BlockPos pos, PlayerEntity player) { - if (!world.isRemote) { - world.setBlockState(pos, newState); - if (((ServerPlayerEntity) player).interactionManager.getGameType() != GameType.CREATIVE) { + if (!world.isClientSide) { + world.setBlockAndUpdate(pos, newState); + if (((ServerPlayerEntity) player).gameMode.getGameModeForPlayer() != GameType.CREATIVE) { heldItem.shrink(1); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/util/DirectionUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/DirectionUtils.java index 42a7b9d18..17f2fda38 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/DirectionUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/DirectionUtils.java @@ -9,10 +9,10 @@ public final class DirectionUtils { } public static Direction getFacingFromEntity(BlockPos clickedBlock, LivingEntity entity) { - return Direction.getFacingFromVector( - (float) (entity.getPosX() - clickedBlock.getX()), - (float) (entity.getPosY() - clickedBlock.getY()), - (float) (entity.getPosZ() - clickedBlock.getZ()) + return Direction.getNearest( + (float) (entity.getX() - clickedBlock.getX()), + (float) (entity.getY() - clickedBlock.getY()), + (float) (entity.getZ() - clickedBlock.getZ()) ); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java index 10c8a5221..96b6dc247 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java @@ -47,11 +47,11 @@ public final class NetworkUtils { } public static ActionResultType attempt(World world, BlockPos pos, PlayerEntity player, Runnable action, Permission... permissionsRequired) { - if (world.isRemote) { + if (world.isClientSide) { return ActionResultType.SUCCESS; } - INetwork network = getNetworkFromNode(getNodeFromTile(world.getTileEntity(pos))); + INetwork network = getNetworkFromNode(getNodeFromTile(world.getBlockEntity(pos))); if (network != null) { for (Permission permission : permissionsRequired) { @@ -69,11 +69,11 @@ public final class NetworkUtils { } public static void extractBucketFromPlayerInventoryOrNetwork(PlayerEntity player, INetwork network, Consumer onBucketFound) { - for (int i = 0; i < player.inventory.getSizeInventory(); ++i) { - ItemStack slot = player.inventory.getStackInSlot(i); + for (int i = 0; i < player.inventory.getContainerSize(); ++i) { + ItemStack slot = player.inventory.getItem(i); if (API.instance().getComparer().isEqualNoQuantity(StackUtils.EMPTY_BUCKET, slot)) { - player.inventory.decrStackSize(i, 1); + player.inventory.removeItem(i, 1); onBucketFound.accept(StackUtils.EMPTY_BUCKET.copy()); diff --git a/src/main/java/com/refinedmods/refinedstorage/util/PacketBufferUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/PacketBufferUtils.java index c1df063cd..5b5315344 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/PacketBufferUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/PacketBufferUtils.java @@ -8,6 +8,6 @@ public final class PacketBufferUtils { // @Volatile: From PacketBuffer#readString, this exists because SideOnly public static String readString(PacketBuffer buffer) { - return buffer.readString(32767); + return buffer.readUtf(32767); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/util/PlayerUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/PlayerUtils.java index 95f89ecc5..538347f4b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/PlayerUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/PlayerUtils.java @@ -7,12 +7,12 @@ public class PlayerUtils { public static void updateHeldItems(ServerPlayerEntity player) { - int mainHandSlot = player.inventory.currentItem; + int mainHandSlot = player.inventory.selected; int offHandSlot = 40; //TODO: @Volatile In 1.17 there is a global variable for this //See ClientPlayNetHandler#HandleSetSlot for the awful vanilla code that makes this necessary // -2 as that directly sets the inventory slots - player.connection.sendPacket(new SSetSlotPacket(-2, mainHandSlot, player.inventory.getStackInSlot(mainHandSlot))); - player.connection.sendPacket(new SSetSlotPacket(-2, offHandSlot, player.inventory.getStackInSlot(offHandSlot))); + player.connection.send(new SSetSlotPacket(-2, mainHandSlot, player.inventory.getItem(mainHandSlot))); + player.connection.send(new SSetSlotPacket(-2, offHandSlot, player.inventory.getItem(offHandSlot))); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java index 810538550..b5c99b0ef 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java @@ -66,7 +66,7 @@ public final class RenderUtils { if (!stacks.get(i).isEmpty() && !combinedIndices.contains(i)) { ItemStack stack = stacks.get(i); - IFormattableTextComponent data = stack.getDisplayName().copyRaw(); + IFormattableTextComponent data = stack.getHoverName().plainCopy(); int amount = stack.getCount(); @@ -79,7 +79,7 @@ public final class RenderUtils { } if (displayAmount) { - data = new StringTextComponent(amount + "x ").appendSibling(data); + data = new StringTextComponent(amount + "x ").append(data); } tooltip.add(data.setStyle(Styles.GRAY)); @@ -94,7 +94,7 @@ public final class RenderUtils { if (!stacks.get(i).isEmpty() && !combinedIndices.contains(i)) { FluidStack stack = stacks.get(i); - IFormattableTextComponent data = stack.getDisplayName().copyRaw(); + IFormattableTextComponent data = stack.getDisplayName().plainCopy(); int amount = stack.getAmount(); @@ -107,7 +107,7 @@ public final class RenderUtils { } if (displayMb) { - data = new StringTextComponent(API.instance().getQuantityFormatter().formatInBucketForm(amount) + " ").appendSibling(data); + data = new StringTextComponent(API.instance().getQuantityFormatter().formatInBucketForm(amount) + " ").append(data); } tooltip.add(data.setStyle(Styles.GRAY)); @@ -119,8 +119,8 @@ public final class RenderUtils { public static void drawTooltipWithSmallText(MatrixStack matrixStack, List textLines, List smallTextLines, boolean showSmallText, @Nonnull ItemStack stack, int mouseX, int mouseY, int screenWidth, int screenHeight, FontRenderer fontRenderer) { // RS begin - definitions int maxTextWidth = -1; - FontRenderer font = Minecraft.getInstance().fontRenderer; - float textScale = Minecraft.getInstance().getForceUnicodeFont() ? 1F : 0.7F; + FontRenderer font = Minecraft.getInstance().font; + float textScale = Minecraft.getInstance().isEnforceUnicode() ? 1F : 0.7F; // RS end if (!textLines.isEmpty()) { @@ -139,7 +139,7 @@ public final class RenderUtils { int tooltipTextWidth = 0; for (ITextProperties textLine : textLines) { - int textLineWidth = font.getStringWidth(textLine.getString()); + int textLineWidth = font.width(textLine.getString()); if (textLineWidth > tooltipTextWidth) tooltipTextWidth = textLineWidth; } @@ -147,7 +147,7 @@ public final class RenderUtils { // RS BEGIN if (showSmallText) { for (String smallText : smallTextLines) { - int size = (int) (font.getStringWidth(smallText) * textScale); + int size = (int) (font.width(smallText) * textScale); if (size > tooltipTextWidth) { tooltipTextWidth = size; @@ -182,12 +182,12 @@ public final class RenderUtils { List wrappedTextLines = new ArrayList<>(); for (int i = 0; i < textLines.size(); i++) { ITextProperties textLine = textLines.get(i); - List wrappedLine = font.getCharacterManager().func_238362_b_(textLine, tooltipTextWidth, Style.EMPTY); + List wrappedLine = font.getSplitter().splitLines(textLine, tooltipTextWidth, Style.EMPTY); if (i == 0) titleLinesCount = wrappedLine.size(); for (ITextProperties line : wrappedLine) { - int lineWidth = font.getStringWidth(line.getString()); + int lineWidth = font.width(line.getString()); if (lineWidth > wrappedTooltipWidth) wrappedTooltipWidth = lineWidth; wrappedTextLines.add(line); @@ -231,7 +231,7 @@ public final class RenderUtils { backgroundColor = colorEvent.getBackground(); borderColorStart = colorEvent.getBorderStart(); borderColorEnd = colorEvent.getBorderEnd(); - Matrix4f matrix = matrixStack.getLast().getMatrix(); + Matrix4f matrix = matrixStack.last().pose(); GuiUtils.drawGradientRect(matrix, zLevel, tooltipX - 3, tooltipY - 4, tooltipX + tooltipTextWidth + 3, tooltipY - 3, backgroundColor, backgroundColor); GuiUtils.drawGradientRect(matrix, zLevel, tooltipX - 3, tooltipY + tooltipHeight + 3, tooltipX + tooltipTextWidth + 3, tooltipY + tooltipHeight + 4, backgroundColor, backgroundColor); @@ -245,17 +245,17 @@ public final class RenderUtils { MinecraftForge.EVENT_BUS.post(new RenderTooltipEvent.PostBackground(stack, textLines, matrixStack, tooltipX, tooltipY, font, tooltipTextWidth, tooltipHeight)); - IRenderTypeBuffer.Impl renderType = IRenderTypeBuffer.getImpl(Tessellator.getInstance().getBuffer()); + IRenderTypeBuffer.Impl renderType = IRenderTypeBuffer.immediate(Tessellator.getInstance().getBuilder()); MatrixStack textStack = new MatrixStack(); textStack.translate(0.0D, 0.0D, zLevel); - Matrix4f textLocation = textStack.getLast().getMatrix(); + Matrix4f textLocation = textStack.last().pose(); int tooltipTop = tooltipY; for (int lineNumber = 0; lineNumber < textLines.size(); ++lineNumber) { ITextProperties line = textLines.get(lineNumber); if (line != null) - font.drawEntityText(LanguageMap.getInstance().func_241870_a(line), (float) tooltipX, (float) tooltipY, -1, true, textLocation, renderType, false, 0, 15728880); + font.drawInBatch(LanguageMap.getInstance().getVisualOrder(line), (float) tooltipX, (float) tooltipY, -1, true, textLocation, renderType, false, 0, 15728880); if (lineNumber + 1 == titleLinesCount) tooltipY += 2; @@ -263,7 +263,7 @@ public final class RenderUtils { tooltipY += 10; } - renderType.finish(); + renderType.endBatch(); MinecraftForge.EVENT_BUS.post(new RenderTooltipEvent.PostText(stack, textLines, matrixStack, tooltipX, tooltipTop, font, tooltipTextWidth, tooltipHeight)); @@ -281,21 +281,21 @@ public final class RenderUtils { smallTextStack.translate(0.0D, 0.0D, zLevel); smallTextStack.scale(textScale, textScale, 1); - IRenderTypeBuffer.Impl renderTypeBuffer = IRenderTypeBuffer.getImpl(Tessellator.getInstance().getBuffer()); - font.renderString( + IRenderTypeBuffer.Impl renderTypeBuffer = IRenderTypeBuffer.immediate(Tessellator.getInstance().getBuilder()); + font.drawInBatch( TextFormatting.GRAY + smallTextLines.get(i), RenderUtils.getOffsetOnScale(tooltipX, textScale), - RenderUtils.getOffsetOnScale(y - (Minecraft.getInstance().getForceUnicodeFont() ? 2 : 0), textScale), + RenderUtils.getOffsetOnScale(y - (Minecraft.getInstance().isEnforceUnicode() ? 2 : 0), textScale), -1, true, - smallTextStack.getLast().getMatrix(), + smallTextStack.last().pose(), renderTypeBuffer, false, 0, 15728880 ); - renderTypeBuffer.finish(); + renderTypeBuffer.endBatch(); y -= 9; } @@ -310,7 +310,7 @@ public final class RenderUtils { // @Volatile: From Screen#getTooltipFromItem public static List getTooltipFromItem(ItemStack stack) { Minecraft minecraft = Minecraft.getInstance(); - return stack.getTooltip(minecraft.player, minecraft.gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL); + return stack.getTooltipLines(minecraft.player, minecraft.options.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL); } public static boolean inBounds(int x, int y, int w, int h, double ox, double oy) { @@ -329,7 +329,7 @@ public final class RenderUtils { if (format == DefaultVertexFormats.BLOCK) { return DefaultVertexFormats.BLOCK; } else if (!format.hasUV(1)) { ; - return new VertexFormat(ImmutableList.builder().addAll(format.getElements()).add(DefaultVertexFormats.TEX_2S).build()); + return new VertexFormat(ImmutableList.builder().addAll(format.getElements()).add(DefaultVertexFormats.ELEMENT_UV1).build()); } return format; @@ -341,7 +341,7 @@ public final class RenderUtils { RenderType originalLayer = MinecraftForgeClient.getRenderLayer(); try { - for (RenderType layer : RenderType.getBlockRenderTypes()) { + for (RenderType layer : RenderType.chunkBufferLayers()) { ForgeHooksClient.setRenderLayer(layer); for (BakedQuad bakedQuad : coverModel.getQuads(coverState, facing, rand)) { @@ -353,7 +353,7 @@ public final class RenderUtils { sprite = bakedQuad.getSprite(); } - if (bakedQuad.getFace() == facing) { + if (bakedQuad.getDirection() == facing) { return bakedQuad.getSprite(); } } @@ -366,7 +366,7 @@ public final class RenderUtils { if (sprite == null) { try { - sprite = coverModel.getParticleTexture(); + sprite = coverModel.getParticleIcon(); } catch (Exception e) { // NO OP } diff --git a/src/main/java/com/refinedmods/refinedstorage/util/StackUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/StackUtils.java index 6b070a11b..28a3cf7fe 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/StackUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/StackUtils.java @@ -57,16 +57,16 @@ public final class StackUtils { Item item = stack.getItem(); - buf.writeVarInt(Item.getIdFromItem(item)); + buf.writeVarInt(Item.getId(item)); buf.writeInt(stack.getCount()); CompoundNBT tag = null; - if (item.isDamageable() || item.shouldSyncTag()) { + if (item.canBeDepleted() || item.shouldOverrideMultiplayerNbt()) { tag = stack.getTag(); } - buf.writeCompoundTag(tag); + buf.writeNbt(tag); } } @@ -78,9 +78,9 @@ public final class StackUtils { int id = buf.readVarInt(); int count = buf.readInt(); - ItemStack stack = new ItemStack(Item.getItemById(id), count); + ItemStack stack = new ItemStack(Item.byId(id), count); - stack.readShareTag(buf.readCompoundTag()); + stack.readShareTag(buf.readNbt()); return stack; } @@ -90,11 +90,11 @@ public final class StackUtils { writeItemStack(buf, stack); buf.writeBoolean(craftable); - buf.writeUniqueId(id); + buf.writeUUID(id); buf.writeBoolean(otherId != null); if (otherId != null) { - buf.writeUniqueId(otherId); + buf.writeUUID(otherId); } if (entry == null) { @@ -103,7 +103,7 @@ public final class StackUtils { buf.writeBoolean(true); buf.writeLong(entry.getTime()); - buf.writeString(entry.getName()); + buf.writeUtf(entry.getName()); } } @@ -111,11 +111,11 @@ public final class StackUtils { ItemStack stack = readItemStack(buf); boolean craftable = buf.readBoolean(); - UUID id = buf.readUniqueId(); + UUID id = buf.readUUID(); UUID otherId = null; if (buf.readBoolean()) { - otherId = buf.readUniqueId(); + otherId = buf.readUUID(); } StorageTrackerEntry entry = null; @@ -130,11 +130,11 @@ public final class StackUtils { stack.writeToPacket(buf); buf.writeBoolean(craftable); - buf.writeUniqueId(id); + buf.writeUUID(id); buf.writeBoolean(otherId != null); if (otherId != null) { - buf.writeUniqueId(otherId); + buf.writeUUID(otherId); } if (entry == null) { @@ -143,18 +143,18 @@ public final class StackUtils { buf.writeBoolean(true); buf.writeLong(entry.getTime()); - buf.writeString(entry.getName()); + buf.writeUtf(entry.getName()); } } public static FluidGridStack readFluidGridStack(PacketBuffer buf) { FluidStack stack = FluidStack.readFromPacket(buf); boolean craftable = buf.readBoolean(); - UUID id = buf.readUniqueId(); + UUID id = buf.readUUID(); UUID otherId = null; if (buf.readBoolean()) { - otherId = buf.readUniqueId(); + otherId = buf.readUUID(); } StorageTrackerEntry entry = null; @@ -205,7 +205,7 @@ public final class StackUtils { } public static void writeItems(IItemHandler handler, int id, CompoundNBT tag) { - writeItems(handler, id, tag, stack -> stack.write(new CompoundNBT())); + writeItems(handler, id, tag, stack -> stack.save(new CompoundNBT())); } public static void readItems(IItemHandlerModifiable handler, int id, CompoundNBT tag, Function deserializer) { @@ -225,13 +225,13 @@ public final class StackUtils { } public static void readItems(IItemHandlerModifiable handler, int id, CompoundNBT tag) { - readItems(handler, id, tag, ItemStack::read); + readItems(handler, id, tag, ItemStack::of); } public static void readItems(BaseItemHandler handler, int id, CompoundNBT tag) { handler.setReading(true); - readItems(handler, id, tag, ItemStack::read); + readItems(handler, id, tag, ItemStack::of); handler.setReading(false); } @@ -239,13 +239,13 @@ public final class StackUtils { public static void writeItems(IInventory inventory, int id, CompoundNBT tag) { ListNBT tagList = new ListNBT(); - for (int i = 0; i < inventory.getSizeInventory(); i++) { - if (!inventory.getStackInSlot(i).isEmpty()) { + for (int i = 0; i < inventory.getContainerSize(); i++) { + if (!inventory.getItem(i).isEmpty()) { CompoundNBT stackTag = new CompoundNBT(); stackTag.putInt(NBT_SLOT, i); - inventory.getStackInSlot(i).write(stackTag); + inventory.getItem(i).save(stackTag); tagList.add(stackTag); } @@ -263,10 +263,10 @@ public final class StackUtils { for (int i = 0; i < tagList.size(); i++) { int slot = tagList.getCompound(i).getInt(NBT_SLOT); - ItemStack stack = ItemStack.read(tagList.getCompound(i)); + ItemStack stack = ItemStack.of(tagList.getCompound(i)); if (!stack.isEmpty()) { - inventory.setInventorySlotContents(slot, stack); + inventory.setItem(slot, stack); } } } @@ -319,7 +319,7 @@ public final class StackUtils { } // @Volatile - stack.write(dummy); + stack.save(dummy); if (dummy.contains(NBT_FORGE_CAPS)) { itemTag.put(NBT_ITEM_CAPS, dummy.get(NBT_FORGE_CAPS)); } diff --git a/src/main/java/com/refinedmods/refinedstorage/util/TimeUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/TimeUtils.java index f372b5b2a..c4520d7a6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/TimeUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/TimeUtils.java @@ -17,19 +17,19 @@ public final class TimeUtils { long diff = System.currentTimeMillis() - ago; if (diff < SECOND * 10) { - return I18n.format("misc.refinedstorage.last_modified.just_now", by); + return I18n.get("misc.refinedstorage.last_modified.just_now", by); } else if (diff < MINUTE) { - return I18n.format("misc.refinedstorage.last_modified.second" + ((diff / SECOND) > 1 ? "s" : ""), diff / SECOND, by); + return I18n.get("misc.refinedstorage.last_modified.second" + ((diff / SECOND) > 1 ? "s" : ""), diff / SECOND, by); } else if (diff < HOUR) { - return I18n.format("misc.refinedstorage.last_modified.minute" + ((diff / MINUTE) > 1 ? "s" : ""), diff / MINUTE, by); + return I18n.get("misc.refinedstorage.last_modified.minute" + ((diff / MINUTE) > 1 ? "s" : ""), diff / MINUTE, by); } else if (diff < DAY) { - return I18n.format("misc.refinedstorage.last_modified.hour" + ((diff / HOUR) > 1 ? "s" : ""), diff / HOUR, by); + return I18n.get("misc.refinedstorage.last_modified.hour" + ((diff / HOUR) > 1 ? "s" : ""), diff / HOUR, by); } else if (diff < WEEK) { - return I18n.format("misc.refinedstorage.last_modified.day" + ((diff / DAY) > 1 ? "s" : ""), diff / DAY, by); + return I18n.get("misc.refinedstorage.last_modified.day" + ((diff / DAY) > 1 ? "s" : ""), diff / DAY, by); } else if (diff < YEAR) { - return I18n.format("misc.refinedstorage.last_modified.week" + ((diff / WEEK) > 1 ? "s" : ""), diff / WEEK, by); + return I18n.get("misc.refinedstorage.last_modified.week" + ((diff / WEEK) > 1 ? "s" : ""), diff / WEEK, by); } - return I18n.format("misc.refinedstorage.last_modified.year" + ((diff / YEAR) > 1 ? "s" : ""), diff / YEAR, by); + return I18n.get("misc.refinedstorage.last_modified.year" + ((diff / YEAR) > 1 ? "s" : ""), diff / YEAR, by); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/util/WorldUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/WorldUtils.java index 2cf88b84d..df1b072ab 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/WorldUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/WorldUtils.java @@ -34,10 +34,10 @@ public final class WorldUtils { } public static void updateBlock(@Nullable World world, BlockPos pos) { - if (world != null && world.isBlockPresent(pos)) { + if (world != null && world.isLoaded(pos)) { BlockState state = world.getBlockState(pos); - world.notifyBlockUpdate(pos, state, state, 1 | 2); + world.sendBlockUpdated(pos, state, state, 1 | 2); } } @@ -68,9 +68,9 @@ public final class WorldUtils { public static FakePlayer getFakePlayer(ServerWorld world, @Nullable UUID owner) { if (owner != null) { - PlayerProfileCache profileCache = world.getServer().getPlayerProfileCache(); + PlayerProfileCache profileCache = world.getServer().getProfileCache(); - GameProfile profile = profileCache.getProfileByUUID(owner); + GameProfile profile = profileCache.get(owner); if (profile != null) { return FakePlayerFactory.get(world, profile); @@ -81,16 +81,16 @@ public final class WorldUtils { } public static void sendNoPermissionMessage(PlayerEntity player) { - player.sendMessage(new TranslationTextComponent("misc.refinedstorage.security.no_permission").setStyle(Styles.RED), player.getUniqueID()); + player.sendMessage(new TranslationTextComponent("misc.refinedstorage.security.no_permission").setStyle(Styles.RED), player.getUUID()); } public static RayTraceResult rayTracePlayer(World world, PlayerEntity player) { double reachDistance = player.getAttribute(ForgeMod.REACH_DISTANCE.get()).getValue(); Vector3d base = player.getEyePosition(1.0F); - Vector3d look = player.getLookVec(); + Vector3d look = player.getLookAngle(); Vector3d target = base.add(look.x * reachDistance, look.y * reachDistance, look.z * reachDistance); - return world.rayTraceBlocks(new RayTraceContext(base, target, RayTraceContext.BlockMode.OUTLINE, RayTraceContext.FluidMode.NONE, player)); + return world.clip(new RayTraceContext(base, target, RayTraceContext.BlockMode.OUTLINE, RayTraceContext.FluidMode.NONE, player)); } }