diff --git a/build.gradle b/build.gradle index 31f8f3a..42e6764 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.0-SNAPSHOT' + id 'fabric-loom' version '1.6-SNAPSHOT' id 'maven-publish' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9b0dc1a..b82aa23 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1 +1,7 @@ -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# 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. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# 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/HEAD/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 +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 + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +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 ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +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 + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + 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 +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$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 + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# 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/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/main/java/heyblack/flexiblepcb/FlexiblePCBSettings.java b/src/main/java/heyblack/flexiblepcb/FlexiblePCBSettings.java index b8baf0b..10ed38e 100644 --- a/src/main/java/heyblack/flexiblepcb/FlexiblePCBSettings.java +++ b/src/main/java/heyblack/flexiblepcb/FlexiblePCBSettings.java @@ -78,4 +78,10 @@ public Integer validate(ServerCommandSource source, ParsedRule currentR category = {COMMAND, CREATIVE, "flexiblepcb"} ) public static boolean commandChunkSaveState = false; + + @Rule( + desc = "Fixes MC-254307, and the same issue with beds", + category = {BUGFIX, "flexiblepcb"} + ) + public static boolean UnstableOnGroundTagFix = false; } diff --git a/src/main/java/heyblack/flexiblepcb/hook/Hooks.java b/src/main/java/heyblack/flexiblepcb/hook/Hooks.java new file mode 100644 index 0000000..ebd8206 --- /dev/null +++ b/src/main/java/heyblack/flexiblepcb/hook/Hooks.java @@ -0,0 +1,25 @@ +package heyblack.flexiblepcb.hook; + +import heyblack.flexiblepcb.FlexiblePCBSettings; +import net.minecraft.block.BedBlock; +import net.minecraft.block.Block; +import net.minecraft.block.SlimeBlock; +import net.minecraft.entity.Entity; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.BlockView; + +public class Hooks { + + @SuppressWarnings("unused") + public static void checkVelocity(Block block, BlockView world, Entity entity, Vec3d vec3d) { + if (FlexiblePCBSettings.UnstableOnGroundTagFix) { + if ((entity.getVelocity().y <= 0.0 && entity.getVelocity().y >= -0.08) + && (block instanceof SlimeBlock || block instanceof BedBlock) + ){ + entity.setVelocity(entity.getVelocity().multiply(1.0, 0.0, 1.0)); + return; + } + } + block.onEntityLand(world, entity); + } +} diff --git a/src/main/java/heyblack/flexiblepcb/hook/Names.java b/src/main/java/heyblack/flexiblepcb/hook/Names.java new file mode 100644 index 0000000..45cf4e3 --- /dev/null +++ b/src/main/java/heyblack/flexiblepcb/hook/Names.java @@ -0,0 +1,39 @@ +package heyblack.flexiblepcb.hook; + +import net.fabricmc.loader.api.FabricLoader; + +public class Names { + public static final String Entity; + public static final String Entity_class; + public static final String Entity_move; + public static final String Entity_move_desc; + public static final String Vec3d; + public static final String Block_onEntityLand; + public static final String Block_onEntityLand_desc; + public static final String Hooks_checkVelocity_desc; + + static { + String currentNamespace = FabricLoader.getInstance().getMappingResolver().getCurrentRuntimeNamespace(); + if (!currentNamespace.equals("intermediary")) { + Entity = "net/minecraft/entity/Entity"; + Entity_move = "move"; + Entity_move_desc = "(Lnet/minecraft/entity/MovementType;Lnet/minecraft/util/math/Vec3d;)V"; + Vec3d = "net/minecraft/util/math/Vec3d"; + + Block_onEntityLand = "onEntityLand"; + Block_onEntityLand_desc = "(Lnet/minecraft/world/BlockView;Lnet/minecraft/entity/Entity;)V"; + + Hooks_checkVelocity_desc = "(Lnet/minecraft/block/Block;Lnet/minecraft/world/BlockView;Lnet/minecraft/entity/Entity;Lnet/minecraft/util/math/Vec3d;)V"; + } else { + Entity = "net/minecraft/class_1297"; + Entity_move = "method_5784"; + Entity_move_desc = "(Lnet/minecraft/class_1313;Lnet/minecraft/class_243;)V"; + Vec3d = "net/minecraft/class_243"; + + Block_onEntityLand = "method_9502"; + Block_onEntityLand_desc = "(Lnet/minecraft/class_1922;Lnet/minecraft/class_1297;)V"; + Hooks_checkVelocity_desc = "(Lnet/minecraft/class_2248;Lnet/minecraft/class_1922;Lnet/minecraft/class_1297;Lnet/minecraft/class_243)V"; + } + Entity_class = Entity.replace("/", "."); + } +} diff --git a/src/main/java/heyblack/flexiblepcb/logging/AbstractLogger.java b/src/main/java/heyblack/flexiblepcb/logging/AbstractLogger.java new file mode 100644 index 0000000..7bfe0a4 --- /dev/null +++ b/src/main/java/heyblack/flexiblepcb/logging/AbstractLogger.java @@ -0,0 +1,37 @@ +package heyblack.flexiblepcb.logging; + +import carpet.logging.Logger; + +public abstract class AbstractLogger +{ + private final String name; + public String[] options = null; + + public AbstractLogger(String name) { + this.name = name; + } + + public Logger createLogger() { + return FlexiblePCBLoggerRegistry.stardardLogger( + this.getName(), + this.getDefaultOption(), + this.getOptions() + ); + } + + public void log() { + + } + + public String getName() { + return this.name; + } + + public String getDefaultOption() { + return this.options == null ? null : options[0]; + } + + public String[] getOptions() { + return this.options; + } +} diff --git a/src/main/java/heyblack/flexiblepcb/logging/FlexiblePCBLoggerRegistry.java b/src/main/java/heyblack/flexiblepcb/logging/FlexiblePCBLoggerRegistry.java new file mode 100644 index 0000000..1e2de7e --- /dev/null +++ b/src/main/java/heyblack/flexiblepcb/logging/FlexiblePCBLoggerRegistry.java @@ -0,0 +1,27 @@ +package heyblack.flexiblepcb.logging; + +import carpet.logging.Logger; +import carpet.logging.LoggerRegistry; +import heyblack.flexiblepcb.logging.logger.ItemShadowLogger; + +public class FlexiblePCBLoggerRegistry +{ + public static boolean __itemshadow; + + public static void registerLoggers() { + register(ItemShadowLogger.getInstance()); + } + + public static void register(AbstractLogger logger) { + LoggerRegistry.registerLogger(logger.getName(), stardardLogger(logger.getName(), logger.getDefaultOption(), logger.getOptions())); + } + + public static Logger stardardLogger(String logName, String def, String [] options) { + try { + return new Logger(FlexiblePCBLoggerRegistry.class.getField("__"+logName), logName, def, options); + } + catch (NoSuchFieldException e) { + throw new RuntimeException("Failed to create logger " + logName); + } + } +} diff --git a/src/main/java/heyblack/flexiblepcb/logging/logger/ItemShadowLogger.java b/src/main/java/heyblack/flexiblepcb/logging/logger/ItemShadowLogger.java new file mode 100644 index 0000000..ebf3263 --- /dev/null +++ b/src/main/java/heyblack/flexiblepcb/logging/logger/ItemShadowLogger.java @@ -0,0 +1,39 @@ +package heyblack.flexiblepcb.logging.logger; + +import heyblack.flexiblepcb.logging.AbstractLogger; +import heyblack.flexiblepcb.logging.FlexiblePCBLoggerRegistry; + +public class ItemShadowLogger extends AbstractLogger +{ + private static final String NAME = "itemshadow"; + private static final ItemShadowLogger INSTANCE = new ItemShadowLogger(); + + public void onItemShadowCreate() { + if (!FlexiblePCBLoggerRegistry.__itemshadow) { + return; + } + } + + public static ItemShadowLogger getInstance() { + return INSTANCE; + } + + private ItemShadowLogger() { + super(NAME); + } + + @Override + public String getName() { + return NAME; + } + + @Override + public String getDefaultOption() { + return null; + } + + @Override + public String[] getOptions() { + return null; + } +} diff --git a/src/main/java/heyblack/flexiblepcb/mixin/FlexiblePCBMixinPlugin.java b/src/main/java/heyblack/flexiblepcb/mixin/FlexiblePCBMixinPlugin.java new file mode 100644 index 0000000..a76427c --- /dev/null +++ b/src/main/java/heyblack/flexiblepcb/mixin/FlexiblePCBMixinPlugin.java @@ -0,0 +1,82 @@ +package heyblack.flexiblepcb.mixin; + +import heyblack.flexiblepcb.hook.Names; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.VarInsnNode; +import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; + +import java.util.List; +import java.util.ListIterator; +import java.util.Set; + +public class FlexiblePCBMixinPlugin implements IMixinConfigPlugin { + @Override + public void onLoad(String mixinPackage) { + + } + + @Override + public String getRefMapperConfig() { + return null; + } + + @Override + public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { + return true; + } + + @Override + public void acceptTargets(Set myTargets, Set otherTargets) { + + } + + @Override + public List getMixins() { + return null; + } + + @Override + public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + + } + + @Override + public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { +// System.out.println("targetClassName = " + targetClassName); + if (targetClassName.equals(Names.Entity_class)) { + for (MethodNode method : targetClass.methods) { + if (method.name.equals(Names.Entity_move) && method.desc.equals(Names.Entity_move_desc)) { +// System.out.println("method = " + method); + ListIterator iter = method.instructions.iterator(); + while (iter.hasNext()) { + AbstractInsnNode insnNode = iter.next(); + //INVOKEVIRTUAL net/minecraft/block/Block.onEntityLand (Lnet/minecraft/world/BlockView;Lnet/minecraft/entity/Entity;)V + if (insnNode instanceof MethodInsnNode + && insnNode.getOpcode() == Opcodes.INVOKEVIRTUAL + && ((MethodInsnNode) insnNode).name.equals(Names.Block_onEntityLand) + && ((MethodInsnNode) insnNode).desc.equals(Names.Block_onEntityLand_desc) + ){ + iter.remove(); + iter.add( + new VarInsnNode(Opcodes.ALOAD, 3) + ); + iter.add( + new MethodInsnNode( + Opcodes.INVOKESTATIC, + "heyblack/flexiblepcb/hook/Hooks", + "checkVelocity", + Names.Hooks_checkVelocity_desc + ) + ); + } + } + } + } + } + } +} diff --git a/src/main/java/heyblack/flexiblepcb/mixin/logger/loggerItemShadow/ScreenHandlerMixin.java b/src/main/java/heyblack/flexiblepcb/mixin/logger/loggerItemShadow/ScreenHandlerMixin.java new file mode 100644 index 0000000..d8bbae5 --- /dev/null +++ b/src/main/java/heyblack/flexiblepcb/mixin/logger/loggerItemShadow/ScreenHandlerMixin.java @@ -0,0 +1,54 @@ +package heyblack.flexiblepcb.mixin.logger.loggerItemShadow; + +import heyblack.flexiblepcb.logging.FlexiblePCBLoggerRegistry; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.screen.slot.SlotActionType; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.Slice; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(ScreenHandler.class) +public abstract class ScreenHandlerMixin +{ + @Shadow public abstract ScreenHandlerType getType(); + + private static ItemStack trackingStack = null; + private Inventory trackingInventory = null; + private static boolean dirty = false; + + @Inject( + method = "method_30010", + at = @At(value = "INVOKE", + target = "Lnet/minecraft/screen/slot/Slot;setStack(Lnet/minecraft/item/ItemStack;)V"), + slice = @Slice( + from = @At(value = "INVOKE", target = "Lnet/minecraft/screen/slot/Slot;setStack(Lnet/minecraft/item/ItemStack;)V", ordinal = 8), + to = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerInventory;setStack(ILnet/minecraft/item/ItemStack;)V", ordinal = 1) + ) + ) + public void onSlotSwap(int i, int j, SlotActionType slotActionType, PlayerEntity playerEntity, CallbackInfoReturnable cir) { + if (FlexiblePCBLoggerRegistry.__itemshadow) { + trackingStack = playerEntity.inventory.getStack(i); +// trackingInventory = this. + dirty = true; + } + } + + public ItemStack getTrackingStack() { + return trackingStack; + } + + static void afterSuppression() { + dirty = false; + } + + static boolean getDirty() { + return dirty; + } +} diff --git a/src/main/java/heyblack/flexiblepcb/mixin/logger/loggerItemShadow/ThreadExecutorMixin.java b/src/main/java/heyblack/flexiblepcb/mixin/logger/loggerItemShadow/ThreadExecutorMixin.java new file mode 100644 index 0000000..023c53f --- /dev/null +++ b/src/main/java/heyblack/flexiblepcb/mixin/logger/loggerItemShadow/ThreadExecutorMixin.java @@ -0,0 +1,21 @@ +package heyblack.flexiblepcb.mixin.logger.loggerItemShadow; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.thread.ThreadExecutor; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(ThreadExecutor.class) +public class ThreadExecutorMixin +{ +// @Inject(method = "executeTask", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/thread/ThreadExecutor;getName()Ljava/lang/String;")) +// public void onException(R task, CallbackInfo ci) { +// ItemStack stack = ScreenHandlerMixin.getTrackingStack(); +// +// if (stack != null && ScreenHandlerMixin.getDirty()) { +// ScreenHandlerMixin.afterSuppression(); +// } +// } +} diff --git a/src/main/java/heyblack/flexiblepcb/mixin/rule/fixUnstableOnGroundTag/EntityMixin.java b/src/main/java/heyblack/flexiblepcb/mixin/rule/fixUnstableOnGroundTag/EntityMixin.java new file mode 100644 index 0000000..e95318a --- /dev/null +++ b/src/main/java/heyblack/flexiblepcb/mixin/rule/fixUnstableOnGroundTag/EntityMixin.java @@ -0,0 +1,9 @@ +package heyblack.flexiblepcb.mixin.rule.fixUnstableOnGroundTag; + +import net.minecraft.entity.Entity; +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(Entity.class) +public class EntityMixin +{ +} diff --git a/src/main/java/heyblack/flexiblepcb/util/logger/loggerItemShadow/ItemShadowTracker.java b/src/main/java/heyblack/flexiblepcb/util/logger/loggerItemShadow/ItemShadowTracker.java new file mode 100644 index 0000000..6fea1db --- /dev/null +++ b/src/main/java/heyblack/flexiblepcb/util/logger/loggerItemShadow/ItemShadowTracker.java @@ -0,0 +1,19 @@ +package heyblack.flexiblepcb.util.logger.loggerItemShadow; + +import heyblack.flexiblepcb.mixin.logger.loggerItemShadow.ScreenHandlerMixin; +import net.minecraft.item.ItemStack; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class ItemShadowTracker +{ +// Map map = new HashMap<>(); +// +// ItemStack latestStack; +// +// public ItemStack getLatestStack() { +// return ScreenHandlerMixin.getTrackingStack(); +// } +} diff --git a/src/main/resources/flexiblepcb.mixins.json b/src/main/resources/flexiblepcb.mixins.json index 517631d..96ad665 100644 --- a/src/main/resources/flexiblepcb.mixins.json +++ b/src/main/resources/flexiblepcb.mixins.json @@ -6,6 +6,7 @@ "mixins": [ "command.commandChunkSaveState.ChunkSerializerMixin", "command.commandUpdateBlock.BlockStateArgumentAccessor", + "rule.fixUnstableOnGroundTag.EntityMixin", "rule.insertBlockToMinecart.MinecartEntityMixin", "rule.moreChunkLoaders.HopperBlockEntityMixin", "rule.moreChunkLoaders.PistonBlockMixin" @@ -14,5 +15,6 @@ ], "injectors": { "defaultRequire": 1 - } + }, + "plugin": "heyblack.flexiblepcb.mixin.FlexiblePCBMixinPlugin" }