Resolving Merge Conflict on "origin/master"

exejar · exejar · commit 65f84b191c8d · 2023-03-02T15:54:05.000-05:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,7 +12,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.github.Weave-MC:Weave-Loader:6015cdb81f")
+    implementation("com.github.Weave-MC:Weave-Loader:4c45210e52")
 }
 
 minecraft {
@@ -28,4 +28,9 @@ tasks.jar {
     manifest.attributes(
         "Weave-Entry" to "com.example.mod.ExampleMod"
     )
+}
+
+minecraft {
+    version = "1.8.9"
+    mappings = "stable_22"
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -2,7 +2,7 @@ rootProject.name = "ExampleMod"
 
 pluginManagement {
     repositories {
-        mavenCentral()
-        maven(url = "https://jitpack.io")
+        gradlePluginPortal()
+        maven("https://jitpack.io")
     }
 }
diff --git a/src/main/java/com/example/mod/ExampleMod.java b/src/main/java/com/example/mod/ExampleMod.java
@@ -1,11 +1,16 @@
 package com.example.mod;
 
-import club.maxstats.weave.loader.api.HookManager;
 import club.maxstats.weave.loader.api.ModInitializer;
+import club.maxstats.weave.loader.api.HookManager;
 import club.maxstats.weave.loader.api.event.EventBus;
-import club.maxstats.weave.loader.api.event.annotation.SubscribeEvent;
-import club.maxstats.weave.loader.api.event.impl.InputEvent;
+import club.maxstats.weave.loader.api.event.InputEvent;
+import club.maxstats.weave.loader.api.event.SubscribeEvent;
+import club.maxstats.weave.loader.util.ExtensionsKt;
+import kotlin.Unit;
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.ChatComponentText;
 import org.jetbrains.annotations.NotNull;
+import org.lwjgl.input.Keyboard;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.MethodInsnNode;
@@ -27,15 +32,13 @@ public void preinit(@NotNull HookManager hookManager) {
                     );
         });
 
-        EventBus.INSTANCE.subscribe(this);
-    }
-
-    @SubscribeEvent
-    public void onInput(InputEvent e) {
-        System.out.println("Pressed: " + e.getKeycode());
+        EventBus.INSTANCE.subscribe(InputEvent.class, e -> {
+            Minecraft.getMinecraft().thePlayer.addChatMessage(
+                    new ChatComponentText("Pressed: " + Keyboard.getKeyName(e.getKeyCode()))
+            );
+        });
     }
-
     public static void onStart() {
         System.out.println("Hello World from Minecraft#startGame");
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ repositories {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`dependencies {`
`15`		`- implementation("com.github.Weave-MC:Weave-Loader:6015cdb81f")`
	`15`	`+ implementation("com.github.Weave-MC:Weave-Loader:4c45210e52")`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`minecraft {`
`@@ -28,4 +28,9 @@ tasks.jar {`
`28`	`28`	`manifest.attributes(`
`29`	`29`	`"Weave-Entry" to "com.example.mod.ExampleMod"`
`30`	`30`	`)`
	`31`	`+}`
	`32`	`+`
	`33`	`+minecraft {`
	`34`	`+ version = "1.8.9"`
	`35`	`+ mappings = "stable_22"`
`31`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ rootProject.name = "ExampleMod"`
`2`	`2`
`3`	`3`	`pluginManagement {`
`4`	`4`	`repositories {`
`5`		`- mavenCentral()`
`6`		`- maven(url = "https://jitpack.io")`
	`5`	`+ gradlePluginPortal()`
	`6`	`+ maven("https://jitpack.io")`
`7`	`7`	`}`
`8`	`8`	`}`