Updated Presets, Fixed TooManyHax

Author: cev-api

README.md

@@ -442,6 +442,7 @@ I did not, nor could I copy their code directly as most are Meteor based mods. S
 - Lets you delete presets
 - Presets are stored under ```.minecraft/wurst/presets/<name>``` for easy backup or sharing
 - Accessible through UI Settings in the ClickUI/Navigator or through the Wurst Options menu mixin
+- Includes a recommended default if no other preset exists
 
 ### Anticheat Detector
 - Watches server behavior and packets to estimate if anti-cheats are present and active

src/main/java/net/wurstclient/WurstClient.java

@@ -95,6 +95,14 @@ public void initialize()
 		IMC = (IMinecraftClient)MC;
 		wurstFolder = createWurstFolder();
 		presetManager = new PresetManager(this, wurstFolder);
+		try
+		{
+			presetManager.seedBundledPresetIfNone("Recommended Default");
+		}catch(IOException e)
+		{
+			System.out.println("Couldn't seed bundled preset.");
+			e.printStackTrace();
+		}
 
 		Path analyticsFile = wurstFolder.resolve("analytics.json");
 		plausible = new PlausibleAnalytics(analyticsFile);

src/main/java/net/wurstclient/clickgui/screens/ClickGuiScreen.java

@@ -94,6 +94,7 @@ public void renderBackground(GuiGraphics context, int mouseX, int mouseY,
 	public void removed()
 	{
 		gui.clearKeyboardInput();
+		gui.init();
 		super.removed();
 	}
 }

src/main/java/net/wurstclient/commands/TargetPlaceCmd.java

@@ -7,7 +7,6 @@
  */
 package net.wurstclient.commands;
 
-import net.wurstclient.Category;
 import net.wurstclient.WurstClient;
 import net.wurstclient.command.CmdException;
 import net.wurstclient.command.CmdSyntaxError;
@@ -21,7 +20,6 @@ public TargetPlaceCmd()
 	{
 		super("targetplace", "Selects a block for TargetPlace or unselects it.",
 			".targetplace");
-		setCategory(Category.BLOCKS);
 	}
 
 	@Override

src/main/java/net/wurstclient/hacks/TooManyHaxHack.java

@@ -24,6 +24,7 @@
 import org.lwjgl.glfw.GLFW;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.input.MouseButtonEvent;
+import net.wurstclient.WurstClient;
 import net.wurstclient.Category;
 import net.wurstclient.DontBlock;
 import net.wurstclient.Feature;
@@ -32,6 +33,7 @@
 import net.wurstclient.clickgui.ClickGui;
 import net.wurstclient.clickgui.ClickGuiIcons;
 import net.wurstclient.clickgui.Component;
+import net.wurstclient.clickgui.screens.ClickGuiScreen;
 import net.wurstclient.hack.Hack;
 import net.wurstclient.keybinds.PossibleKeybind;
 import net.wurstclient.settings.Setting;
@@ -90,15 +92,8 @@ private void disableBlockedHacks()
 
 			((Hack)feature).setEnabled(false);
 		}
-		// Refresh ClickGUI so hacks disabled by TooManyHax are hidden there
-		try
-		{
-			if(WURST.getGui() != null)
-				WURST.getGui().init();
-		}catch(Exception e)
-		{
-			// ignore GUI refresh failures
-		}
+		// Refresh ClickGUI so hacks disabled by TooManyHax are hidden there.
+		refreshClickGui();
 	}
 
 	public ArrayList<Path> listProfiles()
@@ -148,14 +143,7 @@ public void setBlocked(Feature feature, boolean blocked)
 			blockedFeatures.remove(feature);
 
 		file.save();
-		try
-		{
-			if(WURST.getGui() != null)
-				WURST.getGui().init();
-		}catch(Exception e)
-		{
-			// ignore GUI refresh failures
-		}
+		refreshClickGui();
 	}
 
 	public void blockAll()
@@ -179,42 +167,21 @@ public void blockAll()
 			.sort(Comparator.comparing(f -> f.getName().toLowerCase()));
 
 		file.save();
-		try
-		{
-			if(WURST.getGui() != null)
-				WURST.getGui().init();
-		}catch(Exception e)
-		{
-			// ignore GUI refresh failures
-		}
+		refreshClickGui();
 	}
 
 	public void unblockAll()
 	{
 		blockedFeatures.clear();
 		file.save();
-		try
-		{
-			if(WURST.getGui() != null)
-				WURST.getGui().init();
-		}catch(Exception e)
-		{
-			// ignore GUI refresh failures
-		}
+		refreshClickGui();
 	}
 
 	@Override
 	protected void onDisable()
 	{
 		// Rebuild ClickGUI so previously hidden hacks reappear
-		try
-		{
-			if(WURST.getGui() != null)
-				WURST.getGui().init();
-		}catch(Exception e)
-		{
-			// ignore GUI refresh failures
-		}
+		refreshClickGui();
 	}
 
 	public List<Feature> getBlockedFeatures()
@@ -420,4 +387,22 @@ public int getDefaultHeight()
 			return 110;
 		}
 	}
+	
+	private void refreshClickGui()
+	{
+		try
+		{
+			if(WURST.getGui() == null)
+				return;
+			
+			if(WurstClient.MC != null
+				&& WurstClient.MC.screen instanceof ClickGuiScreen)
+				return;
+			
+			WURST.getGui().init();
+		}catch(Exception e)
+		{
+			// ignore GUI refresh failures
+		}
+	}
 }

