snapshot: main source set compile

3 files changed, 29 insertions, 99 deletions

diff --git a/src/main/java/moe/nea/firmament/init/ClientPlayerRiser.java b/src/main/java/moe/nea/firmament/init/ClientPlayerRiser.java
deleted file mode 100644
index d60e3e7..0000000
--- a/src/main/java/moe/nea/firmament/init/ClientPlayerRiser.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package moe.nea.firmament.init;
-
-import me.shedaniel.mm.api.ClassTinkerers;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.InsnNode;
-import org.objectweb.asm.tree.MethodInsnNode;
-import org.objectweb.asm.tree.MethodNode;
-import org.objectweb.asm.tree.VarInsnNode;
-
-import java.lang.reflect.Modifier;
-import java.util.Objects;
-
-public class ClientPlayerRiser extends RiserUtils {
-    @IntermediaryName(net.minecraft.entity.player.PlayerEntity.class)
-    String PlayerEntity;
-    @IntermediaryName(net.minecraft.world.World.class)
-    String World;
-    String GameProfile = "com.mojang.authlib.GameProfile";
-    @IntermediaryName(net.minecraft.util.math.BlockPos.class)
-    String BlockPos;
-    @IntermediaryName(net.minecraft.client.network.AbstractClientPlayerEntity.class)
-    String AbstractClientPlayerEntity;
-    String GuiPlayer = "moe.nea.firmament.gui.entity.GuiPlayer";
-    // World world, BlockPos pos, float yaw, GameProfile gameProfile
-    Type constructorDescriptor = Type.getMethodType(Type.VOID_TYPE, getTypeForClassName(World), getTypeForClassName(BlockPos), Type.FLOAT_TYPE, getTypeForClassName(GameProfile));
-
-
-    private void mapClassNode(ClassNode classNode, Type superClass) {
-        for (MethodNode method : classNode.methods) {
-            if (Objects.equals(method.name, "<init>") && Type.getMethodType(method.desc).equals(constructorDescriptor)) {
-                modifyConstructor(method, superClass);
-                return;
-            }
-        }
-        var node = new MethodNode(Opcodes.ASM9, "<init>", constructorDescriptor.getDescriptor(), null, null);
-        classNode.methods.add(node);
-        modifyConstructor(node, superClass);
-    }
-
-
-    private void modifyConstructor(MethodNode method, Type superClass) {
-        method.access = (method.access | Modifier.PUBLIC) & ~Modifier.PRIVATE & ~Modifier.PROTECTED;
-        if (method.instructions.size() != 0) return; // Some other mod has already made a constructor here
-
-        // World world, BlockPos pos, float yaw, GameProfile gameProfile
-        // ALOAD this
-        method.instructions.add(new VarInsnNode(Opcodes.ALOAD, 0));
-
-        // ALOAD World
-        method.instructions.add(new VarInsnNode(Opcodes.ALOAD, 1));
-
-        // ALOAD BlockPos
-        method.instructions.add(new VarInsnNode(Opcodes.ALOAD, 2));
-
-        // ALOAD yaw
-        method.instructions.add(new VarInsnNode(Opcodes.FLOAD, 3));
-
-        // ALOAD gameProfile
-        method.instructions.add(new VarInsnNode(Opcodes.ALOAD, 4));
-
-        // Call super
-        method.instructions.add(new MethodInsnNode(Opcodes.INVOKESPECIAL, superClass.getInternalName(), "<init>", constructorDescriptor.getDescriptor(), false));
-
-        // Return
-        method.instructions.add(new InsnNode(Opcodes.RETURN));
-    }
-
-    @Override
-    public void addTinkerers() {
-        ClassTinkerers.addTransformation(AbstractClientPlayerEntity, it -> mapClassNode(it, getTypeForClassName(PlayerEntity)), true);
-        ClassTinkerers.addTransformation(GuiPlayer, it -> mapClassNode(it, getTypeForClassName(AbstractClientPlayerEntity)), true);
-    }
-}
diff --git a/src/main/java/moe/nea/firmament/init/EarlyRiser.java b/src/main/java/moe/nea/firmament/init/EarlyRiser.java
index 5441255..ae26bd7 100644
--- a/src/main/java/moe/nea/firmament/init/EarlyRiser.java
+++ b/src/main/java/moe/nea/firmament/init/EarlyRiser.java
@@ -4,7 +4,6 @@ package moe.nea.firmament.init;
 public class EarlyRiser implements Runnable {
     @Override
     public void run() {
-        new ClientPlayerRiser().addTinkerers();
         new HandledScreenRiser().addTinkerers();
         new SectionBuilderRiser().addTinkerers();
 //		TODO: new ItemColorsSodiumRiser().addTinkerers();
diff --git a/src/main/java/moe/nea/firmament/init/HandledScreenRiser.java b/src/main/java/moe/nea/firmament/init/HandledScreenRiser.java
index f7db18c..cb0058d 100644
--- a/src/main/java/moe/nea/firmament/init/HandledScreenRiser.java
+++ b/src/main/java/moe/nea/firmament/init/HandledScreenRiser.java
@@ -3,6 +3,10 @@ package moe.nea.firmament.init;
 
 import me.shedaniel.mm.api.ClassTinkerers;
 import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import net.minecraft.client.input.CharInput;
+import net.minecraft.client.input.KeyInput;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.ClassNode;
@@ -19,23 +23,28 @@ import java.lang.reflect.Modifier;
 import java.util.function.Consumer;
 
 public class HandledScreenRiser extends RiserUtils {
-	@IntermediaryName(net.minecraft.client.gui.screen.Screen.class)
+	@IntermediaryName(Screen.class)
 	String Screen;
-	@IntermediaryName(net.minecraft.client.gui.screen.ingame.HandledScreen.class)
+	@IntermediaryName(KeyInput.class)
+	String KeyInput;
+	@IntermediaryName(CharInput.class)
+	String CharInput;
+	@IntermediaryName(HandledScreen.class)
 	String HandledScreen;
 	Type mouseScrolledDesc = Type.getMethodType(Type.BOOLEAN_TYPE, Type.DOUBLE_TYPE, Type.DOUBLE_TYPE, Type.DOUBLE_TYPE, Type.DOUBLE_TYPE);
-	String mouseScrolled = remapper.mapMethodName("intermediary", "net.minecraft.class_364", "method_25401",
-	                                              mouseScrolledDesc.getDescriptor());
+	String mouseScrolled = remapper.mapMethodName("intermediary", Intermediary.<Element>className(),
+		Intermediary.methodName(Element::mouseScrolled),
+		mouseScrolledDesc.getDescriptor());
 	// boolean keyReleased(int keyCode, int scanCode, int modifiers)
-	Type keyReleasedDesc = Type.getMethodType(Type.BOOLEAN_TYPE, Type.INT_TYPE, Type.INT_TYPE, Type.INT_TYPE);
+	Type keyReleasedDesc = Type.getMethodType(Type.BOOLEAN_TYPE, getTypeForClassName(KeyInput));
 	String keyReleased = remapper.mapMethodName("intermediary", Intermediary.<Element>className(),
-	                                            Intermediary.methodName(Element::keyReleased),
-	                                            keyReleasedDesc.getDescriptor());
+		Intermediary.methodName(Element::keyReleased),
+		keyReleasedDesc.getDescriptor());
 	// public boolean charTyped(char chr, int modifiers)
-	Type charTypedDesc = Type.getMethodType(Type.BOOLEAN_TYPE, Type.CHAR_TYPE, Type.INT_TYPE);
+	Type charTypedDesc = Type.getMethodType(Type.BOOLEAN_TYPE, getTypeForClassName(CharInput));
 	String charTyped = remapper.mapMethodName("intermediary", Intermediary.<Element>className(),
-	                                          Intermediary.methodName(Element::charTyped),
-	                                          charTypedDesc.getDescriptor());
+		Intermediary.methodName(Element::charTyped),
+		charTypedDesc.getDescriptor());
 
 
 	@Override
@@ -56,8 +65,8 @@ public class HandledScreenRiser extends RiserUtils {
 	 * @param insertInvoke insert the invokevirtual/invokestatic call
 	 */
 	void insertTrueHandler(MethodNode node,
-	                       Consumer<InsnList> insertLoads,
-	                       Consumer<InsnList> insertInvoke) {
+						   Consumer<InsnList> insertLoads,
+						   Consumer<InsnList> insertInvoke) {
 
 		var insns = new InsnList();
 		insertLoads.accept(insns);
@@ -80,10 +89,8 @@ public class HandledScreenRiser extends RiserUtils {
 			insns -> {
 				// ALOAD 0, load this
 				insns.add(new VarInsnNode(Opcodes.ALOAD, 0));
-				// ILOAD 1-3, load args
-				insns.add(new VarInsnNode(Opcodes.ILOAD, 1));
-				insns.add(new VarInsnNode(Opcodes.ILOAD, 2));
-				insns.add(new VarInsnNode(Opcodes.ILOAD, 3));
+				// ALOAD 1, load args
+				insns.add(new VarInsnNode(Opcodes.ALOAD, 1));
 			});
 	}
 
@@ -93,9 +100,8 @@ public class HandledScreenRiser extends RiserUtils {
 			insns -> {
 				// ALOAD 0, load this
 				insns.add(new VarInsnNode(Opcodes.ALOAD, 0));
-				// ILOAD 1-2, load args. chars = ints
-				insns.add(new VarInsnNode(Opcodes.ILOAD, 1));
-				insns.add(new VarInsnNode(Opcodes.ILOAD, 2));
+				// ALOAD 1, load args
+				insns.add(new VarInsnNode(Opcodes.ALOAD, 1));
 			});
 	}
 
@@ -119,7 +125,7 @@ public class HandledScreenRiser extends RiserUtils {
 			loadArgs.accept(insns);
 			// INVOKESPECIAL call super method
 			insns.add(new MethodInsnNode(Opcodes.INVOKESPECIAL, getTypeForClassName(Screen).getInternalName(),
-			                             name, desc.getDescriptor()));
+				name, desc.getDescriptor()));
 			// IRETURN return int on stack (booleans are int at runtime)
 			insns.add(new InsnNode(Opcodes.IRETURN));
 			classNode.methods.add(keyReleasedNode);
@@ -127,9 +133,9 @@ public class HandledScreenRiser extends RiserUtils {
 		insertTrueHandler(keyReleasedNode, loadArgs, insns -> {
 			// INVOKEVIRTUAL call custom handler
 			insns.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL,
-			                             getTypeForClassName(HandledScreen).getInternalName(),
-			                             firmamentName,
-			                             desc.getDescriptor()));
+				getTypeForClassName(HandledScreen).getInternalName(),
+				firmamentName,
+				desc.getDescriptor()));
 		});
 
 	}