Added World Presets, Fixed End City Icons

Author: cev-api

README.md

@@ -6,17 +6,20 @@ Original Repo: https://github.com/xpple/SeedMapper/
 
 This project is a friendly, independent fork of Seedmapper. I have not proposed any improvements or features to the upstream but I am welcome to them incorporating my changes. I will sporatically maintain this project and re-base/sync with the upstream project.
 
-## Compiling 
+## Compiling & Running
 
 Original instructions do not apply. Clone and compile as normal. I have included the Cubiome and JExtract files already.
 
+As for running the mod, the main difference between this mod and upstream is that it will NOT function under Java 23, it must be on Java 21 with the enable preview flag. See below.
+
 ## Improvements
 
 ### Java 21
 Project now builds against Java 21 LTS, however, Minecraft/Fabric must have the flag ```--enable-preview``` added to the Java arguments. 
 
 This tells the JVM to accept preview bytecode and APIs. Functionally nothing else changes in Minecraft, Fabric or any of the other mods you have installed.
 
+
 ![Flag](https://i.imgur.com/rOsP2H0.png)
 
 ### Zoom
@@ -29,6 +32,13 @@ Around your player icon in the SeedMap there will be a little arrow showing you
 
 ![Arrow](https://i.imgur.com/pkodE8d.png)
 
+### World Presets
+
+If the server you're on uses anything other than the default world preset (Amplified, Superflat, Large Biomes, Single Biome) this will greatly change the world generation. Change the preset to match the server in order to produce an accurate seedmap.
+
+- /sm:preset list — show available presets  
+- /sm:preset set <id> — set SeedMapper’s preset 
+
 ### Seed Map Minimap
 
 - Run ``` /sm:minimap ``` to open a live SeedMap minimap in the top-left corner of the HUD.  
@@ -37,22 +47,21 @@ Around your player icon in the SeedMap there will be a little arrow showing you
 - The minimap:
   - Renders the same features you selected on the main map.
   - Tracks your current position in real time.
-  - Ideal for overlaying over Xaeros Minimap (See Screenshots).
+  - Ideal for overlaying over Xaeros Minimap (Default settings suits size 152).
 
 - Position & size:
   - Move it horizontally with ``` /sm:config SeedMapMinimapOffsetX ```
   - Move it vertically with ``` /sm:config SeedMapMinimapOffsetY ```
   - Change width with ``` /sm:config SeedMapMinimapWidth ```
   - Change height with ``` /sm:config SeedMapMinimapHeight ```
-  - Can be resized to cover other minimaps if needed.
 
 - Display options:
   - Rotate the map with the player’s facing using ``` /sm:config SeedMapMinimapRotateWithPlayer ```
   - Adjust zoom independently from the main map via ``` /sm:config SeedMapMinimapPixelsPerBiome ```
   - Scale feature icons with ``` /sm:config SeedMapMinimapIconScale ```
   - Fine tune the background opacity with ``` /sm:config SeedMapMinimapOpacity ``` without affecting icon readability.
 
-![Map1](https://i.imgur.com/gIGgOB7.png) ![Map2](https://i.imgur.com/rNwiWhy.png)
+![Map1](https://i.imgur.com/w5U6Aux.png) ![Map2](https://i.imgur.com/MXqXY5n.png)
 
 ### Memory Handling
 Added a config option ```/sm:config ClearSeedMapCachesOnClose``` to clear tiles, per‑world locations and any other relevant caches. When enabled, this prevents FPS dips from garbage collection on large caches after zooming out far and then closing the map. Opening the map again will result it in being loaded like its the first time, at smaller zoom levels this isn't a problem.
@@ -65,9 +74,9 @@ When hovering over location icons in the SeedMap it will display text telling yo
 ### Added Elytra/End Ship Locations
 ~~Can now find Elytra via locating End Ships with the locate command ```/sm:locate feature end_city_ship``` or simply selecting the Elytra icon in the SeedMap~~
 
-This has now been implemented by upstream. They have unified both End City Ships and End Cities together. I have utilised their change but kept my original Elytra icon, because we aren't going to the ships for anything else are we? The command ```/sm:locate feature end_city_ship``` still applies.
+This has now been implemented by upstream. They have unified both End City Ships and End Cities together. I have accepted this change but altered it to retain my Elytra icon, this allows you to explicitly look only for Elytras. The command ```/sm:locate feature end_city_ship``` also still applies.
 
-![Elytra](https://i.imgur.com/Zr2rBcN.png)
+![Elytra](https://i.imgur.com/fFxoFX4.png)
 
 ### Export SeedMap
 - Added **Export JSON** button on the top right of the SeedMap screen which will export all selected locations to a JSON

gradle.properties

@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 
 # Mod Properties
-mod_version=2.17.0
+mod_version=CevAPI-2.17.0
 maven_group=dev.xpple
-archives_base_name=seedmapper
+archives_base_name=SeedMapper
 
 # Minecraft properties
 minecraft_version=1.21.10

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

@@ -17,13 +17,16 @@
 import dev.xpple.seedmapper.command.commands.SeedMapCommand;
 import dev.xpple.seedmapper.command.commands.SourceCommand;
 import dev.xpple.seedmapper.command.commands.StopTaskCommand;
+import dev.xpple.seedmapper.command.commands.WorldPresetCommand;
 import dev.xpple.seedmapper.config.Configs;
 import dev.xpple.seedmapper.config.MapFeatureAdapter;
 import dev.xpple.seedmapper.config.SeedResolutionAdapter;
+
 import dev.xpple.seedmapper.render.RenderManager;
 import dev.xpple.seedmapper.seedmap.MapFeature;
 import dev.xpple.seedmapper.seedmap.SeedMapMinimapManager;
 import dev.xpple.seedmapper.util.SeedDatabaseHelper;
+import dev.xpple.seedmapper.world.WorldPresetManager;
 import dev.xpple.simplewaypoints.api.SimpleWaypointsAPI;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
@@ -78,6 +81,8 @@ public void onInitializeClient() {
             })
             .build();
 
+        WorldPresetManager.init();
+
         SimpleWaypointsAPI.getInstance().registerCommandAlias("sm:waypoint");
 
         SeedDatabaseHelper.fetchSeeds();
@@ -111,5 +116,6 @@ private static void registerCommands(CommandDispatcher<FabricClientCommandSource
         MinimapCommand.register(dispatcher);
         DiscordCommand.register(dispatcher);
         SampleCommand.register(dispatcher);
+        WorldPresetCommand.register(dispatcher);
     }
 }

src/main/java/dev/xpple/seedmapper/command/CustomClientCommandSource.java

@@ -8,6 +8,8 @@
 import dev.xpple.seedmapper.command.arguments.VersionArgument;
 import dev.xpple.seedmapper.config.Configs;
 import dev.xpple.seedmapper.util.SeedDatabaseHelper;
+import dev.xpple.seedmapper.world.WorldPreset;
+import dev.xpple.seedmapper.world.WorldPresetManager;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.SharedConstants;
 import net.minecraft.client.Minecraft;
@@ -156,4 +158,15 @@ public int getVersion() throws CommandSyntaxException {
         }
         return VersionArgument.version().parse(new StringReader(SharedConstants.getCurrentVersion().name()));
     }
+
+    public WorldPreset getWorldPreset() {
+        Object presetMeta = this.getMeta("world_preset");
+        if (presetMeta instanceof String presetId) {
+            WorldPreset preset = WorldPresetManager.findPreset(presetId);
+            if (preset != null) {
+                return preset;
+            }
+        }
+        return WorldPresetManager.activePreset();
+    }
 }

src/main/java/dev/xpple/seedmapper/command/arguments/DimensionArgument.java

@@ -35,6 +35,10 @@ public static int getDimension(CommandContext<FabricClientCommandSource> context
         return context.getArgument(name, Integer.class);
     }
 
+    public static Integer resolveDimensionId(String name) {
+        return DIMENSIONS.get(name);
+    }
+
     @Override
     public Integer parse(StringReader reader) throws CommandSyntaxException {
         int cursor = reader.getCursor();

src/main/java/dev/xpple/seedmapper/command/arguments/VersionArgument.java

@@ -142,6 +142,10 @@ public static int getVersion(CommandContext<FabricClientCommandSource> context,
         return context.getArgument(name, Integer.class);
     }
 
+    public static Integer resolveVersionId(String value) {
+        return VERSIONS.get(value);
+    }
+
     @Override
     public Integer parse(StringReader reader) throws CommandSyntaxException {
         int cursor = reader.getCursor();

src/main/java/dev/xpple/seedmapper/command/arguments/WorldPresetArgument.java

@@ -0,0 +1,49 @@
+package dev.xpple.seedmapper.command.arguments;
+
+import com.mojang.brigadier.StringReader;
+import com.mojang.brigadier.arguments.ArgumentType;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.suggestion.Suggestions;
+import com.mojang.brigadier.suggestion.SuggestionsBuilder;
+import dev.xpple.seedmapper.world.WorldPreset;
+import dev.xpple.seedmapper.world.WorldPresetManager;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.resources.ResourceLocation;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+import java.util.concurrent.CompletableFuture;
+
+public class WorldPresetArgument implements ArgumentType<String> {
+
+    private static final Collection<String> EXAMPLES = List.of("minecraft:default", "minecraft:superflat");
+
+    public static WorldPresetArgument worldPreset() {
+        return new WorldPresetArgument();
+    }
+
+    public static String getWorldPreset(CommandContext<FabricClientCommandSource> context, String name) {
+        return context.getArgument(name, String.class);
+    }
+
+    @Override
+    public String parse(StringReader reader) throws CommandSyntaxException {
+        ResourceLocation id = ResourceLocation.read(reader);
+        return id.toString();
+    }
+
+    @Override
+    public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
+        return SharedSuggestionProvider.suggest(WorldPresetManager.presets().stream()
+            .map(WorldPreset::id)
+            .map(ResourceLocation::toString), builder);
+    }
+
+    @Override
+    public Collection<String> getExamples() {
+        return EXAMPLES;
+    }
+}

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

@@ -21,6 +21,7 @@
 import dev.xpple.seedmapper.render.esp.EspStyle;
 import dev.xpple.seedmapper.util.ComponentUtils;
 import dev.xpple.seedmapper.util.SpiralLoop;
+import dev.xpple.seedmapper.world.WorldPreset;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
@@ -91,9 +92,10 @@ private static int highlightBlock(CustomClientCommandSource source, Pair<Integer
         int version = source.getVersion();
         int dimension = source.getDimension();
         long seed = source.getSeed().getSecond();
+        WorldPreset preset = source.getWorldPreset();
         try (Arena arena = Arena.ofConfined()) {
             MemorySegment generator = Generator.allocate(arena);
-            Cubiomes.setupGenerator(generator, version, 0);
+            Cubiomes.setupGenerator(generator, version, preset.generatorFlags());
             Cubiomes.applySeed(generator, dimension, seed);
             MemorySegment surfaceNoise = SurfaceNoise.allocate(arena);
             Cubiomes.initSurfaceNoise(surfaceNoise, dimension, seed);
@@ -301,7 +303,7 @@ private static int highlightCanyon(CustomClientCommandSource source, int canyonC
             if (CanyonCarverConfig.dim(ccc) != dimension) {
                 throw CommandExceptions.INVALID_DIMENSION_EXCEPTION.create();
             }
-            var biomeFunction = LocateCommand.getCarverBiomeFunction(arena, seed, dimension, version);
+            var biomeFunction = LocateCommand.getCarverBiomeFunction(arena, seed, dimension, version, source.getWorldPreset());
             return highlightCarver(source, chunkRange, Configs.CanyonESP, (chunkX, chunkZ) -> {
                 int biome = biomeFunction.applyAsInt(chunkX, chunkZ);
                 if (Cubiomes.isViableCanyonBiome(canyonCarver, biome) == 0) {
@@ -329,7 +331,7 @@ private static int highlightCave(CustomClientCommandSource source, int caveCarve
             if (CaveCarverConfig.dim(ccc) != dimension) {
                 throw CommandExceptions.INVALID_DIMENSION_EXCEPTION.create();
             }
-            var biomeFunction = LocateCommand.getCarverBiomeFunction(arena, seed, dimension, version);
+            var biomeFunction = LocateCommand.getCarverBiomeFunction(arena, seed, dimension, version, source.getWorldPreset());
             return highlightCarver(source, chunkRange, Configs.CaveESP, (chunkX, chunkZ) -> {
                 int biome = biomeFunction.applyAsInt(chunkX, chunkZ);
                 if (Cubiomes.isViableCaveBiome(caveCarver, biome) == 0) {

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

@@ -29,6 +29,7 @@
 import dev.xpple.seedmapper.util.SpiralSpliterator;
 import dev.xpple.seedmapper.util.TwoDTree;
 import dev.xpple.seedmapper.util.WorldIdentifier;
+import dev.xpple.seedmapper.world.WorldPreset;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.SectionPos;
@@ -104,8 +105,9 @@ private static int locateBiome(CustomClientCommandSource source, int biome) thro
             throw CommandExceptions.INVALID_DIMENSION_EXCEPTION.create();
         }
         try (Arena arena = Arena.ofConfined()) {
+            WorldPreset preset = source.getWorldPreset();
             MemorySegment generator = Generator.allocate(arena);
-            Cubiomes.setupGenerator(generator, source.getVersion(), 0);
+            Cubiomes.setupGenerator(generator, source.getVersion(), preset.generatorFlags());
             Cubiomes.applySeed(generator, dimension, source.getSeed().getSecond());
 
             BlockPos center = BlockPos.containing(source.getPosition());
@@ -130,6 +132,7 @@ private static int locateStructure(CustomClientCommandSource source, StructureAn
         try (Arena arena = Arena.ofConfined()) {
             int version = source.getVersion();
             int dimension = source.getDimension();
+            WorldPreset preset = source.getWorldPreset();
             int structure = structureAndPredicate.structure();
             MemorySegment structureConfig = StructureConfig.allocate(arena);
             int config = Cubiomes.getStructureConfig(structure, version, structureConfig);
@@ -142,7 +145,7 @@ private static int locateStructure(CustomClientCommandSource source, StructureAn
             long seed = source.getSeed().getSecond();
 
             MemorySegment generator = Generator.allocate(arena);
-            Cubiomes.setupGenerator(generator, version, 0);
+            Cubiomes.setupGenerator(generator, version, preset.generatorFlags());
             Cubiomes.applySeed(generator, dimension, seed);
 
             // currently only used for end cities
@@ -225,26 +228,26 @@ private static int locateStronghold(CustomClientCommandSource source) throws Com
             throw CommandExceptions.INVALID_DIMENSION_EXCEPTION.create();
         }
         int version = source.getVersion();
-
+        WorldPreset preset = source.getWorldPreset();
         long seed = source.getSeed().getSecond();
 
         BlockPos position = BlockPos.containing(source.getPosition());
 
-        TwoDTree tree = SeedMapScreen.strongholdDataCache.computeIfAbsent(new WorldIdentifier(seed, dimension, version), ignored -> calculateStrongholds(seed, dimension, version));
+        TwoDTree tree = SeedMapScreen.strongholdDataCache.computeIfAbsent(new WorldIdentifier(seed, dimension, version, preset.cacheKey()), ignored -> calculateStrongholds(seed, dimension, version, preset));
 
         BlockPos pos = tree.nearestTo(position.atY(0));
 
         source.getClient().schedule(() -> source.sendFeedback(Component.translatable("command.locate.feature.stronghold.success", ComponentUtils.formatXZ(pos.getX(), pos.getZ()))));
         return Command.SINGLE_SUCCESS;
     }
 
-    public static TwoDTree calculateStrongholds(long seed, int dimension, int version) {
+    public static TwoDTree calculateStrongholds(long seed, int dimension, int version, WorldPreset preset) {
         TwoDTree tree = new TwoDTree();
         try (Arena arena = Arena.ofConfined()) {
             MemorySegment strongholdIter = StrongholdIter.allocate(arena);
             Cubiomes.initFirstStronghold(arena, strongholdIter, version, seed);
             MemorySegment generator = Generator.allocate(arena);
-            Cubiomes.setupGenerator(generator, version, 0);
+            Cubiomes.setupGenerator(generator, version, preset.generatorFlags());
             Cubiomes.applySeed(generator, dimension, seed);
 
             final int count = version <= Cubiomes.MC_1_8() ? 3 : 128;
@@ -287,10 +290,11 @@ private static int locateLoot(CustomClientCommandSource source, int amount, Ench
         }
         int dimension = source.getDimension();
         long seed = source.getSeed().getSecond();
+        WorldPreset preset = source.getWorldPreset();
 
         try (Arena arena = Arena.ofConfined()) {
             MemorySegment generator = Generator.allocate(arena);
-            Cubiomes.setupGenerator(generator, version, 0);
+            Cubiomes.setupGenerator(generator, version, preset.generatorFlags());
             Cubiomes.applySeed(generator, dimension, seed);
 
             // currently only used for end cities
@@ -455,8 +459,9 @@ record StructureIterationState(MemorySegment structureConfig, StructureChecks.Ge
 
     private static int locateSpawn(CustomClientCommandSource source) throws CommandSyntaxException {
         try (Arena arena = Arena.ofConfined()) {
+            WorldPreset preset = source.getWorldPreset();
             MemorySegment generator = Generator.allocate(arena);
-            Cubiomes.setupGenerator(generator, source.getVersion(), 0);
+            Cubiomes.setupGenerator(generator, source.getVersion(), preset.generatorFlags());
             Cubiomes.applySeed(generator, source.getDimension(), source.getSeed().getSecond());
             MemorySegment pos = Cubiomes.getSpawn(arena, generator);
 
@@ -516,9 +521,10 @@ private static int locateCanyon(CustomClientCommandSource source) throws Command
         if (version < Cubiomes.MC_1_13()) {
             throw CommandExceptions.CANYON_WRONG_VERSION_EXCEPTION.create();
         }
+        WorldPreset preset = source.getWorldPreset();
         ChunkPos center = new ChunkPos(BlockPos.containing(source.getPosition()));
         try (Arena arena = Arena.ofConfined()) {
-            ToIntBiFunction<Integer, Integer> biomeFunction = getCarverBiomeFunction(arena, seed, dimension, version);
+            ToIntBiFunction<Integer, Integer> biomeFunction = getCarverBiomeFunction(arena, seed, dimension, version, preset);
             MemorySegment ccc = CanyonCarverConfig.allocate(arena);
             MemorySegment rnd = NativeAccess.allocate(arena, Cubiomes.C_LONG_LONG, 1);
             SpiralLoop.Coordinate pos = SpiralLoop.spiral(center.x, center.z, 6400, (chunkX, chunkZ) -> {
@@ -545,12 +551,12 @@ private static int locateCanyon(CustomClientCommandSource source) throws Command
         }
     }
 
-    static ToIntBiFunction<Integer, Integer> getCarverBiomeFunction(Arena arena, long seed, int dimension, int version) {
+    static ToIntBiFunction<Integer, Integer> getCarverBiomeFunction(Arena arena, long seed, int dimension, int version, WorldPreset preset) {
         if (version > Cubiomes.MC_1_17_1()) {
             return (chunkX, chunkZ) -> -1;
         }
         MemorySegment generator = Generator.allocate(arena);
-        Cubiomes.setupGenerator(generator, version, 0);
+        Cubiomes.setupGenerator(generator, version, preset.generatorFlags());
         Cubiomes.applySeed(generator, dimension, seed);
         return (chunkX, chunkZ) -> Cubiomes.getBiomeAt(generator, 4, chunkX << 2, 0, chunkZ << 2);
     }