Toggle for AntiFingerPrint button

Author: cev-api

src/main/java/net/cevapi/config/AntiFingerprintConfig.java

@@ -60,6 +60,10 @@ public final class AntiFingerprintConfig
 		"After sandboxing a pack, automatically extract it using Minecraft's resource-pack loader so you can inspect the contents.",
 		false);
 
+	private final CheckboxSetting showMultiplayerButton =
+		new CheckboxSetting("Show multiplayer button",
+			"Adds a shortcut to this panel to the Multiplayer screen.", true);
+	
 	private final SliderSetting fingerprintThreshold = new SliderSetting(
 		"Fingerprint threshold",
 		"Number of packs within the window before a fingerprint attempt is assumed.",
@@ -110,6 +114,11 @@ public CheckboxSetting getExtractSandboxSetting()
 		return extractSandbox;
 	}
 
+	public CheckboxSetting getShowMultiplayerButtonSetting()
+	{
+		return showMultiplayerButton;
+	}
+	
 	public SliderSetting getFingerprintThresholdSetting()
 	{
 		return fingerprintThreshold;
@@ -155,6 +164,11 @@ public boolean shouldExtractSandbox()
 		return extractSandbox.isChecked();
 	}
 
+	public boolean shouldShowMultiplayerButton()
+	{
+		return showMultiplayerButton.isChecked();
+	}
+	
 	public int getFingerprintThreshold()
 	{
 		return Math.max(2, fingerprintThreshold.getValueI());
@@ -217,8 +231,8 @@ public Set<String> getWhitelistedHosts()
 	public List<Setting> getAllSettings()
 	{
 		return Arrays.asList(policy, toastVerbosity, auditLog, purgeCache,
-			isolateCache, extractSandbox, fingerprintThreshold,
-			fingerprintWindowMs, whitelistedHosts);
+			isolateCache, extractSandbox, showMultiplayerButton,
+			fingerprintThreshold, fingerprintWindowMs, whitelistedHosts);
 	}
 
 	private static boolean isValidHostList(String value)

src/main/java/net/cevapi/config/AntiFingerprintConfigScreen.java

@@ -102,6 +102,14 @@ CycleButton.<AntiFingerprintConfig.ToastVerbosity> builder(
 					.setChecked(value)));
 		y += 34;
 
+		addRenderableWidget(CycleButton.onOffBuilder()
+			.withInitialValue(config.shouldShowMultiplayerButton())
+			.create(centerX - 100, y, 200, 20,
+				Component.literal("Show Multiplayer button"),
+				(button, value) -> config.getShowMultiplayerButtonSetting()
+					.setChecked(value)));
+		y += 34;
+		
 		// Extra breathing room before first text field so labels never clip
 		y += FIRST_FIELD_TOP_SPACER;
 

src/main/java/net/wurstclient/mixin/MultiplayerScreenMixin.java

@@ -13,16 +13,17 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import net.wurstclient.WurstClient;
-import net.wurstclient.serverfinder.CleanUpScreen;
+import net.cevapi.config.AntiFingerprintConfigScreen;
+import net.cevapi.security.ResourcePackProtector;
 import net.wurstclient.serverfinder.ServerFinderScreen;
 import net.wurstclient.util.LastServerRememberer;
-import net.cevapi.config.AntiFingerprintConfigScreen;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.network.chat.Component;
 import net.wurstclient.nicewurst.NiceWurstModule;
+import net.wurstclient.serverfinder.CleanUpScreen;
 
 @Mixin(JoinMultiplayerScreen.class)
 public class MultiplayerScreenMixin extends Screen
@@ -70,12 +71,13 @@ private void refreshCustomButtons()
 		if(!WurstClient.INSTANCE.isEnabled())
 			return;
 
-		if(antiFingerprintButton == null)
+		boolean showAntiFingerprintButton = NiceWurstModule
+			.showAntiFingerprintControls()
+			&& ResourcePackProtector.getConfig().shouldShowMultiplayerButton();
+		
+		if(showAntiFingerprintButton)
 		{
-			if(!NiceWurstModule.showAntiFingerprintControls())
-			{
-				antiFingerprintButton = null;
-			}else
+			if(antiFingerprintButton == null)
 			{
 				antiFingerprintButton = Button.builder(
 					Component.literal("Anti-Fingerprint"),
@@ -84,14 +86,14 @@ private void refreshCustomButtons()
 					.bounds(0, 0, 100, 20).build();
 				addRenderableWidget(antiFingerprintButton);
 			}
-		}
-		
-		if(antiFingerprintButton != null)
-		{
+			
 			antiFingerprintButton.setX(width / 2 + 54);
 			antiFingerprintButton.setY(10);
 			antiFingerprintButton.setWidth(100);
 			antiFingerprintButton.visible = true;
+		}else if(antiFingerprintButton != null)
+		{
+			antiFingerprintButton.visible = false;
 		}
 
 		if(cornerServerFinderButton == null)