summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAizistral2024-05-10 20:28:07 +0200
committerAizistral2024-05-10 20:28:07 +0200
commit6865a2fbe3ddba02ac609041e20c9bc83d29641e (patch)
tree12484da0e2639dcdd0e852368af892f794866da7
parent43c3ce780a931eca7238a119f3e23f6759894e68 (diff)
Fix some Forge stuff
-rw-r--r--forge/build.gradle30
-rw-r--r--forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json2
-rw-r--r--neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json2
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java7
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java2
-rw-r--r--src/main/resources/mixins/common/nochatreports.mixins.json2
-rw-r--r--src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json2
7 files changed, 24 insertions, 23 deletions
diff --git a/forge/build.gradle b/forge/build.gradle
index 905fbba..554643f 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 ccb04ac..fc7bc59 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 81e5afb..809694f 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 abed585..4a04d2f 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 com.aizistral.nochatreports.common.gui.UnsafeServerScreen;
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 @@ public class MixinChatListener {
}
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 87be749..538ca3c 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 @@ public class MixinTitleScreen extends Screen {
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 76fa5da..dde73c2 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 35076dc..8352ca8 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": [