From 71d49fc7d954ef8417453f0c8e79b020cb6df134 Mon Sep 17 00:00:00 2001 From: Ruling-0 <47913168+Ruling-0@users.noreply.github.com> Date: Thu, 27 Aug 2026 22:44:02 -0500 Subject: [PATCH] Record only retired names in the world id table and strip FML's item discriminator --- .../postea/utility/IDRegistry.java | 89 ++++++++++++------- .../postea/utility/WorldIdTable.java | 17 ++-- .../postea/utility/WorldIdTableTest.java | 6 +- 3 files changed, 71 insertions(+), 41 deletions(-) diff --git a/src/main/java/com/gtnewhorizons/postea/utility/IDRegistry.java b/src/main/java/com/gtnewhorizons/postea/utility/IDRegistry.java index 99fbc4e..7e4d581 100644 --- a/src/main/java/com/gtnewhorizons/postea/utility/IDRegistry.java +++ b/src/main/java/com/gtnewhorizons/postea/utility/IDRegistry.java @@ -2,6 +2,7 @@ package com.gtnewhorizons.postea.utility; import java.io.File; import java.util.Collection; +import java.util.LinkedHashMap; import java.util.Map; import java.util.function.Consumer; @@ -11,6 +12,7 @@ import com.gtnewhorizons.postea.Postea; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.LoaderState; +import cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry; import cpw.mods.fml.common.registry.GameData; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntList; @@ -21,7 +23,7 @@ import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; /** * Resolves a namespaced id to the numeric ids it holds or held in the active world: the live registry id, the id * the world's own saved map assigns it, and the ids recorded in the world's {@link WorldIdTable} for content that - * has since been removed. + * has since been removed. A retired id counts only while FML still blocks it and no live content occupies it. */ public abstract class IDRegistry { @@ -36,10 +38,11 @@ public abstract class IDRegistry { private static File tableFile; private static WorldIdTable table = new WorldIdTable(); + private static IntSet blockedIds; /** * Opens the retired id table of the world about to load. Until {@link #endWorld()} the saved id map is captured - * and merged into it. + * and its missing names merged into it. */ public static void beginWorld(File worldDirectory) { tableFile = new File(new File(worldDirectory, Postea.MODID), WorldIdTable.FILE_NAME); @@ -49,6 +52,7 @@ public abstract class IDRegistry { public static void endWorld() { tableFile = null; table = new WorldIdTable(); + blockedIds = null; BLOCK_NAME_TO_ID.clear(); ITEM_NAME_TO_ID.clear(); } @@ -80,9 +84,9 @@ public abstract class IDRegistry { /** * Called by {@link com.gtnewhorizons.postea.mixins.preinit.MixinGameData}, this function captures the world's - * saved name-to-id map before FML remaps the live registries onto it, and records it in the world's retired id - * table. Ignored outside a server world and off the server thread, since the client side of the FML handshake - * also injects a map. + * saved name-to-id map before FML remaps the live registries onto it, and records the names no registered + * content answers to in the world's retired id table. Ignored outside a server world and off the server thread, + * since the client side of the FML handshake also injects a map. */ public static void registerWorldSpecificIDs(Map map) { if (tableFile == null || !FMLCommonHandler.instance() @@ -90,17 +94,23 @@ public abstract class IDRegistry { .isServer()) return; BLOCK_NAME_TO_ID.clear(); ITEM_NAME_TO_ID.clear(); + blockedIds = null; + Map missing = new LinkedHashMap<>(); for (Map.Entry kv : map.entrySet()) { String name = kv.getKey() .substring(1); - if (kv.getKey() - .charAt(0) == '\u0001') { + boolean block = kv.getKey() + .charAt(0) == WorldIdTable.BLOCK_PREFIX; + if (block) { BLOCK_NAME_TO_ID.put(name, (int) kv.getValue()); } else { ITEM_NAME_TO_ID.put(name, (int) kv.getValue()); } + FMLControlledNamespacedRegistry registry = block ? GameData.getBlockRegistry() + : GameData.getItemRegistry(); + if (registry.getId(name) < 0) missing.put(kv.getKey(), kv.getValue()); } - if (table.merge(map)) table.save(tableFile); + if (table.merge(missing)) table.save(tableFile); } /** @@ -110,7 +120,7 @@ public abstract class IDRegistry { public static int getBlockId(String name) { int id = liveBlockId(name); if (id >= 0) return id; - IntList retired = table.blockIds(name); + IntList retired = retiredBlockIds(name, id); return retired.isEmpty() ? -1 : retired.getInt(retired.size() - 1); } @@ -121,50 +131,69 @@ public abstract class IDRegistry { public static int getItemId(String name) { int id = liveItemId(name); if (id >= 0) return id; - IntList retired = table.itemIds(name); + IntList retired = retiredItemIds(name, id); return retired.isEmpty() ? -1 : retired.getInt(retired.size() - 1); } /** - * Every block id {@code name} holds or held in this world: the live id, plus retired ids that FML still blocks - * and no block occupies. Empty when the world never mapped the name. + * Every block id {@code name} holds or held in this world, live id first. Empty when the world never mapped + * the name. */ public static IntList getBlockIds(String name) { int live = liveBlockId(name); - IntList ids = new IntArrayList(); - if (live >= 0) ids.add(live); - IntSet blocked = new IntOpenHashSet(GameData.getBlockedIds()); - for (int id : table.blockIds(name)) { - if (id != live && blocked.contains(id) - && GameData.getBlockRegistry() - .getRaw(id) == null) { - ids.add(id); - } - } - if (live < 0 && !ids.isEmpty()) { + IntList ids = retiredBlockIds(name, live); + if (live >= 0) { + ids.add(0, live); + } else if (!ids.isEmpty()) { Postea.LOG.info("Block {} is no longer registered; its transformers target retired id(s) {}", name, ids); } return ids; } /** - * Every item id {@code name} holds or held in this world: the live id, plus retired ids that FML still blocks - * and no item occupies. Empty when the world never mapped the name. + * Every item id {@code name} holds or held in this world, live id first. Empty when the world never mapped + * the name. */ public static IntList getItemIds(String name) { int live = liveItemId(name); + IntList ids = retiredItemIds(name, live); + if (live >= 0) { + ids.add(0, live); + } else if (!ids.isEmpty()) { + Postea.LOG.info("Item {} is no longer registered; its transformers target retired id(s) {}", name, ids); + } + return ids; + } + + private static IntList retiredBlockIds(String name, int live) { + IntList ids = new IntArrayList(); + for (int id : table.blockIds(name)) { + if (id != live && blockedIds().contains(id) + && GameData.getBlockRegistry() + .getRaw(id) == null) { + ids.add(id); + } + } + return ids; + } + + private static IntList retiredItemIds(String name, int live) { IntList ids = new IntArrayList(); - if (live >= 0) ids.add(live); - IntSet blocked = new IntOpenHashSet(GameData.getBlockedIds()); for (int id : table.itemIds(name)) { - if (id != live && blocked.contains(id) + if (id != live && blockedIds().contains(id) && GameData.getItemRegistry() .getRaw(id) == null) { ids.add(id); } } - if (live < 0 && !ids.isEmpty()) { - Postea.LOG.info("Item {} is no longer registered; its transformers target retired id(s) {}", name, ids); + return ids; + } + + private static IntSet blockedIds() { + IntSet ids = blockedIds; + if (ids == null) { + ids = new IntOpenHashSet(GameData.getBlockedIds()); + blockedIds = ids; } return ids; } diff --git a/src/main/java/com/gtnewhorizons/postea/utility/WorldIdTable.java b/src/main/java/com/gtnewhorizons/postea/utility/WorldIdTable.java index 74b73c8..2aca61a 100644 --- a/src/main/java/com/gtnewhorizons/postea/utility/WorldIdTable.java +++ b/src/main/java/com/gtnewhorizons/postea/utility/WorldIdTable.java @@ -20,9 +20,9 @@ import it.unimi.dsi.fastutil.ints.IntList; import it.unimi.dsi.fastutil.ints.IntLists; /** - * Every namespaced block and item name a world has mapped to a numeric id, with every id it held, oldest first. - * FML drops a missing name from {@code level.dat} on the first save after its content disappears; this table keeps - * the name so transformers keyed on it keep resolving in later sessions. Persisted as + * Every namespaced block and item name whose content was missing when a world loaded, with every id it held, + * oldest first. FML drops a missing name from {@code level.dat} on the first save after its content disappears; + * this table keeps the name so transformers keyed on it keep resolving in later sessions. Persisted as * {@code /postea/known-ids.json}, format version 1: * * 
@@ -32,6 +32,8 @@ import it.unimi.dsi.fastutil.ints.IntLists;
 public final class WorldIdTable {
 
     static final String FILE_NAME = "known-ids.json";
+    /** FML prefixes block names with this character in a saved id map; items get U+0002. */
+    static final char BLOCK_PREFIX = 1;
     private static final int FORMAT_VERSION = 1;
 
     private final Map blocks = new TreeMap<>();
@@ -108,16 +110,15 @@ public final class WorldIdTable {
     }
 
     /**
-     * Records a world's saved name-to-id map, in which a name prefixed with U+0001 is a block. Returns whether
-     * any pair was new.
+     * Records entries of a world's saved name-to-id map, whose names FML prefixes with U+0001 for a block and
+     * U+0002 for an item. Returns whether any pair was new.
      */
     public boolean merge(Map dataList) {
         boolean changed = false;
         for (Map.Entry entry : dataList.entrySet()) {
             String prefixed = entry.getKey();
-            boolean block = prefixed.charAt(0) == '\u0001';
-            Map into = block ? blocks : items;
-            IntList ids = into.computeIfAbsent(block ? prefixed.substring(1) : prefixed, name -> new IntArrayList());
+            Map into = prefixed.charAt(0) == BLOCK_PREFIX ? blocks : items;
+            IntList ids = into.computeIfAbsent(prefixed.substring(1), name -> new IntArrayList());
             if (!ids.contains((int) entry.getValue())) {
                 ids.add((int) entry.getValue());
                 changed = true;
diff --git a/src/test/java/com/gtnewhorizons/postea/utility/WorldIdTableTest.java b/src/test/java/com/gtnewhorizons/postea/utility/WorldIdTableTest.java
index 18a6ae1..3fe6bf1 100644
--- a/src/test/java/com/gtnewhorizons/postea/utility/WorldIdTableTest.java
+++ b/src/test/java/com/gtnewhorizons/postea/utility/WorldIdTableTest.java
@@ -43,8 +43,8 @@ class WorldIdTableTest {
     void mergeRecordsEveryIdANameHeldInObservationOrderAndReportsChanges() {
         WorldIdTable table = new WorldIdTable();
 
-        assertTrue(table.merge(savedIds("\u0001mod:block", 300, "mod:item", 4200)));
-        assertFalse(table.merge(savedIds("\u0001mod:block", 300, "mod:item", 4200)));
+        assertTrue(table.merge(savedIds("\u0001mod:block", 300, "\u0002mod:item", 4200)));
+        assertFalse(table.merge(savedIds("\u0001mod:block", 300, "\u0002mod:item", 4200)));
         assertTrue(table.merge(savedIds("\u0001mod:block", 301)));
 
         assertEquals(ids(300, 301), table.blockIds("mod:block"));
@@ -55,7 +55,7 @@ class WorldIdTableTest {
     @Test
     void saveAndLoadRoundTrip() {
         WorldIdTable table = new WorldIdTable();
-        table.merge(savedIds("\u0001mod:block", 300, "mod:item", 4200));
+        table.merge(savedIds("\u0001mod:block", 300, "\u0002mod:item", 4200));
         table.merge(savedIds("\u0001mod:block", 301));
 
         table.save(file());