From 4fa017e785fdce7241e42dfd355406d7b0c2c4fd Mon Sep 17 00:00:00 2001
From: Ryhon <ryhon@ryhn.link>
Date: Wed, 11 Dec 2024 22:07:29 +0100
Subject: [PATCH] Require attack to always be held

---
 .../AutoswitchSettingsScreen.java             | 20 +------------------
 .../simpleautoswitch/SimpleAutoswitch.java    | 10 +---------
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/src/main/java/xyz/ryhon/simpleautoswitch/AutoswitchSettingsScreen.java b/src/main/java/xyz/ryhon/simpleautoswitch/AutoswitchSettingsScreen.java
index cb1dd18..f24c9b5 100644
--- a/src/main/java/xyz/ryhon/simpleautoswitch/AutoswitchSettingsScreen.java
+++ b/src/main/java/xyz/ryhon/simpleautoswitch/AutoswitchSettingsScreen.java
@@ -18,7 +18,6 @@ protected AutoswitchSettingsScreen(Screen parent) {
 	}
 
 	SwitchButton enabledButton;
-	SwitchButton requiresAttackHeldButton;
 	SwitchButton returnToPreviousSlotButton;
 	SwitchButton sneakToggleButton;
 	ButtonWidget doneButton;
@@ -47,26 +46,9 @@ public void setToggled(boolean toggled) {
 				enabledButton.getY() + (buttonHeight / 2) - (textRenderer.fontHeight / 2));
 		addDrawableChild(t);
 
-		requiresAttackHeldButton = new SwitchButton(
+		returnToPreviousSlotButton = new SwitchButton(
 				enabledButton.getX(), enabledButton.getY() + enabledButton.getHeight(),
 				enabledButton.getWidth(), enabledButton.getHeight(),
-				SimpleAutoswitch.requiresAttackHeld) {
-			@Override
-			public void setToggled(boolean toggled) {
-				super.setToggled(toggled);
-				SimpleAutoswitch.requiresAttackHeld = toggled;
-			}
-		};
-		addDrawableChild(requiresAttackHeldButton);
-		addSelectableChild(requiresAttackHeldButton);
-		t = new TextWidget(Text.translatable("simpleautoswitch.menuscreen.requiresAttackHeld"), textRenderer);
-		t.setPosition((width / 2) - (panelWidth / 2),
-				requiresAttackHeldButton.getY() + (buttonHeight / 2) - (textRenderer.fontHeight / 2));
-		addDrawableChild(t);
-
-		returnToPreviousSlotButton = new SwitchButton(
-				requiresAttackHeldButton.getX(), requiresAttackHeldButton.getY() + requiresAttackHeldButton.getHeight(),
-				requiresAttackHeldButton.getWidth(), requiresAttackHeldButton.getHeight(),
 				SimpleAutoswitch.returnToPreviousSlot) {
 			@Override
 			public void setToggled(boolean toggled) {
diff --git a/src/main/java/xyz/ryhon/simpleautoswitch/SimpleAutoswitch.java b/src/main/java/xyz/ryhon/simpleautoswitch/SimpleAutoswitch.java
index bb746e7..b7092cc 100644
--- a/src/main/java/xyz/ryhon/simpleautoswitch/SimpleAutoswitch.java
+++ b/src/main/java/xyz/ryhon/simpleautoswitch/SimpleAutoswitch.java
@@ -10,7 +10,6 @@
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.client.world.ClientWorld;
-import net.minecraft.entity.attribute.EntityAttributes;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.HitResult;
@@ -30,7 +29,6 @@ public class SimpleAutoswitch implements ModInitializer {
 	public static final Logger LOGGER = LoggerFactory.getLogger("simple-autoswitch");
 
 	static public boolean enabled = true;
-	static public boolean requiresAttackHeld = true;
 	static public boolean returnToPreviousSlot = true;
 	static public boolean sneakToggle = true;
 
@@ -109,10 +107,7 @@ boolean shouldSwitch(MinecraftClient client) {
 		if (sneakToggle && client.player.isSneaking())
 			return false;
 
-		if (requiresAttackHeld)
-			return client.options.attackKey.isPressed();
-		else
-			return true;
+		return client.options.attackKey.isPressed();
 	}
 
 	void switchToBestSlot(MinecraftClient client) {
@@ -164,8 +159,6 @@ static void loadConfig() {
 
 			if (jo.has("enabled"))
 				enabled = jo.get("enabled").getAsBoolean();
-			if (jo.has("requiresAttackHeld"))
-				requiresAttackHeld = jo.get("requiresAttackHeld").getAsBoolean();
 			if (jo.has("returnToPreviousSlot"))
 				returnToPreviousSlot = jo.get("returnToPreviousSlot").getAsBoolean();
 			if (jo.has("sneakToggle"))
@@ -180,7 +173,6 @@ static void saveConfig() {
 		JsonObject jo = new JsonObject();
 
 		jo.add("enabled", new JsonPrimitive(enabled));
-		jo.add("requiresAttackHeld", new JsonPrimitive(requiresAttackHeld));
 		jo.add("returnToPreviousSlot", new JsonPrimitive(returnToPreviousSlot));
 		jo.add("sneakToggle", new JsonPrimitive(sneakToggle));