From cb2b082ef1b383b2361d9f92a157e1b0c57a86b1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 21 Feb 2019 01:42:44 -0600 Subject: [PATCH] Armor and some other items --- .../java/vazkii/botania/api/BotaniaAPI.java | 165 ++++++++++++++++-- .../botania/common/item/ItemBlackLotus.java | 11 +- .../botania/common/item/ItemCraftPattern.java | 16 +- .../vazkii/botania/common/item/ModItems.java | 62 +++---- .../armor/elementium/ItemElementiumArmor.java | 7 +- .../armor/elementium/ItemElementiumBoots.java | 4 +- .../armor/elementium/ItemElementiumChest.java | 4 +- .../armor/elementium/ItemElementiumHelm.java | 9 +- .../armor/elementium/ItemElementiumLegs.java | 4 +- .../armor/manasteel/ItemManasteelArmor.java | 7 +- .../armor/manaweave/ItemManaweaveArmor.java | 31 ++-- .../armor/manaweave/ItemManaweaveBoots.java | 22 --- .../armor/manaweave/ItemManaweaveChest.java | 23 --- .../armor/manaweave/ItemManaweaveHelm.java | 8 +- .../armor/manaweave/ItemManaweaveLegs.java | 22 --- .../armor/terrasteel/ItemTerrasteelArmor.java | 23 ++- .../armor/terrasteel/ItemTerrasteelBoots.java | 22 --- .../armor/terrasteel/ItemTerrasteelChest.java | 22 --- .../armor/terrasteel/ItemTerrasteelHelm.java | 30 ++-- .../armor/terrasteel/ItemTerrasteelLegs.java | 22 --- .../tool/terrasteel/ItemTerraAxe.java | 1 - .../ItemTerrasteelHelmRevealing.java | 4 +- .../botania/common/lib/LibItemNames.java | 2 +- 23 files changed, 253 insertions(+), 268 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveBoots.java delete mode 100644 src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveChest.java delete mode 100644 src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveLegs.java delete mode 100644 src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelBoots.java delete mode 100644 src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelChest.java delete mode 100644 src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelLegs.java diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index f74b815b5..8077ac48d 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -23,8 +23,10 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.EnumRarity; +import net.minecraft.item.IArmorMaterial; import net.minecraft.item.IItemTier; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; @@ -34,6 +36,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.Ingredient; import net.minecraft.state.EnumProperty; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundEvent; import net.minecraft.util.registry.RegistryNamespaced; import net.minecraft.util.registry.RegistryNamespacedDefaultedByKey; import net.minecraft.util.text.TextFormatting; @@ -104,8 +107,44 @@ public final class BotaniaAPI { public static final Set> gravityRodBlacklist = new LinkedHashSet<>(); // TODO 1.13 move these to eliminate dependence on botania proper in Ingredients - public static final ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16, - new int[] { 2, 5, 6, 2 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0); + private static final int[] MAX_DAMAGE_ARRAY = new int[]{13, 15, 16, 11}; + public static final IArmorMaterial MANASTEEL_ARMOR_MAT = new IArmorMaterial() { + private final int[] damageReduction = { 2, 5, 6, 2 }; + @Override + public int getDurability(EntityEquipmentSlot slotIn) { + return 16 * MAX_DAMAGE_ARRAY[slotIn.getIndex()]; + } + + @Override + public int getDamageReductionAmount(EntityEquipmentSlot slotIn) { + return damageReduction[slotIn.getIndex()]; + } + + @Override + public int getEnchantability() { + return 18; + } + + @Override + public SoundEvent getSoundEvent() { + return SoundEvents.ITEM_ARMOR_EQUIP_IRON; + } + + @Override + public Ingredient getRepairMaterial() { + return Ingredient.fromItems(ModItems.manaSteel); + } + + @Override + public String getName() { + return "manasteel"; + } + + @Override + public float getToughness() { + return 0; + } + }; public static final IItemTier MANASTEEL_ITEM_TIER = new IItemTier() { @Override public int getMaxUses() { @@ -137,12 +176,45 @@ public final class BotaniaAPI { public Ingredient getRepairMaterial() { return Ingredient.fromItems(ModItems.manaSteel); } - } + }; - public static final ArmorMaterial elementiumArmorMaterial = EnumHelper.addArmorMaterial("B_ELEMENTIUM", "b_elementium", 18, - new int[] { 2, 5, 6, 2 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0); - public static final ToolMaterial elementiumToolMaterial = EnumHelper.addToolMaterial("B_ELEMENTIUM", 3, 720, 6.2F, 2F, 20); + public static final IArmorMaterial ELEMENTIUM_ARMOR_MAT = new IArmorMaterial() { + private final int[] damageReduction = { 2, 5, 6, 2 }; + @Override + public int getDurability(EntityEquipmentSlot slotIn) { + return 18 * MAX_DAMAGE_ARRAY[slotIn.getIndex()]; + } + @Override + public int getDamageReductionAmount(EntityEquipmentSlot slotIn) { + return damageReduction[slotIn.getIndex()]; + } + + @Override + public int getEnchantability() { + return 18; + } + + @Override + public SoundEvent getSoundEvent() { + return SoundEvents.ITEM_ARMOR_EQUIP_IRON; + } + + @Override + public Ingredient getRepairMaterial() { + return Ingredient.fromItems(ModItems.elementium); + } + + @Override + public String getName() { + return "elementium"; + } + + @Override + public float getToughness() { + return 0; + } + }; public static final IItemTier ELEMENTIUM_ITEM_TIER = new IItemTier() { @Override public int getMaxUses() { @@ -174,10 +246,45 @@ public final class BotaniaAPI { public Ingredient getRepairMaterial() { return Ingredient.fromItems(ModItems.elementium); } - } + }; - public static final ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", "terrasteel", 34, - new int[] { 3, 6, 8, 3 }, 26, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 3F); + public static final IArmorMaterial TERRASTEEL_ARMOR_MAT = new IArmorMaterial() { + private final int[] damageReduction = { 3, 6, 8, 3 }; + @Override + public int getDurability(EntityEquipmentSlot slotIn) { + return 34 * MAX_DAMAGE_ARRAY[slotIn.getIndex()]; + } + + @Override + public int getDamageReductionAmount(EntityEquipmentSlot slotIn) { + return damageReduction[slotIn.getIndex()]; + } + + @Override + public int getEnchantability() { + return 26; + } + + @Override + public SoundEvent getSoundEvent() { + return SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND; + } + + @Override + public Ingredient getRepairMaterial() { + return Ingredient.fromItems(ModItems.terrasteel); + } + + @Override + public String getName() { + return "terrasteel"; + } + + @Override + public float getToughness() { + return 3; + } + }; public static final IItemTier TERRASTEEL_ITEM_TIER = new IItemTier() { @Override public int getMaxUses() { @@ -209,10 +316,44 @@ public final class BotaniaAPI { public Ingredient getRepairMaterial() { return Ingredient.fromItems(ModItems.terrasteel); } - } + }; + public static final IArmorMaterial MANAWEAVE_ARMOR_MAT = new IArmorMaterial() { + private final int[] damageReduction = { 1, 2, 2, 1 }; + @Override + public int getDurability(EntityEquipmentSlot slotIn) { + return 5 * MAX_DAMAGE_ARRAY[slotIn.getIndex()]; + } - public static final ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", "manaweave", 5, - new int[] { 1, 2, 2, 1 }, 18, SoundEvents.ITEM_ARMOR_EQUIP_LEATHER, 0); + @Override + public int getDamageReductionAmount(EntityEquipmentSlot slotIn) { + return damageReduction[slotIn.getIndex()]; + } + + @Override + public int getEnchantability() { + return 18; + } + + @Override + public SoundEvent getSoundEvent() { + return SoundEvents.ITEM_ARMOR_EQUIP_LEATHER; + } + + @Override + public Ingredient getRepairMaterial() { + return Ingredient.fromItems(ModItems.manaweaveCloth); + } + + @Override + public String getName() { + return "manaweave"; + } + + @Override + public float getToughness() { + return 0; + } + }; public static final EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", TextFormatting.GOLD, "Relic"); diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 80e41e91f..881b462ae 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -12,11 +12,12 @@ package vazkii.botania.common.item; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -37,8 +38,8 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { private static final int MANA_PER = 8000; private static final int MANA_PER_T2 = 100000; - public ItemBlackLotus(String name) { - super(name); + public ItemBlackLotus(Properties props) { + super(props); } @Override @@ -66,8 +67,8 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { @OnlyIn(Dist.CLIENT) @Override - public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flags) { - list.add(I18n.format("botaniamisc.lotusDesc")); + public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flags) { + list.add(new TextComponentTranslation("botaniamisc.lotusDesc")); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index c36297eb2..f300dec15 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -10,11 +10,9 @@ */ package vazkii.botania.common.item; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemUseContext; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.state.enums.CratePattern; @@ -27,17 +25,19 @@ import java.util.Locale; public class ItemCraftPattern extends ItemMod { public final CratePattern pattern; - public ItemCraftPattern(CratePattern pattern) { - super(LibItemNames.CRAFT_PATTERN + "_" + pattern.name().toLowerCase(Locale.ROOT)); + public ItemCraftPattern(CratePattern pattern, Properties props) { + super(LibItemNames.CRAFT_PATTERN_PREFIX + "_" + pattern.name().toLowerCase(Locale.ROOT)); this.pattern = pattern; - setMaxStackSize(1); } @Nonnull @Override - public EnumActionResult onItemUse(EntityPlayer p, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { + public EnumActionResult onItemUse(ItemUseContext ctx) { + World world = ctx.getWorld(); + BlockPos pos = ctx.getPos(); + TileEntity tile = world.getTileEntity(pos); - if(tile != null && tile instanceof TileCraftCrate) { + if(tile instanceof TileCraftCrate) { TileCraftCrate crate = (TileCraftCrate) tile; crate.pattern = this.pattern; world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 8); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 3b34a06da..fbd085dd0 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -38,10 +38,12 @@ import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelBoots; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelChest; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelHelm; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelLegs; +import vazkii.botania.common.item.equipment.armor.manaweave.ItemManaweaveArmor; import vazkii.botania.common.item.equipment.armor.manaweave.ItemManaweaveBoots; import vazkii.botania.common.item.equipment.armor.manaweave.ItemManaweaveChest; import vazkii.botania.common.item.equipment.armor.manaweave.ItemManaweaveHelm; import vazkii.botania.common.item.equipment.armor.manaweave.ItemManaweaveLegs; +import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelArmor; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelBoots; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelChest; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; @@ -106,7 +108,7 @@ import java.util.stream.Collectors; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public final class ModItems { - public static final Item lexicon = new ItemLexicon(); + public static final Item lexicon = new ItemLexicon(unstackable()); public static final Map petals = new EnumMap<>(EnumDyeColor.class); public static final Map dyes = new EnumMap<>(EnumDyeColor.class); static { @@ -217,11 +219,11 @@ public final class ModItems { public static final Item manasteelAxe = new ItemManasteelAxe(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANASTEEL_AXE); public static final Item manasteelSword = new ItemManasteelSword(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANASTEEL_SWORD); public static final Item manasteelShears = new ItemManasteelShears(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANASTEEL_SHEARS); - public static final Item terrasteelHelm = new ItemTerrasteelHelm(); - public static final Item terrasteelHelmRevealing = new ItemTerrasteelHelmRevealing(); - public static final Item terrasteelChest = new ItemTerrasteelChest(); - public static final Item terrasteelLegs = new ItemTerrasteelLegs(); - public static final Item terrasteelBoots = new ItemTerrasteelBoots(); + public static final Item terrasteelHelm = new ItemTerrasteelHelm(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TERRASTEEL_HELM); + public static final Item terrasteelHelmRevealing = new ItemTerrasteelHelmRevealing(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TERRASTEEL_HELM_R); + public static final Item terrasteelChest = new ItemTerrasteelArmor(EntityEquipmentSlot.CHEST, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TERRASTEEL_CHEST); + public static final Item terrasteelLegs = new ItemTerrasteelArmor(EntityEquipmentSlot.LEGS, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TERRASTEEL_LEGS); + public static final Item terrasteelBoots = new ItemTerrasteelArmor(EntityEquipmentSlot.FEET, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TERRASTEEL_BOOTS); public static final Item terraSword = new ItemTerraSword(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TERRA_SWORD); public static final Item tinyPlanet = new ItemTinyPlanet(); public static final Item manaRing = new ItemManaRing(); @@ -235,7 +237,7 @@ public final class ModItems { public static final Item magnetRing = new ItemMagnetRing(); public static final Item waterRing = new ItemWaterRing(); public static final Item miningRing = new ItemMiningRing(); - public static final Item terraPick = new ItemTerraPick(); + public static final Item terraPick = new ItemTerraPick(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TERRA_PICK); public static final Item divaCharm = new ItemDivaCharm(); public static final Item flightTiara = new ItemFlightTiara(); public static final Item enderDagger = new ItemEnderDagger(unstackable().defaultMaxDamage(69).setNoRepair()); // What you looking at? @@ -247,11 +249,11 @@ public final class ModItems { public static final Item elfQuartz = new ItemElven(LibItemNames.QUARTZ_NAMES[5]); public static final Item sunnyQuartz = new ItemMod(LibItemNames.QUARTZ_NAMES[6]); public static final Item waterRod = new ItemWaterRod(); - public static final Item elementiumHelm = new ItemElementiumHelm(); + public static final Item elementiumHelm = new ItemElementiumHelm(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ELEMENTIUM_HELM); public static final Item elementiumHelmRevealing = new ItemElementiumHelmRevealing(); - public static final Item elementiumChest = new ItemElementiumChest(); - public static final Item elementiumLegs = new ItemElementiumLegs(); - public static final Item elementiumBoots = new ItemElementiumBoots(); + public static final Item elementiumChest = new ItemElementiumChest(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ELEMENTIUM_CHEST); + public static final Item elementiumLegs = new ItemElementiumLegs(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ELEMENTIUM_LEGS); + public static final Item elementiumBoots = new ItemElementiumBoots(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ELEMENTIUM_BOOTS); public static final Item elementiumPick = new ItemElementiumPick(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ELEMENTIUM_PICK); public static final Item elementiumShovel = new ItemElementiumShovel(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ELEMENTIUM_SHOVEL); public static final Item elementiumAxe = new ItemElementiumAxe(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ELEMENTIUM_AXE); @@ -275,7 +277,7 @@ public final class ModItems { public static final Item itemFinder = new ItemItemFinder(); public static final Item superLavaPendant = new ItemSuperLavaPendant(); public static final Item enderHand = new ItemEnderHand(); - public static final Item glassPick = new ItemGlassPick(); + public static final Item glassPick = new ItemGlassPick(unstackable()); public static final Item spark = new ItemSpark(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SPARK); public static final Item sparkUpgradeDispersive = new ItemSparkUpgrade(defaultBuilder(), SparkUpgradeType.DISPERSIVE).setRegistryName(LibMisc.MOD_ID, LibItemNames.SPARK_UPGRADE + "_" + SparkUpgradeType.DISPERSIVE.name().toLowerCase(Locale.ROOT)); public static final Item sparkUpgradeDominant = new ItemSparkUpgrade(defaultBuilder(), SparkUpgradeType.DOMINANT).setRegistryName(LibMisc.MOD_ID, LibItemNames.SPARK_UPGRADE + "_" + SparkUpgradeType.DOMINANT.name().toLowerCase(Locale.ROOT)); @@ -294,8 +296,8 @@ public final class ModItems { public static final Item unholyCloak = new ItemUnholyCloak(); public static final Item balanceCloak = new ItemBalanceCloak(); public static final Item craftingHalo = new ItemCraftingHalo(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CRAFTING_HALO); - public static final Item blackLotus = new ItemBlackLotus(LibItemNames.BLACK_LOTUS); - public static final Item blackerLotus = new ItemBlackLotus(LibItemNames.BLACKER_LOTUS); + public static final Item blackLotus = new ItemBlackLotus(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.BLACK_LOTUS); + public static final Item blackerLotus = new ItemBlackLotus(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.BLACKER_LOTUS); public static final Item monocle = new ItemMonocle(); public static final Item clip = new ItemClip(); public static final Item cobbleRod = new ItemCobbleRod(); @@ -305,15 +307,15 @@ public final class ModItems { public static final Item thornChakram = new ItemThornChakram(defaultBuilder().maxStackSize(6)).setRegistryName(LibMisc.MOD_ID, LibItemNames.THORN_CHAKRAM); public static final Item flareChakram = new ItemThornChakram(defaultBuilder().maxStackSize(6)).setRegistryName(LibMisc.MOD_ID, LibItemNames.FLARE_CHAKRAM); public static final Item overgrowthSeed = new ItemOvergrowthSeed(); - public static final Item craftPattern1_1 = new ItemCraftPattern(CratePattern.CRAFTY_1_1); - public static final Item craftPattern2_2 = new ItemCraftPattern(CratePattern.CRAFTY_2_2); - public static final Item craftPattern1_2 = new ItemCraftPattern(CratePattern.CRAFTY_1_2); - public static final Item craftPattern2_1 = new ItemCraftPattern(CratePattern.CRAFTY_2_1); - public static final Item craftPattern1_3 = new ItemCraftPattern(CratePattern.CRAFTY_1_3); - public static final Item craftPattern3_1 = new ItemCraftPattern(CratePattern.CRAFTY_3_1); - public static final Item craftPattern2_3 = new ItemCraftPattern(CratePattern.CRAFTY_2_3); - public static final Item craftPattern3_2 = new ItemCraftPattern(CratePattern.CRAFTY_3_2); - public static final Item craftPatternDonut = new ItemCraftPattern(CratePattern.CRAFTY_DONUT); + public static final Item craftPattern1_1 = new ItemCraftPattern(CratePattern.CRAFTY_1_1, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CRAFT_PATTERN_PREFIX + "1_1"); + public static final Item craftPattern2_2 = new ItemCraftPattern(CratePattern.CRAFTY_2_2, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CRAFT_PATTERN_PREFIX + "2_2"); + public static final Item craftPattern1_2 = new ItemCraftPattern(CratePattern.CRAFTY_1_2, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CRAFT_PATTERN_PREFIX + "1_2"); + public static final Item craftPattern2_1 = new ItemCraftPattern(CratePattern.CRAFTY_2_1, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CRAFT_PATTERN_PREFIX + "2_1"); + public static final Item craftPattern1_3 = new ItemCraftPattern(CratePattern.CRAFTY_1_3, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CRAFT_PATTERN_PREFIX + "1_3"); + public static final Item craftPattern3_1 = new ItemCraftPattern(CratePattern.CRAFTY_3_1, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CRAFT_PATTERN_PREFIX + "3_1"); + public static final Item craftPattern2_3 = new ItemCraftPattern(CratePattern.CRAFTY_2_3, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CRAFT_PATTERN_PREFIX + "2_3"); + public static final Item craftPattern3_2 = new ItemCraftPattern(CratePattern.CRAFTY_3_2, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CRAFT_PATTERN_PREFIX + "3_2"); + public static final Item craftPatternDonut = new ItemCraftPattern(CratePattern.CRAFTY_DONUT, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CRAFT_PATTERN_PREFIX + "donut"); public static final Item ancientWillAhrim = new ItemAncientWill(IAncientWillContainer.AncientWillType.AHRIM); public static final Item ancientWillDharok = new ItemAncientWill(IAncientWillContainer.AncientWillType.DHAROK); public static final Item ancientWillGuthan = new ItemAncientWill(IAncientWillContainer.AncientWillType.GUTHAN); @@ -348,19 +350,19 @@ public final class ModItems { public static final Item recordGaia2 = new ItemModRecord(1, ModSounds.gaiaMusic2, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.RECORD_GAIA2); public static final Item temperanceStone = new ItemTemperanceStone(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TEMPERANCE_STONE); public static final Item incenseStick = new ItemIncenseStick(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.INCENSE_STICK); - public static final Item terraAxe = new ItemTerraAxe(); + public static final Item terraAxe = new ItemTerraAxe(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TERRA_AXE); public static final Item waterBowl = new ItemWaterBowl(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.WATER_BOWL); public static final Item obedienceStick = new ItemObedienceStick(); public static final Item cacophonium = new ItemCacophonium(); public static final Item slimeBottle = new ItemSlimeBottle(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SLIME_BOTTLE); - public static final Item starSword = new ItemStarSword(); + public static final Item starSword = new ItemStarSword(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.STAR_SWORD); public static final Item exchangeRod = new ItemExchangeRod(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.EXCHANGE_ROD); public static final Item magnetRingGreater = new ItemGreaterMagnetRing(); - public static final Item thunderSword = new ItemThunderSword(); - public static final Item manaweaveHelm = new ItemManaweaveHelm(); - public static final Item manaweaveChest = new ItemManaweaveChest(); - public static final Item manaweaveLegs = new ItemManaweaveLegs(); - public static final Item manaweaveBoots = new ItemManaweaveBoots(); + public static final Item thunderSword = new ItemThunderSword(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.THUNDER_SWORD); + public static final Item manaweaveHelm = new ItemManaweaveHelm(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANAWEAVE_HELM); + public static final Item manaweaveChest = new ItemManaweaveArmor(EntityEquipmentSlot.CHEST, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANAWEAVE_CHEST); + public static final Item manaweaveLegs = new ItemManaweaveArmor(EntityEquipmentSlot.LEGS, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANAWEAVE_LEGS); + public static final Item manaweaveBoots = new ItemManaweaveArmor(EntityEquipmentSlot.FEET, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANAWEAVE_BOOTS); public static final Item autocraftingHalo = new ItemAutocraftingHalo(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.AUTOCRAFTING_HALO); public static final Item gaiaHead = new ItemGaiaHead(); public static final Item sextant = new ItemSextant(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SEXTANT); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java index faf533080..154f7513c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java @@ -23,7 +23,7 @@ import java.util.List; public abstract class ItemElementiumArmor extends ItemManasteelArmor implements IPixieSpawner { public ItemElementiumArmor(EntityEquipmentSlot type, Properties props) { - super(type, BotaniaAPI.elementiumArmorMaterial, props); + super(type, BotaniaAPI.ELEMENTIUM_ARMOR_MAT, props); } @Override @@ -38,11 +38,6 @@ public abstract class ItemElementiumArmor extends ItemManasteelArmor implements return ConfigHandler.enableArmorModels ? LibResources.MODEL_ELEMENTIUM_NEW : slot == EntityEquipmentSlot.LEGS ? LibResources.MODEL_ELEMENTIUM_1 : LibResources.MODEL_ELEMENTIUM_0; } - @Override - public boolean getIsRepairable(ItemStack armor, @Nonnull ItemStack material) { - return material.getItem() == ModItems.elementium ? true : super.getIsRepairable(armor, material); - } - static ItemStack[] armorset; @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumBoots.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumBoots.java index a0f96b086..519fe707e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumBoots.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumBoots.java @@ -6,8 +6,8 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemElementiumBoots extends ItemElementiumArmor { - public ItemElementiumBoots() { - super(EntityEquipmentSlot.FEET, LibItemNames.ELEMENTIUM_BOOTS); + public ItemElementiumBoots(Properties props) { + super(EntityEquipmentSlot.FEET, props); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumChest.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumChest.java index ff707c5a5..a381d4202 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumChest.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumChest.java @@ -6,8 +6,8 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemElementiumChest extends ItemElementiumArmor { - public ItemElementiumChest() { - super(EntityEquipmentSlot.CHEST, LibItemNames.ELEMENTIUM_CHEST); + public ItemElementiumChest(Properties props) { + super(EntityEquipmentSlot.CHEST, props); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java index 52f67032f..d24fc6034 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java @@ -9,13 +9,8 @@ import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nullable; public class ItemElementiumHelm extends ItemElementiumArmor implements IManaDiscountArmor { - - public ItemElementiumHelm() { - this(LibItemNames.ELEMENTIUM_HELM); - } - - public ItemElementiumHelm(String name) { - super(EntityEquipmentSlot.HEAD, name); + public ItemElementiumHelm(Properties props) { + super(EntityEquipmentSlot.HEAD, props); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumLegs.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumLegs.java index 31f244b9e..207d0b014 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumLegs.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumLegs.java @@ -6,8 +6,8 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemElementiumLegs extends ItemElementiumArmor { - public ItemElementiumLegs() { - super(EntityEquipmentSlot.LEGS, LibItemNames.ELEMENTIUM_LEGS); + public ItemElementiumLegs(Properties props) { + super(EntityEquipmentSlot.LEGS, props); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 51d64bdfb..92752bb0f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -64,7 +64,7 @@ public class ItemManasteelArmor extends ItemArmor implements IManaUsingItem, IPh public final EntityEquipmentSlot type; public ItemManasteelArmor(EntityEquipmentSlot type, Properties props) { - this(type, BotaniaAPI.manasteelArmorMaterial, props); + this(type, BotaniaAPI.MANASTEEL_ARMOR_MAT, props); } public ItemManasteelArmor(EntityEquipmentSlot type, IArmorMaterial mat, Properties props) { @@ -130,11 +130,6 @@ public class ItemManasteelArmor extends ItemArmor implements IManaUsingItem, IPh return models.get(slot); } - @Override - public boolean getIsRepairable(ItemStack armor, @Nonnull ItemStack material) { - return material.getItem() == ModItems.manaSteel ? true : super.getIsRepairable(armor, material); - } - @Override public boolean usesMana(ItemStack stack) { return true; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index fdb560f43..37974feb5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -10,13 +10,15 @@ */ package vazkii.botania.common.item.equipment.armor.manaweave; -import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.resources.I18n; +import net.minecraft.client.renderer.entity.model.ModelBiped; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -33,8 +35,8 @@ import java.util.List; public class ItemManaweaveArmor extends ItemManasteelArmor { - public ItemManaweaveArmor(EntityEquipmentSlot type, String name) { - super(type, name, BotaniaAPI.manaweaveArmorMaterial); + public ItemManaweaveArmor(EntityEquipmentSlot type, Properties props) { + super(type, BotaniaAPI.MANAWEAVE_ARMOR_MAT, props); addPropertyOverride(new ResourceLocation("botania", "holiday"), (stack, worldIn, entityIn) -> ClientProxy.jingleTheBells ? 1 : 0); } @@ -60,11 +62,6 @@ public class ItemManaweaveArmor extends ItemManasteelArmor { return name; } - @Override - public boolean getIsRepairable(ItemStack armor, @Nonnull ItemStack material) { - return material.getItem() == ModItems.manaweaveCloth || super.getIsRepairable(armor, material); - } - private static ItemStack[] armorset; @Override @@ -101,16 +98,16 @@ public class ItemManaweaveArmor extends ItemManasteelArmor { @OnlyIn(Dist.CLIENT) @Override - public String getArmorSetName() { - return I18n.format("botania.armorset.manaweave.name"); + public ITextComponent getArmorSetName() { + return new TextComponentTranslation("botania.armorset.manaweave.name"); } @OnlyIn(Dist.CLIENT) @Override - public void addInformationAfterShift(ItemStack stack, World world, List list, ITooltipFlag flags) { + public void addInformationAfterShift(ItemStack stack, World world, List list, ITooltipFlag flags) { if(ClientProxy.jingleTheBells) { - addStringToTooltip(I18n.format("botaniamisc.santaweaveInfo"), list); - addStringToTooltip("", list); + list.add(new TextComponentTranslation("botaniamisc.santaweaveInfo")); + list.add(new TextComponentString("")); } super.addInformationAfterShift(stack, world, list, flags); @@ -118,8 +115,8 @@ public class ItemManaweaveArmor extends ItemManasteelArmor { @OnlyIn(Dist.CLIENT) @Override - public void addArmorSetDescription(ItemStack stack, List list) { - addStringToTooltip(I18n.format("botania.armorset.manaweave.desc0"), list); - addStringToTooltip(I18n.format("botania.armorset.manaweave.desc1"), list); + public void addArmorSetDescription(ItemStack stack, List list) { + list.add(new TextComponentTranslation("botania.armorset.manaweave.desc0")); + list.add(new TextComponentTranslation("botania.armorset.manaweave.desc1")); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveBoots.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveBoots.java deleted file mode 100644 index 114b5facb..000000000 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveBoots.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Aug 28, 2015, 8:48:58 PM (GMT)] - */ -package vazkii.botania.common.item.equipment.armor.manaweave; - -import net.minecraft.inventory.EntityEquipmentSlot; -import vazkii.botania.common.lib.LibItemNames; - -public class ItemManaweaveBoots extends ItemManaweaveArmor { - - public ItemManaweaveBoots() { - super(EntityEquipmentSlot.FEET, LibItemNames.MANAWEAVE_BOOTS); - } - -} diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveChest.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveChest.java deleted file mode 100644 index caa5fc86f..000000000 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveChest.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Aug 28, 2015, 8:48:17 PM (GMT)] - */ -package vazkii.botania.common.item.equipment.armor.manaweave; - -import net.minecraft.inventory.EntityEquipmentSlot; -import vazkii.botania.common.lib.LibItemNames; - -public class ItemManaweaveChest extends ItemManaweaveArmor { - - public ItemManaweaveChest() { - super(EntityEquipmentSlot.CHEST, LibItemNames.MANAWEAVE_CHEST); - } - - -} diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java index 7ab82ac51..08690a749 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java @@ -29,8 +29,8 @@ public class ItemManaweaveHelm extends ItemManaweaveArmor implements IManaDiscou private static final int MANA_PER_DAMAGE = 30; - public ItemManaweaveHelm() { - super(EntityEquipmentSlot.HEAD, LibItemNames.MANAWEAVE_HELM); + public ItemManaweaveHelm(Properties props) { + super(EntityEquipmentSlot.HEAD, props); } @Override @@ -45,8 +45,8 @@ public class ItemManaweaveHelm extends ItemManaweaveArmor implements IManaDiscou @Override public void onArmorTick(World world, EntityPlayer player, ItemStack stack) { - if(!world.isRemote && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExact(stack, player, MANA_PER_DAMAGE * 2, true)) - stack.setItemDamage(stack.getItemDamage() - 1); + if(!world.isRemote && stack.getDamage() > 0 && ManaItemHandler.requestManaExact(stack, player, MANA_PER_DAMAGE * 2, true)) + stack.setDamage(stack.getDamage() - 1); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveLegs.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveLegs.java deleted file mode 100644 index 4449c4db5..000000000 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveLegs.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Aug 28, 2015, 8:48:36 PM (GMT)] - */ -package vazkii.botania.common.item.equipment.armor.manaweave; - -import net.minecraft.inventory.EntityEquipmentSlot; -import vazkii.botania.common.lib.LibItemNames; - -public class ItemManaweaveLegs extends ItemManaweaveArmor { - - public ItemManaweaveLegs() { - super(EntityEquipmentSlot.LEGS, LibItemNames.MANAWEAVE_LEGS); - } - -} diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index b41db6dbd..adbf8ba4f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -11,13 +11,15 @@ package vazkii.botania.common.item.equipment.armor.terrasteel; import com.google.common.collect.Multimap; -import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.renderer.entity.model.ModelBiped; import net.minecraft.client.resources.I18n; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; @@ -34,7 +36,7 @@ import java.util.UUID; public class ItemTerrasteelArmor extends ItemManasteelArmor { public ItemTerrasteelArmor(EntityEquipmentSlot type, Properties props) { - super(type, props, BotaniaAPI.terrasteelArmorMaterial); + super(type, BotaniaAPI.TERRASTEEL_ARMOR_MAT, props); } @Override @@ -49,11 +51,6 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { return ConfigHandler.enableArmorModels ? LibResources.MODEL_TERRASTEEL_NEW : slot == EntityEquipmentSlot.CHEST ? LibResources.MODEL_TERRASTEEL_1 : LibResources.MODEL_TERRASTEEL_0; } - @Override - public boolean getIsRepairable(ItemStack armor, @Nonnull ItemStack material) { - return material.getItem() == ModItems.terrasteel || super.getIsRepairable(armor, material); - } - @Nonnull @Override public Multimap getAttributeModifiers(@Nonnull EntityEquipmentSlot slot, ItemStack stack) { @@ -101,16 +98,16 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { @OnlyIn(Dist.CLIENT) @Override - public String getArmorSetName() { - return I18n.format("botania.armorset.terrasteel.name"); + public ITextComponent getArmorSetName() { + return new TextComponentTranslation("botania.armorset.terrasteel.name"); } @OnlyIn(Dist.CLIENT) @Override - public void addArmorSetDescription(ItemStack stack, List list) { - addStringToTooltip(I18n.format("botania.armorset.terrasteel.desc0"), list); - addStringToTooltip(I18n.format("botania.armorset.terrasteel.desc1"), list); - addStringToTooltip(I18n.format("botania.armorset.terrasteel.desc2"), list); + public void addArmorSetDescription(ItemStack stack, List list) { + list.add(new TextComponentTranslation("botania.armorset.terrasteel.desc0")); + list.add(new TextComponentTranslation("botania.armorset.terrasteel.desc1")); + list.add(new TextComponentTranslation("botania.armorset.terrasteel.desc2")); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelBoots.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelBoots.java deleted file mode 100644 index ed59b76b0..000000000 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelBoots.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Apr 14, 2014, 3:14:11 PM (GMT)] - */ -package vazkii.botania.common.item.equipment.armor.terrasteel; - -import net.minecraft.inventory.EntityEquipmentSlot; -import vazkii.botania.common.lib.LibItemNames; - -public class ItemTerrasteelBoots extends ItemTerrasteelArmor { - - public ItemTerrasteelBoots() { - super(EntityEquipmentSlot.FEET, LibItemNames.TERRASTEEL_BOOTS); - } - -} diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelChest.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelChest.java deleted file mode 100644 index f405024f5..000000000 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelChest.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Apr 14, 2014, 3:13:36 PM (GMT)] - */ -package vazkii.botania.common.item.equipment.armor.terrasteel; - -import net.minecraft.inventory.EntityEquipmentSlot; -import vazkii.botania.common.lib.LibItemNames; - -public class ItemTerrasteelChest extends ItemTerrasteelArmor { - - public ItemTerrasteelChest() { - super(EntityEquipmentSlot.CHEST, LibItemNames.TERRASTEEL_CHEST); - } - -} diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index cc61fb547..0d71fc4b5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -21,10 +21,11 @@ import net.minecraft.init.MobEffects; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.IAncientWillContainer; @@ -45,13 +46,9 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc public static final String TAG_ANCIENT_WILL = "AncientWill"; - public ItemTerrasteelHelm() { - this(LibItemNames.TERRASTEEL_HELM); - } - public ItemTerrasteelHelm(Properties props) { super(EntityEquipmentSlot.HEAD, props); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.addListener(this::onEntityAttacked); } @Override @@ -86,11 +83,11 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc @Override @OnlyIn(Dist.CLIENT) - public void addArmorSetDescription(ItemStack stack, List list) { + public void addArmorSetDescription(ItemStack stack, List list) { super.addArmorSetDescription(stack, list); for(AncientWillType type : AncientWillType.values()) if(hasAncientWill(stack, type)) - addStringToTooltip(I18n.format("botania.armorset.will_" + type.name().toLowerCase(Locale.ROOT) + ".desc"), list); + list.add(new TextComponentTranslation("botania.armorset.will_" + type.name().toLowerCase(Locale.ROOT) + ".desc")); } private static boolean hasAnyWill(ItemStack stack) { @@ -110,23 +107,22 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc float f2 = MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getMinV(); float f3 = MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getMaxV(); IBaubleRender.Helper.translateToHeadLevel(player); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(-0.26F, -1.45F, -0.39F); - GlStateManager.scale(0.5F, 0.5F, 0.5F); - IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getIconWidth(), MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getIconHeight(), 1F / 16F); + Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + GlStateManager.rotatef(90F, 0F, 1F, 0F); + GlStateManager.rotatef(180F, 1F, 0F, 0F); + GlStateManager.translatef(-0.26F, -1.45F, -0.39F); + GlStateManager.scalef(0.5F, 0.5F, 0.5F); + IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getWidth(), MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getHeight(), 1F / 16F); GlStateManager.popMatrix(); } } - @SubscribeEvent - public void onEntityAttacked(LivingHurtEvent event) { + private void onEntityAttacked(LivingHurtEvent event) { Entity attacker = event.getSource().getImmediateSource(); if(attacker instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) attacker; if(hasArmorSet(player)) { - boolean crit = player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(MobEffects.BLINDNESS) && !player.isRiding(); + boolean crit = player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(MobEffects.BLINDNESS) && !player.isPassenger(); ItemStack stack = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD); if(crit && !stack.isEmpty() && stack.getItem() instanceof ItemTerrasteelHelm) { if(hasAncientWill(stack, AncientWillType.AHRIM)) diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelLegs.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelLegs.java deleted file mode 100644 index 34c883a15..000000000 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelLegs.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Apr 14, 2014, 3:13:49 PM (GMT)] - */ -package vazkii.botania.common.item.equipment.armor.terrasteel; - -import net.minecraft.inventory.EntityEquipmentSlot; -import vazkii.botania.common.lib.LibItemNames; - -public class ItemTerrasteelLegs extends ItemTerrasteelArmor { - - public ItemTerrasteelLegs() { - super(EntityEquipmentSlot.LEGS, LibItemNames.TERRASTEEL_LEGS); - } - -} diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java index a1a1f37ca..715743a37 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java @@ -80,7 +80,6 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker public ItemTerraAxe(Properties props) { super(BotaniaAPI.TERRASTEEL_ITEM_TIER, props); MinecraftForge.EVENT_BUS.register(this); - attackSpeed = -3f; addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "terraaxe_on"), (stack, world, entity) -> { if(entity instanceof EntityPlayer && !shouldBreak((EntityPlayer) entity)) return 0; diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java index 1e0c89766..f8f123396 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java @@ -26,8 +26,8 @@ import vazkii.botania.common.lib.LibItemNames; @Optional.Interface(modid = "thaumcraft", iface = "thaumcraft.api.items.IRevealer", striprefs = true)}) public class ItemTerrasteelHelmRevealing extends ItemTerrasteelHelm implements IGoggles, IRevealer { - public ItemTerrasteelHelmRevealing() { - super(LibItemNames.TERRASTEEL_HELM_R); + public ItemTerrasteelHelmRevealing(Properties props) { + super(props); } @Override diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 9ff6f709c..3f6f5bee2 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -133,7 +133,7 @@ public final class LibItemNames { public static final String THORN_CHAKRAM = "thorn_chakram"; public static final String FLARE_CHAKRAM = "flare_chakram"; public static final String OVERGROWTH_SEED = "overgrowthseed"; - public static final String CRAFT_PATTERN = "pattern"; + public static final String CRAFT_PATTERN_PREFIX = "pattern_"; public static final String ANCIENT_WILL = "ancient_will"; public static final String CORPOREA_SPARK = "corporea_spark"; public static final String CORPOREA_SPARK_MASTER = "corporea_spark_master";