Updated To Suit Upstream Changes

Author: cev-api

README.md

@@ -1,10 +1,10 @@
-# Seedmapper 2.18.x (MC1.21.11) - Modified by CevAPI
+# Seedmapper 2.19.x (MC1.21.11) - Modified by CevAPI
 
 Original Repo: https://github.com/xpple/SeedMapper/
 
 ## Relationship to upstream
 
-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.
+This project is a friendly, independent fork of Seedmapper. I have only proposed one feature to the upstream, which was [accepted](https://github.com/xpple/SeedMapper/commit/fb3a3bd0b2d657ac54b35c39fffa990e02b35da0), but I am welcome to them incorporating further changes. I will sporatically maintain this project and re-base/sync with the upstream project.
 
 ## Compiling & Running
 
@@ -26,7 +26,9 @@ This change was accepted upstream, however in my fork I have adjusted the size o
 
 ### World Presets
 
-If the server you're on uses anything other than the default world preset (Large Biomes, Single Biome, ~~Amplified~~, ~~Superflat~~) this will greatly change the world generation. Change the preset to match the server in order to produce an accurate seedmap. 
+This has been implemented by upstream, but my way does not require you to input the seed again. Both methods are available to use in this fork.
+
+If the server you're on uses anything other than the default world preset (Large Biomes, Single Biome, No Beta Ocean, Force Ocean Variants, ~~Amplified~~, ~~Superflat~~) this will greatly change the world generation. Change the preset to match the server in order to produce an accurate seedmap. 
 
 Note that Amplified and Superflat biomes are not implemented yet and are placeholders.
 
@@ -35,7 +37,9 @@ Note that Amplified and Superflat biomes are not implemented yet and are placeho
 
 ### Seed Map Minimap
 
-This is soon to be accepted by upstream!
+This has been implemented in the [upstream](https://github.com/xpple/SeedMapper/commit/fb3a3bd0b2d657ac54b35c39fffa990e02b35da0)!
+
+My fork still remains different, has different commands and retains the opacity functionality.
 
 - Run ``` /sm:minimap ``` to open a live SeedMap minimap in the top-left corner of the HUD.  
   - Use ``` /sm:minimap on/off ``` or  to explicitly control whether it is shown.
@@ -96,6 +100,9 @@ Can now export the entire loot table for the map you're viewing by clicking ```E
 Exported data will be located in ```SeedMapper/loot/<Server IP>_<Seed>-<Date/Time>.json```
 
 ### Auto Apply SeedCracker Seed
-If the server you're in already has a seed in the database it will be auto applied and saved.
+If the server you're in already has a seed in the database, or it has just been cracked it will be auto applied and saved. 
 
 You can enable/disable this with ```/sm:config AutoApplySeedCrackerSeed true/false```
+
+### Notes
+If using the original SeedMapper after using my fork you must erase my ```config.json``` first due to the mismatch of settings.

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 
 # Mod Properties
-mod_version=2.18.1-CevAPI
+mod_version=2.19.0-CevAPI
 maven_group=dev.xpple
 archives_base_name=SeedMapper
 

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

@@ -34,14 +34,12 @@
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-import dev.xpple.seedmapper.command.CustomClientCommandSource;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.commands.CommandBuildContext;
-import net.fabricmc.loader.api.FabricLoader;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -88,10 +86,10 @@ public void onInitializeClient() {
 
         SeedDatabaseHelper.fetchSeeds();
 
-        KeyMapping keyMapping = KeyBindingHelper.registerKeyBinding(new KeyMapping("key.seedMap", InputConstants.KEY_M, KeyMapping.Category.GAMEPLAY));
+        KeyMapping seedMapKeyMapping = KeyBindingHelper.registerKeyBinding(new KeyMapping("key.seedMap", InputConstants.KEY_M, KeyMapping.Category.GAMEPLAY));
         KeyMapping minimapKeyMapping = KeyBindingHelper.registerKeyBinding(new KeyMapping("key.seedMapMinimap", InputConstants.KEY_COMMA, KeyMapping.Category.GAMEPLAY));
         ClientTickEvents.END_CLIENT_TICK.register(minecraft -> {
-            while (keyMapping.consumeClick()) {
+            while (seedMapKeyMapping.consumeClick()) {
                 minecraft.player.connection.sendCommand("sm:seedmap");
             }
             while (minimapKeyMapping.consumeClick()) {

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

@@ -22,6 +22,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.permissions.PermissionSet;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.dimension.DimensionType;
 import net.minecraft.world.phys.Vec2;
 import net.minecraft.world.phys.Vec3;
 import org.jspecify.annotations.Nullable;
@@ -156,11 +157,7 @@ public int getDimension() throws CommandSyntaxException {
             return DimensionArgument.dimension().parse(new StringReader(this.getWorld().dimension().identifier().getPath()));
         } catch (CommandSyntaxException _) {
         }
-        return switch (this.getWorld().dimensionType().skybox()) {
-            case NONE -> Cubiomes.DIM_NETHER();
-            case OVERWORLD -> Cubiomes.DIM_OVERWORLD();
-            case END -> Cubiomes.DIM_END();
-        };
+        return inferDimension(this.getWorld().dimensionType());
     }
 
     public int getVersion() throws CommandSyntaxException {
@@ -185,4 +182,12 @@ public int getGeneratorFlags() throws CommandSyntaxException {
         }
         return WorldPresetManager.activePreset().generatorFlags();
     }
+
+    public static int inferDimension(DimensionType dimensionType) {
+        return switch (dimensionType.skybox()) {
+            case NONE -> Cubiomes.DIM_NETHER();
+            case OVERWORLD -> Cubiomes.DIM_OVERWORLD();
+            case END -> Cubiomes.DIM_END();
+        };
+    }
 }

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

@@ -83,9 +83,7 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
         targetArgNode.then(literal("reset")
             .executes(ctx -> executeReset(ctx, getTargetArgument(ctx, "target"))));
         modRoot.addChild(targetArgNode.build());
-        for (String literalName : new String[]{"Zoom", "zoom"}) {
-            modRoot.addChild(buildZoomLiteral(literalName).build());
-        }
+        modRoot.addChild(buildZoomLiteral("Zoom").build());
     }
 
     private static void registerDirectSmConfig(CommandDispatcher<FabricClientCommandSource> dispatcher) {
@@ -104,9 +102,7 @@ private static void registerDirectSmConfig(CommandDispatcher<FabricClientCommand
         targetArgNode.then(literal("reset")
             .executes(ctx -> executeReset(ctx, getTargetArgument(ctx, "target"))));
         smRoot.then(targetArgNode);
-        for (String literalName : new String[]{"zoom", "Zoom"}) {
-            smRoot.then(buildZoomLiteral(literalName));
-        }
+        smRoot.then(buildZoomLiteral("Zoom"));
         // esptimeout top-level alias
         smRoot.then(literal("esptimeout")
             .executes(ctx -> {

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

@@ -274,19 +274,20 @@ private static int highlightTerrain(CustomClientCommandSource source, int chunkR
             Set<BlockPos> blocks = new HashSet<>();
             SequenceLayout columnLayout = MemoryLayout.sequenceLayout(384, Cubiomes.C_INT);
             MemorySegment blockStates = arena.allocate(columnLayout, (long) blockW * blockH);
-            Cubiomes.generateRegion(params, minChunkX, minChunkZ, chunkW, chunkH, blockStates, MemorySegment.NULL, 0);
+            MemorySegment heights = arena.allocate(Cubiomes.C_INT, (long) blockW * blockH);
+            Cubiomes.generateRegion(params, minChunkX, minChunkZ, chunkW, chunkH, blockStates, heights, 1);
 
             for (int relX = 0; relX < blockW; relX++) {
                 int x = minX + relX;
                 for (int relZ = 0; relZ < blockH; relZ++) {
                     int z = minZ + relZ;
-                    int columnIdx = (relX * blockH + relZ) * 384;
-                    for (int y = -64; y < 320; y++) {
-                        int block = blockStates.getAtIndex(Cubiomes.C_INT, columnIdx + y + 64);
-                        if (block == 1) {
-                            blocks.add(new BlockPos(x, y, z));
-                        }
+                    int columnIndex = relX * blockH + relZ;
+                    int stored = heights.getAtIndex(Cubiomes.C_INT, columnIndex);
+                    if (stored <= -64) {
+                        continue;
                     }
+                    int surfaceY = stored - 1 - 64;
+                    blocks.add(new BlockPos(x, surfaceY, z));
                 }
             }
             RenderManager.drawBoxes(blocks, Configs.TerrainESP, 0xFF_FF0000);

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

@@ -53,25 +53,12 @@ private static int listPresets(CustomClientCommandSource source) {
     }
 
     private static int setPreset(CustomClientCommandSource source, String presetId) {
-        if (!WorldPresetManager.selectPreset(presetId)) {
+        WorldPreset preset = WorldPresetManager.findPreset(presetId);
+        if (preset == null || !Configs.applyWorldPreset(preset.id().toString(), true)) {
             source.sendError(Component.translatable("command.worldpreset.unknown", presetId));
             return 0;
         }
-        Configs.WorldPresetId = presetId;
-        Configs.save();
-        WorldPreset preset = WorldPresetManager.activePreset();
-        source.sendFeedback(Component.translatable("command.worldpreset.set", accent(preset.displayName().getString())));
-        // also send a literal confirmation (fallback if translation missing) and refresh minimap
         source.sendFeedback(Component.literal("Preset set: " + preset.displayName().getString()));
-        try {
-            dev.xpple.seedmapper.seedmap.SeedMapMinimapManager.refreshIfOpenWithGeneratorFlags(preset.generatorFlags());
-        } catch (Throwable ignored) {}
-        try {
-            dev.xpple.seedmapper.seedmap.SeedMapScreen.clearCachesForPresetChange();
-        } catch (Throwable ignored) {}
-        try {
-            dev.xpple.seedmapper.seedmap.SeedMapMinimapManager.debugNotifyPreset();
-        } catch (Throwable ignored) {}
         return Command.SINGLE_SUCCESS;
     }
 }

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

@@ -7,9 +7,11 @@
 import dev.xpple.seedmapper.SeedMapper;
 import dev.xpple.seedmapper.command.arguments.SeedResolutionArgument;
 import dev.xpple.seedmapper.seedmap.MapFeature;
+import dev.xpple.seedmapper.seedmap.SeedMapMinimapManager;
 import dev.xpple.seedmapper.seedmap.SeedMapScreen;
 import dev.xpple.seedmapper.util.ComponentUtils;
 import dev.xpple.seedmapper.util.SeedIdentifier;
+import dev.xpple.seedmapper.world.WorldPresetManager;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
@@ -33,11 +35,14 @@ public static void save() {
         Configs.CONFIG_REF.get().save();
     }
 
-    @Config(chatRepresentation = "displaySeed")
+    @Config(chatRepresentation = "displaySeed", setter = @Config.Setter("setSeedIdentifier"))
     public static SeedIdentifier Seed = null;
     private static Component displaySeed() {
         return ComponentUtils.formatSeed(Seed);
     }
+    private static void setSeedIdentifier(SeedIdentifier seed) {
+        updateSeedValue(seed);
+    }
 
     @Config(putter = @Config.Putter("none"), adder = @Config.Adder(value = "addSavedSeed", type = SeedIdentifier.class), chatRepresentation = "displaySavedSeeds")
     public static Map<String, SeedIdentifier> SavedSeeds = new HashMap<>();
@@ -81,7 +86,7 @@ public static void applySeedForCurrentServer(long seed, boolean storeAsSavedSeed
             changed = true;
         }
         if (!Objects.equals(Seed, identifier)) {
-            Seed = identifier;
+            updateSeedValue(identifier);
             changed = true;
         }
         if (changed) {
@@ -239,19 +244,15 @@ public static Component getDevModeComment() {
     public static String WorldPresetId = "minecraft:default";
 
     private static void setWorldPresetId(String presetId) {
-        WorldPresetId = presetId;
-        try {
-            dev.xpple.seedmapper.world.WorldPresetManager.selectPreset(presetId);
-            // refresh minimap if open so it picks up new preset
-            try {
-                dev.xpple.seedmapper.seedmap.SeedMapMinimapManager.refreshIfOpenWithGeneratorFlags(dev.xpple.seedmapper.world.WorldPresetManager.activePreset().generatorFlags());
-            } catch (Throwable ignored) {
-            }
-            try {
-                dev.xpple.seedmapper.seedmap.SeedMapScreen.clearCachesForPresetChange();
-            } catch (Throwable ignored) {}
-        } catch (Throwable ignored) {
+        applyWorldPresetInternal(presetId);
+    }
+
+    public static boolean applyWorldPreset(String presetId, boolean saveConfig) {
+        boolean applied = applyWorldPresetInternal(presetId);
+        if (applied && saveConfig) {
+            save();
         }
+        return applied;
     }
 
     @Config(setter = @Config.Setter("setSingleBiome"))
@@ -269,4 +270,54 @@ private static void setSingleBiome(String biomeId) {
             dev.xpple.seedmapper.seedmap.SeedMapMinimapManager.refreshIfOpenWithGeneratorFlags(dev.xpple.seedmapper.world.WorldPresetManager.activePreset().generatorFlags());
         } catch (Throwable ignored) {}
     }
+
+    private static void updateSeedValue(SeedIdentifier seed) {
+        Seed = seed;
+        notifySeedConsumers(null);
+    }
+
+    private static void notifySeedConsumers(Integer generatorFlagsOverride) {
+        int generatorFlags;
+        if (generatorFlagsOverride != null) {
+            generatorFlags = generatorFlagsOverride;
+        } else if (Seed != null && Seed.generatorFlags() != 0) {
+            generatorFlags = Seed.generatorFlags();
+        } else {
+            try {
+                generatorFlags = WorldPresetManager.activePreset().generatorFlags();
+            } catch (Throwable ignored) {
+                generatorFlags = 0;
+            }
+        }
+        try {
+            SeedMapScreen.clearCachesForPresetChange();
+        } catch (Throwable ignored) {}
+        try {
+            SeedMapScreen.reopenIfOpen(generatorFlags);
+        } catch (Throwable ignored) {}
+        try {
+            SeedMapMinimapManager.refreshIfOpenWithGeneratorFlags(generatorFlags);
+        } catch (Throwable ignored) {}
+    }
+
+    private static boolean applyWorldPresetInternal(String presetId) {
+        boolean selected;
+        try {
+            selected = WorldPresetManager.selectPreset(presetId);
+        } catch (Throwable ignored) {
+            selected = false;
+        }
+        if (!selected) {
+            return false;
+        }
+        WorldPresetId = presetId;
+        int generatorFlags;
+        try {
+            generatorFlags = WorldPresetManager.activePreset().generatorFlags();
+        } catch (Throwable ignored) {
+            generatorFlags = 0;
+        }
+        notifySeedConsumers(generatorFlags);
+        return true;
+    }
 }

src/main/java/dev/xpple/seedmapper/mixin/ClientPacketListenerMixin.java

@@ -2,6 +2,7 @@
 
 import dev.xpple.seedmapper.config.Configs;
 import dev.xpple.seedmapper.render.RenderManager;
+import dev.xpple.seedmapper.seedmap.SeedMapMinimapManager;
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.network.protocol.game.ClientboundLoginPacket;
 import net.minecraft.network.protocol.game.ClientboundRespawnPacket;
@@ -12,9 +13,11 @@
 
 @Mixin(ClientPacketListener.class)
 public class ClientPacketListenerMixin {
-    @Inject(method = "handleLogin", at = @At("HEAD"))
+    @Inject(method = "handleLogin", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/protocol/PacketUtils;ensureRunningOnSameThread(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/PacketListener;Lnet/minecraft/network/PacketProcessor;)V", shift = At.Shift.AFTER))
     private void onHandleLogin(ClientboundLoginPacket packet, CallbackInfo ci) {
         RenderManager.clear();
+
+        SeedMapMinimapManager.hide();
     }
 
     @Inject(method = "handleLogin", at = @At("TAIL"))
@@ -25,5 +28,7 @@ private void onHandleLogin(ClientboundLoginPacket packet, CallbackInfo ci) {
     @Inject(method = "handleRespawn", at = @At("HEAD"))
     private void onHandleRespawn(ClientboundRespawnPacket packet, CallbackInfo ci) {
         RenderManager.clear();
+
+        SeedMapMinimapManager.refreshIfOpen();
     }
 }