Refactor SwingHandSetting

Wurst-Imperium · Apr 4, 2024 · 583e57e · 583e57e
1 parent 208154c
commit 583e57e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/main/java/net/wurstclient/hacks/AutoLibrarianHack.java b/src/main/java/net/wurstclient/hacks/AutoLibrarianHack.java
@@ -297,7 +297,7 @@ private void breakJobSite()
 		// damage block and swing hand
 		if(MC.interactionManager.updateBlockBreakingProgress(jobSite,
 			params.side()))
-			swingHand.getSelected().swing(Hand.MAIN_HAND);
+			swingHand.swing(Hand.MAIN_HAND);
 
 		// update progress
 		overlay.updateProgress();
@@ -359,7 +359,7 @@ private void placeJobSite()
 
 		// swing hand
 		if(result.isAccepted() && result.shouldSwingHand())
-			swingHand.getSelected().swing(hand);
+			swingHand.swing(hand);
 
 		// reset sneak
 		((IKeyBinding)MC.options.sneakKey).resetPressedState();
@@ -401,7 +401,7 @@ private void openTradeScreen()
 
 		// swing hand
 		if(actionResult.isAccepted() && actionResult.shouldSwingHand())
-			swingHand.getSelected().swing(hand);
+			swingHand.swing(hand);
 
 		// set cooldown
 		MC.itemUseCooldown = 4;

diff --git a/src/main/java/net/wurstclient/hacks/TreeBotHack.java b/src/main/java/net/wurstclient/hacks/TreeBotHack.java
@@ -250,7 +250,7 @@ private boolean breakBlock(BlockPos pos)
 		// damage block and swing hand
 		if(MC.interactionManager.updateBlockBreakingProgress(pos,
 			params.side()))
-			swingHand.getSelected().swing(Hand.MAIN_HAND);
+			swingHand.swing(Hand.MAIN_HAND);
 
 		// update progress
 		overlay.updateProgress();

diff --git a/src/main/java/net/wurstclient/settings/SwingHandSetting.java b/src/main/java/net/wurstclient/settings/SwingHandSetting.java
@@ -34,6 +34,11 @@ public SwingHandSetting(String name, String description, SwingHand selected)
 		super(name, description, SwingHand.values(), selected);
 	}
 
+	public void swing(Hand hand)
+	{
+		getSelected().swing(hand);
+	}
+
 	public enum SwingHand
 	{
 		OFF("Off", hand -> {}),
@@ -44,8 +49,8 @@ public enum SwingHand
 
 		CLIENT("Client-side", hand -> MC.player.swingHand(hand));
 
-		private String name;
-		private Consumer<Hand> swing;
+		private final String name;
+		private final Consumer<Hand> swing;
 
 		private SwingHand(String name, Consumer<Hand> swing)
 		{