diff options
Diffstat (limited to 'src/Java/miscutil/core/item')
6 files changed, 24 insertions, 81 deletions
diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java index 360b620cc5..8dc49c3249 100644 --- a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java +++ b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java @@ -6,8 +6,6 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import ic2.core.IC2Potion; -import ic2.core.item.armor.ItemArmorHazmat; import java.util.List; @@ -18,7 +16,6 @@ import miscutil.core.util.item.UtilsItems; import miscutil.core.util.math.MathUtils; import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -100,14 +97,7 @@ public class BaseItemDust extends Item{ protected final int sRadiation; @Override public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { - if (!world.isRemote){ - if (this.sRadiation > 0 && (entityHolding instanceof EntityLivingBase)) { - EntityLivingBase entityLiving = (EntityLivingBase) entityHolding; - if (!ItemArmorHazmat.hasCompleteHazmat(entityLiving)) { - IC2Potion.radiation.applyTo(entityLiving, sRadiation * 20, sRadiation * 10); - } - } - } + Utils.applyRadiationDamageToEntity(sRadiation, world, entityHolding); } @Override @@ -123,8 +113,8 @@ public class BaseItemDust extends Item{ list.add(EnumChatFormatting.GRAY+"A pile of " + materialName + " dust."); } if (sRadiation > 0){ - list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.GREEN+"Radioactive! "+EnumChatFormatting.GOLD+" Avoid direct handling without hazmat protection."); - } + list.add(CORE.GT_Tooltip_Radioactive); + } //} super.addInformation(stack, aPlayer, list, bool); } @@ -141,6 +131,8 @@ public class BaseItemDust extends Item{ return colour; } + + private void addMixerRecipe(){ ItemStack tempStack = UtilsItems.getSimpleStack(this); diff --git a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java b/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java index 30659c53cc..c726614be6 100644 --- a/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java +++ b/src/Java/miscutil/core/item/base/ingots/BaseItemIngot.java @@ -2,8 +2,6 @@ package miscutil.core.item.base.ingots; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; -import ic2.core.IC2Potion; -import ic2.core.item.armor.ItemArmorHazmat; import java.util.List; @@ -13,7 +11,6 @@ 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.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -67,8 +64,8 @@ public class BaseItemIngot extends Item{ list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.RED+"Very hot! "+EnumChatFormatting.GRAY+" Avoid direct handling.."); } if (sRadiation > 0){ - list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.GREEN+"Radioactive! "+EnumChatFormatting.GOLD+" Avoid direct handling without hazmat protection."); - } + list.add(CORE.GT_Tooltip_Radioactive); + } super.addInformation(stack, aPlayer, list, bool); } @@ -116,13 +113,6 @@ public class BaseItemIngot extends Item{ protected final int sRadiation; @Override public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { - if (!world.isRemote){ - if (this.sRadiation > 0 && (entityHolding instanceof EntityLivingBase)) { - EntityLivingBase entityLiving = (EntityLivingBase) entityHolding; - if (!ItemArmorHazmat.hasCompleteHazmat(entityLiving)) { - IC2Potion.radiation.applyTo(entityLiving, sRadiation * 20, sRadiation * 10); - } - } - } + Utils.applyRadiationDamageToEntity(sRadiation, world, entityHolding); } } diff --git a/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtBlock.java b/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtBlock.java index 6c244b33db..9c701ab51f 100644 --- a/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtBlock.java +++ b/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtBlock.java @@ -1,19 +1,17 @@ package miscutil.core.item.base.itemblock; import gregtech.api.util.GT_OreDictUnificator; -import ic2.core.IC2Potion; -import ic2.core.item.armor.ItemArmorHazmat; import java.util.List; +import miscutil.core.lib.CORE; +import miscutil.core.util.Utils; import miscutil.core.util.item.UtilsItems; import net.minecraft.block.Block; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; public class ItemBlockGtBlock extends ItemBlock{ @@ -40,21 +38,14 @@ public class ItemBlockGtBlock extends ItemBlock{ @Override public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { if (sRadiation > 0){ - list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.GREEN+"Radioactive! "+EnumChatFormatting.GOLD+" Avoid direct handling without hazmat protection."); + list.add(CORE.GT_Tooltip_Radioactive); } super.addInformation(stack, aPlayer, list, bool); } @Override public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { - if (!world.isRemote){ - if (this.sRadiation > 0 && (entityHolding instanceof EntityLivingBase)) { - EntityLivingBase entityLiving = (EntityLivingBase) entityHolding; - if (!ItemArmorHazmat.hasCompleteHazmat(entityLiving)) { - IC2Potion.radiation.applyTo(entityLiving, sRadiation * 20, sRadiation * 10); - } - } - } + Utils.applyRadiationDamageToEntity(sRadiation, world, entityHolding); } } diff --git a/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java b/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java index 75d3f6a527..b802ed51bf 100644 --- a/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java +++ b/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java @@ -2,8 +2,6 @@ package miscutil.core.item.base.plates; import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_OreDictUnificator; -import ic2.core.IC2Potion; -import ic2.core.item.armor.ItemArmorHazmat; import java.util.List; @@ -13,7 +11,6 @@ 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.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -56,8 +53,8 @@ public class BaseItemPlate extends Item{ list.add(EnumChatFormatting.GRAY+"A flat plate of " + materialName + "."); } if (sRadiation > 0){ - list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.GREEN+"Radioactive! "+EnumChatFormatting.GOLD+" Avoid direct handling without hazmat protection."); - } + list.add(CORE.GT_Tooltip_Radioactive); + } super.addInformation(stack, aPlayer, list, bool); } @@ -77,14 +74,7 @@ public class BaseItemPlate extends Item{ protected final int sRadiation; @Override public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { - if (!world.isRemote){ - if (this.sRadiation > 0 && (entityHolding instanceof EntityLivingBase)) { - EntityLivingBase entityLiving = (EntityLivingBase) entityHolding; - if (!ItemArmorHazmat.hasCompleteHazmat(entityLiving)) { - IC2Potion.radiation.applyTo(entityLiving, sRadiation * 20, sRadiation * 10); - } - } - } + Utils.applyRadiationDamageToEntity(sRadiation, world, entityHolding); } private void addBendingRecipe(){ diff --git a/src/Java/miscutil/core/item/base/rods/BaseItemRod.java b/src/Java/miscutil/core/item/base/rods/BaseItemRod.java index 64abd9f591..c007887b59 100644 --- a/src/Java/miscutil/core/item/base/rods/BaseItemRod.java +++ b/src/Java/miscutil/core/item/base/rods/BaseItemRod.java @@ -3,8 +3,6 @@ package miscutil.core.item.base.rods; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.util.GT_OreDictUnificator; -import ic2.core.IC2Potion; -import ic2.core.item.armor.ItemArmorHazmat; import java.util.List; @@ -15,7 +13,6 @@ import miscutil.core.util.item.UtilsItems; import miscutil.core.util.math.MathUtils; import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -58,8 +55,8 @@ public class BaseItemRod extends Item{ list.add(EnumChatFormatting.GRAY+"A 40cm Rod of " + materialName + "."); } if (sRadiation > 0){ - list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.GREEN+"Radioactive! "+EnumChatFormatting.GOLD+" Avoid direct handling without hazmat protection."); - } + list.add(CORE.GT_Tooltip_Radioactive); + } super.addInformation(stack, aPlayer, list, bool); } @@ -79,14 +76,7 @@ public class BaseItemRod extends Item{ protected final int sRadiation; @Override public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { - if (!world.isRemote){ - if (this.sRadiation > 0 && (entityHolding instanceof EntityLivingBase)) { - EntityLivingBase entityLiving = (EntityLivingBase) entityHolding; - if (!ItemArmorHazmat.hasCompleteHazmat(entityLiving)) { - IC2Potion.radiation.applyTo(entityLiving, sRadiation * 20, sRadiation * 10); - } - } - } + Utils.applyRadiationDamageToEntity(sRadiation, world, entityHolding); } private void addExtruderRecipe(){ diff --git a/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java b/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java index dc2b50e594..c02254488a 100644 --- a/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java +++ b/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java @@ -2,8 +2,6 @@ package miscutil.core.item.base.rods; import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_OreDictUnificator; -import ic2.core.IC2Potion; -import ic2.core.item.armor.ItemArmorHazmat; import java.util.List; @@ -14,7 +12,6 @@ import miscutil.core.util.item.UtilsItems; import miscutil.core.util.math.MathUtils; import miscutil.core.util.recipe.UtilsRecipe; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -57,7 +54,7 @@ public class BaseItemRodLong extends Item{ list.add(EnumChatFormatting.GRAY+"A 80cm Rod of " + materialName + "."); } if (sRadiation > 0){ - list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.GREEN+"Radioactive! "+EnumChatFormatting.GOLD+" Avoid direct handling without hazmat protection."); + list.add(CORE.GT_Tooltip_Radioactive); } super.addInformation(stack, aPlayer, list, bool); } @@ -76,18 +73,11 @@ public class BaseItemRodLong extends Item{ } protected final int sRadiation; - @Override - public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { - if (!world.isRemote){ - if (this.sRadiation > 0 && (entityHolding instanceof EntityLivingBase)) { - EntityLivingBase entityLiving = (EntityLivingBase) entityHolding; - if (!ItemArmorHazmat.hasCompleteHazmat(entityLiving)) { - IC2Potion.radiation.applyTo(entityLiving, sRadiation * 20, sRadiation * 10); - } - } - } - } - + @Override + public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { + Utils.applyRadiationDamageToEntity(sRadiation, world, entityHolding); + } + private void addExtruderRecipe(){ Utils.LOG_WARNING("Adding recipe for Long "+materialName+" Rods"); String tempIngot = unlocalName.replace("itemRodLong", "stick"); |