diff options
Diffstat (limited to 'forge')
4 files changed, 32 insertions, 19 deletions
diff --git a/forge/build.gradle b/forge/build.gradle index 3bdaf35..634da6d 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -137,9 +137,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" @@ -158,7 +158,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, @@ -248,4 +248,10 @@ publishing { url "file:///${project.projectDir}/mcmodsrepo" } } +} + +sourceSets.each { + def dir = layout.buildDirectory.dir("sourceSets/$it.name") + it.output.resourcesDir = dir + it.java.destinationDirectory = dir }
\ No newline at end of file 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 0ba32b1..b9efea3 100644 --- a/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java +++ b/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java @@ -8,6 +8,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; 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; @@ -24,12 +25,8 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.ClientPlayerNetworkEvent; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.server.ServerStartedEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.ModLoadingContext; 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.config.ModConfig; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; @@ -47,6 +44,10 @@ public class NoChatReports implements PlatformProvider { public NoChatReports() { NCRCore.awaken(this); + + if (NCRConfig.isModRunning() && this.isOnClient()) { + MinecraftForge.EVENT_BUS.addListener(Events::onPlayReady); + } } @Override @@ -63,16 +64,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) public static class Events { - @SubscribeEvent @OnlyIn(Dist.CLIENT) public static void onPlayReady(ClientPlayerNetworkEvent.LoggingIn event) { Minecraft client = Minecraft.getInstance(); @@ -80,11 +74,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/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 fc7bc59..ceee94e 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_18", "mixins": [], "client": [ |
