Fix various NPE with the matter clusters (#44)

GTNewHorizons · Oct 11, 2024 · b8571db · b8571db
1 parent 0d3bb47
commit b8571db
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 94 deletions.
diff --git a/src/main/java/fox/spiteful/avaritia/DamageSourceInfinitySword.java b/src/main/java/fox/spiteful/avaritia/DamageSourceInfinitySword.java
@@ -1,7 +1,5 @@
 package fox.spiteful.avaritia;
 
-import java.util.Random;
-
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.util.ChatComponentTranslation;
@@ -10,19 +8,17 @@
 
 public class DamageSourceInfinitySword extends EntityDamageSource {
 
-    private static final Random randy = new Random();
-
     public DamageSourceInfinitySword(Entity source) {
         super("infinity", source);
     }
 
     @Override
-    public IChatComponent func_151519_b(EntityLivingBase p_151519_1_) { // getDeathMessage
+    public IChatComponent func_151519_b(EntityLivingBase entity) { // getDeathMessage
         String s = "death.attack.infinity";
-        int rando = randy.nextInt(5);
+        int rando = entity.worldObj.rand.nextInt(5);
         if (rando != 0) s = s + "." + rando;
         // func_145748_c_ = getFormattedCommandSenderName
-        return new ChatComponentTranslation(s, p_151519_1_.func_145748_c_(), this.damageSourceEntity.func_145748_c_());
+        return new ChatComponentTranslation(s, entity.func_145748_c_(), this.damageSourceEntity.func_145748_c_());
     }
 
     @Override

diff --git a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java
@@ -5,7 +5,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -39,7 +38,6 @@
 
 public class LudicrousEvents {
 
-    private static Random randy = new Random();
     static final String[] trash = new String[] { "dirt", "sand", "gravel", "cobblestone", "netherrack" };
 
     @SubscribeEvent
@@ -66,7 +64,7 @@ public void onPlayerMine(PlayerInteractEvent event) {
                         event.entityPlayer);
             } else {
 
-                if (block.quantityDropped(randy) == 0) {
+                if (block.quantityDropped(event.world.rand) == 0) {
                     ItemStack drop = block.getPickBlock(
                             ToolHelper.raytraceFromEntity(event.world, event.entityPlayer, true, 10),
                             event.world,
@@ -168,9 +166,9 @@ private static boolean isGarbage(ItemStack drop) {
 
     public static void dropItem(ItemStack drop, World world, int x, int y, int z) {
         float f = 0.7F;
-        double d0 = (double) (randy.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
-        double d1 = (double) (randy.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
-        double d2 = (double) (randy.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
+        double d0 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
+        double d1 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
+        double d2 = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
         EntityItem entityitem = new EntityItem(world, (double) x + d0, (double) y + d1, (double) z + d2, drop);
         entityitem.delayBeforeCanPickup = 10;
         world.spawnEntityInWorld(entityitem);

diff --git a/src/main/java/fox/spiteful/avaritia/blocks/BlockCompressor.java b/src/main/java/fox/spiteful/avaritia/blocks/BlockCompressor.java
@@ -1,7 +1,5 @@
 package fox.spiteful.avaritia.blocks;
 
-import java.util.Random;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -25,7 +23,6 @@
 public class BlockCompressor extends BlockContainer {
 
     private IIcon top, sides, front;
-    private Random randy = new Random();
 
     public BlockCompressor() {
         super(Material.iron);
@@ -104,12 +101,12 @@ public void breakBlock(World world, int x, int y, int z, Block block, int wut) {
                 ItemStack itemstack = compressor.getStackInSlot(i);
 
                 if (itemstack != null) {
-                    float f = this.randy.nextFloat() * 0.8F + 0.1F;
-                    float f1 = this.randy.nextFloat() * 0.8F + 0.1F;
-                    float f2 = this.randy.nextFloat() * 0.8F + 0.1F;
+                    float f = world.rand.nextFloat() * 0.8F + 0.1F;
+                    float f1 = world.rand.nextFloat() * 0.8F + 0.1F;
+                    float f2 = world.rand.nextFloat() * 0.8F + 0.1F;
 
                     while (itemstack.stackSize > 0) {
-                        int j1 = this.randy.nextInt(21) + 10;
+                        int j1 = world.rand.nextInt(21) + 10;
 
                         if (j1 > itemstack.stackSize) {
                             j1 = itemstack.stackSize;
@@ -118,9 +115,9 @@ public void breakBlock(World world, int x, int y, int z, Block block, int wut) {
                         itemstack.stackSize -= j1;
                         EntityItem entityitem = new EntityItem(
                                 world,
-                                (double) ((float) x + f),
-                                (double) ((float) y + f1),
-                                (double) ((float) z + f2),
+                                (float) x + f,
+                                (float) y + f1,
+                                (float) z + f2,
                                 new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage()));
 
                         if (itemstack.hasTagCompound()) {
@@ -129,9 +126,9 @@ public void breakBlock(World world, int x, int y, int z, Block block, int wut) {
                         }
 
                         float f3 = 0.05F;
-                        entityitem.motionX = (double) ((float) this.randy.nextGaussian() * f3);
-                        entityitem.motionY = (double) ((float) this.randy.nextGaussian() * f3 + 0.2F);
-                        entityitem.motionZ = (double) ((float) this.randy.nextGaussian() * f3);
+                        entityitem.motionX = (float) world.rand.nextGaussian() * f3;
+                        entityitem.motionY = (float) world.rand.nextGaussian() * f3 + 0.2F;
+                        entityitem.motionZ = (float) world.rand.nextGaussian() * f3;
                         world.spawnEntityInWorld(entityitem);
                     }
                 }

diff --git a/src/main/java/fox/spiteful/avaritia/blocks/BlockDireCrafting.java b/src/main/java/fox/spiteful/avaritia/blocks/BlockDireCrafting.java
@@ -1,7 +1,5 @@
 package fox.spiteful.avaritia.blocks;
 
-import java.util.Random;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -22,7 +20,6 @@
 public class BlockDireCrafting extends BlockContainer {
 
     private static IIcon top, sides, bottom;
-    private Random randy = new Random();
 
     public BlockDireCrafting() {
         super(Material.iron);
@@ -74,12 +71,12 @@ public void breakBlock(World world, int x, int y, int z, Block block, int wut) {
                 ItemStack itemstack = craft.getStackInSlot(i);
 
                 if (itemstack != null) {
-                    float f = this.randy.nextFloat() * 0.8F + 0.1F;
-                    float f1 = this.randy.nextFloat() * 0.8F + 0.1F;
-                    float f2 = this.randy.nextFloat() * 0.8F + 0.1F;
+                    float f = world.rand.nextFloat() * 0.8F + 0.1F;
+                    float f1 = world.rand.nextFloat() * 0.8F + 0.1F;
+                    float f2 = world.rand.nextFloat() * 0.8F + 0.1F;
 
                     while (itemstack.stackSize > 0) {
-                        int j1 = this.randy.nextInt(21) + 10;
+                        int j1 = world.rand.nextInt(21) + 10;
 
                         if (j1 > itemstack.stackSize) {
                             j1 = itemstack.stackSize;
@@ -88,9 +85,9 @@ public void breakBlock(World world, int x, int y, int z, Block block, int wut) {
                         itemstack.stackSize -= j1;
                         EntityItem entityitem = new EntityItem(
                                 world,
-                                (double) ((float) x + f),
-                                (double) ((float) y + f1),
-                                (double) ((float) z + f2),
+                                (float) x + f,
+                                (float) y + f1,
+                                (float) z + f2,
                                 new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage()));
 
                         if (itemstack.hasTagCompound()) {
@@ -99,9 +96,9 @@ public void breakBlock(World world, int x, int y, int z, Block block, int wut) {
                         }
 
                         float f3 = 0.05F;
-                        entityitem.motionX = (double) ((float) this.randy.nextGaussian() * f3);
-                        entityitem.motionY = (double) ((float) this.randy.nextGaussian() * f3 + 0.2F);
-                        entityitem.motionZ = (double) ((float) this.randy.nextGaussian() * f3);
+                        entityitem.motionX = (float) world.rand.nextGaussian() * f3;
+                        entityitem.motionY = (float) world.rand.nextGaussian() * f3 + 0.2F;
+                        entityitem.motionZ = (float) world.rand.nextGaussian() * f3;
                         world.spawnEntityInWorld(entityitem);
                     }
                 }

diff --git a/src/main/java/fox/spiteful/avaritia/blocks/BlockNeutronCollector.java b/src/main/java/fox/spiteful/avaritia/blocks/BlockNeutronCollector.java
@@ -1,7 +1,5 @@
 package fox.spiteful.avaritia.blocks;
 
-import java.util.Random;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -25,7 +23,6 @@
 public class BlockNeutronCollector extends BlockContainer {
 
     private IIcon top, sides, front;
-    private Random randy = new Random();
 
     public BlockNeutronCollector() {
         super(Material.iron);
@@ -103,12 +100,12 @@ public void breakBlock(World world, int x, int y, int z, Block block, int wut) {
             ItemStack itemstack = collector.getStackInSlot(0);
 
             if (itemstack != null) {
-                float f = this.randy.nextFloat() * 0.8F + 0.1F;
-                float f1 = this.randy.nextFloat() * 0.8F + 0.1F;
-                float f2 = this.randy.nextFloat() * 0.8F + 0.1F;
+                float f = world.rand.nextFloat() * 0.8F + 0.1F;
+                float f1 = world.rand.nextFloat() * 0.8F + 0.1F;
+                float f2 = world.rand.nextFloat() * 0.8F + 0.1F;
 
                 while (itemstack.stackSize > 0) {
-                    int j1 = this.randy.nextInt(21) + 10;
+                    int j1 = world.rand.nextInt(21) + 10;
 
                     if (j1 > itemstack.stackSize) {
                         j1 = itemstack.stackSize;
@@ -117,19 +114,19 @@ public void breakBlock(World world, int x, int y, int z, Block block, int wut) {
                     itemstack.stackSize -= j1;
                     EntityItem entityitem = new EntityItem(
                             world,
-                            (double) ((float) x + f),
-                            (double) ((float) y + f1),
-                            (double) ((float) z + f2),
+                            (float) x + f,
+                            (float) y + f1,
+                            (float) z + f2,
                             new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage()));
 
                     if (itemstack.hasTagCompound()) {
                         entityitem.getEntityItem().setTagCompound((NBTTagCompound) itemstack.getTagCompound().copy());
                     }
 
                     float f3 = 0.05F;
-                    entityitem.motionX = (double) ((float) this.randy.nextGaussian() * f3);
-                    entityitem.motionY = (double) ((float) this.randy.nextGaussian() * f3 + 0.2F);
-                    entityitem.motionZ = (double) ((float) this.randy.nextGaussian() * f3);
+                    entityitem.motionX = (float) world.rand.nextGaussian() * f3;
+                    entityitem.motionY = (float) world.rand.nextGaussian() * f3 + 0.2F;
+                    entityitem.motionZ = (float) world.rand.nextGaussian() * f3;
                     world.spawnEntityInWorld(entityitem);
                 }
             }

diff --git a/src/main/java/fox/spiteful/avaritia/compat/ticon/TonkersEvents.java b/src/main/java/fox/spiteful/avaritia/compat/ticon/TonkersEvents.java
@@ -1,7 +1,5 @@
 package fox.spiteful.avaritia.compat.ticon;
 
-import java.util.Random;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
@@ -24,8 +22,6 @@
 
 public class TonkersEvents {
 
-    private Random randy = new Random();
-
     @SubscribeEvent
     public void craftTool(ToolCraftEvent.NormalTool event) {
         NBTTagCompound toolTag = event.toolTag.getCompoundTag("InfiTool");
@@ -142,7 +138,7 @@ public void onPlayerMine(PlayerInteractEvent event) {
 
             if (toolTag != null && toolTag.getInteger("Head") == Tonkers.infinityMetalId
                     && tool.canHarvestBlock(Blocks.stone, held)) {
-                if (block.quantityDropped(randy) == 0) {
+                if (block.quantityDropped(event.world.rand) == 0) {
                     ItemStack drop = block.getPickBlock(
                             ToolHelper.raytraceFromEntity(event.world, event.entityPlayer, true, 10),
                             event.world,

diff --git a/src/main/java/fox/spiteful/avaritia/entity/EntityGapingVoid.java b/src/main/java/fox/spiteful/avaritia/entity/EntityGapingVoid.java
@@ -1,7 +1,6 @@
 package fox.spiteful.avaritia.entity;
 
 import java.util.List;
-import java.util.Random;
 
 import net.minecraft.block.Block;
 import net.minecraft.command.IEntitySelector;
@@ -16,7 +15,6 @@
 
 public class EntityGapingVoid extends Entity {
 
-    private static Random randy = new Random();
     public static final int maxLifetime = 186;
     public static double collapse = .95;
     public static double suckrange = 20.0;
@@ -96,8 +94,8 @@ public void onUpdate() {
         double size = getVoidScale(age) * 0.5 - 0.2;
         for (int i = 0; i < 50; i++) {
             Vec3 pootdir = Vec3.createVectorHelper(0, 0, size);
-            pootdir.rotateAroundY(randy.nextFloat() * 180f);
-            pootdir.rotateAroundX(randy.nextFloat() * 360f);
+            pootdir.rotateAroundY(rand.nextFloat() * 180f);
+            pootdir.rotateAroundX(rand.nextFloat() * 360f);
 
             Vec3 pootspeed = pootdir.normalize();
             pootspeed.xCoord *= particlespeed;

diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemMatterCluster.java b/src/main/java/fox/spiteful/avaritia/items/ItemMatterCluster.java
@@ -5,7 +5,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Random;
 
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -29,8 +28,6 @@
 
 public class ItemMatterCluster extends Item implements ICosmicRenderItem {
 
-    protected static Random randy = new Random();
-
     public static final String MAINTAG = "clusteritems";
     public static final String LISTTAG = "items";
     public static final String ITEMTAG = "item";
@@ -85,12 +82,15 @@ public void addInformation(ItemStack stack, EntityPlayer player, List<String> to
                 NBTTagCompound tag = list.getCompoundTagAt(i);
                 ItemStack countstack = ItemStack.loadItemStackFromNBT(tag.getCompoundTag(ITEMTAG));
                 int count = tag.getInteger(COUNTTAG);
-
-                tooltip.add(
-                        countstack.getItem().getRarity(countstack).rarityColor + countstack.getDisplayName()
-                                + EnumChatFormatting.GRAY
-                                + " x "
-                                + count);
+                if (countstack != null) {
+                    tooltip.add(
+                            countstack.getItem().getRarity(countstack).rarityColor + countstack.getDisplayName()
+                                    + EnumChatFormatting.GRAY
+                                    + " x "
+                                    + count);
+                } else {
+                    tooltip.add(EnumChatFormatting.RED + "DELETED" + EnumChatFormatting.GRAY + " x " + count);
+                }
             }
         } else {
             tooltip.add(EnumChatFormatting.DARK_GRAY + StatCollector.translateToLocal("tooltip.matter_cluster.desc"));
@@ -102,12 +102,11 @@ public void addInformation(ItemStack stack, EntityPlayer player, List<String> to
 
     public static List<ItemStack> makeClusters(List<ItemStack> input) {
         Map<ItemStackWrapper, Integer> items = ToolHelper.collateMatterCluster(input);
-        List<ItemStack> clusters = new ArrayList<ItemStack>();
-        List<Entry<ItemStackWrapper, Integer>> itemlist = new ArrayList<Entry<ItemStackWrapper, Integer>>();
-        itemlist.addAll(items.entrySet());
+        List<ItemStack> clusters = new ArrayList<>();
+        List<Entry<ItemStackWrapper, Integer>> itemlist = new ArrayList<>(items.entrySet());
 
         int currentTotal = 0;
-        Map<ItemStackWrapper, Integer> currentItems = new HashMap<ItemStackWrapper, Integer>();
+        Map<ItemStackWrapper, Integer> currentItems = new HashMap<>();
 
         while (!itemlist.isEmpty()) {
             Entry<ItemStackWrapper, Integer> e = itemlist.get(0);
@@ -134,7 +133,7 @@ public static List<ItemStack> makeClusters(List<ItemStack> input) {
                 clusters.add(cluster);
 
                 currentTotal = 0;
-                currentItems = new HashMap<ItemStackWrapper, Integer>();
+                currentItems = new HashMap<>();
             }
         }
 
@@ -159,15 +158,21 @@ public static ItemStack makeCluster(Map<ItemStackWrapper, Integer> input) {
 
     public static Map<ItemStackWrapper, Integer> getClusterData(ItemStack cluster) {
         if (!cluster.hasTagCompound() || !cluster.getTagCompound().hasKey(MAINTAG)) {
-            return null;
+            return new HashMap<>();
         }
         NBTTagCompound tag = cluster.getTagCompound().getCompoundTag(MAINTAG);
         NBTTagList list = tag.getTagList(LISTTAG, 10);
-        Map<ItemStackWrapper, Integer> data = new HashMap<ItemStackWrapper, Integer>();
+        Map<ItemStackWrapper, Integer> data = new HashMap<>();
 
         for (int i = 0; i < list.tagCount(); i++) {
             NBTTagCompound entry = list.getCompoundTagAt(i);
-            ItemStackWrapper wrap = new ItemStackWrapper(ItemStack.loadItemStackFromNBT(entry.getCompoundTag(ITEMTAG)));
+            final ItemStack stack = ItemStack.loadItemStackFromNBT(entry.getCompoundTag(ITEMTAG));
+            if (stack == null) {
+                // item might be null if the cluster contains items that don't exist
+                // anymore by removing a mod for example
+                continue;
+            }
+            ItemStackWrapper wrap = new ItemStackWrapper(stack);
             int count = entry.getInteger(COUNTTAG);
             data.put(wrap, count);
         }
@@ -211,8 +216,7 @@ public static void mergeClusters(ItemStack donor, ItemStack recipient) {
 
         Map<ItemStackWrapper, Integer> donordata = getClusterData(donor);
         Map<ItemStackWrapper, Integer> recipientdata = getClusterData(recipient);
-        List<Entry<ItemStackWrapper, Integer>> datalist = new ArrayList<Entry<ItemStackWrapper, Integer>>();
-        datalist.addAll(donordata.entrySet());
+        List<Entry<ItemStackWrapper, Integer>> datalist = new ArrayList<>(donordata.entrySet());
 
         while (recipientcount < capacity && donorcount > 0) {
             Entry<ItemStackWrapper, Integer> e = datalist.get(0);