fix some crash + misc

Author: JohnButlerThird

src/main/java/net/pufferlab/primal/Registry.java

@@ -682,19 +682,22 @@ public void registerModItem(Block block, String name) {
 
     public void registerModItem(Item item, String name) {
         if (item instanceof IMetaItem item2) {
-            String[] elements = item2.getElements();
-            String[] elementsBlacklist = item2.getElementsBlacklist();
-            String elementName = item2.getElementName();
-            String suffix = "";
-            if (item2.hasSuffix()) {
-                suffix = "_" + elementName;
-            }
-            for (int i = 0; i < elements.length; i++) {
-                if (!Utils.contains(elementsBlacklist, elements[i])) {
-                    ItemStack stack = new ItemStack(item2.getItemObject(), 1, i);
-                    ItemUtils.registerModItem(elements[i] + suffix, stack);
-                    if (item2.registerOre()) {
-                        ItemUtils.registerModOreDict(ItemUtils.getOreDictionaryName(elementName, elements[i]), stack);
+            if (item2.registerModItem()) {
+                String[] elements = item2.getElements();
+                String[] elementsBlacklist = item2.getElementsBlacklist();
+                String elementName = item2.getElementName();
+                String suffix = "";
+                if (item2.hasSuffix()) {
+                    suffix = "_" + elementName;
+                }
+                for (int i = 0; i < elements.length; i++) {
+                    if (!Utils.contains(elementsBlacklist, elements[i])) {
+                        ItemStack stack = new ItemStack(item2.getItemObject(), 1, i);
+                        ItemUtils.registerModItem(elements[i] + suffix, stack);
+                        if (item2.registerOre()) {
+                            ItemUtils
+                                .registerModOreDict(ItemUtils.getOreDictionaryName(elementName, elements[i]), stack);
+                        }
                     }
                 }
             }

src/main/java/net/pufferlab/primal/client/renderer/RenderContainer.java

@@ -37,6 +37,7 @@ public void renderContainer(ItemStack stack, IItemRenderer.ItemRenderType type)
 
         if (item instanceof ItemBucketMeta item2) {
             IIcon mask = item2.getIconFromDamageForRenderPass(meta, 1);
+            if (meta >= item2.getFluidBlocks().length) return;
             Fluid fluid = item2.getFluidObjects()[meta];
             if (type == IItemRenderer.ItemRenderType.INVENTORY) {
                 GL11.glScalef(16.0F, 16.0F, 16.0F);

src/main/java/net/pufferlab/primal/client/renderer/items/ItemPrimalRenderer.java

@@ -8,6 +8,7 @@
 import net.pufferlab.primal.client.models.ModelPrimal;
 import net.pufferlab.primal.client.renderer.RenderContainer;
 import net.pufferlab.primal.client.renderer.RenderHeat;
+import net.pufferlab.primal.items.IMetaItem;
 import net.pufferlab.primal.utils.HeatUtils;
 import net.pufferlab.primal.world.GlobalTickingData;
 
@@ -93,11 +94,22 @@ public Item getMaskItem() {
         return null;
     }
 
+    public boolean isValidMeta(ItemStack item) {
+        if (item.getItem() instanceof IMetaItem meta) {
+            if (item.getItemDamage() >= meta.getElements().length) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     @Override
     public boolean handleRenderType(ItemStack item, ItemRenderType type) {
-        if (Utils.contains(getMetaBlacklist(), item.getItemDamage())) return false;
-        if (Utils.contains(getMeta(), item.getItemDamage()) || getMeta() == null) {
-            return true;
+        if (isValidMeta(item)) {
+            if (Utils.contains(getMetaBlacklist(), item.getItemDamage())) return false;
+            if (Utils.contains(getMeta(), item.getItemDamage()) || getMeta() == null) {
+                return true;
+            }
         }
         return false;
     }

src/main/java/net/pufferlab/primal/items/IMetaItem.java

@@ -16,7 +16,11 @@ default String[] getElementsBlacklist() {
 
     default boolean registerOre() {
         return false;
-    };
+    }
+
+    default boolean registerModItem() {
+        return true;
+    }
 
     public Item getItemObject();
 }

src/main/java/net/pufferlab/primal/items/ItemBucketCeramic.java

@@ -24,6 +24,7 @@ public ItemStack getEmptyBucket() {
     @Override
     public FluidStack getFluid(ItemStack container) {
         int meta = container.getItemDamage();
+        if (meta >= getFluidObjects().length) return null;
         Fluid fluid = getFluidObjects()[meta];
         if (fluid == null) {
             return null;
@@ -103,6 +104,7 @@ public int getRenderPasses(int metadata) {
 
     @Override
     public boolean isBreakable(ItemStack itemStack) {
+        if (itemStack.getItemDamage() >= Constants.fluidsBreak.length) return false;
         return Constants.fluidsBreak[itemStack.getItemDamage()];
     }
 }

src/main/java/net/pufferlab/primal/items/ItemBucketCeramicModded.java

@@ -115,14 +115,21 @@ public Fluid[] getFluidObjects() {
 
     @Override
     public boolean isBreakable(ItemStack itemStack) {
+        if (itemStack.getItemDamage() >= fluids.length) return false;
         return fluids[itemStack.getItemDamage()].getTemperature() > Config.ceramicBucketLiquidsHotCap.getInt();
     }
 
     @Override
     public boolean isHotLiquid(int meta) {
+        if (meta >= fluids.length) return false;
         return fluids[meta].getTemperature() > Config.ceramicBucketLiquidsHotCap.getInt();
     }
 
+    @Override
+    public boolean registerModItem() {
+        return false;
+    }
+
     @Override
     public ItemStack getEmptyBucket() {
         return new ItemStack(Registry.ceramic_bucket, 1, 0);

src/main/java/net/pufferlab/primal/items/ItemMetal.java

@@ -21,16 +21,19 @@ public MetalType getMetal(ItemStack stack) {
 
     @Override
     public int getMeltingTemperature(ItemStack stack) {
+        if (stack.getItemDamage() >= metalTypes.length) return -1;
         return metalTypes[stack.getItemDamage()].meltingTemperature;
     }
 
     @Override
     public int getWeldingTemperature(ItemStack stack) {
+        if (stack.getItemDamage() >= metalTypes.length) return -1;
         return metalTypes[stack.getItemDamage()].weldingTemperature;
     }
 
     @Override
     public int getForgingTemperature(ItemStack stack) {
+        if (stack.getItemDamage() >= metalTypes.length) return -1;
         return metalTypes[stack.getItemDamage()].forgingTemperature;
     }
 }

src/main/java/net/pufferlab/primal/scripts/ScriptWorld.java

@@ -2,6 +2,7 @@
 
 import net.pufferlab.primal.Config;
 import net.pufferlab.primal.Constants;
+import net.pufferlab.primal.utils.SoilType;
 import net.pufferlab.primal.utils.StoneType;
 
 public class ScriptWorld implements IScript {
@@ -21,6 +22,9 @@ public void addOredicts() {
                 addOreDict("rock", getModItem(name + "_rock", 1));
                 addOreDict("stone", getModItem(name + "_raw", 1));
                 addOreDict("cobblestone", getModItem(name + "_cobble", 1));
+            }
+            for (SoilType soil : Constants.soilTypes) {
+                String name = soil.name;
                 addOreDict("dirt", getModItem(name + "_dirt", 1));
             }
         }

src/main/java/net/pufferlab/primal/utils/HeatUtils.java

@@ -55,16 +55,19 @@ public MetalType getMetal(ItemStack stack) {
 
             @Override
             public int getMeltingTemperature(ItemStack stack) {
+                if (stack.getItemDamage() >= metals.size()) return -1;
                 return metals.get(stack.getItemDamage()).meltingTemperature;
             }
 
             @Override
             public int getWeldingTemperature(ItemStack stack) {
+                if (stack.getItemDamage() >= metals.size()) return -1;
                 return metals.get(stack.getItemDamage()).weldingTemperature;
             }
 
             @Override
             public int getForgingTemperature(ItemStack stack) {
+                if (stack.getItemDamage() >= metals.size()) return -1;
                 return metals.get(stack.getItemDamage()).forgingTemperature;
             }
         });