NoRender: map content (#4624)

MeteorDevelopment · Jun 6, 2024 · 94ee5c6 · 94ee5c6
1 parent 580ad3f
commit 94ee5c6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/main/java/meteordevelopment/meteorclient/mixin/MapRendererMixin.java b/src/main/java/meteordevelopment/meteorclient/mixin/MapRendererMixin.java
@@ -10,14 +10,23 @@
 import meteordevelopment.meteorclient.systems.modules.render.NoRender;
 import meteordevelopment.meteorclient.utils.misc.EmptyIterator;
 import net.minecraft.client.render.MapRenderer;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.map.MapDecoration;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(MapRenderer.MapTexture.class)
 public abstract class MapRendererMixin {
     @ModifyExpressionValue(method = "draw(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ZI)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/map/MapState;getDecorations()Ljava/lang/Iterable;"))
     private Iterable<MapDecoration> getIconsProxy(Iterable<MapDecoration> original) {
         return (Modules.get().get(NoRender.class).noMapMarkers()) ? EmptyIterator::new : original;
     }
+
+    @Inject(method = "draw(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ZI)V", at = @At("HEAD"), cancellable = true)
+    private void onDraw(MatrixStack matrices, VertexConsumerProvider vertexConsumers, boolean hidePlayerIcons, int light, CallbackInfo ci) {
+        if (Modules.get().get(NoRender.class).noMapContents()) ci.cancel();
+    }
 }
diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java
@@ -269,6 +269,13 @@ public class NoRender extends Module {
         .build()
     );
 
+    private final Setting<Boolean> noMapContents = sgWorld.add(new BoolSetting.Builder()
+        .name("map-contents")
+        .description("Disable rendering of maps.")
+        .defaultValue(false)
+        .build()
+    );
+
     private final Setting<BannerRenderMode> bannerRender = sgWorld.add(new EnumSetting.Builder<BannerRenderMode>()
         .name("banners")
         .description("Changes rendering of banners.")
@@ -517,6 +524,10 @@ public boolean noMapMarkers() {
         return isActive() && noMapMarkers.get();
     }
 
+    public boolean noMapContents() {
+        return isActive() && noMapContents.get();
+    }
+
     public BannerRenderMode getBannerRenderMode() {
         if (!isActive()) return BannerRenderMode.Everything;
         else return bannerRender.get();