misc cleanup

RecursivePineapple · Jan 4, 2025 · d2cd55a · d2cd55a
1 parent 293428f
commit d2cd55a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 18 deletions.
diff --git a/src/main/java/com/recursive_pineapple/matter_manipulator/CommonProxy.java b/src/main/java/com/recursive_pineapple/matter_manipulator/CommonProxy.java
@@ -1,6 +1,5 @@
 package com.recursive_pineapple.matter_manipulator;
 
-import com.recursive_pineapple.matter_manipulator.common.building.BlockSpec;
 import com.recursive_pineapple.matter_manipulator.common.compat.BlockPropertyRegistry;
 import com.recursive_pineapple.matter_manipulator.common.entities.EntityItemLarge;
 import com.recursive_pineapple.matter_manipulator.common.items.MMItems;

diff --git a/...cursive_pineapple/matter_manipulator/common/building/ArchitectureCraftAnalysisResult.java b/...cursive_pineapple/matter_manipulator/common/building/ArchitectureCraftAnalysisResult.java
@@ -174,25 +174,17 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
+        if (this == obj) return true;
+        if (obj == null) return false;
+        if (getClass() != obj.getClass()) return false;
         ArchitectureCraftAnalysisResult other = (ArchitectureCraftAnalysisResult) obj;
-        if (shape != other.shape)
-            return false;
+        if (shape != other.shape) return false;
         if (material == null) {
-            if (other.material != null)
-                return false;
-        } else if (!material.equals(other.material))
-            return false;
+            if (other.material != null) return false;
+        } else if (!material.equals(other.material)) return false;
         if (cladding == null) {
-            if (other.cladding != null)
-                return false;
-        } else if (!cladding.equals(other.cladding))
-            return false;
+            if (other.cladding != null) return false;
+        } else if (!cladding.equals(other.cladding)) return false;
         return true;
     }
 

diff --git a/...ain/java/com/recursive_pineapple/matter_manipulator/common/items/manipulator/MMState.java b/...ain/java/com/recursive_pineapple/matter_manipulator/common/items/manipulator/MMState.java
@@ -122,6 +122,8 @@ private static void migrateJson(JsonObject obj) {
                 config.remove("faces");
                 config.remove("volumes");
                 config.remove("cables");
+                config.remove("replaceWhitelist");
+                config.remove("replaceWith");
             }
             version = 1;
         }

diff --git a/src/main/java/com/recursive_pineapple/matter_manipulator/common/persist/UIDJsonAdapter.java b/src/main/java/com/recursive_pineapple/matter_manipulator/common/persist/UIDJsonAdapter.java
@@ -68,6 +68,7 @@ public UniqueIdentifier deserialize(JsonElement json, Type typeOfT, JsonDeserial
     }
 
     public static enum CommonName {
+        AIR(Mods.Minecraft, "air"),
         GT_BLOCKMACHINES(Mods.GregTech, "gt.blockmachines"),
         AE_ITEMPART(Mods.AppliedEnergistics2, "item.ItemMultiPart"),
         ARCH_SHAPE(Mods.ArchitectureCraft, "shape"),

diff --git a/src/main/java/com/recursive_pineapple/matter_manipulator/common/utils/Mods.java b/src/main/java/com/recursive_pineapple/matter_manipulator/common/utils/Mods.java
@@ -23,7 +23,12 @@ public enum Mods {
     IndustrialCraft2(Names.INDUSTRIAL_CRAFT2),
     LogisticsPipes(Names.LOGISTICS_PIPES),
     MatterManipulator(Names.MATTER_MANIPULATOR),
-    Minecraft(Names.MINECRAFT),
+    Minecraft(Names.MINECRAFT) {
+        @Override
+        public boolean isModLoaded() {
+            return true;
+        }
+    },
     NewHorizonsCoreMod(Names.NEW_HORIZONS_CORE_MOD),
     NotEnoughItems(Names.NOT_ENOUGH_ITEMS),
     StorageDrawers(Names.STORAGE_DRAWERS),