Updated Loot Table Export (Added Enchantments), World Border Saved Per Server

Author: cev-api

README.md

@@ -29,7 +29,7 @@ You can also override per dimension:
 - ```/sm:config WorldBorderNether set 8000```
 - ```/sm:config WorldBorderEnd set 8000```
 
-Per-dimension values take priority when set; use 0 to fall back to the global border.
+Per-dimension values take priority when set; use 0 to fall back to the global border. Border values are saved per server.
 
 ### Datapack Structures Import
 Import a datapack URL so its custom structures appear on the SeedMap. Datapack structures render as solid colored squares (one color per structure) and show up in the datapack toggle list so you can enable/disable them like vanilla features. You can also right‑click a datapack structure and mark it complete/incomplete (a green tick is drawn on the icon).

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

@@ -80,6 +80,18 @@ private static Component displaySavedSeeds() {
     @Config
     public static Map<String, String> DatapackSavedCachePaths = new HashMap<>();
 
+    @Config
+    public static Map<String, Integer> WorldBorderSaved = new HashMap<>();
+
+    @Config
+    public static Map<String, Integer> WorldBorderOverworldSaved = new HashMap<>();
+
+    @Config
+    public static Map<String, Integer> WorldBorderNetherSaved = new HashMap<>();
+
+    @Config
+    public static Map<String, Integer> WorldBorderEndSaved = new HashMap<>();
+
     @Config(setter = @Config.Setter("setDatapackColorScheme"))
     public static int DatapackColorScheme = 1;
 
@@ -180,6 +192,21 @@ public static void loadSavedSeedForCurrentServer() {
         }
     }
 
+    public static void loadWorldBorderForCurrentServer() {
+        String key = getCurrentServerKey();
+        if (key == null) {
+            WorldBorder = 0;
+            WorldBorderOverworld = 0;
+            WorldBorderNether = 0;
+            WorldBorderEnd = 0;
+            return;
+        }
+        WorldBorder = Math.max(0, WorldBorderSaved.getOrDefault(key, 0));
+        WorldBorderOverworld = Math.max(0, WorldBorderOverworldSaved.getOrDefault(key, 0));
+        WorldBorderNether = Math.max(0, WorldBorderNetherSaved.getOrDefault(key, 0));
+        WorldBorderEnd = Math.max(0, WorldBorderEndSaved.getOrDefault(key, 0));
+    }
+
     @Config
     public static SeedResolutionArgument.SeedResolution SeedResolutionOrder = new SeedResolutionArgument.SeedResolution();
 
