summaryrefslogtreecommitdiffstats
path: root/src/main/java/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java7
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/config/NCRConfigClient.java13
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java17
3 files changed, 3 insertions, 34 deletions
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 4d4ee53..c3ae63d 100644
--- a/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java
+++ b/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java
@@ -129,13 +129,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/NCRConfigClient.java b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigClient.java
index 30db481..7363581 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 enableMod = true, showNCRButton = true,
verifiedIconEnabled = true, showServerSafety = true, hideInsecureMessageIndicators = true,
hideModifiedMessageIndicators = true, hideSystemMessageIndicators = true,
hideWarningToast = true, hideSigningRequestMessage = false, alwaysHideReportButton = false,
@@ -125,17 +125,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>
*
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 d0ca0b9..163a911 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
@@ -19,12 +19,11 @@ import com.aizistral.nochatreports.common.gui.SwitchableSprites;
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.resources.Identifier;
/**
- * 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
*/
@@ -32,9 +31,7 @@ import net.minecraft.resources.Identifier;
public abstract class MixinJoinMultiplayerScreen extends Screen {
@Shadow @Final
private HeaderAndFooterLayout layout;
- private static final Identifier RELOAD_TEXTURE = Identifier.fromNamespaceAndPath("nochatreports", "textures/gui/config_reload_button.png"),
- TOGGLE_TEXTURE = Identifier.fromNamespaceAndPath("nochatreports", "textures/gui/ncr_toggle_button.png");
- private static final Component RELOAD_TOOLTIP = Component.translatable("gui.nochatreports.reload_config_tooltip");
+ private static final Identifier TOGGLE_TEXTURE = Identifier.fromNamespaceAndPath("nochatreports", "textures/gui/ncr_toggle_button.png");
protected MixinJoinMultiplayerScreen() {
super(null);
@@ -47,16 +44,6 @@ public abstract class MixinJoinMultiplayerScreen extends Screen {
layoutSettings.paddingLeft(336);
});
- if (NCRConfig.getClient().showReloadButton()) {
- var button = new AdvancedImageButton(0, 0, 20, 20,
- SwitchableSprites.of(GUIShenanigans.getSprites("config_reload_button")),
- btn -> NCRConfig.load(), CommonComponents.EMPTY, this);
- button.setTooltip(new AdvancedTooltip(RELOAD_TOOLTIP).setMaxWidth(250));
- button.active = true;
- button.visible = true;
- ncrButtons.addChild(button);
- }
-
if (NCRConfig.getClient().showNCRButton()) {
var button = new AdvancedImageButton(0, 0, 20, 20,
SwitchableSprites.of(