diff options
Diffstat (limited to 'neoforge')
5 files changed, 29 insertions, 20 deletions
diff --git a/neoforge/.gitignore b/neoforge/.gitignore index fd65394..15955d9 100644 --- a/neoforge/.gitignore +++ b/neoforge/.gitignore @@ -33,6 +33,7 @@ multiuser_args.txt old_enigmatic_desc.txt **/TestEventHandler* /.apt_generated_tests/ +runs # Symlink directories deps diff --git a/neoforge/build.gradle b/neoforge/build.gradle index e4cb2a5..d5ef7ab 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -22,7 +22,7 @@ plugins { id 'eclipse' id 'idea' id "com.modrinth.minotaur" version "2.+" - id 'net.neoforged.gradle.userdev' version '7.0.109' + id 'net.neoforged.gradle.userdev' version '7.0.192' } println("Applying plugins...") @@ -113,9 +113,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"), ]) @@ -133,7 +133,7 @@ processResources { // Replace properties in mods.toml with ones derived from settings.gradle include 'neoforge.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/neoforge/src/main/java/com/aizistral/nochatreports/loader/LoaderPaths.java b/neoforge/src/main/java/com/aizistral/nochatreports/loader/LoaderPaths.java new file mode 100644 index 0000000..8f4e23a --- /dev/null +++ b/neoforge/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.neoforged.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/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java index 11071ec..8591a3f 100644 --- a/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java +++ b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java @@ -1,6 +1,7 @@ package com.aizistral.nochatreports.neoforge; 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; import net.minecraft.client.Minecraft; @@ -8,13 +9,10 @@ import net.minecraft.client.multiplayer.ClientPacketListener; import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent; -import net.neoforged.neoforge.event.server.ServerStartedEvent; -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.EventBusSubscriber; -import net.neoforged.fml.common.EventBusSubscriber.Bus; import net.neoforged.fml.common.Mod; import net.neoforged.fml.loading.FMLEnvironment; import net.neoforged.fml.loading.FMLPaths; +import net.neoforged.neoforge.common.NeoForge; import java.nio.file.Path; @@ -23,6 +21,10 @@ public class NoChatReports implements PlatformProvider { public NoChatReports() { NCRCore.awaken(this); + + if (NCRConfig.isModRunning() && this.isOnClient()) { + NeoForge.EVENT_BUS.addListener(ClientPlayerNetworkEvent.LoggingIn.class, Events::onPlayReady); + } } @Override @@ -39,16 +41,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.GAME) public static class Events { - @SubscribeEvent @OnlyIn(Dist.CLIENT) public static void onPlayReady(ClientPlayerNetworkEvent.LoggingIn event) { Minecraft client = Minecraft.getInstance(); @@ -56,11 +51,6 @@ public class NoChatReports implements PlatformProvider { ClientEvents.PLAY_READY.invoker().handle(handler, client); } - @SubscribeEvent - public static void onServerStarted(ServerStartedEvent event) { - // NO-OP, see https://github.com/Aizistral-Studios/No-Chat-Reports/issues/473 - } - } } 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 809694f..46a6524 100644 --- a/neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json +++ b/neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json @@ -2,6 +2,7 @@ "required": true, "minVersion": "0.8", "package": "com.aizistral.nochatreports.neoforge.mixins", + "plugin": "com.aizistral.nochatreports.common.NCRMixinPlugin", "compatibilityLevel": "JAVA_18", "mixins": [], "client": [ |