src/main/java/net/wurstclient/presets/PresetManager.java

@@ -8,6 +8,7 @@
 package net.wurstclient.presets;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
@@ -66,6 +67,46 @@ public void savePreset(String name) throws IOException
 		copyCurrentFilesToPreset(presetFolder);
 	}
 
+	public void seedBundledPresetIfNone(String name) throws IOException
+	{
+		if(name == null || name.isBlank())
+			return;
+		
+		if(!listPresets().isEmpty())
+			return;
+		
+		installBundledPreset(name);
+	}
+	
+	public void installBundledPreset(String name) throws IOException
+	{
+		if(name == null || name.isBlank())
+			return;
+		
+		Path presetFolder = getPresetFolder(name);
+		if(Files.isDirectory(presetFolder))
+			return;
+		
+		boolean copiedAny = false;
+		for(String fileName : PRESET_FILES)
+		{
+			String resourcePath = "/wurst/presets/" + name + "/" + fileName;
+			try(InputStream in =
+				PresetManager.class.getResourceAsStream(resourcePath))
+			{
+				if(in == null)
+					continue;
+				
+				if(!copiedAny)
+					Files.createDirectories(presetFolder);
+				
+				Files.copy(in, presetFolder.resolve(fileName),
+					StandardCopyOption.REPLACE_EXISTING);
+				copiedAny = true;
+			}
+		}
+	}
+	
 	public void loadPreset(String name) throws IOException
 	{
 		Path presetFolder = getPresetFolder(name);

src/main/resources/wurst/presets/Recommended Default/enabled-hacks.json

@@ -0,0 +1,54 @@
+[
+  "AntiBlast",
+  "AntiBlind",
+  "AntiCheatDetect",
+  "AntiDrop",
+  "AntiEntityPush",
+  "AntiKnockback",
+  "AntiWaterPush",
+  "AutoRespawn",
+  "AutoTool",
+  "AutoTotem",
+  "BeaconExploit",
+  "BedESP",
+  "Breadcrumbs",
+  "CheatDetector",
+  "ChestESP",
+  "CoordLogger",
+  "Criticals",
+  "EnchantmentHandler",
+  "Fullbright",
+  "HealthTags",
+  "ItemESP",
+  "ItemHandler",
+  "LogoutSpots",
+  "MaceDMG",
+  "MobESP",
+  "NameTags",
+  "NoBackground",
+  "NoFall",
+  "NoFog",
+  "NoLevitation",
+  "NoOverlay",
+  "NoShieldOverlay",
+  "NoSlowdown",
+  "NoWeather",
+  "NoWeb",
+  "Outreach",
+  "PearlESP",
+  "PlayerESP",
+  "PortalESP",
+  "PortalGUI",
+  "QuickShulker",
+  "Reach",
+  "RedstoneESP",
+  "SignESP",
+  "SignFramePT",
+  "SnowShoe",
+  "SpearAssist",
+  "TridentESP",
+  "TrueSight",
+  "Waypoints",
+  "WorkstationESP",
+  "XCarry"
+]

src/main/resources/wurst/presets/Recommended Default/favourites.json

@@ -0,0 +1,22 @@
+[
+  "AutoTotem",
+  "BedESP",
+  "Breadcrumbs",
+  "ChestESP",
+  "Flight",
+  "HandNoClip",
+  "ItemESP",
+  "LavaWaterESP",
+  "MobESP",
+  "MobSearch",
+  "NoFall",
+  "NoShieldOverlay",
+  "OpenWaterESP",
+  "PlayerESP",
+  "PortalESP",
+  "RedstoneESP",
+  "Search",
+  "SignESP",
+  "Waypoints",
+  "X-Ray"
+]

src/main/resources/wurst/presets/Recommended Default/keybinds.json

@@ -0,0 +1,27 @@
+{
+  "key.keyboard.apostrophe": ".waypoints",
+  "key.keyboard.b": "fastplace;fastbreak",
+  "key.keyboard.c": "fullbright",
+  "key.keyboard.g": "flight",
+  "key.keyboard.h": "say /home",
+  "key.keyboard.j": "jesus",
+  "key.keyboard.k": "multiaura",
+  "key.keyboard.keypad.0": "HandNoClip",
+  "key.keyboard.keypad.1": "PacketDelay",
+  "key.keyboard.keypad.5": ".say /sm:seedmap",
+  "key.keyboard.keypad.7": "Blink",
+  "key.keyboard.keypad.8": "SafeTP",
+  "key.keyboard.keypad.9": ".setcheckbox noslowdown no_water_slowdown toggle",
+  "key.keyboard.keypad.add": "Panic",
+  "key.keyboard.keypad.decimal": "panic restore",
+  "key.keyboard.left.bracket": "ChestSearch",
+  "key.keyboard.menu": "clickgui",
+  "key.keyboard.n": "nuker",
+  "key.keyboard.r": "multiaura",
+  "key.keyboard.right.bracket": ".setcheckbox breadcrumbs paused toggle",
+  "key.keyboard.right.shift": "navigator",
+  "key.keyboard.semicolon": "itemhandler gui",
+  "key.keyboard.u": "freecam",
+  "key.keyboard.x": "x-ray",
+  "key.keyboard.y": "chestesp"
+}