Features needed to get IronChests ingame

Author: TheGlitch76

patchwork-extensions/src/main/java/net/patchworkmc/impl/extensions/asm/InstanceFinder.java

@@ -24,6 +24,7 @@
 
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.MethodInsnNode;
+import org.objectweb.asm.tree.MethodNode;
 import org.objectweb.asm.tree.analysis.Analyzer;
 import org.objectweb.asm.tree.analysis.AnalyzerException;
 import org.objectweb.asm.tree.analysis.Frame;
@@ -46,13 +47,22 @@ public static void classLoadMePlease() {
 
 	private class InternalFrame extends Frame<SourceValue> {
 		private AbstractInsnNode current;
+		boolean capturing = false;
+		SourceValue last = null;
+
 		InternalFrame(int numLocals, int numStack) {
 			super(numLocals, numStack);
 		}
 
 		@Override
 		public void execute(AbstractInsnNode insn, Interpreter<SourceValue> interpreter) throws AnalyzerException {
 			this.current = insn;
+
+			// The instance is pushed first and therefore popped last
+			if (capturing && current != target) {
+				throw new FoundException(last.insns);
+			}
+
 			super.execute(insn, interpreter);
 		}
 
@@ -63,11 +73,14 @@ public void push(SourceValue value) {
 
 		@Override
 		public SourceValue pop() {
+			SourceValue ret = super.pop();
+
 			if (current == target) {
-				throw new FoundException(super.pop().insns);
+				capturing = true;
+				this.last = ret;
 			}
 
-			return super.pop();
+			return ret;
 		}
 	}
 
@@ -76,6 +89,20 @@ protected Frame<SourceValue> newFrame(int numLocals, int numStack) {
 		return new InternalFrame(numLocals, numStack);
 	}
 
+	@Override
+	public Frame<SourceValue>[] analyze(String owner, MethodNode method) throws AnalyzerException {
+		Frame<SourceValue>[] frames = super.analyze(owner, method);
+		InternalFrame ours = (InternalFrame) frames[0];
+
+		// Handle the case where the MIN is the last of the whole method
+		// I don't actually know if this could ever even happen, but better safe than sorry
+		if (ours.capturing) {
+			throw new FoundException(ours.last.insns);
+		}
+
+		return frames;
+	}
+
 	class FoundException extends RuntimeException {
 		public final Set<AbstractInsnNode> insns;
 

patchwork-extensions/src/main/java/net/patchworkmc/impl/extensions/asm/TileEntityHacks.java

@@ -32,9 +32,9 @@
  */
 class TileEntityHacks {
 	private static final String BLOCK_ENTITY_PROVIDER = Transformer.mapSlashedClass("net/minecraft/block/BlockEntityProvider");
-	// it's easier to just hardcode this method name that will never change since we don't need the desc
-	private static final String CREATE_BE =
-			FabricLoader.getInstance().isDevelopmentEnvironment() ? "createBlockEntity" : "method_10123";
+	// it's easier to just hardcode these method names that will never change since we don't need the desc
+	private static final String CREATE_BE = FabricLoader.getInstance().isDevelopmentEnvironment() ? "createBlockEntity" : "method_10123";
+	private static final String HAS_BLOCK_ENTITY = FabricLoader.getInstance().isDevelopmentEnvironment() ? "hasBlockEntity" : "method_9570";
 	private static final String BLOCK = Transformer.mapSlashedClass("net/minecraft/class_2248");
 
 	public static void classLoadMePlease() {
@@ -45,12 +45,18 @@ public static boolean transform(MethodNode node) {
 		boolean didSomething = false;
 
 		for (AbstractInsnNode instruction : node.instructions) {
-			if (instruction.getOpcode() == Opcodes.CHECKCAST) {
+			if (instruction instanceof TypeInsnNode) {
 				TypeInsnNode tin = (TypeInsnNode) instruction;
 
 				if (tin.desc.equals(BLOCK_ENTITY_PROVIDER)) {
-					// this could be problematic for weird use cases. too bad!
-					node.instructions.remove(tin);
+					if (tin.getOpcode() == Opcodes.CHECKCAST) {
+						// this could be problematic for weird use cases. too bad!
+						node.instructions.remove(tin);
+					} else if (tin.getOpcode() == Opcodes.INSTANCEOF) {
+						MethodInsnNode newMin = new MethodInsnNode(Opcodes.INVOKEVIRTUAL, BLOCK, HAS_BLOCK_ENTITY, "()Z");
+						node.instructions.insertBefore(tin, newMin);
+						node.instructions.remove(tin);
+					}
 				}
 			} else if (instruction.getOpcode() == Opcodes.INVOKEINTERFACE) {
 				MethodInsnNode min = (MethodInsnNode) instruction;

patchwork-extensions/src/main/java/net/patchworkmc/impl/extensions/asm/Transformer.java

@@ -50,7 +50,7 @@
  */
 class Transformer {
 	private static final FabricLoader LOADER = FabricLoader.getInstance();
-	private static final boolean CHANGE_ME_TO_AUDIT = false;
+	private static final boolean CHANGE_ME_TO_AUDIT = true;
 	private static final boolean AUDIT = FabricLoader.getInstance().isDevelopmentEnvironment() && CHANGE_ME_TO_AUDIT;
 
 	public static final Logger LOGGER = LogManager.getLogger("Patchwork Mass ASM");

patchwork-registries/src/main/java/net/minecraftforge/fml/client/registry/ClientRegistry.java.old renamed to patchwork-registries/src/main/java/net/minecraftforge/fml/client/registry/ClientRegistry.java

@@ -21,38 +21,39 @@
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
 
 import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.client.options.KeyBinding;
-import net.minecraft.client.render.block.entity.BlockEntityRenderer;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.Identifier;
 
-import net.fabricmc.fabric.api.client.keybinding.KeyBindingRegistry;
-import net.fabricmc.fabric.api.client.render.BlockEntityRendererRegistry;
+import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
+import net.fabricmc.fabric.api.client.rendereregistry.v1.BlockEntityRendererRegistry;
 
 import net.patchworkmc.impl.registries.AddedKeybinds;
 
 public class ClientRegistry {
-	private static Map<Class<? extends Entity>, Identifier> entityShaderMap = new ConcurrentHashMap<>();
+	private static final Map<Class<? extends Entity>, Identifier> entityShaderMap = new ConcurrentHashMap<>();
 
 	/**
-	 * Registers a {@link BlockEntityRenderer}
+	 * Registers a Tile Entity renderer.
 	 * Call this during {@link net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent}.
 	 * This method is safe to call during parallel mod loading.
 	 */
-	public static synchronized <T extends BlockEntity> void bindTileEntitySpecialRenderer(Class<T> tileEntityClass, BlockEntityRenderer<? super T> specialRenderer) {
-		BlockEntityRendererRegistry.INSTANCE.register(tileEntityClass, specialRenderer);
-		// Done by Fabric API: specialRenderer.setRenderManager(BlockEntityRenderDispatcher.INSTANCE);
+	public static synchronized <T extends BlockEntity> void bindTileEntityRenderer(BlockEntityType<T> tileEntityType,
+			Function rendererFactory) {
+		BlockEntityRendererRegistry.INSTANCE.register(tileEntityType, rendererFactory);
 	}
 
 	/**
-	 * Registers a {@link KeyBinding}.
+	 * Registers a KeyBinding.
 	 * Call this during {@link net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent}.
 	 * This method is safe to call during parallel mod loading.
 	 */
 	public static synchronized void registerKeyBinding(KeyBinding key) {
-		KeyBindingRegistry.INSTANCE.addCategory(key.getCategory());
+		KeyBindingHelper.registerKeyBinding(key);
 		AddedKeybinds.registerKeyBinding(key);
 	}
 

patchwork-registries/src/main/java/net/minecraftforge/registries/DeferredRegister.java

@@ -154,6 +154,7 @@ public Supplier<IForgeRegistry<T>> makeRegistry(final String name, final Supplie
 	 * @param bus The Mod Specific event bus.
 	 */
 	public void register(IEventBus bus) {
+		EventRegistrarRegistry.INSTANCE.registerInstance(EventDispatcher.class, (in, it) -> it.addListener(in::handleEvent));
 		bus.register(new EventDispatcher(this));
 
 		if (this.type == null && this.registryFactory != null) {
@@ -173,11 +174,6 @@ public void handleEvent(RegistryEvent.Register<?> event) {
 		}
 	}
 
-	// can't use $ because of how the ${version} replacement works
-	public static void patchwork_registerEventRegistrar() {
-		EventRegistrarRegistry.INSTANCE.registerInstance(EventDispatcher.class, (in, bus) -> bus.addListener(in::handleEvent));
-	}
-
 	/**
 	 * @return The unmodifiable view of registered entries. Useful for bulk operations on all values.
 	 */

patchwork-registries/src/main/resources/fabric.mod.json

@@ -20,11 +20,6 @@
   "mixins": [
     "patchwork-registries.mixins.json"
   ],
-  "entrypoints": {
-    "patchwork:commonAutomaticSubscribers": [
-      "net.minecraftforge.registries.DeferredRegister::patchwork_registerEventRegistrar"
-    ]
-  },
   "accessWidener": "patchwork-registries.accesswidener",
   "custom": {
     "modmenu:api": true,