diff options
Diffstat (limited to 'src/Java/miscutil/core/item')
12 files changed, 26 insertions, 15 deletions
diff --git a/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java b/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java index e529e8329b..d33ca866ba 100644 --- a/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java +++ b/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java @@ -10,6 +10,7 @@ import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -59,7 +60,7 @@ public class BaseItemBolt extends Item{ @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (colour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return colour; diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java index b0064b0b11..1dee49bfa4 100644 --- a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java +++ b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java @@ -13,6 +13,7 @@ import miscutil.core.lib.CORE; import miscutil.core.lib.MaterialInfo; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -111,7 +112,7 @@ public class BaseItemDust extends Item{ @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (colour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return colour; @@ -218,7 +219,7 @@ public class BaseItemDust extends Item{ tempInputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1); tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempDust, 1); ItemStack tempStackOutput2; - int chance = mTier*10/Utils.randInt(10, 20); + int chance = mTier*10/MathUtils.randInt(10, 20); if (outputStacks[1] != null && !outputStacks[1].getUnlocalizedName().toLowerCase().contains("aaa_broken")){ tempStackOutput2 = outputStacks[1]; tempOutputStack = outputStacks[0]; diff --git a/src/Java/miscutil/core/item/base/foods/BaseItemHotFood.java b/src/Java/miscutil/core/item/base/foods/BaseItemHotFood.java index 7a0e162eec..a56f2293f4 100644 --- a/src/Java/miscutil/core/item/base/foods/BaseItemHotFood.java +++ b/src/Java/miscutil/core/item/base/foods/BaseItemHotFood.java @@ -4,6 +4,7 @@ import java.util.List; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -46,7 +47,7 @@ public class BaseItemHotFood extends BaseItemFood{ }else if(iStack.getItemDamage() < cooldownTime){ iStack.setItemDamage(iStack.getItemDamage() + 1); } - if(Utils.divideXintoY(iStack.getItemDamage(), 150)){ + if(MathUtils.divideXintoY(iStack.getItemDamage(), 150)){ entityHolding.attackEntityFrom(DamageSource.onFire, 1); } diff --git a/src/Java/miscutil/core/item/base/gears/BaseItemGear.java b/src/Java/miscutil/core/item/base/gears/BaseItemGear.java index 5c427a025f..f9b13742ca 100644 --- a/src/Java/miscutil/core/item/base/gears/BaseItemGear.java +++ b/src/Java/miscutil/core/item/base/gears/BaseItemGear.java @@ -10,6 +10,7 @@ import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -59,7 +60,7 @@ public class BaseItemGear extends Item{ @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (colour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return colour; diff --git a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java b/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java index 8915b155bd..ac71a4391c 100644 --- a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java +++ b/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java @@ -9,6 +9,7 @@ import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -69,7 +70,7 @@ public class BaseItemIngot extends Item{ @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (colour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return colour; diff --git a/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java b/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java index 689f085198..93dbf432e0 100644 --- a/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java +++ b/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java @@ -9,6 +9,7 @@ import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -59,7 +60,7 @@ public class BaseItemPlate extends Item{ @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (colour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return colour; diff --git a/src/Java/miscutil/core/item/base/rings/BaseItemRing.java b/src/Java/miscutil/core/item/base/rings/BaseItemRing.java index 0938076905..0ec02b0299 100644 --- a/src/Java/miscutil/core/item/base/rings/BaseItemRing.java +++ b/src/Java/miscutil/core/item/base/rings/BaseItemRing.java @@ -10,6 +10,7 @@ import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -59,7 +60,7 @@ public class BaseItemRing extends Item{ @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (colour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return colour; diff --git a/src/Java/miscutil/core/item/base/rods/BaseItemRod.java b/src/Java/miscutil/core/item/base/rods/BaseItemRod.java index 853e6dde70..8ae9d0a7f4 100644 --- a/src/Java/miscutil/core/item/base/rods/BaseItemRod.java +++ b/src/Java/miscutil/core/item/base/rods/BaseItemRod.java @@ -10,6 +10,7 @@ import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -60,7 +61,7 @@ public class BaseItemRod extends Item{ @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (colour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return colour; diff --git a/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java b/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java index 64b7d7f2bb..af9f27617d 100644 --- a/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java +++ b/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java @@ -9,6 +9,7 @@ import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -59,7 +60,7 @@ public class BaseItemRodLong extends Item{ @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (colour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return colour; diff --git a/src/Java/miscutil/core/item/base/rotors/BaseItemRotor.java b/src/Java/miscutil/core/item/base/rotors/BaseItemRotor.java index cc8504339f..35610975ad 100644 --- a/src/Java/miscutil/core/item/base/rotors/BaseItemRotor.java +++ b/src/Java/miscutil/core/item/base/rotors/BaseItemRotor.java @@ -8,6 +8,7 @@ import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -56,7 +57,7 @@ public class BaseItemRotor extends Item{ @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (colour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return colour; diff --git a/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java b/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java index 37efc3e935..9282cce3f3 100644 --- a/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java +++ b/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java @@ -9,6 +9,7 @@ import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -60,7 +61,7 @@ public class BaseItemScrew extends Item{ @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { if (colour == 0){ - return Utils.generateSingularRandomHexValue(); + return MathUtils.generateSingularRandomHexValue(); } return colour; diff --git a/src/Java/miscutil/core/item/general/RF2EU_Battery.java b/src/Java/miscutil/core/item/general/RF2EU_Battery.java index 61d5cb1ea0..a6888b4dcc 100644 --- a/src/Java/miscutil/core/item/general/RF2EU_Battery.java +++ b/src/Java/miscutil/core/item/general/RF2EU_Battery.java @@ -8,8 +8,8 @@ import java.util.List; import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; -import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; +import miscutil.core.util.math.MathUtils; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -117,7 +117,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem, public double getDurabilityForDisplay(ItemStack stack) { //return 1.0D - getEnergyStored(stack) / this.capacity; - return Utils.findPercentage(getEnergyStored(stack), getMaxEnergyStored(stack)); + return MathUtils.findPercentage(getEnergyStored(stack), getMaxEnergyStored(stack)); } @Override @@ -155,7 +155,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem, list.add(""); list.add("RF Information"); list.add("Extraction Rate: [" + this.maxExtract + "Rf/t]" + " Insert Rate: [" + this.maxReceive+"Rf/t]"); - list.add("Current Charge: ["+getEnergyStored(stack) + "Rf / " + getMaxEnergyStored(stack)+"Rf] "+Utils.findPercentage(getEnergyStored(stack), getMaxEnergyStored(stack))+"%"); + list.add("Current Charge: ["+getEnergyStored(stack) + "Rf / " + getMaxEnergyStored(stack)+"Rf] "+MathUtils.findPercentage(getEnergyStored(stack), getMaxEnergyStored(stack))+"%"); super.addInformation(stack, aPlayer, list, bool); } |