Added Discord Presence and Capes. Updated Mapa and NiceWurst

Author: cev-api

build.gradle

@@ -43,6 +43,8 @@ base {
 }
 
 repositories {
+	mavenCentral()
+	
 	// Add repositories to retrieve artifacts from in here.
 	// You should only use this when depending on other mods because
 	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
@@ -78,6 +80,7 @@ dependencies {
 	// In other words, Wurst won't compile without this library,
 	// even though it's Minecraft that actually uses it.
 	implementation "com.google.code.findbugs:jsr305:3.0.2"
+	
 }
 
 fabricApi.configureTests {

gradle.properties

@@ -15,7 +15,7 @@ fabric_api_version=0.146.1+26.1.2
 
 # Mod Properties
 mod_version=v7.53.1-CevAPI-MC26.1.1
-fork_release_version=0.50
+fork_release_version=0.51
 maven_group=net.wurstclient
 archives_base_name=Wurst-Client
 mod_loader=Fabric

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

@@ -76,7 +76,7 @@ public final class MapaHack extends Hack
 	private final SliderSetting minimapSize =
 		new SliderSetting("Size", 220, 72, 256, 1, ValueDisplay.INTEGER);
 	private final SliderSetting minimapZoom =
-		new SliderSetting("Zoom", 2.0, 0.25, 10.0, 0.05, ValueDisplay.DECIMAL);
+		new SliderSetting("Zoom", 2.0, 0.25, 64.0, 0.05, ValueDisplay.DECIMAL);
 	private final SliderSetting minimapPosX =
 		new SliderSetting("Position X", 10, 0, 10000, 1, ValueDisplay.INTEGER);
 	private final SliderSetting minimapPosY =

src/main/java/net/wurstclient/mapa/config/XMapConfig.java

@@ -52,7 +52,7 @@ public final class XMapConfig
 	public void sanitize()
 	{
 		minimapSize = Math.max(72, Math.min(256, minimapSize));
-		minimapZoom = Math.max(0.25, Math.min(10.0, minimapZoom));
+		minimapZoom = Math.max(0.25, Math.min(64.0, minimapZoom));
 		minimapPosX = Math.max(0, minimapPosX);
 		minimapPosY = Math.max(0, minimapPosY);
 		playerNameScale = Math.max(0.5, Math.min(4.0, playerNameScale));

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

@@ -25,12 +25,21 @@
 import net.minecraft.client.resources.SkinManager;
 import net.minecraft.core.UUIDUtil;
 import net.minecraft.world.entity.player.PlayerSkin;
+import net.wurstclient.WurstClient;
 import net.wurstclient.util.json.JsonUtils;
 import net.wurstclient.util.json.WsonObject;
 
 @Mixin(SkinManager.class)
 public abstract class SkinManagerMixin
 {
+	@Unique
+	private static final String WURST_CAPES_URL =
+		"https://www.wurstclient.net/api/v1/capes.json";
+	
+	@Unique
+	private static final String FORK_CAPES_URL =
+		"https://gist.github.com/cev-api/dc3a20eb270a679d172724989f9e6d44/raw/capes.json";
+	
 	@Unique
 	private static HashMap<String, String> capes;
 
@@ -48,8 +57,14 @@ private void onFetchSkinTextures(UUID uuid,
 
 		try
 		{
+			if(!WurstClient.INSTANCE.getOtfs().wurstCapesOtf.isEnabled())
+			{
+				currentCape = null;
+				return;
+			}
+			
 			if(capes == null)
-				setupWurstCapes();
+				setupCapeMap();
 
 			if(capes.containsKey(uuidString))
 			{
@@ -85,44 +100,67 @@ private MinecraftProfileTexture modifyCapeTexture(
 	}
 
 	@Unique
-	private void setupWurstCapes()
+	private void setupCapeMap()
 	{
 		try
 		{
 			// assign map first to prevent endless retries if download fails
 			capes = new HashMap<>();
-			Pattern uuidPattern = Pattern.compile(
-				"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}");
+			loadCapeSource("Wurst",
+				JsonUtils.parseURLToObject(WURST_CAPES_URL));
+			loadForkCapeSource();
 
-			// download cape list from wurstclient.net
-			WsonObject rawCapes = JsonUtils.parseURLToObject(
-				"https://www.wurstclient.net/api/v1/capes.json");
+		}catch(Exception e)
+		{
+			System.err.println("[Wurst] Failed to load cape maps!");
 
-			// convert names to offline UUIDs
-			for(Entry<String, String> entry : rawCapes.getAllStrings()
-				.entrySet())
+			e.printStackTrace();
+		}
+	}
+	
+	@Unique
+	private void loadCapeSource(String sourceName, WsonObject rawCapes)
+	{
+		Pattern uuidPattern = Pattern.compile(
+			"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}");
+		
+		for(Entry<String, String> entry : rawCapes.getAllStrings().entrySet())
+		{
+			String name = entry.getKey();
+			String capeURL = entry.getValue();
+			
+			// check if name is already a UUID
+			if(uuidPattern.matcher(name).matches())
 			{
-				String name = entry.getKey();
-				String capeURL = entry.getValue();
-				
-				// check if name is already a UUID
-				if(uuidPattern.matcher(name).matches())
-				{
-					capes.put(name, capeURL);
-					continue;
-				}
-				
-				// convert name to offline UUID
-				String offlineUUID =
-					"" + UUIDUtil.createOfflinePlayerUUID(name);
-				capes.put(offlineUUID, capeURL);
+				capes.put(name, capeURL);
+				continue;
 			}
 
-		}catch(Exception e)
+			// convert names to offline UUIDs so the same list can be shared
+			// between cracked/offline and online-style account names.
+			String offlineUUID = "" + UUIDUtil.createOfflinePlayerUUID(name);
+			capes.put(offlineUUID, capeURL);
+		}
+		
+		System.out.println("[Wurst] Loaded " + rawCapes.getAllStrings().size()
+			+ " cape entries from " + sourceName + ".");
+	}
+	
+	@Unique
+	private void loadForkCapeSource()
+	{
+		String forkCapesUrl = FORK_CAPES_URL;
+		if(forkCapesUrl == null || forkCapesUrl.isBlank())
+			return;
+		
+		try
 		{
-			System.err
-				.println("[Wurst] Failed to load capes from wurstclient.net!");
+			loadCapeSource("fork", JsonUtils.parseURLToObject(forkCapesUrl));
 
+		}catch(Exception e)
+		{
+			System.err.println(
+				"[Wurst] Failed to load fork capes from " + forkCapesUrl + "!");
 			e.printStackTrace();
 		}
 	}

src/main/java/net/wurstclient/nicewurst/NiceWurstModule.java

@@ -56,8 +56,9 @@ public final class NiceWurstModule
 
 	private static final EnumMap<Category, Set<String>> ALLOWED_HACKS =
 		new EnumMap<>(Category.class);
-	private static final Set<String> ALLOWED_NAME_ONLY = Set.of("ClickGUI",
-		"Navigator", "AltGUI", "ChorusFruit", "MeasurementESP", "Towny");
+	private static final Set<String> ALLOWED_NAME_ONLY =
+		Set.of("ClickGUI", "Navigator", "AltGUI", "XPGUI", "ChorusFruit",
+			"MeasurementESP", "Towny");
 
 	private static final Set<String> HIDDEN_OTHER_FEATURES =
 		Set.of("Anti-Fingerprint");
@@ -84,8 +85,8 @@ public final class NiceWurstModule
 	{
 		ALLOWED_HACKS.put(Category.BLOCKS,
 			Set.of("AutoBuild", "AutoSign", "AutoTool", "BuildRandom",
-				"Excavator", "InstantBunker", "ScaffoldWalk", "TemplateTool",
-				"TargetPlace", "SilkOnly", "MusicAura"));
+				"Excavator", "HandNoClip", "InstantBunker", "ScaffoldWalk",
+				"TemplateTool", "TargetPlace", "SilkOnly", "MusicAura"));
 
 		ALLOWED_HACKS.put(Category.MOVEMENT, Set.of("BunnyHop", "AutoSprint",
 			"AutoWalk", "AutoSwim", "Dolphin", "SafeWalk", "Sneak", "InvWalk"));
@@ -97,7 +98,8 @@ public final class NiceWurstModule
 			Set.of("Breadcrumbs", "DurabilityHUD", "Fullbright", "HealthTags",
 				"MobHealth", "NameTags", "NewChunks", "NewerNewChunks",
 				"NoBackground", "NoFireOverlay", "NoVignette", "NoWeather",
-				"Freecam", "Waypoints", "HideWurst", "ElytraInfo", "Mapa"));
+				"Freecam", "Waypoints", "HideWurst", "ElytraInfo", "Mapa",
+				"BedrockStash"));
 
 		ALLOWED_HACKS.put(Category.CHAT,
 			Set.of("AutoChat", "Mention", "NoPlayerChat"));
@@ -109,7 +111,7 @@ public final class NiceWurstModule
 				"PacketRate", "Panic", "PortalGUI", "SafeTP", "UI-Utils",
 				"SeedMapperHelper", "TooManyHax", "HideModMenu", "GameStats",
 				"DamageDetect", "ClientChatOverlay", "CommandScanner",
-				"GlobalToggle"));
+				"GlobalToggle", "SpectatorMonitor"));
 
 		ALLOWED_HACKS.put(Category.ITEMS,
 			Set.of("AntiDrop", "AutoDisenchant", "AutoDrop", "AutoEat",

src/main/java/net/wurstclient/options/WurstOptionsScreen.java

@@ -207,17 +207,22 @@ private void addLinkButtons()
 		new WurstOptionsButton(54, 24, () -> primaryLabel, primaryTooltip,
 			b -> os.openUri(primaryUrl));
 
-		new WurstOptionsButton(54, 48, () -> "Wurst Website",
+		new WurstOptionsButton(54, 48, () -> "CevAPI Discord",
+			"§n§ldiscord.gg/wDgqxkAKFQ",
+			b -> os.openUri("https://discord.gg/wDgqxkAKFQ"));
+		
+		new WurstOptionsButton(54, 72, () -> "Wurst Website",
 			"§n§lWurstClient.net",
 			b -> os.openUri("https://www.wurstclient.net/options-website/"));
 
-		new WurstOptionsButton(54, 72, () -> "Wurst Wiki", "§n§lWurst.Wiki",
+		new WurstOptionsButton(54, 96, () -> "Wurst Wiki", "§n§lWurst.Wiki",
 			b -> os.openUri("https://www.wurstclient.net/options-wiki/"));
 
-		new WurstOptionsButton(54, 96, () -> "WurstForum", "§n§lWurstForum.net",
+		new WurstOptionsButton(54, 120, () -> "WurstForum",
+			"§n§lWurstForum.net",
 			b -> os.openUri("https://www.wurstclient.net/options-forum/"));
 
-		new WurstOptionsButton(54, 120, () -> "Twitter", "@Wurst_Imperium",
+		new WurstOptionsButton(54, 144, () -> "Twitter", "@Wurst_Imperium",
 			b -> os.openUri("https://www.wurstclient.net/options-twitter/"));
 
 	}

src/main/java/net/wurstclient/other_feature/OtfList.java

@@ -23,6 +23,7 @@ public final class OtfList
 	public final CleanUpOtf cleanUpOtf = new CleanUpOtf();
 	public final ConnectionLogOverlayOtf connectionLogOverlayOtf =
 		new ConnectionLogOverlayOtf();
+	public final DiscordRpcOtf discordRpcOtf = new DiscordRpcOtf();
 	public final ForceAllowChatsOtf forceAllowChatsOtf =
 		new ForceAllowChatsOtf();
 	public final DisableOtf disableOtf = new DisableOtf();
@@ -59,7 +60,7 @@ public OtfList()
 			wurstOptionsOtf.linkAdditionalSettings(disableOtf, commandPrefixOtf,
 				changelogOtf, connectionLogOverlayOtf, noTelemetryOtf,
 				noChatReportsOtf, forceAllowChatsOtf, vanillaSpoofOtf,
-				translationsOtf);
+				translationsOtf, wurstCapesOtf, discordRpcOtf);
 
 			for(Field field : OtfList.class.getDeclaredFields())
 			{

src/main/java/net/wurstclient/other_features/ConnectionLogOverlayOtf.java

@@ -16,8 +16,8 @@ public final class ConnectionLogOverlayOtf extends OtherFeature
 {
 	private final CheckboxSetting showConnectionLog =
 		new CheckboxSetting("Connection log overlay", true);
-	private final SliderSetting fontScale = new SliderSetting("Font size", 0.7,
-		0.5, 3.0, 0.05, ValueDisplay.DECIMAL);
+	private final SliderSetting fontScale = new SliderSetting(
+		"Overlay Font Size", 0.7, 0.5, 3.0, 0.05, ValueDisplay.DECIMAL);
 
 	public ConnectionLogOverlayOtf()
 	{