From df7675c48e1d74937b3e81c7f0d425b4547df1f9 Mon Sep 17 00:00:00 2001 From: George Paton Date: Mon, 3 Jun 2024 17:06:57 +1000 Subject: [PATCH 1/3] I _might_ be stupid --- src/main/java/com/hbm/blocks/bomb/BlockChargeBase.java | 2 +- src/main/java/com/hbm/blocks/bomb/DetCord.java | 2 +- src/main/java/com/hbm/blocks/bomb/DetMiner.java | 2 +- src/main/java/com/hbm/blocks/bomb/ExplosiveCharge.java | 2 +- src/main/java/com/hbm/blocks/generic/YellowBarrel.java | 2 +- src/main/java/com/hbm/inventory/material/NTMMaterial.java | 5 +++++ 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/hbm/blocks/bomb/BlockChargeBase.java b/src/main/java/com/hbm/blocks/bomb/BlockChargeBase.java index 6419fe459..4ce9a4bc3 100644 --- a/src/main/java/com/hbm/blocks/bomb/BlockChargeBase.java +++ b/src/main/java/com/hbm/blocks/bomb/BlockChargeBase.java @@ -18,7 +18,7 @@ import com.hbm.tileentity.bomb.TileEntityCharge; import api.hbm.block.IFuckingExplode; import api.hbm.block.IToolable; -import codechicken.lib.math.MathHelper; +import net.minecraft.util.MathHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/hbm/blocks/bomb/DetCord.java b/src/main/java/com/hbm/blocks/bomb/DetCord.java index 326a0c801..2a02ed0cc 100644 --- a/src/main/java/com/hbm/blocks/bomb/DetCord.java +++ b/src/main/java/com/hbm/blocks/bomb/DetCord.java @@ -2,7 +2,7 @@ package com.hbm.blocks.bomb; import com.hbm.entity.item.EntityTNTPrimedBase; -import codechicken.lib.math.MathHelper; +import net.minecraft.util.MathHelper; import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/hbm/blocks/bomb/DetMiner.java b/src/main/java/com/hbm/blocks/bomb/DetMiner.java index f8b0ffcaa..4ec679353 100644 --- a/src/main/java/com/hbm/blocks/bomb/DetMiner.java +++ b/src/main/java/com/hbm/blocks/bomb/DetMiner.java @@ -10,7 +10,7 @@ import com.hbm.explosion.ExplosionNT.ExAttrib; import com.hbm.interfaces.IBomb; import api.hbm.block.IFuckingExplode; -import codechicken.lib.math.MathHelper; +import net.minecraft.util.MathHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.Item; diff --git a/src/main/java/com/hbm/blocks/bomb/ExplosiveCharge.java b/src/main/java/com/hbm/blocks/bomb/ExplosiveCharge.java index f1b92756b..84ccebc63 100644 --- a/src/main/java/com/hbm/blocks/bomb/ExplosiveCharge.java +++ b/src/main/java/com/hbm/blocks/bomb/ExplosiveCharge.java @@ -10,7 +10,7 @@ import com.hbm.explosion.ExplosionNT; import com.hbm.interfaces.IBomb; import com.hbm.lib.RefStrings; -import codechicken.lib.math.MathHelper; +import net.minecraft.util.MathHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; diff --git a/src/main/java/com/hbm/blocks/generic/YellowBarrel.java b/src/main/java/com/hbm/blocks/generic/YellowBarrel.java index 17895777c..bf0d4baf9 100644 --- a/src/main/java/com/hbm/blocks/generic/YellowBarrel.java +++ b/src/main/java/com/hbm/blocks/generic/YellowBarrel.java @@ -9,7 +9,7 @@ import com.hbm.entity.item.EntityTNTPrimedBase; import com.hbm.explosion.ExplosionNukeGeneric; import com.hbm.handler.radiation.ChunkRadiationManager; -import codechicken.lib.math.MathHelper; +import net.minecraft.util.MathHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/hbm/inventory/material/NTMMaterial.java b/src/main/java/com/hbm/inventory/material/NTMMaterial.java index 193ad939a..554845e05 100644 --- a/src/main/java/com/hbm/inventory/material/NTMMaterial.java +++ b/src/main/java/com/hbm/inventory/material/NTMMaterial.java @@ -4,7 +4,11 @@ import java.util.HashSet; import java.util.Locale; import java.util.Set; +import java.awt.Color; + import com.hbm.inventory.OreDictManager.DictFrame; +import com.hbm.main.MainRegistry; +import com.hbm.util.I18nUtil; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -86,6 +90,7 @@ public class NTMMaterial { public NTMMaterial setMoltenColor(int color) { this.moltenColor = color; + MainRegistry.logger.info(I18nUtil.resolveKey(getUnlocalizedName()) + " : " + String.format("0x%08X", color)); return this; } From 3b160158c1b19a7e5c0db027fa4bd07144cc34ac Mon Sep 17 00:00:00 2001 From: George Paton Date: Mon, 3 Jun 2024 17:08:40 +1000 Subject: [PATCH 2/3] and the hits keep coming --- src/main/java/com/hbm/inventory/material/NTMMaterial.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/com/hbm/inventory/material/NTMMaterial.java b/src/main/java/com/hbm/inventory/material/NTMMaterial.java index 554845e05..193ad939a 100644 --- a/src/main/java/com/hbm/inventory/material/NTMMaterial.java +++ b/src/main/java/com/hbm/inventory/material/NTMMaterial.java @@ -4,11 +4,7 @@ import java.util.HashSet; import java.util.Locale; import java.util.Set; -import java.awt.Color; - import com.hbm.inventory.OreDictManager.DictFrame; -import com.hbm.main.MainRegistry; -import com.hbm.util.I18nUtil; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -90,7 +86,6 @@ public class NTMMaterial { public NTMMaterial setMoltenColor(int color) { this.moltenColor = color; - MainRegistry.logger.info(I18nUtil.resolveKey(getUnlocalizedName()) + " : " + String.format("0x%08X", color)); return this; } From 209c1b169120abf32aad82e40c45dfc2d0859e23 Mon Sep 17 00:00:00 2001 From: George Paton Date: Mon, 3 Jun 2024 17:13:47 +1000 Subject: [PATCH 3/3] Replace scala Arrays with java.util Arrays (asList is equivalent) --- src/main/java/com/hbm/interfaces/ICustomWarhead.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hbm/interfaces/ICustomWarhead.java b/src/main/java/com/hbm/interfaces/ICustomWarhead.java index 656425cd1..479ad891c 100644 --- a/src/main/java/com/hbm/interfaces/ICustomWarhead.java +++ b/src/main/java/com/hbm/interfaces/ICustomWarhead.java @@ -4,6 +4,7 @@ import java.text.DecimalFormat; import java.util.ArrayList; import java.util.List; import java.util.Locale; +import java.util.Arrays; import org.apache.logging.log4j.Level; @@ -17,7 +18,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; -import scala.actors.threadpool.Arrays; /** * Interface for customizable warheads or other explosive devices * @author UFFR