From 9c34dab0a979327394144a4e719d1c6ad0c9eccd Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Tue, 24 Jan 2023 21:55:55 +0800
Subject: fix remap handler using unnamespaced id

---
 src/main/java/kekztech/KekzCore.java | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index 7c0a3c7726..baf9ad5817 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -65,19 +65,18 @@ public class KekzCore {
         List<FMLMissingMappingsEvent.MissingMapping> missingMappings = event.get();
 
         // intentionally not a static final field to save a bit of ram.
-        Set<String> removedBlocks = ImmutableSet.of(
-                "kekztech_tfftcasingblock_block",
-                "kekztech_tfftmultihatch_block",
-                "kekztech_tfftstoragefieldblock1_block",
-                "kekztech_tfftstoragefieldblock2_block",
-                "kekztech_tfftstoragefieldblock3_block",
-                "kekztech_tfftstoragefieldblock4_block",
-                "kekztech_tfftstoragefieldblock5_block");
+        Set<String> removedStuff = ImmutableSet.of(
+                MODID + ":kekztech_tfftcasingblock_block",
+                MODID + ":kekztech_tfftmultihatch_block",
+                MODID + ":kekztech_tfftstoragefieldblock1_block",
+                MODID + ":kekztech_tfftstoragefieldblock2_block",
+                MODID + ":kekztech_tfftstoragefieldblock3_block",
+                MODID + ":kekztech_tfftstoragefieldblock4_block",
+                MODID + ":kekztech_tfftstoragefieldblock5_block");
 
         for (FMLMissingMappingsEvent.MissingMapping mapping : missingMappings) {
-            if (mapping.type == GameRegistry.Type.BLOCK) {
-                if (removedBlocks.contains(mapping.name)) mapping.ignore();
-            }
+            if (removedStuff.contains(mapping.name)) mapping.ignore();
+            else mapping.warn(); // we don't know what happened. probably warn the user.
         }
     }
 }
-- 
cgit 


From a86ec0131a10801d1959732165668c62914d2971 Mon Sep 17 00:00:00 2001
From: GitHub GTNH Actions <>
Date: Tue, 24 Jan 2023 13:57:55 +0000
Subject: spotlessApply

---
 src/main/java/kekztech/KekzCore.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index baf9ad5817..dbef680cc3 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -9,7 +9,6 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.registry.GameRegistry;
 import java.util.List;
 import java.util.Set;
 import org.apache.logging.log4j.LogManager;
-- 
cgit