Fix Neoforge mixin

BRForgers · Jan 27, 2025 · ac88d9f · ac88d9f
1 parent 9f429aa
commit ac88d9f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/events/src/main/java/one/armelin/dischatbridge/mixins/MixinServerGamePacketListenerImpl.java b/events/src/main/java/one/armelin/dischatbridge/mixins/MixinServerGamePacketListenerImpl.java
@@ -17,7 +17,7 @@
 public class MixinServerGamePacketListenerImpl {
     @Shadow public ServerPlayer player;
 
-    @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/server/players/PlayerList;broadcastChatMessage(Lnet/minecraft/network/chat/PlayerChatMessage;Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/network/chat/ChatType$Bound;)V"), method = "broadcastChatMessage", cancellable = true)
+    @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/server/players/PlayerList;broadcastChatMessage(Lnet/minecraft/network/chat/PlayerChatMessage;Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/network/chat/ChatType$Bound;)V"), method = "broadcastChatMessage(Lnet/minecraft/network/chat/PlayerChatMessage;)V", cancellable = true)
     private void broadcastChatMessage(PlayerChatMessage message, CallbackInfo ci) {
         CompoundEventResult<Component> eventResult = ServerChat.RECEIVED.invoker().received(this.player, message.decoratedContent());
         if (eventResult.isPresent()) {

diff --git a/.../main/resources/dischatbridge.mixins.json → .../src/main/resources/disfabric.mixins.json b/.../main/resources/dischatbridge.mixins.json → .../src/main/resources/disfabric.mixins.json
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -26,7 +26,7 @@
     ]
   },
   "mixins": [
-    "dischatbridge.mixins.json"
+    "disfabric.mixins.json"
   ],
   "depends": {
     "fabricloader": ">=0.16.10",

diff --git a/forge/src/main/resources/META-INF/neoforge.mods.toml b/forge/src/main/resources/META-INF/neoforge.mods.toml
@@ -35,4 +35,4 @@ A barebones Discord <-> Minecraft chat bridge.
    side = "SERVER"
 
 [[mixins]]
-config = "dischatbridge.mixins.json"
+config = "disforge.mixins.json"
diff --git a/forge/src/main/resources/disforge.mixins.json b/forge/src/main/resources/disforge.mixins.json
@@ -0,0 +1,12 @@
+{
+  "required": true,
+  "package": "one.armelin.dischatbridge.mixins",
+  "compatibilityLevel": "JAVA_21",
+  "mixins": [
+    "MixinServerGamePacketListenerImpl",
+    "MixinCrashReport"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx4G
 minecraft_version=1.21.1
 
 archives_base_name=DisChatBridge
-mod_version=2.3.2
+mod_version=2.3.3
 maven_group=one.armelin.dischatbridge
 
 architectury_version = 13.0.8