More Fixes for 26.2

Author: cev-api

README.md

@@ -1,4 +1,4 @@
-# Wurst Client v7.54 (MC26.1.2) - Modified by CevAPI 
+# Wurst Client v7.54 (MC26.2) - Modified by CevAPI 
 
 ![CevAPI Logo](https://i.imgur.com/4x8fvbp.jpeg)
 
@@ -11,7 +11,7 @@
 ### Download
 Pre-compiled copies are available on the [Release Page](https://github.com/cev-api/Wurst7-CevAPI/releases). 
 
-I have versions for [1.21.1](https://github.com/cev-api/Wurst7-CevAPI/tree/1.21.1), [1.21.8](https://github.com/cev-api/Wurst7-CevAPI/tree/1.21.8), [1.21.10](https://github.com/cev-api/Wurst7-CevAPI/tree/1.21.10), [1.21.11](https://github.com/cev-api/Wurst7-CevAPI/tree/1.21.11) but I only update and maintain the latest; [26.1.x.](https://github.com/cev-api/Wurst7-CevAPI/tree/master)
+I have versions for [1.21.1](https://github.com/cev-api/Wurst7-CevAPI/tree/1.21.1), [1.21.8](https://github.com/cev-api/Wurst7-CevAPI/tree/1.21.8), [1.21.10](https://github.com/cev-api/Wurst7-CevAPI/tree/1.21.10), [1.21.11](https://github.com/cev-api/Wurst7-CevAPI/tree/1.21.11), [26.1.2](https://github.com/cev-api/Wurst7-CevAPI/tree/26.1.2) but I only update and maintain the latest; [26.2.x.](https://github.com/cev-api/Wurst7-CevAPI/tree/master)
 
 Not happy with the supported versions? Download [ViaFabricPlus](https://modrinth.com/mod/viafabricplus)
 

build.gradle

@@ -92,6 +92,12 @@ fabricApi.configureTests {
 
 loom {
 	accessWidenerPath = file("src/main/resources/wurst.accesswidener")
+	mods {
+		wurst {
+			sourceSet sourceSets.main
+			sourceSet sourceSets.gametest
+		}
+	}
 
 	runs {
 		clientGameTest {

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

@@ -60,9 +60,9 @@ 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.", false);
+	private final CheckboxSetting showMultiplayerButton =
+		new CheckboxSetting("Show multiplayer button",
+			"Adds a shortcut to this panel to the Multiplayer screen.", false);
 
 	private final CheckboxSetting bypassResourcePack = new CheckboxSetting(
 		"Bypass resource pack",

src/main/java/net/wurstclient/altgui/AltGuiScreen.java

@@ -2058,8 +2058,6 @@ private List<Feature> getFilteredFeatures()
 			: searchText.toLowerCase(Locale.ROOT).trim();
 		boolean globalSearch = !query.isEmpty();
 		ArrayList<Feature> features = new ArrayList<>();
-		Feature performanceOverlay =
-			WurstClient.INSTANCE.getOtfs().performanceOverlayOtf;
 		List<Feature> clientSettingsFeatures = getClientSettingsFeatures();
 
 		for(Hack hack : WurstClient.INSTANCE.getHax().getAllHax())
@@ -2092,7 +2090,7 @@ private List<Feature> getFilteredFeatures()
 
 		for(OtherFeature otf : WurstClient.INSTANCE.getOtfs().getAllOtfs())
 		{
-			if(otf == null || otf == performanceOverlay)
+			if(otf == null)
 				continue;
 
 			if(HIDDEN_OTHER_FEATURES.contains(otf.getName()))
@@ -2112,7 +2110,7 @@ private List<Feature> getFilteredFeatures()
 			{
 				if(styleCategorySelected || enabledCategorySelected)
 					continue;
-				if(!selectedCategory.equalsIgnoreCase(Category.OTHER.getName()))
+				if(!matchesCategory(otf, selectedCategory))
 					continue;
 			}
 
@@ -2122,15 +2120,6 @@ private List<Feature> getFilteredFeatures()
 			features.add(otf);
 		}
 
-		if(!styleCategorySelected && !enabledCategorySelected)
-		{
-			boolean include = globalSearch
-				? matchesSearch(performanceOverlay, query)
-				: selectedCategory.equalsIgnoreCase(Category.OTHER.getName());
-			if(include && !isHiddenByTooManyHax(performanceOverlay))
-				features.add(performanceOverlay);
-		}
-		
 		if(globalSearch)
 			features.sort(buildSearchComparator(query));
 		else
@@ -2188,16 +2177,6 @@ private List<DisplayEntry> getUniversalSearchEntries(String query)
 			entries.add(new DisplayEntry(feature, false));
 		}
 
-		Feature performanceOverlay =
-			WurstClient.INSTANCE.getOtfs().performanceOverlayOtf;
-		if(!isHiddenByTooManyHax(performanceOverlay)
-			&& matchesSearch(performanceOverlay, query))
-		{
-			String key = performanceOverlay.getName().toLowerCase(Locale.ROOT);
-			if(added.add(key))
-				entries.add(new DisplayEntry(performanceOverlay, false));
-		}
-		
 		Comparator<Feature> comparator = buildSearchComparator(query);
 		entries.sort(Comparator
 			.comparing((DisplayEntry entry) -> entry.feature(), comparator));
@@ -2303,16 +2282,16 @@ private List<Feature> getClientSettingsFeatures()
 		return features;
 	}
 
-	private boolean matchesCategory(Hack hack, String categoryName)
+	private boolean matchesCategory(Feature feature, String categoryName)
 	{
 		if(categoryName.equalsIgnoreCase(Category.FAVORITES.getName()))
-			return hack.isFavorite();
+			return feature instanceof Hack hack && hack.isFavorite();
 
-		String hackCategory = hack.getCategoryName();
-		if(hackCategory == null || hackCategory.isBlank())
-			hackCategory = Category.OTHER.getName();
+		String featureCategory = feature.getCategoryName();
+		if(featureCategory == null || featureCategory.isBlank())
+			featureCategory = Category.OTHER.getName();
 
-		return hackCategory.equalsIgnoreCase(categoryName);
+		return featureCategory.equalsIgnoreCase(categoryName);
 	}
 
 	private List<String> getDisplayCategories()

src/main/java/net/wurstclient/clickgui/ClickGui.java

@@ -156,17 +156,8 @@ public void init()
 			window.add(new FeatureButton(f));
 		}
 
-		// Bridge selected category-less "Other Features" into Other so they
-		// remain discoverable in the hack-style category layout.
-		windowMap.get(net.wurstclient.Category.OTHER.getName())
-			.add(new FeatureButton(WURST.getOtfs().performanceOverlayOtf));
-		
-		// Keep the "Other" category usable: it contains a mixed bag of hacks,
-		// commands and other-features, so insertion order is not meaningful.
-		Window otherWindow =
-			windowMap.get(net.wurstclient.Category.OTHER.getName());
-		if(otherWindow != null)
-			sortWindowByFeatureName(otherWindow);
+		for(Window window : windowMap.values())
+			sortWindowByFeatureName(window);
 		// add favorites window entries (show favorites in the Favorites
 		// category). Respect TooManyHax hiding behaviour here as well so
 		// favorite hacks disabled by TooManyHax don't appear in ClickGUI.

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

@@ -23,7 +23,7 @@ public AutoBuildCmd()
 		super("autobuild",
 			"Selects an AutoBuild template by file name and enables AutoBuild.",
 			".autobuild <template>");
-		setCategory(Category.BLOCKS);
+		setCategory(Category.OTHER);
 	}
 
 	@Override

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

@@ -50,11 +50,11 @@ public final class AntiVoidHack extends Hack implements UpdateListener
 		"When triggered, enable Flight instead of rubberbanding/AirWalk.",
 		false);
 
-	private final CheckboxSetting autoEnableOnOutOfWorld =
-		new CheckboxSetting("Auto-enable on out_of_world",
-			"Automatically enables AntiVoid and rescues to the fixed void level"
-				+ " when taking out_of_world damage.",
-			true);
+	private final CheckboxSetting autoEnableOnOutOfWorld =
+		new CheckboxSetting("Auto-enable on out_of_world",
+			"Automatically enables AntiVoid and rescues to the fixed void level"
+				+ " when taking out_of_world damage.",
+			true);
 
 	private final SliderSetting lavaBufferBlocks = new SliderSetting(
 		"Lava buffer (blocks)", 2, 0, 12, 1, ValueDisplay.INTEGER);

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

@@ -90,8 +90,8 @@ public final class FreecamHack extends Hack implements UpdateListener,
 	private final FreecamInitialPosSetting initialPos =
 		new FreecamInitialPosSetting();
 
-	private final CheckboxSetting tracer = new CheckboxSetting("Tracer",
-		"description.wurst.setting.freecam.tracer", true);
+	private final CheckboxSetting tracer = new CheckboxSetting("Tracer",
+		"description.wurst.setting.freecam.tracer", true);
 
 	private final ColorSetting color =
 		new ColorSetting("Tracer color", Color.WHITE);

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

@@ -62,22 +62,22 @@ public final class HandNoClipHack extends Hack
 		"minecraft:red_shulker_box", "minecraft:shulker_box",
 		"minecraft:trapped_chest", "minecraft:white_shulker_box",
 		"minecraft:yellow_shulker_box");
-	private final CheckboxSetting enableOnTarget = new CheckboxSetting(
-		"Enable On Target",
-		WText.literal("Only noclip while aiming at a listed block."), true);
+	private final CheckboxSetting enableOnTarget =
+		new CheckboxSetting("Enable On Target",
+			WText.literal("Only noclip while aiming at a listed block."), true);
 
-	private final CheckboxSetting villagerThroughWalls = new CheckboxSetting(
+	private final CheckboxSetting villagerThroughWalls = new CheckboxSetting(
 		"Villagers Through Walls",
 		WText.literal(
 			"Allows interacting with villagers through walls when aiming at them."
 				+ " Only works with Enable On Target."),
-		true);
+		true);
 
-	private final CheckboxSetting bedrockPassthrough = new CheckboxSetting(
+	private final CheckboxSetting bedrockPassthrough = new CheckboxSetting(
 		"Bedrock Passthrough",
 		WText.literal("When enabled, aiming through bedrock can target"
 			+ " blocks behind it for breaking, interacting, and placement."),
-		true);
+		true);
 
 	private BlockPos targetBlock;
 	private boolean targetVillager;

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

@@ -29,24 +29,24 @@
 @SearchTags({"health tags"})
 public final class HealthTagsHack extends Hack implements GUIRenderListener
 {
-	private final CheckboxSetting heartsBelowName =
-		new CheckboxSetting("Hearts below name",
-			"Shows hearts on a second line below the nametag instead of"
-				+ " appending a numeric value to the name.",
-			true);
+	private final CheckboxSetting heartsBelowName =
+		new CheckboxSetting("Hearts below name",
+			"Shows hearts on a second line below the nametag instead of"
+				+ " appending a numeric value to the name.",
+			true);
 
 	private final CheckboxSetting ignoreNpcs = new CheckboxSetting(
 		"Ignore NPCs",
 		"Hides health tags/hearts for likely NPC players (tab-list mismatch, no tab entry, or NPC-style names).",
 		true);
 
-	private final CheckboxSetting showArmor = new CheckboxSetting("Show armor",
-		"Shows total armor as HUD-style armor icons above hearts.", true);
+	private final CheckboxSetting showArmor = new CheckboxSetting("Show armor",
+		"Shows total armor as HUD-style armor icons above hearts.", true);
 
-	private final CheckboxSetting showHeldItems = new CheckboxSetting(
-		"Show held items",
-		"Shows main-hand/offhand item icons, durability, and potion-effect color indicators.",
-		true);
+	private final CheckboxSetting showHeldItems = new CheckboxSetting(
+		"Show held items",
+		"Shows main-hand/offhand item icons, durability, and potion-effect color indicators.",
+		true);
 
 	private final EnumSetting<EntityHealthRenderer.DurabilityDisplayMode> durabilityDisplayMode =
 		new EnumSetting<>("Held item durability mode",
@@ -60,10 +60,10 @@ public final class HealthTagsHack extends Hack implements GUIRenderListener
 	private final SliderSetting scale = new SliderSetting("Scale",
 		"Scales the hearts below the nametag. 100% is the original size.", 1,
 		0.25, 3, 0.05, SliderSetting.ValueDisplay.PERCENTAGE);
-	private final CheckboxSetting scaleWithNameTagDistance =
-		new CheckboxSetting("Scale with nametag distance",
-			"Makes hearts grow with distance like nametags while still applying the Scale setting.",
-			true);
+	private final CheckboxSetting scaleWithNameTagDistance =
+		new CheckboxSetting("Scale with nametag distance",
+			"Makes hearts grow with distance like nametags while still applying the Scale setting.",
+			true);
 
 	private final java.util.Set<LivingEntity> entitiesToRender =
 		java.util.Collections.newSetFromMap(new java.util.WeakHashMap<>());