Improved ESP

Author: cev-api

src/main/java/dev/xpple/seedmapper/SeedMapper.java

@@ -113,5 +113,7 @@ private static void registerCommands(CommandDispatcher<FabricClientCommandSource
         WorldPresetCommand.register(dispatcher);
         DiscordCommand.register(dispatcher);
         SampleCommand.register(dispatcher);
+        // ESP config command
+        dev.xpple.seedmapper.command.commands.EspConfigCommand.register(dispatcher);
     }
 }

src/main/java/dev/xpple/seedmapper/command/commands/EspConfigCommand.java

@@ -19,6 +19,7 @@
 import dev.xpple.seedmapper.config.Configs;
 import dev.xpple.seedmapper.feature.OreTypes;
 import dev.xpple.seedmapper.render.RenderManager;
+import dev.xpple.seedmapper.render.esp.EspStyle;
 import dev.xpple.seedmapper.util.ComponentUtils;
 import dev.xpple.seedmapper.util.SpiralLoop;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
@@ -169,7 +170,7 @@ private static int highlightBlock(CustomClientCommandSource source, Pair<Integer
                     .toList();
                 count[0] += blockOres.size();
                 source.getClient().schedule(() -> {
-                    RenderManager.drawBoxes(blockOres, colour);
+                    RenderManager.drawBoxes(blockOres, Configs.BlockHighlightESP, colour);
                     source.sendFeedback(Component.translatable("command.highlight.block.chunkSuccess", accent(String.valueOf(blockOres.size())), ComponentUtils.formatXZ(chunkX, chunkZ)));
                 });
 
@@ -229,7 +230,7 @@ private static int highlightOreVein(CustomClientCommandSource source, int chunkR
                     }
                     count[0] += positions.size();
                     int colour = BLOCKS.values().stream().filter(pair -> Objects.equals(block, pair.getFirst())).findAny().orElseThrow().getSecond();
-                    RenderManager.drawBoxes(positions, colour);
+                    RenderManager.drawBoxes(positions, Configs.OreVeinESP, colour);
                     if (block == Cubiomes.RAW_COPPER_BLOCK() || block == Cubiomes.RAW_IRON_BLOCK()) {
                         source.getClient().schedule(() -> source.sendFeedback(Component.translatable("command.highlight.oreVein.rawBlocks", ComponentUtils.formatXYZCollection(positions))));
                     }
@@ -279,7 +280,7 @@ private static int highlightTerrain(CustomClientCommandSource source, int chunkR
                 }
                 return false;
             });
-            RenderManager.drawBoxes(blocks, 0xFF_FF0000);
+            RenderManager.drawBoxes(blocks, Configs.TerrainESP, 0xFF_FF0000);
             return blocks.size();
         }
     }
@@ -302,7 +303,7 @@ private static int highlightCanyon(CustomClientCommandSource source, int canyonC
                 throw CommandExceptions.INVALID_DIMENSION_EXCEPTION.create();
             }
             var biomeFunction = LocateCommand.getCarverBiomeFunction(arena, seed, dimension, version);
