Merge Upstream, Update Mapa

Author: cev-api

gradle.properties

@@ -11,7 +11,7 @@ loader_version=0.18.6
 loom_version=1.15-SNAPSHOT
 
 # Fabric API
-fabric_api_version=0.145.3+26.1.1
+fabric_api_version=0.145.4+26.1.1
 
 # Mod Properties
 mod_version=v7.53.1-CevAPI-MC26.1.1

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

@@ -80,6 +80,8 @@ public final class MapaHack extends Hack
 	private final CheckboxSetting noMap = new CheckboxSetting("No map",
 		"Disables terrain rendering and cache writes while keeping ESP icons positioned inside the map box.",
 		false);
+	private final CheckboxSetting espIconsEnabled =
+		new CheckboxSetting("Enable ESP icons", true);
 	private final SettingGroup mapEspGroup = new SettingGroup("ESP icons",
 		net.wurstclient.util.text.WText.literal(
 			"Controls which enabled ESP hacks are mirrored onto the map."),
@@ -178,6 +180,7 @@ public MapaHack()
 		setCategory(Category.RENDER);
 		addSetting(openWorldMapButton);
 		addSetting(noMap);
+		addSetting(espIconsEnabled);
 		if(NiceWurstModule.isActive())
 		{
 			mapEspGroup.addChildren(portalEspOnMap, playerEspOnMap,
@@ -314,6 +317,9 @@ private void renderMinimapOverlay(GuiGraphicsExtractor context,
 	private void renderMapEsp(GuiGraphicsExtractor context, float partialTicks,
 		XMapConfig cfg)
 	{
+		if(!espIconsEnabled.isChecked())
+			return;
+		
 		if(chestEspOnMap.isChecked() && WURST.getHax().chestEspHack.isEnabled())
 			renderChestMarkers(context, cfg, partialTicks);
 		if(workstationEspOnMap.isChecked()
@@ -620,6 +626,7 @@ public void onMouseUpdate(MouseUpdateEvent event)
 	public void resetToDefaults()
 	{
 		noMap.setChecked(false);
+		espIconsEnabled.setChecked(true);
 		minimapSize.setValue(220);
 		minimapZoom.setValue(2.0);
 		minimapIconSize.setValue(8);
@@ -869,6 +876,7 @@ private void updateMapSettingVisibility()
 	{
 		boolean mapVisible = !noMap.isChecked();
 		boolean niceWurst = NiceWurstModule.isActive();
+		boolean espVisible = mapVisible && espIconsEnabled.isChecked();
 		minimapSamples.setVisibleInGui(mapVisible);
 		rotateWithPlayer.setVisibleInGui(mapVisible);
 		undergroundMode.setVisibleInGui(mapVisible);
@@ -897,13 +905,14 @@ private void updateMapSettingVisibility()
 		waterDetail.setVisibleInGui(mapVisible);
 		waterOpacity.setVisibleInGui(mapVisible);
 		chunkRefreshAggression.setVisibleInGui(mapVisible);
-		chestEspOnMap.setVisibleInGui(mapVisible && !niceWurst);
-		workstationEspOnMap.setVisibleInGui(mapVisible && !niceWurst);
-		signEspOnMap.setVisibleInGui(mapVisible && !niceWurst);
-		portalEspOnMap.setVisibleInGui(mapVisible);
-		playerEspOnMap.setVisibleInGui(mapVisible);
-		logoutSpotsOnMap.setVisibleInGui(mapVisible);
-		bedEspOnMap.setVisibleInGui(mapVisible && !niceWurst);
+		mapEspGroup.setVisibleInGui(espVisible);
+		chestEspOnMap.setVisibleInGui(espVisible && !niceWurst);
+		workstationEspOnMap.setVisibleInGui(espVisible && !niceWurst);
+		signEspOnMap.setVisibleInGui(espVisible && !niceWurst);
+		portalEspOnMap.setVisibleInGui(espVisible);
+		playerEspOnMap.setVisibleInGui(espVisible);
+		logoutSpotsOnMap.setVisibleInGui(espVisible);
+		bedEspOnMap.setVisibleInGui(espVisible && !niceWurst);
 	}
 
 	private static boolean isEditorScreen(Screen screen)
@@ -937,6 +946,8 @@ public void renderFullscreenMapEsp(GuiGraphicsExtractor context, int mapX,
 	{
 		if(MC.player == null || MC.level == null)
 			return;
+		if(!espIconsEnabled.isChecked())
+			return;
 
 		context.enableScissor(mapX, mapY, mapX + drawWidth, mapY + drawHeight);
 		try