fix crash when right clicking howler with any gtmetaitem

GTNewHorizons · Apr 17, 2024 · 3e0cfc0 · 3e0cfc0
1 parent 7c4056a
commit 3e0cfc0
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/blocks/BlockNuclearControlMain.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/blocks/BlockNuclearControlMain.java
@@ -403,23 +403,24 @@ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer p
             float f3) {
         int blockType = world.getBlockMetadata(x, y, z);
         TileEntity tileEntity = world.getTileEntity(x, y, z);
-        if (tileEntity instanceof TileEntityHowlerAlarm) {
+        if (tileEntity instanceof TileEntityHowlerAlarm tileHowler) {
             if (player.getCurrentEquippedItem() != null && DyeUtil.isADye(player.getCurrentEquippedItem())) {
-                ((TileEntityHowlerAlarm) tileEntity)
-                        .setColor(ItemDye.field_150922_c[DyeUtil.getDyeId(player.getCurrentEquippedItem())]);
-                world.markBlockForUpdate(x, y, z);
-                if (!player.capabilities.isCreativeMode) {
-                    if (player.inventory.getCurrentItem().stackSize == 1) {
-                        player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
-                    } else {
-                        player.inventory.getCurrentItem().stackSize--;
+                int dyeId = DyeUtil.getDyeId(player.getCurrentEquippedItem());
+                if(dyeId >= 0){
+                    tileHowler.setColor(ItemDye.field_150922_c[dyeId]);
+                    world.markBlockForUpdate(x, y, z);
+                    if (!player.capabilities.isCreativeMode) {
+                        if (player.inventory.getCurrentItem().stackSize == 1) {
+                            player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
+                        } else {
+                            player.inventory.getCurrentItem().stackSize--;
+                        }
                     }
+                    return true;
                 }
-                return true;
             } else if (player.getCurrentEquippedItem() != null) {
-                if (player.getCurrentEquippedItem().getItem() instanceof ItemToolPainter) {
-                    ItemToolPainter p = (ItemToolPainter) player.getCurrentEquippedItem().getItem();
-                    ((TileEntityHowlerAlarm) tileEntity).setColor(ItemDye.field_150922_c[p.color]);
+                if (player.getCurrentEquippedItem().getItem() instanceof ItemToolPainter toolPainter) {
+                    tileHowler.setColor(ItemDye.field_150922_c[toolPainter.color]);
                     world.markBlockForUpdate(x, y, z);
                     player.getCurrentEquippedItem().damageItem(1, player);
                     return true;