Fix a crash on 1.16 servers

Really random function was client only for some reason, fixed anyway lol
UnlikePaladin · Nov 12, 2023 · cbc70f7 · cbc70f7
1 parent aeec545
commit cbc70f7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/common/src/main/java/com/unlikepaladin/pfm/data/materials/VariantBase.java b/common/src/main/java/com/unlikepaladin/pfm/data/materials/VariantBase.java
@@ -80,7 +80,7 @@ protected <V> V findRelatedEntry(String append, String postPend, Registry<V> reg
         };
         V found = null;
         for (Identifier r : targets) {
-            if (reg.containsId(r)) {
+            if (reg.getOrEmpty(r).isPresent()) {
                 found = reg.get(r);
                 break;
             }

diff --git a/common/src/main/java/com/unlikepaladin/pfm/data/materials/WoodVariant.java b/common/src/main/java/com/unlikepaladin/pfm/data/materials/WoodVariant.java
@@ -100,14 +100,14 @@ protected Block findLogRelatedBlock(String append, String postpend) {
                     new Identifier(id.getNamespace(), append + "_" + id.getPath() + postNether.replace("_", ""))
             };
             for (Identifier r : nether_targets) {
-                if (Registry.BLOCK.containsId(r)) {
+                if (Registry.BLOCK.getOrEmpty(r).isPresent()) {
                     found = Registry.BLOCK.get(r);
                     break;
                 }
             }
         }
         for (Identifier r : targets) {
-            if (Registry.BLOCK.containsId(r)) {
+            if (Registry.BLOCK.getOrEmpty(r).isPresent()) {
                 found = Registry.BLOCK.get(r);
                 break;
             }

diff --git a/common/src/main/java/com/unlikepaladin/pfm/data/materials/WoodVariantRegistry.java b/common/src/main/java/com/unlikepaladin/pfm/data/materials/WoodVariantRegistry.java
@@ -112,7 +112,7 @@ private static Block findLog(Identifier id) {
         };
         Block temp = null;
         for (Identifier r : test) {
-            if (Registry.BLOCK.containsId(r)) {
+            if (Registry.BLOCK.getOrEmpty(r).isPresent()) {
                 temp = Registry.BLOCK.get(r);
                 break;
             }