From 6865a2fbe3ddba02ac609041e20c9bc83d29641e Mon Sep 17 00:00:00 2001 From: Aizistral Date: Fri, 10 May 2024 20:28:07 +0200 Subject: [PATCH] Fix some Forge stuff --- forge/build.gradle | 30 +++++++++---------- .../forge/nochatreports-forge.mixins.json | 2 +- .../nochatreports-neoforge.mixins.json | 2 +- .../mixins/client/MixinChatListener.java | 7 +++-- .../mixins/client/MixinTitleScreen.java | 2 +- .../mixins/common/nochatreports.mixins.json | 2 +- .../fabric/nochatreports-fabric.mixins.json | 2 +- 7 files changed, 24 insertions(+), 23 deletions(-) diff --git a/forge/build.gradle b/forge/build.gradle index 905fbba8..554643f6 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -75,34 +75,29 @@ minecraft { copyIdeResources = true runs { + configureEach { + workingDirectory project.file('run') + property 'forge.logging.markers', 'REGISTRIES' + property 'forge.logging.console.level', 'debug' + } + + client { properties 'org.gradle.jvmargs': '-Xms4G -Xmx4G' properties 'fml.earlyprogresswindow': 'false' properties 'mixin.env.disableRefMap': 'true' - workingDirectory project.file('run') - + + property 'forge.enabledGameTestNamespaces', mod_id property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' property 'forge.logging.console.level', 'debug' - - mods { - nochatreports { - source sourceSets.main - } - } } server { properties 'mixin.env.disableRefMap': 'true' - workingDirectory project.file('run') - + property 'forge.enabledGameTestNamespaces', mod_id property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' property 'forge.logging.console.level', 'debug' - - mods { - nochatreports { - source sourceSets.main - } - } + args '--nogui' } } } @@ -129,6 +124,9 @@ dependencies { implementation "generic:fabric-annotations:v1.0.0" implementation "generic:cloth-config-api:14.0.126" annotationProcessor "org.spongepowered:mixin:0.8.5:processor" + + // Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transtive dependencies request 6.0+ + implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } } } diff --git a/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json b/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json index ccb04acb..fc7bc593 100644 --- a/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json +++ b/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "com.aizistral.nochatreports.forge.mixins", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_18", "mixins": [], "client": [ "client.MixinClientConnection", diff --git a/neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json b/neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json index 81e5afb8..809694f0 100644 --- a/neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json +++ b/neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "com.aizistral.nochatreports.neoforge.mixins", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_18", "mixins": [], "client": [ "client.MixinClientConnection", diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java index abed585a..4a04d2fa 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java @@ -23,6 +23,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.ChatScreen; +import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.multiplayer.chat.ChatListener; import net.minecraft.client.multiplayer.chat.ChatTrustLevel; import net.minecraft.core.RegistryAccess; @@ -64,8 +65,10 @@ private void onHandleSystemMessage(Component message, boolean overlay, CallbackI } if (NCRConfig.getServerPreferences().hasModeCurrent(SigningMode.PROMPT)) { - Minecraft.getInstance().setScreen(new UnsafeServerScreen(Minecraft.getInstance().screen - instanceof ChatScreen chat ? chat : new ChatScreen(""))); + Screen returnScreen = Minecraft.getInstance().screen instanceof ChatScreen chat ? chat + : new ChatScreen(""); + Screen unsafeScreen = new UnsafeServerScreen(returnScreen); + Minecraft.getInstance().setScreen(unsafeScreen); if (NCRConfig.getClient().hideSigningRequestMessage()) { info.cancel(); diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java index 87be7497..538ca3cd 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java @@ -21,7 +21,7 @@ protected MixinTitleScreen() { throw new IllegalStateException("Can't touch this"); } - @Inject(method = "method_55814", at = @At("HEAD"), cancellable = true) + @Inject(method = { "realmsButtonClicked", "method_55814", "lambda$createNormalMenuOptions$9" }, at = @At("HEAD"), cancellable = true) private void onRealmsButtonClicked(Button button, CallbackInfo info) { if (RealmsWarningScreen.shouldShow()) { this.minecraft.setScreen(new RealmsWarningScreen(new TitleScreen(), new RealmsMainScreen(this))); diff --git a/src/main/resources/mixins/common/nochatreports.mixins.json b/src/main/resources/mixins/common/nochatreports.mixins.json index 76fa5daa..dde73c2f 100644 --- a/src/main/resources/mixins/common/nochatreports.mixins.json +++ b/src/main/resources/mixins/common/nochatreports.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "com.aizistral.nochatreports.common.mixins", - "compatibilityLevel": "JAVA_21", + "compatibilityLevel": "JAVA_18", "mixins": [ "common.MixinServerStatus", "common.MixinFriendlyByteBuf", diff --git a/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json b/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json index 35076dc8..8352ca8b 100644 --- a/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json +++ b/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "com.aizistral.nochatreports.fabric.mixins", - "compatibilityLevel": "JAVA_21", + "compatibilityLevel": "JAVA_18", "mixins": [ ], "client": [