diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Java/gtPlusPlus/core/item/wearable/WearableLoader.java | 2 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java | 16 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java | 147 | ||||
-rw-r--r-- | src/resources/assets/miscutils/lang/en_US.lang | 3 | ||||
-rw-r--r-- | src/resources/assets/miscutils/textures/items/itemHatTinFoil.png | bin | 0 -> 261 bytes | |||
-rw-r--r-- | src/resources/assets/miscutils/textures/models/TinFoil.png | bin | 0 -> 588 bytes |
6 files changed, 166 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/item/wearable/WearableLoader.java b/src/Java/gtPlusPlus/core/item/wearable/WearableLoader.java index 7b1efb1546..6912b4e771 100644 --- a/src/Java/gtPlusPlus/core/item/wearable/WearableLoader.java +++ b/src/Java/gtPlusPlus/core/item/wearable/WearableLoader.java @@ -5,7 +5,7 @@ import gtPlusPlus.core.item.wearable.armour.ArmourLoader; public class WearableLoader { public static void run() { - //execute(); + execute(); } private static void execute() { diff --git a/src/Java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java b/src/Java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java index db6ee5c0d1..6918f2b048 100644 --- a/src/Java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java +++ b/src/Java/gtPlusPlus/core/item/wearable/armour/ArmourLoader.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.item.wearable.armour; +import cpw.mods.fml.common.registry.GameRegistry; +import gtPlusPlus.core.item.wearable.armour.tinfoil.ArmourTinFoilHat; +import gtPlusPlus.core.lib.CORE; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor.ArmorMaterial; @@ -7,16 +10,22 @@ import net.minecraftforge.common.util.EnumHelper; public class ArmourLoader { + //Glass public static Item ClearGlassChestplate; public static Item ClearGlassBoots; public static Item ClearGlassLeggings; public static Item ClearGlassHelmet; - public static ArmorMaterial ClearGlassArmor = EnumHelper.addArmorMaterial("ClearGlassArmor", 1, new int[] { 1, 4, 2, 1 }, 100); + //Tin Foil + public static Item TinFoilHat; + + public static ArmorMaterial ClearGlassArmour = EnumHelper.addArmorMaterial("ClearGlassArmor", 1, new int[] {1, 1, 1, 1}, 100); + public static ArmorMaterial TinFoilArmour = EnumHelper.addArmorMaterial("TINFOIL", 5, new int[]{1, 1, 1, 1}, 50); public static void run() { glassArmour(); + tinfoilArmour(); } private static void glassArmour() { @@ -24,4 +33,9 @@ public class ArmourLoader { //ClearGlassHelmet = new ClearGlassArmor(2055, ClearGlassArmor, 5, 0).setUnlocalizedName("amethyst_helmet"); } + private static void tinfoilArmour() { + TinFoilHat = new ArmourTinFoilHat().setUnlocalizedName("itemHatTinFoil"); + GameRegistry.registerItem(TinFoilHat, "itemHatTinFoil", CORE.MODID); + } + } diff --git a/src/Java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java b/src/Java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java new file mode 100644 index 0000000000..9017849d8c --- /dev/null +++ b/src/Java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java @@ -0,0 +1,147 @@ +package gtPlusPlus.core.item.wearable.armour.tinfoil; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.util.GT_Utility; +import gtPlusPlus.core.item.wearable.armour.ArmourLoader; +import gtPlusPlus.core.item.wearable.armour.base.BaseArmourHelm; +import gtPlusPlus.core.lib.CORE; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.item.EntityXPOrb; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +public class ArmourTinFoilHat extends BaseArmourHelm { + + public IIcon iconHelm; + + public ArmourTinFoilHat() { + super(ArmourLoader.TinFoilArmour, 0); + } + + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister ir) { + this.iconHelm = ir.registerIcon(CORE.MODID + ":itemHatTinFoil"); + } + + @Override + public int getRenderIndex() { + return 0; + } + + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int par1) { + return this.iconHelm; + } + + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { + return CORE.MODID + ":textures/models/TinFoil.png"; + } + + public EnumRarity getRarity(ItemStack itemstack) { + return EnumRarity.uncommon; + } + + public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + return false; + } + + @Override + public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { + return super.getArmorDisplay(player, armor, slot); + } + + @Override + public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { + super.damageArmor(entity, stack, source, damage, slot); + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List aList, boolean p_77624_4_) { + aList.add("DoomSquirter's protection against cosmic radiation!"); + aList.add("General paranoia makes the wearer unable to collect xp"); + aList.add("Movement speed is also reduced, to keep you safe"); + } + + @Override + public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, + int slot) { + return super.getProperties(player, armor, source, damage, slot); + } + + @Override + public boolean isDamageable() { + return false; + } + + @Override + public boolean itemInteractionForEntity(ItemStack p_111207_1_, EntityPlayer p_111207_2_, + EntityLivingBase p_111207_3_) { + return super.itemInteractionForEntity(p_111207_1_, p_111207_2_, p_111207_3_); + } + + @Override + public void onUpdate(ItemStack aStack, World aWorld, Entity aEntity, int p_77663_4_, boolean p_77663_5_) { + super.onUpdate(aStack, aWorld, aEntity, p_77663_4_, p_77663_5_); + } + + @Override + public boolean onEntityItemUpdate(EntityItem entityItem) { + return super.onEntityItemUpdate(entityItem); + } + + @Override + public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { + if (itemStack != null && player != null && world != null && !world.isRemote) { + if (player instanceof EntityPlayer) { + + // Apply Slow + if (!GT_Utility.getPotion(player, Potion.moveSlowdown.id)) { + player.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 2, 1, true)); + } + + // Move Xp orbs away + try { + AxisAlignedBB box = player.getBoundingBox(); + box.maxX += 5; + box.maxY += 5; + box.maxZ += 5; + box.minX += 5; + box.minY += 5; + box.minZ += 5; + @SuppressWarnings("unchecked") + List<Entity> g = world.getEntitiesWithinAABBExcludingEntity(player, box); + if (g.size() > 0) { + for (Entity e : g) { + if (e instanceof EntityXPOrb) { + e.setVelocity(player.motionX + 0.2, player.motionY, player.motionZ + 0.2); + } + } + } + } catch (Throwable t) { + } + } + } + + super.onArmorTick(world, player, itemStack); + } + + @Override + public boolean showDurabilityBar(ItemStack stack) { + return false; + } + +} diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang index 122c2ea434..84a1060b87 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -2015,3 +2015,6 @@ description.villager.profession.miscutils.banker=Banker description.villager.profession.miscutils.technician=GT Technician description.villager.profession.miscutils.trader=Ore Trader description.villager.profession.miscutils.aboriginal=Native Australian + +//Added 23/8/18 +item.itemHatTinFoil.name=Tin Foil Hat diff --git a/src/resources/assets/miscutils/textures/items/itemHatTinFoil.png b/src/resources/assets/miscutils/textures/items/itemHatTinFoil.png Binary files differnew file mode 100644 index 0000000000..91f1cad62e --- /dev/null +++ b/src/resources/assets/miscutils/textures/items/itemHatTinFoil.png diff --git a/src/resources/assets/miscutils/textures/models/TinFoil.png b/src/resources/assets/miscutils/textures/models/TinFoil.png Binary files differnew file mode 100644 index 0000000000..4f4f29bb32 --- /dev/null +++ b/src/resources/assets/miscutils/textures/models/TinFoil.png |