diff options
Diffstat (limited to 'src/main/java')
21 files changed, 162 insertions, 142 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/common/NCRClient.java b/src/main/java/com/aizistral/nochatreports/common/NCRClient.java index 7f5d177..5b339f0 100644 --- a/src/main/java/com/aizistral/nochatreports/common/NCRClient.java +++ b/src/main/java/com/aizistral/nochatreports/common/NCRClient.java @@ -31,9 +31,6 @@ public class NCRClient { } private static void onDisconnect(Minecraft client) { - if (!NCRConfig.getClient().enableMod()) - return; - if (NCRConfig.getCommon().enableDebugLog()) { NCRCore.LOGGER.info("Disconnected from server, resetting safety state!"); } @@ -42,9 +39,6 @@ public class NCRClient { } private static void onPlayReady(ClientPacketListener handler, Minecraft client) { - if (!NCRConfig.getClient().enableMod()) - return; - client.execute(() -> { if (!client.isLocalServer()) { if (ServerSafetyState.isOnRealms()) { diff --git a/src/main/java/com/aizistral/nochatreports/common/NCRCore.java b/src/main/java/com/aizistral/nochatreports/common/NCRCore.java index e931e21..6db0286 100644 --- a/src/main/java/com/aizistral/nochatreports/common/NCRCore.java +++ b/src/main/java/com/aizistral/nochatreports/common/NCRCore.java @@ -28,6 +28,11 @@ public class NCRCore { Preconditions.checkArgument(provider == null, "NCRCore already awake"); provider = platformProvider; + if (!NCRConfig.isModRunning()) { + LOGGER.info("No Chat Reports is disabled in its config and will not initialize."); + return; + } + setup(); if (provider.isOnClient()) { @@ -39,7 +44,7 @@ public class NCRCore { LOGGER.info("KONNICHIWA ZA WARUDO!"); LOGGER.info("Default JVM text encoding is: " + Charset.defaultCharset().displayName()); - NCRConfig.load(); + NCRConfig.save(); } @Environment(EnvType.CLIENT) diff --git a/src/main/java/com/aizistral/nochatreports/common/NCRMixinPlugin.java b/src/main/java/com/aizistral/nochatreports/common/NCRMixinPlugin.java new file mode 100644 index 0000000..1155ead --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/common/NCRMixinPlugin.java @@ -0,0 +1,46 @@ +package com.aizistral.nochatreports.common; + +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.nochatreports.common.config.NCRConfig; + +public class NCRMixinPlugin implements IMixinConfigPlugin { + private static final String TOGGLE_BUTTON_MIXIN = "com.aizistral.nochatreports.common.mixins.client.MixinJoinMultiplayerScreen"; + + @Override + public void onLoad(String mixinPackage) { + } + + @Override + public String getRefMapperConfig() { + return null; + } + + @Override + public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { + return NCRConfig.isModRunning() || TOGGLE_BUTTON_MIXIN.equals(mixinClassName); + } + + @Override + public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) { + } + + @Override + public List<String> 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/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java b/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java index d65d191..d8b2c55 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java @@ -4,7 +4,6 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Stream; -import com.aizistral.nochatreports.common.core.ServerSafetyState; import com.aizistral.nochatreports.common.core.SigningMode; import com.aizistral.nochatreports.common.gui.FontHelper; @@ -72,19 +71,24 @@ public final class ClothConfigIntegration { .setTitle(Component.translatable("configuration.NoChatReports.config")); // Set category + ConfigCategory common = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.common")); ConfigCategory client = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.client")); ConfigCategory lan = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.lan")); ConfigEntryBuilder entryBuilder = builder.entryBuilder(); + String enableModTooltip = translateKey("option.NoChatReports.enableMod.tooltip"); + + if (NCRConfig.getCommon().getSavedEnableMod() != NCRConfig.isModRunning()) { + enableModTooltip += "\n" + translateKey("gui.nochatreports.ncr_toggle_restart_pending"); + } + // Set an option for enableMod - client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableMod"), NCRConfig.getClient().enableMod) + common.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableMod"), NCRConfig.getCommon().getSavedEnableMod()) .setDefaultValue(true) - .setTooltip(makeTooltip("option.NoChatReports.enableMod.tooltip")) - .setSaveConsumer(newValue -> ServerSafetyState.scheduleResetAction(() -> { - NCRConfig.getClient().enableMod = newValue; - NCRConfig.getClient().saveFile(); - })) + .setTooltip(wrapTooltip(enableModTooltip)) + .requireRestart() + .setSaveConsumer(newValue -> NCRConfig.getCommon().setSavedEnableMod(newValue)) .build()); // Set an option for showNCRButton @@ -128,13 +132,6 @@ public final class ClothConfigIntegration { .build() ); - // Set an option for showReloadButton - client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showReloadButton"), NCRConfig.getClient().showReloadButton) - .setDefaultValue(true) - .setTooltip(makeTooltip("option.NoChatReports.showReloadButton.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getClient().showReloadButton = newValue) - .build()); - // Set an option for verifiedIconEnabled client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.verifiedIconEnabled"), NCRConfig.getClient().verifiedIconEnabled) .setDefaultValue(true) diff --git a/src/main/java/com/aizistral/nochatreports/common/config/JSONConfig.java b/src/main/java/com/aizistral/nochatreports/common/config/JSONConfig.java index f8fe3b4..9f0113e 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/JSONConfig.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/JSONConfig.java @@ -8,16 +8,14 @@ import java.util.Optional; import java.util.function.Supplier; import com.aizistral.nochatreports.common.NCRCore; +import com.aizistral.nochatreports.loader.LoaderPaths; import com.google.gson.ExclusionStrategy; import com.google.gson.FieldAttributes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import net.fabricmc.api.EnvType; -import net.minecraft.client.multiplayer.resolver.ServerAddress; - public abstract class JSONConfig { - protected static final Path CONFIG_DIR = NCRCore.getProvider().getConfigDir(); + protected static final Path CONFIG_DIR = LoaderPaths.getConfigDir(); protected static final Gson GSON = createGson(); protected final String fileName; @@ -37,6 +35,10 @@ public abstract class JSONConfig { writeFile(this.fileName, this); } + protected Gson getGson() { + return GSON; + } + protected void uponLoad() { // NO-OP } @@ -45,19 +47,20 @@ public abstract class JSONConfig { public static <T extends JSONConfig> T loadConfig(Class<T> configClass, Supplier<T> freshInstance, String fileName) { NCRCore.LOGGER.info("Reading config file {}...", fileName); - T config = readFile(fileName, configClass).orElseGet(freshInstance); + T defaults = freshInstance.get(); + T config = readFile(fileName, configClass, defaults.getGson()).orElse(defaults); config.uponLoad(); return config; } - private static <T extends JSONConfig> Optional<T> readFile(String fileName, Class<T> configClass) { + private static <T extends JSONConfig> Optional<T> readFile(String fileName, Class<T> configClass, Gson gson) { Path file = CONFIG_DIR.resolve(fileName); if (!Files.isRegularFile(file)) return Optional.empty(); try (BufferedReader reader = Files.newBufferedReader(file)) { - return Optional.of(GSON.fromJson(reader, configClass)); + return Optional.of(gson.fromJson(reader, configClass)); } catch (Exception ex) { NCRCore.LOGGER.fatal("Could not read config file: {}", file); NCRCore.LOGGER.fatal("This likely indicates the file is corrupted. " @@ -67,13 +70,13 @@ public abstract class JSONConfig { } } - private static <T> void writeFile(String fileName, T config) { + private static void writeFile(String fileName, JSONConfig config) { Path file = CONFIG_DIR.resolve(fileName); try { Files.createDirectories(file.getParent()); try (BufferedWriter writer = Files.newBufferedWriter(file)) { - GSON.toJson(config, writer); + config.getGson().toJson(config, writer); } } catch (Exception ex) { NCRCore.LOGGER.fatal("Could not write config file: {}", file); @@ -98,10 +101,6 @@ public abstract class JSONConfig { } }); - if (NCRCore.getProvider().isOnClient()) { - builder.registerTypeAdapter(ServerAddress.class, ServerAddressAdapter.INSTANCE); - } - return builder.create(); } diff --git a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfig.java b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfig.java index 14289d4..064238b 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfig.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfig.java @@ -3,7 +3,7 @@ package com.aizistral.nochatreports.common.config; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.util.function.Supplier; +import java.util.List; import com.aizistral.nochatreports.common.NCRCore; @@ -14,51 +14,51 @@ public final class NCRConfig { private static NCRConfigCommon common = null; private static NCRConfigClient client = null; private static NCRServerPreferences serverPreferences = null; + private static boolean modRunning = false; private NCRConfig() { throw new IllegalStateException("Can't touch this"); } - public static NCRConfigCommon getCommon() { - return checkLoaded(() -> common); - } + public static synchronized NCRConfigCommon getCommon() { + if (common == null) { + common = JSONConfig.loadConfig(NCRConfigCommon.class, NCRConfigCommon::new, NCRConfigCommon.FILE_NAME); + modRunning = common.getSavedEnableMod(); + NCRCore.LOGGER.info("Mod Enabled: {}", modRunning); + } - @Environment(EnvType.CLIENT) - public static NCRConfigClient getClient() { - return checkLoaded(() -> client); + return common; } - @Environment(EnvType.CLIENT) - public static NCRServerPreferences getServerPreferences() { - return checkLoaded(() -> serverPreferences); + public static boolean isModRunning() { + getCommon(); + return modRunning; } - private static <T extends JSONConfig> T checkLoaded(Supplier<T> config) { - if (config.get() == null) { - load(); + @Environment(EnvType.CLIENT) + public static synchronized NCRConfigClient getClient() { + if (client == null) { + client = JSONConfig.loadConfig(NCRConfigClient.class, NCRConfigClient::new, NCRConfigClient.FILE_NAME); } - return config.get(); + return client; } - public static void load() { - common = JSONConfig.loadConfig(NCRConfigCommon.class, NCRConfigCommon::new, NCRConfigCommon.FILE_NAME); - - if (NCRCore.getProvider().isOnClient()) { - client = JSONConfig.loadConfig(NCRConfigClient.class, NCRConfigClient::new, NCRConfigClient.FILE_NAME); + @Environment(EnvType.CLIENT) + public static synchronized NCRServerPreferences getServerPreferences() { + if (serverPreferences == null) { serverPreferences = JSONConfig.loadConfig(NCRServerPreferences.class, NCRServerPreferences::new, NCRServerPreferences.FILE_NAME); } - save(); + return serverPreferences; } public static void save() { - checkLoaded(() -> common).saveFile(); + List<JSONConfig> configs = NCRCore.getProvider().isOnClient() + ? List.of(getCommon(), getClient(), getServerPreferences()) + : List.of(getCommon()); - if (NCRCore.getProvider().isOnClient()) { - checkLoaded(() -> client).saveFile(); - checkLoaded(() -> serverPreferences).saveFile(); - } + configs.forEach(JSONConfig::saveFile); Path readme = JSONConfig.CONFIG_DIR.resolve("NoChatReports/README.md"); try { diff --git a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigClient.java b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigClient.java index 30db481..3644301 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigClient.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigClient.java @@ -9,7 +9,7 @@ public final class NCRConfigClient extends JSONConfig { protected static final String FILE_NAME = "NoChatReports/NCR-Client.json"; protected SigningMode defaultSigningMode = SigningMode.PROMPT; - protected boolean enableMod = true, showNCRButton = true, showReloadButton = true, + protected boolean showNCRButton = true, verifiedIconEnabled = true, showServerSafety = true, hideInsecureMessageIndicators = true, hideModifiedMessageIndicators = true, hideSystemMessageIndicators = true, hideWarningToast = true, hideSigningRequestMessage = false, alwaysHideReportButton = false, @@ -26,10 +26,6 @@ public final class NCRConfigClient extends JSONConfig { return new NCRConfigClient(); } - public void toggleMod() { - this.enableMod = !this.enableMod; - } - /** * @return True if client with No Chat Reports installed should demand that mod is present on * every server that it tries to join. In that case client will not be able to join servers that @@ -125,17 +121,6 @@ public final class NCRConfigClient extends JSONConfig { } /** - * @return True if the configuration reload button should be displayed in multiplayer screen. - * <br><br> - * - * This is true by default. - */ - - public boolean showReloadButton() { - return this.showReloadButton; - } - - /** * @return True if "Safe Server" icon should be displayed in multiplayer menu for servers that * declare themselves as preventing chat reports.<br><br> * @@ -173,14 +158,6 @@ public final class NCRConfigClient extends JSONConfig { } /** - * @return Whether or not No Chat Reports should provide networking-related functionality. - */ - - public boolean enableMod() { - return this.enableMod; - } - - /** * @return Whether warning on entering Realms screen should not be displayed. */ @@ -190,6 +167,7 @@ public final class NCRConfigClient extends JSONConfig { public void setSkipRealmsWarning(boolean skipRealmsWarning) { this.skipRealmsWarning = skipRealmsWarning; + this.saveFile(); } public boolean hideSigningRequestMessage() { diff --git a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigCommon.java b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigCommon.java index 9242d90..9da10bb 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigCommon.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigCommon.java @@ -3,6 +3,7 @@ package com.aizistral.nochatreports.common.config; public final class NCRConfigCommon extends JSONConfig { protected static final String FILE_NAME = "NoChatReports/NCR-Common.json"; + protected boolean enableMod = true; protected String demandOnClientMessage = "You do not have No Chat Reports, and this server is" + " configured to require it on client!"; protected boolean demandOnClient = false, convertToGameMessage = true, @@ -17,6 +18,15 @@ public final class NCRConfigCommon extends JSONConfig { return new NCRConfigCommon(); } + public boolean getSavedEnableMod() { + return this.enableMod; + } + + public void setSavedEnableMod(boolean enableMod) { + this.enableMod = enableMod; + this.saveFile(); + } + /** * @return True if server with No Chat Reports installed should demand that mod is present on * every client that tries to join. Mod's installation on client is optional otherwise.<br><br> diff --git a/src/main/java/com/aizistral/nochatreports/common/config/NCRServerPreferences.java b/src/main/java/com/aizistral/nochatreports/common/config/NCRServerPreferences.java index 77b12c1..8589c9e 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/NCRServerPreferences.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/NCRServerPreferences.java @@ -7,11 +7,14 @@ import org.jetbrains.annotations.Nullable; import com.aizistral.nochatreports.common.NCRClient; import com.aizistral.nochatreports.common.core.ServerSafetyState; import com.aizistral.nochatreports.common.core.SigningMode; +import com.google.gson.Gson; import net.minecraft.client.multiplayer.resolver.ServerAddress; public class NCRServerPreferences extends JSONConfig { protected static final String FILE_NAME = "NoChatReports/NCR-ServerPreferences.json"; + private static final Gson PREFERENCES_GSON = GSON.newBuilder() + .registerTypeAdapter(ServerAddress.class, ServerAddressAdapter.INSTANCE).create(); protected HashMap<ServerAddress, SigningMode> signingModes = new HashMap<>(); protected NCRServerPreferences() { @@ -23,6 +26,11 @@ public class NCRServerPreferences extends JSONConfig { return new NCRServerPreferences(); } + @Override + protected Gson getGson() { + return PREFERENCES_GSON; + } + public SigningMode getModeRaw(@Nullable ServerAddress address) { return this.signingModes.get(address); } diff --git a/src/main/java/com/aizistral/nochatreports/common/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/common/core/ServerSafetyState.java index 4b056ff..bcd3e5c 100644 --- a/src/main/java/com/aizistral/nochatreports/common/core/ServerSafetyState.java +++ b/src/main/java/com/aizistral/nochatreports/common/core/ServerSafetyState.java @@ -21,7 +21,6 @@ import net.minecraft.client.multiplayer.resolver.ServerAddress; @Environment(EnvType.CLIENT) public final class ServerSafetyState { - private static final List<Runnable> RESET_ACTIONS = new ArrayList<>(); private static final List<Runnable> SIGNING_ACTIONS = new ArrayList<>(); private static final AtomicBoolean ALLOW_CHAT_SIGNING = new AtomicBoolean(false); private volatile static ServerSafetyLevel current = ServerSafetyLevel.UNDEFINED; @@ -92,10 +91,6 @@ public final class ServerSafetyState { lastMessage = message; } - public static void scheduleResetAction(Runnable action) { - RESET_ACTIONS.add(action); - } - public static void scheduleSigningAction(Runnable action) { SIGNING_ACTIONS.add(action); } @@ -106,8 +101,6 @@ public final class ServerSafetyState { ALLOW_CHAT_SIGNING.set(false); UnsafeServerScreen.setHideThisSession(false); - RESET_ACTIONS.forEach(Runnable::run); - RESET_ACTIONS.clear(); SIGNING_ACTIONS.clear(); } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatOptionsScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatOptionsScreen.java index 24e5fad..e58d251 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatOptionsScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatOptionsScreen.java @@ -4,8 +4,6 @@ import java.util.Optional; import org.spongepowered.asm.mixin.Mixin; -import com.aizistral.nochatreports.common.config.NCRConfig; - import net.minecraft.client.Minecraft; import net.minecraft.client.OptionInstance; import net.minecraft.client.Options; @@ -33,10 +31,8 @@ public class MixinChatOptionsScreen extends SimpleOptionsSubScreen { protected void init() { super.init(); - if (NCRConfig.getClient().enableMod()) { - Optional.ofNullable(this.list.findOption(Minecraft.getInstance().options.onlyShowSecureChat())) - .ifPresent(option -> option.active = false); - } + Optional.ofNullable(this.list.findOption(Minecraft.getInstance().options.onlyShowSecureChat())) + .ifPresent(option -> option.active = false); } } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java index 597c958..2abf8dd 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java @@ -86,7 +86,7 @@ public abstract class MixinChatScreen extends Screen { private void onInit(CallbackInfo info) { int buttonX = this.width - 23; - if (NCRConfig.getClient().showServerSafety() && NCRConfig.getClient().enableMod()) { + if (NCRConfig.getClient().showServerSafety()) { this.safetyStatusButton = new AdvancedImageButton(buttonX, this.height - 37, 20, 20, this.getXOffset(), 0, 20, CHAT_STATUS_ICONS, 128, 128, btn -> { if (!NCRClient.areSigningKeysPresent()) diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinConnectScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinConnectScreen.java index d89d9ae..4e918d0 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinConnectScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinConnectScreen.java @@ -28,9 +28,6 @@ public class MixinConnectScreen { @Inject(method = "startConnecting", at = @At("HEAD")) private static void onStartConnecting(Screen screen, Minecraft minecraft, ServerAddress serverAddress, @Nullable ServerData serverData, boolean quickplay, CallbackInfo info) { - if (!NCRConfig.getClient().enableMod()) - return; - ServerSafetyState.reset(); ServerSafetyState.setLastServer(serverAddress); diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java index 4e2e2d5..5bb3e5f 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java @@ -6,7 +6,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.aizistral.nochatreports.common.config.NCRConfig; -import com.aizistral.nochatreports.common.core.ServerSafetyState; import com.aizistral.nochatreports.common.gui.AdvancedImageButton; import com.aizistral.nochatreports.common.gui.AdvancedTooltip; @@ -14,20 +13,18 @@ import net.minecraft.client.gui.components.ImageButton; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; import net.minecraft.locale.Language; -import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; /** - * This is responsible for adding config reload button to server selection menu. + * This is responsible for adding mod toggle button to server selection menu. * @author Aizistral */ @Mixin(JoinMultiplayerScreen.class) public abstract class MixinJoinMultiplayerScreen extends Screen { - private static final ResourceLocation RELOAD_TEXTURE = new ResourceLocation("nochatreports", "textures/gui/config_reload_button.png"), - TOGGLE_TEXTURE = new ResourceLocation("nochatreports", "textures/gui/ncr_toggle_button.png"); - private static final Component RELOAD_TOOLTIP = Component.translatable("gui.nochatreports.reload_config_tooltip"); + private static final ResourceLocation TOGGLE_TEXTURE = new ResourceLocation("nochatreports", "textures/gui/ncr_toggle_button.png"); protected MixinJoinMultiplayerScreen() { super(null); @@ -36,33 +33,30 @@ public abstract class MixinJoinMultiplayerScreen extends Screen { @Inject(method = "init", at = @At("HEAD")) private void onInit(CallbackInfo info) { - if (NCRConfig.getClient().showReloadButton()) { - var button = new AdvancedImageButton(this.width/2 + 158, this.height - 54, 20, 20, 0, 0, 20, - RELOAD_TEXTURE, 64, 64, btn -> NCRConfig.load(), CommonComponents.EMPTY, this); - button.setTooltip(new AdvancedTooltip(RELOAD_TOOLTIP).setMaxWidth(250).setRenderWithoutGap(true)); - button.active = true; - button.visible = true; - this.addRenderableWidget(button); - } - - if (NCRConfig.getClient().showNCRButton()) { + if (!NCRConfig.isModRunning() || NCRConfig.getClient().showNCRButton()) { var button = new AdvancedImageButton(this.width/2 + 158, this.height - 30, 20, 20, - NCRConfig.getClient().enableMod() ? 0 : 20, 0, 20, TOGGLE_TEXTURE, 64, 64, + NCRConfig.getCommon().getSavedEnableMod() ? 0 : 20, 0, 20, TOGGLE_TEXTURE, 64, 64, btn -> { - NCRConfig.getClient().toggleMod(); - boolean enabled = NCRConfig.getClient().enableMod(); + NCRConfig.getCommon().setSavedEnableMod(!NCRConfig.getCommon().getSavedEnableMod()); + boolean enabled = NCRConfig.getCommon().getSavedEnableMod(); if (enabled) { ((ImageButton)btn).xTexStart = 0; } else { ((ImageButton)btn).xTexStart = 20; } - - ServerSafetyState.reset(); }, Component.translatable("gui.nochatreports.ncr_toggle"), this); - button.setTooltip(new AdvancedTooltip(() -> Component.translatable("gui.nochatreports.ncr_toggle_tooltip", - Language.getInstance().getOrDefault("gui.nochatreports.ncr_state_" + (NCRConfig.getClient() - .enableMod() ? "on" : "off")))).setMaxWidth(250)); + button.setTooltip(new AdvancedTooltip(() -> { + boolean saved = NCRConfig.getCommon().getSavedEnableMod(); + MutableComponent tooltip = Component.translatable("gui.nochatreports.ncr_toggle_tooltip", + Language.getInstance().getOrDefault("gui.nochatreports.ncr_state_" + (saved ? "on" : "off"))); + + if (saved != NCRConfig.isModRunning()) { + tooltip.append("\n").append(Component.translatable("gui.nochatreports.ncr_toggle_restart_pending")); + } + + return tooltip; + }).setMaxWidth(250)); button.active = true; button.visible = true; this.addRenderableWidget(button); diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinMinecraft.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinMinecraft.java index ca36de9..28d8ff2 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinMinecraft.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinMinecraft.java @@ -29,9 +29,6 @@ public class MixinMinecraft { @Inject(method = "getProfileKeyPairManager", at = @At("HEAD"), cancellable = true) private void onGetProfileKeyPairManager(CallbackInfoReturnable<ProfileKeyPairManager> info) { - if (!NCRConfig.getClient().enableMod()) - return; - if (!ServerSafetyState.allowChatSigning()) { info.setReturnValue(ProfileKeyPairManager.EMPTY_KEY_MANAGER); } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOptions.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOptions.java index e2ffe8c..6c0e205 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOptions.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOptions.java @@ -6,7 +6,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.aizistral.nochatreports.common.config.NCRConfig; import com.google.common.collect.ImmutableList; import com.mojang.serialization.Codec; @@ -26,9 +25,6 @@ public class MixinOptions { @Inject(method = "onlyShowSecureChat", at = @At("RETURN"), cancellable = true) private void onlyShowSecureChat(CallbackInfoReturnable<OptionInstance<Boolean>> cir) { - if (!NCRConfig.getClient().enableMod()) - return; - if (this.alternativeOption == null) { this.alternativeOption = new OptionInstance<>("options.onlyShowSecureChat", OptionInstance.cachedConstantTooltip(SECURE_CHAT_TOOLTIP), diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinRealmsConnect.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinRealmsConnect.java index a6f16ef..2a97ae3 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinRealmsConnect.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinRealmsConnect.java @@ -5,7 +5,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.aizistral.nochatreports.common.config.NCRConfig; import com.aizistral.nochatreports.common.core.ServerSafetyLevel; import com.aizistral.nochatreports.common.core.ServerSafetyState; import com.mojang.realmsclient.dto.RealmsServer; @@ -23,9 +22,6 @@ public class MixinRealmsConnect { @Inject(method = "connect", at = @At("HEAD")) private void onConnect(RealmsServer realmsServer, ServerAddress serverAddress, CallbackInfo info) { - if (!NCRConfig.getClient().enableMod()) - return; - ServerSafetyState.reset(); ServerSafetyState.updateCurrent(ServerSafetyLevel.REALMS); ServerSafetyState.setAllowChatSigning(true); diff --git a/src/main/java/com/aizistral/nochatreports/common/platform/PlatformProvider.java b/src/main/java/com/aizistral/nochatreports/common/platform/PlatformProvider.java index bdeee8d..6bdf5a5 100644 --- a/src/main/java/com/aizistral/nochatreports/common/platform/PlatformProvider.java +++ b/src/main/java/com/aizistral/nochatreports/common/platform/PlatformProvider.java @@ -13,6 +13,4 @@ public interface PlatformProvider { public Path getMinecraftDir(); - public Path getConfigDir(); - } diff --git a/src/main/java/com/aizistral/nochatreports/fabric/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/fabric/NoChatReports.java index 4dcb517..8339bed 100644 --- a/src/main/java/com/aizistral/nochatreports/fabric/NoChatReports.java +++ b/src/main/java/com/aizistral/nochatreports/fabric/NoChatReports.java @@ -32,9 +32,4 @@ public class NoChatReports implements ModInitializer, PlatformProvider { return FabricLoader.getInstance().getGameDir(); } - @Override - public Path getConfigDir() { - return FabricLoader.getInstance().getConfigDir(); - } - } diff --git a/src/main/java/com/aizistral/nochatreports/fabric/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/fabric/NoChatReportsClient.java index 2ae4236..b84adf5 100644 --- a/src/main/java/com/aizistral/nochatreports/fabric/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/fabric/NoChatReportsClient.java @@ -1,5 +1,6 @@ package com.aizistral.nochatreports.fabric; +import com.aizistral.nochatreports.common.config.NCRConfig; import com.aizistral.nochatreports.common.platform.events.ClientEvents; import net.fabricmc.api.ClientModInitializer; @@ -12,6 +13,9 @@ public class NoChatReportsClient implements ClientModInitializer { @Override public void onInitializeClient() { + if (!NCRConfig.isModRunning()) + return; + ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> ClientEvents.PLAY_READY.invoker().handle(handler, client)); diff --git a/src/main/java/com/aizistral/nochatreports/loader/LoaderPaths.java b/src/main/java/com/aizistral/nochatreports/loader/LoaderPaths.java new file mode 100644 index 0000000..762ab74 --- /dev/null +++ b/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.fabricmc.loader.api.FabricLoader; + +public final class LoaderPaths { + + private LoaderPaths() { + throw new IllegalStateException("Can't touch this"); + } + + public static Path getConfigDir() { + return FabricLoader.getInstance().getConfigDir(); + } + +} |
