summaryrefslogtreecommitdiffstats
path: root/forge
diff options
context:
space:
mode:
Diffstat (limited to 'forge')
-rw-r--r--forge/build.gradle6
-rw-r--r--forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java36
-rw-r--r--forge/src/main/java/com/aizistral/nochatreports/loader/LoaderPaths.java17
-rw-r--r--forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json1
4 files changed, 38 insertions, 22 deletions
diff --git a/forge/build.gradle b/forge/build.gradle
index afa5688..c7c06d9 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -140,9 +140,9 @@ jar {
attributes([
"Specification-Title": "${mod_name}",
"Specification-Vendor": "${mod_author}",
- "Specification-Version": "${version}",
+ "Specification-Version": "${manifest_version}",
"Implementation-Title": "${mod_name}",
- "Implementation-Version": "${version}",
+ "Implementation-Version": "${manifest_version}",
"Implementation-Vendor" :"${mod_author}",
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
"MixinConfigs": "mixins/common/nochatreports.mixins.json, mixins/forge/nochatreports-forge.mixins.json"
@@ -161,7 +161,7 @@ processResources {
// Replace properties in mods.toml with ones derived from settings.gradle
include 'mods.toml'
expand 'mod_license': mod_license,
- 'mod_version': version,
+ 'mod_version': manifest_version,
'mod_id' : mod_id,
'mod_name': mod_name,
'mod_url': mod_url,
diff --git a/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java b/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java
index 7ca0815..8c59459 100644
--- a/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java
+++ b/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java
@@ -5,6 +5,7 @@ import java.util.function.Function;
import com.aizistral.nochatreports.common.NCRClient;
import com.aizistral.nochatreports.common.NCRCore;
+import com.aizistral.nochatreports.common.config.NCRConfig;
import com.aizistral.nochatreports.common.platform.PlatformProvider;
import com.aizistral.nochatreports.common.platform.events.ClientEvents;
@@ -14,10 +15,7 @@ import net.minecraft.client.multiplayer.ClientPacketListener;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.ConfigScreenHandler;
import net.minecraftforge.client.event.ClientPlayerNetworkEvent;
-import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.fml.loading.FMLEnvironment;
import net.minecraftforge.fml.loading.FMLPaths;
@@ -27,15 +25,22 @@ public class NoChatReports implements PlatformProvider {
public NoChatReports(FMLJavaModLoadingContext context) {
NCRCore.awaken(this);
- Function<Screen, Screen> configScreenFactory = NCRClient.getConfigScreen();
- if (isOnClient() && configScreenFactory != null) {
- context.registerExtensionPoint(
- ConfigScreenHandler.ConfigScreenFactory.class,
- () -> new ConfigScreenHandler.ConfigScreenFactory(
- (minecraft, parent) -> configScreenFactory.apply(parent)
- )
- );
- }
+
+ if (NCRConfig.isModRunning() && this.isOnClient()) {
+ ClientPlayerNetworkEvent.LoggingIn.BUS.addListener(Events::onPlayReady);
+ }
+
+ if (this.isOnClient()) {
+ Function<Screen, Screen> configScreenFactory = NCRClient.getConfigScreen();
+ if (configScreenFactory != null) {
+ context.registerExtensionPoint(
+ ConfigScreenHandler.ConfigScreenFactory.class,
+ () -> new ConfigScreenHandler.ConfigScreenFactory(
+ (minecraft, parent) -> configScreenFactory.apply(parent)
+ )
+ );
+ }
+ }
}
@Override
@@ -52,16 +57,9 @@ public class NoChatReports implements PlatformProvider {
public Path getMinecraftDir() {
return FMLPaths.GAMEDIR.get();
}
-
- @Override
- public Path getConfigDir() {
- return FMLPaths.CONFIGDIR.get();
- }
- @EventBusSubscriber(modid = "nochatreports", bus = Bus.FORGE, value = Dist.CLIENT)
public static class Events {
- @SubscribeEvent
public static void onPlayReady(ClientPlayerNetworkEvent.LoggingIn event) {
Minecraft client = Minecraft.getInstance();
ClientPacketListener handler = client.getConnection();
diff --git a/forge/src/main/java/com/aizistral/nochatreports/loader/LoaderPaths.java b/forge/src/main/java/com/aizistral/nochatreports/loader/LoaderPaths.java
new file mode 100644
index 0000000..751f952
--- /dev/null
+++ b/forge/src/main/java/com/aizistral/nochatreports/loader/LoaderPaths.java
@@ -0,0 +1,17 @@
+package com.aizistral.nochatreports.loader;
+
+import java.nio.file.Path;
+
+import net.minecraftforge.fml.loading.FMLPaths;
+
+public final class LoaderPaths {
+
+ private LoaderPaths() {
+ throw new IllegalStateException("Can't touch this");
+ }
+
+ public static Path getConfigDir() {
+ return FMLPaths.CONFIGDIR.get();
+ }
+
+}
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 6c5e73e..d0ecdd6 100644
--- a/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json
+++ b/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json
@@ -2,6 +2,7 @@
"required": true,
"minVersion": "0.8",
"package": "com.aizistral.nochatreports.forge.mixins",
+ "plugin": "com.aizistral.nochatreports.common.NCRMixinPlugin",
"compatibilityLevel": "JAVA_21",
"mixins": [],
"client": [