-            return highlightCarver(source, chunkRange, (chunkX, chunkZ) -> {
+            return highlightCarver(source, chunkRange, Configs.CanyonESP, (chunkX, chunkZ) -> {
                 int biome = biomeFunction.applyAsInt(chunkX, chunkZ);
                 if (Cubiomes.isViableCanyonBiome(canyonCarver, biome) == 0) {
                     return null;
@@ -330,7 +331,7 @@ private static int highlightCave(CustomClientCommandSource source, int caveCarve
                 throw CommandExceptions.INVALID_DIMENSION_EXCEPTION.create();
             }
             var biomeFunction = LocateCommand.getCarverBiomeFunction(arena, seed, dimension, version);
-            return highlightCarver(source, chunkRange, (chunkX, chunkZ) -> {
+            return highlightCarver(source, chunkRange, Configs.CaveESP, (chunkX, chunkZ) -> {
                 int biome = biomeFunction.applyAsInt(chunkX, chunkZ);
                 if (Cubiomes.isViableCaveBiome(caveCarver, biome) == 0) {
                     return null;
@@ -340,7 +341,7 @@ private static int highlightCave(CustomClientCommandSource source, int caveCarve
         }
     }
 
-    private static int highlightCarver(CustomClientCommandSource source, int chunkRange, BiFunction<Integer, Integer, @Nullable MemorySegment> carverFunction) {
+    private static int highlightCarver(CustomClientCommandSource source, int chunkRange, EspStyle style, BiFunction<Integer, Integer, @Nullable MemorySegment> carverFunction) {
         ChunkPos center = new ChunkPos(BlockPos.containing(source.getPosition()));
         Set<BlockPos> blocks = new HashSet<>();
         SpiralLoop.spiral(center.x, center.z, chunkRange, (chunkX, chunkZ) -> {
@@ -357,7 +358,7 @@ private static int highlightCarver(CustomClientCommandSource source, int chunkRa
 
             return false;
         });
-        RenderManager.drawBoxes(blocks, 0xFF_FF0000);
+        RenderManager.drawBoxes(blocks, style, 0xFF_FF0000);
         source.getClient().schedule(() -> source.sendFeedback(Component.translatable("command.highlight.carver.success", accent(String.valueOf(blocks.size())))));
         return blocks.size();
     }

src/main/java/dev/xpple/seedmapper/command/commands/HighlightCommand.java

@@ -11,6 +11,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.Util;
+import dev.xpple.seedmapper.render.esp.EspStyle;
 
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -141,6 +142,28 @@ public static Component getDevModeComment() {
         return Component.translatable("config.devMode.comment");
     }
 
+    @Config(comment = "getEspTimeoutComment")
+    public static double EspTimeoutMinutes = 5.0D;
+
+    private static Component getEspTimeoutComment() {
+        return Component.translatable("config.espTimeout.comment");
+    }
+
+    @Config
+    public static EspStyle BlockHighlightESP = EspStyle.useCommandColorDefaults();
+
+    @Config
+    public static EspStyle OreVeinESP = EspStyle.useCommandColorDefaults();
+
+    @Config
+    public static EspStyle TerrainESP = EspStyle.useCommandColorDefaults();
+
+    @Config
+    public static EspStyle CanyonESP = EspStyle.useCommandColorDefaults();
+
+    @Config
+    public static EspStyle CaveESP = EspStyle.useCommandColorDefaults();
+
     @Config(setter = @Config.Setter("setWorldPresetId"))
     public static String WorldPresetId = "minecraft:default";
 

src/main/java/dev/xpple/seedmapper/config/Configs.java

@@ -21,10 +21,25 @@ private NoDepthLayer() {
             .build()
     );
 
+    // pipeline for filled quads (renders quads as two triangles each)
+    private static final RenderPipeline QUADS_NO_DEPTH_PIPELINE = RenderPipelines.register(
+        RenderPipeline.builder(RenderPipelines.DEBUG_FILLED_SNIPPET)
+            .withLocation(Identifier.fromNamespaceAndPath(SeedMapper.MOD_ID, "pipeline/quads_no_depth"))
+            .withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST)
+            .build()
+    );
+
     public static final RenderType LINES_NO_DEPTH_LAYER = RenderType.create(SeedMapper.MOD_ID + "_no_depth",
         RenderSetup.builder(LINES_NO_DEPTH_PIPELINE)
             .setLayeringTransform(LayeringTransform.VIEW_OFFSET_Z_LAYERING)
             .setOutputTarget(OutputTarget.ITEM_ENTITY_TARGET)
             .createRenderSetup()
     );
+
+    public static final RenderType QUADS_NO_DEPTH_LAYER = RenderType.create(SeedMapper.MOD_ID + "_quads_no_depth",
+        RenderSetup.builder(QUADS_NO_DEPTH_PIPELINE)
+            .setLayeringTransform(LayeringTransform.VIEW_OFFSET_Z_LAYERING)
+            .setOutputTarget(OutputTarget.ITEM_ENTITY_TARGET)
+            .createRenderSetup()
+    );
 }