From e2fa93dde025440c67d84889f1ade541df230493 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Wed, 18 Nov 2026 17:15:35 +0100 Subject: Add enableMod config option --- .../nochatrestrictions/config/NCRConfig.java | 27 ++++++++++--- .../nochatrestrictions/core/NCRMixinPlugin.java | 45 ++++++++++++++++++++++ .../main/resources/nochatrestrictions.mixins.json | 1 + .../nochatrestrictions/config/NCRConfig.java | 27 ++++++++++--- .../nochatrestrictions/core/NCRMixinPlugin.java | 45 ++++++++++++++++++++++ .../main/resources/nochatrestrictions.mixins.json | 1 + .../nochatrestrictions/config/NCRConfig.java | 27 ++++++++++--- .../nochatrestrictions/core/NCRMixinPlugin.java | 45 ++++++++++++++++++++++ .../main/resources/nochatrestrictions.mixins.json | 1 + 9 files changed, 201 insertions(+), 18 deletions(-) create mode 100644 Fabric/src/main/java/com/aizistral/nochatrestrictions/core/NCRMixinPlugin.java create mode 100644 Forge/src/main/java/com/aizistral/nochatrestrictions/core/NCRMixinPlugin.java create mode 100644 NeoForge/src/main/java/com/aizistral/nochatrestrictions/core/NCRMixinPlugin.java diff --git a/Fabric/src/main/java/com/aizistral/nochatrestrictions/config/NCRConfig.java b/Fabric/src/main/java/com/aizistral/nochatrestrictions/config/NCRConfig.java index ee04b0b..8dadba5 100644 --- a/Fabric/src/main/java/com/aizistral/nochatrestrictions/config/NCRConfig.java +++ b/Fabric/src/main/java/com/aizistral/nochatrestrictions/config/NCRConfig.java @@ -4,6 +4,7 @@ import java.io.BufferedReader; import java.io.BufferedWriter; import java.nio.file.Files; import java.nio.file.Path; +import java.util.Map; import java.util.Optional; import org.jetbrains.annotations.Nullable; @@ -11,15 +12,18 @@ import org.jetbrains.annotations.Nullable; import com.aizistral.nochatrestrictions.core.NCRCore; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; -import net.minecraft.client.Minecraft; +import net.fabricmc.loader.api.FabricLoader; -public record NCRConfig(boolean allowTelemetry, boolean allowProfanityFilter) { +public record NCRConfig(boolean enableMod, boolean allowTelemetry, boolean allowProfanityFilter) { private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); private static @Nullable NCRConfig instance = null; private static NCRConfig getDefault() { - return new NCRConfig(false, false); + return new NCRConfig(true, false, false); } public static NCRConfig getInstance() { @@ -34,6 +38,7 @@ public record NCRConfig(boolean allowTelemetry, boolean allowProfanityFilter) { NCRCore.LOGGER.debug("Reading config file {}...", fileName); NCRConfig config = readFile(fileName).orElseGet(NCRConfig::getDefault); + NCRCore.LOGGER.info("Mod Enabled: {}", config.enableMod()); NCRCore.LOGGER.info("Telemetry Allowed: {}", config.allowTelemetry()); NCRCore.LOGGER.info("Profanity Filter Allowed: {}", config.allowProfanityFilter()); @@ -43,14 +48,24 @@ public record NCRConfig(boolean allowTelemetry, boolean allowProfanityFilter) { return config; } + private static Path getConfigFile(String fileName) { + return FabricLoader.getInstance().getConfigDir().resolve(fileName); + } + private static Optional readFile(String fileName) { - Path file = Minecraft.getInstance().gameDirectory.toPath().resolve("config").resolve(fileName); + Path file = getConfigFile(fileName); if (!Files.isRegularFile(file)) return Optional.empty(); try (BufferedReader reader = Files.newBufferedReader(file)) { - return Optional.of(GSON.fromJson(reader, NCRConfig.class)); + JsonObject json = GSON.toJsonTree(getDefault()).getAsJsonObject(); + + for (Map.Entry entry : JsonParser.parseReader(reader).getAsJsonObject().entrySet()) { + json.add(entry.getKey(), entry.getValue()); + } + + return Optional.of(GSON.fromJson(json, NCRConfig.class)); } catch (Exception ex) { NCRCore.LOGGER.fatal("Could not read config file: {}", file); NCRCore.LOGGER.fatal("This likely indicates the file is corrupted. " @@ -61,7 +76,7 @@ public record NCRConfig(boolean allowTelemetry, boolean allowProfanityFilter) { } private static void writeFile(String fileName, NCRConfig config) { - Path file = Minecraft.getInstance().gameDirectory.toPath().resolve("config").resolve(fileName); + Path file = getConfigFile(fileName); try { Files.createDirectories(file.getParent()); diff --git a/Fabric/src/main/java/com/aizistral/nochatrestrictions/core/NCRMixinPlugin.java b/Fabric/src/main/java/com/aizistral/nochatrestrictions/core/NCRMixinPlugin.java new file mode 100644 index 0000000..cac9d7f --- /dev/null +++ b/Fabric/src/main/java/com/aizistral/nochatrestrictions/core/NCRMixinPlugin.java @@ -0,0 +1,45 @@ +package com.aizistral.nochatrestrictions.core; + +import java.util.List; +import java.util.Set; + +import org.objectweb.asm.tree.ClassNode; +import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; + +import com.aizistral.nochatrestrictions.config.NCRConfig; + +public class NCRMixinPlugin implements IMixinConfigPlugin { + + @Override + public void onLoad(String mixinPackage) { + } + + @Override + public String getRefMapperConfig() { + return null; + } + + @Override + public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { + return NCRConfig.getInstance().enableMod(); + } + + @Override + public void acceptTargets(Set myTargets, Set otherTargets) { + } + + @Override + public List getMixins() { + return null; + } + + @Override + public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + } + + @Override + public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + } + +} diff --git a/Fabric/src/main/resources/nochatrestrictions.mixins.json b/Fabric/src/main/resources/nochatrestrictions.mixins.json index 4b9d3fd..fec6468 100644 --- a/Fabric/src/main/resources/nochatrestrictions.mixins.json +++ b/Fabric/src/main/resources/nochatrestrictions.mixins.json @@ -1,6 +1,7 @@ { "required": true, "package": "com.aizistral.nochatrestrictions.mixins", + "plugin": "com.aizistral.nochatrestrictions.core.NCRMixinPlugin", "minVersion": "0.8", "mixins": [], "client": [ diff --git a/Forge/src/main/java/com/aizistral/nochatrestrictions/config/NCRConfig.java b/Forge/src/main/java/com/aizistral/nochatrestrictions/config/NCRConfig.java index ee04b0b..ef7be96 100644 --- a/Forge/src/main/java/com/aizistral/nochatrestrictions/config/NCRConfig.java +++ b/Forge/src/main/java/com/aizistral/nochatrestrictions/config/NCRConfig.java @@ -4,6 +4,7 @@ import java.io.BufferedReader; import java.io.BufferedWriter; import java.nio.file.Files; import java.nio.file.Path; +import java.util.Map; import java.util.Optional; import org.jetbrains.annotations.Nullable; @@ -11,15 +12,18 @@ import org.jetbrains.annotations.Nullable; import com.aizistral.nochatrestrictions.core.NCRCore; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; -import net.minecraft.client.Minecraft; +import net.minecraftforge.fml.loading.FMLPaths; -public record NCRConfig(boolean allowTelemetry, boolean allowProfanityFilter) { +public record NCRConfig(boolean enableMod, boolean allowTelemetry, boolean allowProfanityFilter) { private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); private static @Nullable NCRConfig instance = null; private static NCRConfig getDefault() { - return new NCRConfig(false, false); + return new NCRConfig(true, false, false); } public static NCRConfig getInstance() { @@ -34,6 +38,7 @@ public record NCRConfig(boolean allowTelemetry, boolean allowProfanityFilter) { NCRCore.LOGGER.debug("Reading config file {}...", fileName); NCRConfig config = readFile(fileName).orElseGet(NCRConfig::getDefault); + NCRCore.LOGGER.info("Mod Enabled: {}", config.enableMod()); NCRCore.LOGGER.info("Telemetry Allowed: {}", config.allowTelemetry()); NCRCore.LOGGER.info("Profanity Filter Allowed: {}", config.allowProfanityFilter()); @@ -43,14 +48,24 @@ public record NCRConfig(boolean allowTelemetry, boolean allowProfanityFilter) { return config; } + private static Path getConfigFile(String fileName) { + return FMLPaths.CONFIGDIR.get().resolve(fileName); + } + private static Optional readFile(String fileName) { - Path file = Minecraft.getInstance().gameDirectory.toPath().resolve("config").resolve(fileName); + Path file = getConfigFile(fileName); if (!Files.isRegularFile(file)) return Optional.empty(); try (BufferedReader reader = Files.newBufferedReader(file)) { - return Optional.of(GSON.fromJson(reader, NCRConfig.class)); + JsonObject json = GSON.toJsonTree(getDefault()).getAsJsonObject(); + + for (Map.Entry entry : JsonParser.parseReader(reader).getAsJsonObject().entrySet()) { + json.add(entry.getKey(), entry.getValue()); + } + + return Optional.of(GSON.fromJson(json, NCRConfig.class)); } catch (Exception ex) { NCRCore.LOGGER.fatal("Could not read config file: {}", file); NCRCore.LOGGER.fatal("This likely indicates the file is corrupted. " @@ -61,7 +76,7 @@ public record NCRConfig(boolean allowTelemetry, boolean allowProfanityFilter) { } private static void writeFile(String fileName, NCRConfig config) { - Path file = Minecraft.getInstance().gameDirectory.toPath().resolve("config").resolve(fileName); + Path file = getConfigFile(fileName); try { Files.createDirectories(file.getParent()); diff --git a/Forge/src/main/java/com/aizistral/nochatrestrictions/core/NCRMixinPlugin.java b/Forge/src/main/java/com/aizistral/nochatrestrictions/core/NCRMixinPlugin.java new file mode 100644 index 0000000..cac9d7f --- /dev/null +++ b/Forge/src/main/java/com/aizistral/nochatrestrictions/core/NCRMixinPlugin.java @@ -0,0 +1,45 @@ +package com.aizistral.nochatrestrictions.core; + +import java.util.List; +import java.util.Set; + +import org.objectweb.asm.tree.ClassNode; +import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; + +import com.aizistral.nochatrestrictions.config.NCRConfig; + +public class NCRMixinPlugin implements IMixinConfigPlugin { + + @Override + public void onLoad(String mixinPackage) { + } + + @Override + public String getRefMapperConfig() { + return null; + } + + @Override + public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { + return NCRConfig.getInstance().enableMod(); + } + + @Override + public void acceptTargets(Set myTargets, Set otherTargets) { + } + + @Override + public List getMixins() { + return null; + } + + @Override + public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + } + + @Override + public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + } + +} diff --git a/Forge/src/main/resources/nochatrestrictions.mixins.json b/Forge/src/main/resources/nochatrestrictions.mixins.json index c9e96c5..508cb57 100644 --- a/Forge/src/main/resources/nochatrestrictions.mixins.json +++ b/Forge/src/main/resources/nochatrestrictions.mixins.json @@ -1,6 +1,7 @@ { "required": true, "package": "com.aizistral.nochatrestrictions.mixins", + "plugin": "com.aizistral.nochatrestrictions.core.NCRMixinPlugin", "minVersion": "0.8", "refmap": "nochatrestrictions.refmap.json", "mixins": [], diff --git a/NeoForge/src/main/java/com/aizistral/nochatrestrictions/config/NCRConfig.java b/NeoForge/src/main/java/com/aizistral/nochatrestrictions/config/NCRConfig.java index ee04b0b..0b2818f 100644 --- a/NeoForge/src/main/java/com/aizistral/nochatrestrictions/config/NCRConfig.java +++ b/NeoForge/src/main/java/com/aizistral/nochatrestrictions/config/NCRConfig.java @@ -4,6 +4,7 @@ import java.io.BufferedReader; import java.io.BufferedWriter; import java.nio.file.Files; import java.nio.file.Path; +import java.util.Map; import java.util.Optional; import org.jetbrains.annotations.Nullable; @@ -11,15 +12,18 @@ import org.jetbrains.annotations.Nullable; import com.aizistral.nochatrestrictions.core.NCRCore; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; -import net.minecraft.client.Minecraft; +import net.neoforged.fml.loading.FMLPaths; -public record NCRConfig(boolean allowTelemetry, boolean allowProfanityFilter) { +public record NCRConfig(boolean enableMod, boolean allowTelemetry, boolean allowProfanityFilter) { private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); private static @Nullable NCRConfig instance = null; private static NCRConfig getDefault() { - return new NCRConfig(false, false); + return new NCRConfig(true, false, false); } public static NCRConfig getInstance() { @@ -34,6 +38,7 @@ public record NCRConfig(boolean allowTelemetry, boolean allowProfanityFilter) { NCRCore.LOGGER.debug("Reading config file {}...", fileName); NCRConfig config = readFile(fileName).orElseGet(NCRConfig::getDefault); + NCRCore.LOGGER.info("Mod Enabled: {}", config.enableMod()); NCRCore.LOGGER.info("Telemetry Allowed: {}", config.allowTelemetry()); NCRCore.LOGGER.info("Profanity Filter Allowed: {}", config.allowProfanityFilter()); @@ -43,14 +48,24 @@ public record NCRConfig(boolean allowTelemetry, boolean allowProfanityFilter) { return config; } + private static Path getConfigFile(String fileName) { + return FMLPaths.CONFIGDIR.get().resolve(fileName); + } + private static Optional readFile(String fileName) { - Path file = Minecraft.getInstance().gameDirectory.toPath().resolve("config").resolve(fileName); + Path file = getConfigFile(fileName); if (!Files.isRegularFile(file)) return Optional.empty(); try (BufferedReader reader = Files.newBufferedReader(file)) { - return Optional.of(GSON.fromJson(reader, NCRConfig.class)); + JsonObject json = GSON.toJsonTree(getDefault()).getAsJsonObject(); + + for (Map.Entry entry : JsonParser.parseReader(reader).getAsJsonObject().entrySet()) { + json.add(entry.getKey(), entry.getValue()); + } + + return Optional.of(GSON.fromJson(json, NCRConfig.class)); } catch (Exception ex) { NCRCore.LOGGER.fatal("Could not read config file: {}", file); NCRCore.LOGGER.fatal("This likely indicates the file is corrupted. " @@ -61,7 +76,7 @@ public record NCRConfig(boolean allowTelemetry, boolean allowProfanityFilter) { } private static void writeFile(String fileName, NCRConfig config) { - Path file = Minecraft.getInstance().gameDirectory.toPath().resolve("config").resolve(fileName); + Path file = getConfigFile(fileName); try { Files.createDirectories(file.getParent()); diff --git a/NeoForge/src/main/java/com/aizistral/nochatrestrictions/core/NCRMixinPlugin.java b/NeoForge/src/main/java/com/aizistral/nochatrestrictions/core/NCRMixinPlugin.java new file mode 100644 index 0000000..cac9d7f --- /dev/null +++ b/NeoForge/src/main/java/com/aizistral/nochatrestrictions/core/NCRMixinPlugin.java @@ -0,0 +1,45 @@ +package com.aizistral.nochatrestrictions.core; + +import java.util.List; +import java.util.Set; + +import org.objectweb.asm.tree.ClassNode; +import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; + +import com.aizistral.nochatrestrictions.config.NCRConfig; + +public class NCRMixinPlugin implements IMixinConfigPlugin { + + @Override + public void onLoad(String mixinPackage) { + } + + @Override + public String getRefMapperConfig() { + return null; + } + + @Override + public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { + return NCRConfig.getInstance().enableMod(); + } + + @Override + public void acceptTargets(Set myTargets, Set otherTargets) { + } + + @Override + public List getMixins() { + return null; + } + + @Override + public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + } + + @Override + public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + } + +} diff --git a/NeoForge/src/main/resources/nochatrestrictions.mixins.json b/NeoForge/src/main/resources/nochatrestrictions.mixins.json index c9e96c5..508cb57 100644 --- a/NeoForge/src/main/resources/nochatrestrictions.mixins.json +++ b/NeoForge/src/main/resources/nochatrestrictions.mixins.json @@ -1,6 +1,7 @@ { "required": true, "package": "com.aizistral.nochatrestrictions.mixins", + "plugin": "com.aizistral.nochatrestrictions.core.NCRMixinPlugin", "minVersion": "0.8", "refmap": "nochatrestrictions.refmap.json", "mixins": [], -- cgit v1.2.3