@@ -222,6 +249,13 @@ private static Component getWorldBorderComment() {
 
     private static void setWorldBorder(int worldBorder) {
         WorldBorder = Math.max(0, worldBorder);
+        storeWorldBorderForCurrentServer(WorldBorderSaved, WorldBorder);
+        WorldBorderOverworld = 0;
+        WorldBorderNether = 0;
+        WorldBorderEnd = 0;
+        storeWorldBorderForCurrentServer(WorldBorderOverworldSaved, WorldBorderOverworld);
+        storeWorldBorderForCurrentServer(WorldBorderNetherSaved, WorldBorderNether);
+        storeWorldBorderForCurrentServer(WorldBorderEndSaved, WorldBorderEnd);
     }
 
     @Config(comment = "getWorldBorderOverworldComment", setter = @Config.Setter("setWorldBorderOverworld"))
@@ -233,6 +267,7 @@ private static Component getWorldBorderOverworldComment() {
 
     private static void setWorldBorderOverworld(int worldBorder) {
         WorldBorderOverworld = Math.max(0, worldBorder);
+        storeWorldBorderForCurrentServer(WorldBorderOverworldSaved, WorldBorderOverworld);
     }
 
     @Config(comment = "getWorldBorderNetherComment", setter = @Config.Setter("setWorldBorderNether"))
@@ -244,6 +279,7 @@ private static Component getWorldBorderNetherComment() {
 
     private static void setWorldBorderNether(int worldBorder) {
         WorldBorderNether = Math.max(0, worldBorder);
+        storeWorldBorderForCurrentServer(WorldBorderNetherSaved, WorldBorderNether);
     }
 
     @Config(comment = "getWorldBorderEndComment", setter = @Config.Setter("setWorldBorderEnd"))
@@ -255,6 +291,19 @@ private static Component getWorldBorderEndComment() {
 
     private static void setWorldBorderEnd(int worldBorder) {
         WorldBorderEnd = Math.max(0, worldBorder);
+        storeWorldBorderForCurrentServer(WorldBorderEndSaved, WorldBorderEnd);
+    }
+
+    private static void storeWorldBorderForCurrentServer(Map<String, Integer> map, int worldBorder) {
+        String key = getCurrentServerKey();
+        if (key == null) {
+            return;
+        }
+        if (worldBorder <= 0) {
+            map.remove(key);
+        } else {
+            map.put(key, worldBorder);
+        }
     }
 
     public static int getWorldBorderForDimension(int dimension) {

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

@@ -24,6 +24,7 @@ private void onHandleLogin(ClientboundLoginPacket packet, CallbackInfo ci) {
     @Inject(method = "handleLogin", at = @At("TAIL"))
     private void seedmapper$applySavedSeed(ClientboundLoginPacket packet, CallbackInfo ci) {
         Configs.loadSavedSeedForCurrentServer();
+        Configs.loadWorldBorderForCurrentServer();
         if (Configs.DatapackAutoload) {
             String url = Configs.getSavedDatapackUrlForCurrentServer();
             if (url != null && !url.isBlank()) {

src/main/java/dev/xpple/seedmapper/util/LootExportHelper.java

@@ -1,6 +1,7 @@
 package dev.xpple.seedmapper.util;
 
 import com.github.cubiomes.Cubiomes;
+import com.github.cubiomes.EnchantInstance;
 import com.github.cubiomes.ItemStack;
 import com.github.cubiomes.LootTableContext;
 import com.github.cubiomes.Piece;
@@ -11,11 +12,13 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
+import dev.xpple.seedmapper.command.arguments.ItemAndEnchantmentsPredicateArgument;
 import dev.xpple.seedmapper.feature.StructureChecks;
 import net.minecraft.SharedConstants;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.QuartPos;
+import net.minecraft.world.item.Item;
 
 import java.io.IOException;
 import java.lang.foreign.Arena;
@@ -95,9 +98,39 @@ public static Result exportLoot(Minecraft minecraft, MemorySegment biomeGenerato
                             for (int lootIdx = 0; lootIdx < lootCount; lootIdx++) {
                                 MemorySegment itemStack = ItemStack.asSlice(LootTableContext.generated_items(lootTableContext), lootIdx);
                                 int itemId = Cubiomes.get_global_item_id(lootTableContext, ItemStack.item(itemStack));
+                                String itemName = Cubiomes.global_id2item_name(itemId, version).getString(0);
                                 JsonObject itemObj = new JsonObject();
-                                itemObj.addProperty("id", Cubiomes.global_id2item_name(itemId, version).getString(0));
+                                itemObj.addProperty("slot", lootIdx);
                                 itemObj.addProperty("count", ItemStack.count(itemStack));
+                                itemObj.addProperty("itemId", itemName);
+                                itemObj.addProperty("id", itemName);
+
+                                Item mcItem = ItemAndEnchantmentsPredicateArgument.ITEM_ID_TO_MC.get(itemId);
+                                if (mcItem != null) {
+                                    net.minecraft.world.item.ItemStack mcStack = new net.minecraft.world.item.ItemStack(mcItem, ItemStack.count(itemStack));
+                                    itemObj.addProperty("displayName", mcStack.getHoverName().getString());
+                                    itemObj.addProperty("nbt", mcStack.toString());
+                                } else {
+                                    itemObj.addProperty("displayName", itemName);
+                                    itemObj.addProperty("nbt", itemName);
+                                }
+
+                                JsonArray enchantments = new JsonArray();
+                                JsonArray enchantmentLevels = new JsonArray();
+                                MemorySegment enchantmentsInternal = ItemStack.enchantments(itemStack);
+                                int enchantmentCount = ItemStack.enchantment_count(itemStack);
+                                for (int enchantmentIdx = 0; enchantmentIdx < enchantmentCount; enchantmentIdx++) {
+                                    MemorySegment enchantInstance = EnchantInstance.asSlice(enchantmentsInternal, enchantmentIdx);
+                                    int itemEnchantment = EnchantInstance.enchantment(enchantInstance);
+                                    String enchantmentName = Cubiomes.get_enchantment_name(itemEnchantment).getString(0);
+                                    if (enchantmentName == null || enchantmentName.isBlank()) {
+                                        enchantmentName = "unknown:" + itemEnchantment;
+                                    }
+                                    enchantments.add(enchantmentName);
+                                    enchantmentLevels.add(EnchantInstance.level(enchantInstance));
+                                }
+                                itemObj.add("enchantments", enchantments);
+                                itemObj.add("enchantmentLevels", enchantmentLevels);
                                 items.add(itemObj);
                             }