Bump loader version + cleanup

Nilsen84 · Nilsen84 · commit e89412421d78 · 2023-03-19T03:37:52.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,7 +13,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly("com.github.Weave-MC:Weave-Loader:0c09d7496f")
+    compileOnly("com.github.Weave-MC:Weave-Loader:454f9a8cca")
 }
 
 tasks.compileJava {
diff --git a/src/main/java/com/example/mod/ExampleMod.java b/src/main/java/com/example/mod/ExampleMod.java
@@ -5,63 +5,29 @@
 import club.maxstats.weave.loader.api.HookManager;
 import club.maxstats.weave.loader.api.event.*;
 import com.example.mod.command.TestCommand;
-import com.example.mod.listener.RenderGameOverlayListener;
-import kotlin.Unit;
+import com.example.mod.hook.MinecraftHook;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.ChatComponentText;
 import org.lwjgl.input.Keyboard;
-import org.lwjgl.input.Mouse;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.tree.MethodInsnNode;
 
 public class ExampleMod implements ModInitializer {
     @Override
     public void preInit(HookManager hookManager) {
-        hookManager.register("net/minecraft/client/Minecraft", cn -> {
-            cn.methods.stream()
-                    .filter(m -> m.name.equals("startGame"))
-                    .findFirst().orElseThrow()
-                    .instructions.insert(
-                            new MethodInsnNode(
-                                    Opcodes.INVOKESTATIC,
-                                    Type.getInternalName(this.getClass()),
-                                    "onStart",
-                                    "()V"
-                            )
-                    );
-        });
+        System.out.println("Initializing ExampleMod!");
 
-        EventBus.INSTANCE.subscribe(KeyboardEvent.class, e -> {
-            Minecraft.getMinecraft().thePlayer.addChatMessage(
-                    new ChatComponentText("Key Pressed: " + Keyboard.getKeyName(e.getKeyCode()))
-            );
-        });
+        hookManager.register(new MinecraftHook());
+        CommandBus.INSTANCE.register(new TestCommand());
 
-        EventBus.INSTANCE.subscribe(MouseEvent.class, e -> {
-            if (e.getButton() >= 0) {
+        EventBus.INSTANCE.subscribe(KeyboardEvent.class, e -> {
+            if (Minecraft.getMinecraft().currentScreen == null && e.getKeyState()) {
                 Minecraft.getMinecraft().thePlayer.addChatMessage(
-                        new ChatComponentText("Mouse Pressed: " + Mouse.getButtonName(e.getButton()))
+                        new ChatComponentText("Key Pressed: " + Keyboard.getKeyName(e.getKeyCode()))
                 );
             }
         });
 
-        EventBus.INSTANCE.subscribe(ShutdownEvent.class, e -> System.out.println("Shutdown Event"));
-        EventBus.INSTANCE.subscribe(ChatSentEvent.class, e -> {
-            if (e.getMessage().equals("Test")) {
-                e.setCancelled(true);
-                Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("Cancelled 'Test' Message"));
-            }
+        EventBus.INSTANCE.subscribe(RenderHandEvent.class, e -> {
+            e.setCancelled(true);
         });
-
-        EventBus.INSTANCE.subscribe(new RenderGameOverlayListener());
-        EventBus.INSTANCE.subscribe(StartGameEvent.Pre.class, e -> System.out.println("Pre StartGame"));
-        EventBus.INSTANCE.subscribe(StartGameEvent.Post.class, e -> System.out.println("Post StartGame"));
-
-        CommandBus.INSTANCE.register(new TestCommand());
-    }
-
-    public static void onStart() {
-        System.out.println("Hello World from Minecraft#startGame");
     }
 }
diff --git a/src/main/java/com/example/mod/hook/MinecraftHook.java b/src/main/java/com/example/mod/hook/MinecraftHook.java
@@ -0,0 +1,34 @@
+package com.example.mod.hook;
+
+import club.maxstats.weave.loader.api.Hook;
+import org.jetbrains.annotations.NotNull;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+
+public class MinecraftHook extends Hook {
+    public MinecraftHook() {
+        super("net/minecraft/client/Minecraft");
+    }
+
+    @Override
+    public void transform(@NotNull ClassNode classNode, @NotNull AssemblerConfig assemblerConfig) {
+        classNode.methods.stream()
+                .filter(m -> m.name.equals("startGame"))
+                .findFirst().orElseThrow()
+                .instructions.insert(
+                        new MethodInsnNode(
+                                Opcodes.INVOKESTATIC,
+                                Type.getInternalName(MinecraftHook.class),
+                                "onStartGame",
+                                "()V"
+                        )
+                );
+    }
+
+    @SuppressWarnings("unused")
+    public static void onStartGame() {
+        System.out.println("onStartGame");
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ repositories {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`dependencies {`
`16`		`- compileOnly("com.github.Weave-MC:Weave-Loader:0c09d7496f")`
	`16`	`+ compileOnly("com.github.Weave-MC:Weave-Loader:454f9a8cca")`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`tasks.compileJava {`