diff --git a/Xplat/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java b/Xplat/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java index 7aebb125c4..93002e5c98 100644 --- a/Xplat/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java +++ b/Xplat/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java @@ -153,7 +153,7 @@ public float getKnockbackResistance() { private enum ItemTier implements Tier { MANASTEEL(300, 6.2F, 2, 3, 20, () -> BotaniaItems.manaSteel), ELEMENTIUM(720, 6.2F, 2, 3, 20, () -> BotaniaItems.elementium), - TERRASTEEL(2300, 9, 3, 4, 26, () -> BotaniaItems.terrasteel); + TERRASTEEL(2300, 9, 4, 4, 26, () -> BotaniaItems.terrasteel); private final int maxUses; private final float efficiency; diff --git a/Xplat/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ElementiumAxeItem.java b/Xplat/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ElementiumAxeItem.java index 32e019d475..c57ab4a493 100644 --- a/Xplat/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ElementiumAxeItem.java +++ b/Xplat/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ElementiumAxeItem.java @@ -35,7 +35,7 @@ public class ElementiumAxeItem extends ManasteelAxeItem { private static final ResourceLocation BEHEADING_LOOT_TABLE = prefix("elementium_axe_beheading"); public ElementiumAxeItem(Properties props) { - super(BotaniaAPI.instance().getElementiumItemTier(), props); + super(BotaniaAPI.instance().getElementiumItemTier(), 6F, -3.1F, props); } public static void onEntityDrops(boolean hitRecently, DamageSource source, LivingEntity target, diff --git a/Xplat/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ManasteelAxeItem.java b/Xplat/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ManasteelAxeItem.java index dd280c062b..aba6cf9014 100644 --- a/Xplat/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ManasteelAxeItem.java +++ b/Xplat/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ManasteelAxeItem.java @@ -41,11 +41,11 @@ public class ManasteelAxeItem extends AxeItem implements CustomDamageItem, Sorta private static final int MANA_PER_DAMAGE = 60; public ManasteelAxeItem(Properties props) { - this(BotaniaAPI.instance().getManasteelItemTier(), props); + this(BotaniaAPI.instance().getManasteelItemTier(), 6F, -3.1F, props); } - public ManasteelAxeItem(Tier mat, Properties props) { - super(mat, 6F, -3.1F, props); + public ManasteelAxeItem(Tier mat, float attackDamage, float attackSpeed, Properties props) { + super(mat, attackDamage, attackSpeed, props); } @Override diff --git a/Xplat/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/TerraTruncatorItem.java b/Xplat/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/TerraTruncatorItem.java index 8b72ef3867..cb0a2642bf 100644 --- a/Xplat/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/TerraTruncatorItem.java +++ b/Xplat/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/TerraTruncatorItem.java @@ -68,7 +68,7 @@ public class TerraTruncatorItem extends ManasteelAxeItem implements SequentialBr private static boolean tickingSwappers = false; public TerraTruncatorItem(Properties props) { - super(BotaniaAPI.instance().getTerrasteelItemTier(), props); + super(BotaniaAPI.instance().getTerrasteelItemTier(), 5.0F, -3.0F, props); } public static boolean shouldBreak(Player player) { diff --git a/Xplat/src/main/resources/assets/botania/lang/en_us.json b/Xplat/src/main/resources/assets/botania/lang/en_us.json index 3f91ab2e9e..0294b9d6f5 100644 --- a/Xplat/src/main/resources/assets/botania/lang/en_us.json +++ b/Xplat/src/main/resources/assets/botania/lang/en_us.json @@ -2821,8 +2821,8 @@ "botania.page.grassHorn3": "Adjusting for $(item)Snow$(0)", "botania.entry.terrasteelArmor": "Terrasteel Armor", - "botania.tagline.terrasteelArmor": "Diamond-tier armor with Manasteel properties", - "botania.page.terrasteelArmor0": "Armor made out of $(l:basics/terrasteel)$(item)Terrasteel$(0)$(/l), much like its $(item)Manasteel$(0)-based counterpart, can use $(thing)Mana$(0) from the inventory to heal damage.$(p)However, its durabilities are comparable more to $(item)Diamond$(0) armor than to $(item)Iron$(0).", + "botania.tagline.terrasteelArmor": "Netherite-tier armor with Manasteel properties", + "botania.page.terrasteelArmor0": "Armor made out of $(l:basics/terrasteel)$(item)Terrasteel$(0)$(/l), much like its $(item)Manasteel$(0)-based counterpart, can use $(thing)Mana$(0) from the inventory to heal damage.$(p)However, its properties are comparable more to $(item)Netherite$(0) armor than to $(item)Iron$(0).", "botania.page.terrasteelArmor1": "The $(item)Terrasteel Helmet$(0)", "botania.page.terrasteelArmor2": "The $(item)Terrasteel Chestplate$(0)", "botania.page.terrasteelArmor3": "The $(item)Terrasteel Leggings$(0)", @@ -2830,7 +2830,7 @@ "botania.entry.terraSword": "Terra Blade", "botania.tagline.terraSword": "A sword that fires a beam that damages mobs", - "botania.page.terraSword0": "The $(item)Terra Blade$(0), crafted from $(l:basics/terrasteel)$(item)Terrasteel Ingots$(0)$(/l), is a sword infused with the strength of nature. It's on par with a $(item)Diamond Sword$(0) in terms of raw power, and when swung, can sometimes fire a beam that will deal as much as a melee hit would. Additionally, it can use $(thing)Mana$(0) for durability, much like $(l:tools/mana_gear)$(item)Manasteel Tools$(0)$(/l) can.", + "botania.page.terraSword0": "The $(item)Terra Blade$(0), crafted from $(l:basics/terrasteel)$(item)Terrasteel Ingots$(0)$(/l), is a sword infused with the strength of nature. It's on par with a $(item)Netherite Sword$(0) in terms of raw power, and when swung, can sometimes fire a beam that will deal as much as a melee hit would. Additionally, it can use $(thing)Mana$(0) for durability, much like $(l:tools/mana_gear)$(item)Manasteel Tools$(0)$(/l) can.", "botania.page.terraSword1": "No Broken Hero Sword", "botania.entry.terraPick": "Terra Shatterer", @@ -2849,7 +2849,7 @@ "botania.entry.elfGear": "Elementium Equipment", "botania.tagline.elfGear": "Manasteel equivalent gear with special properties", - "botania.page.elfGear0": "Similarly to other metals, $(l:alfhomancy/elf_resources)$(item)Elementium$(0)$(/l) can be shaped into tools and armor.$(p)The respective armor components each have decent damage resistances (about half that of diamond armor), as well as the ability to drain $(thing)Mana$(0) to heal damage.", + "botania.page.elfGear0": "Similarly to other metals, $(l:alfhomancy/elf_resources)$(item)Elementium$(0)$(/l) can be shaped into tools and armor.$(p)The respective armor components each have decent damage resistances (same as manasteel armor), as well as the ability to drain $(thing)Mana$(0) to heal damage.", "botania.page.elfGear1": "Each piece of armor will, when its bearer is harmed, have a chance to spawn a $(thing)Pixie$(0) to fly after the aggressor, dealing some decent damage.$(p)The more pieces of $(item)Elementium Armor$(0) equipped, the higher the chance becomes. Additionally, each of the tools in the set comes with its own unique ability.", "botania.page.elfGear2": "First, the $(item)Elementium Pickaxe$(0) will clear away $(item)Cobblestone$(0), $(item)Dirt$(0), $(item)Netherrack$(0), and other common materials, leaving behind only ores and fine resources. Certain blocks are considered $(o)semi-disposable$(), meaning they won't be voided when broken while sneaking. $(p)Combining the $(item)Elementium Pickaxe$(0) with a $(l:tools/terra_pick)$(item)Terra Shatterer$(0)$(/l) in a crafting square allows for the latter to take on the former's power. This can't be undone.", "botania.page.elfGear3": "The $(item)Elementium Pickaxe$(0)",