diff --git a/gradle.properties b/gradle.properties index 829f915..1efc0d4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,4 @@ modid=additional-armoury #Fabric api fabric_version=0.91.0+1.20.1 fabric_asm_version=v2.3 -combatplus_version=0.3.0-mc1.20.1 \ No newline at end of file +combatplus_version=0.3.1-mc1.20.1 \ No newline at end of file diff --git a/src/main/java/com/provismet/AdditionalArmoury/items/AAExtraAxeItem.java b/src/main/java/com/provismet/AdditionalArmoury/items/AAExtraAxeItem.java new file mode 100644 index 0000000..b2628fe --- /dev/null +++ b/src/main/java/com/provismet/AdditionalArmoury/items/AAExtraAxeItem.java @@ -0,0 +1,45 @@ +package com.provismet.AdditionalArmoury.items; + +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.Multimap; +import com.provismet.CombatPlusCore.utility.AttributeIdentifiers; + +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.attribute.EntityAttribute; +import net.minecraft.entity.attribute.EntityAttributeModifier; +import net.minecraft.entity.attribute.EntityAttributes; +import net.minecraft.item.AxeItem; + +public class AAExtraAxeItem extends AxeItem { + private final float extraAttackDamage; + private final Multimap extraAttributeModifiers; + + public AAExtraAxeItem (AAToolMaterials toolMaterial, float attackDamage, float attackSpeed, Settings settings) { + super(toolMaterial, attackDamage, attackSpeed, settings); + this.extraAttackDamage = attackDamage + toolMaterial.getAttackDamage(); + if (toolMaterial.getCustomAttribute() == EntityAttributes.GENERIC_ATTACK_SPEED) attackSpeed += toolMaterial.getCustomAttributeValue(); + + ImmutableMultimap.Builder builder = ImmutableMultimap.builder(); + builder.put(EntityAttributes.GENERIC_ATTACK_DAMAGE, new EntityAttributeModifier(ATTACK_DAMAGE_MODIFIER_ID, "Tool modifier", (double)this.extraAttackDamage, EntityAttributeModifier.Operation.ADDITION)); + builder.put(EntityAttributes.GENERIC_ATTACK_SPEED, new EntityAttributeModifier(ATTACK_SPEED_MODIFIER_ID, "Tool modifier", (double)attackSpeed, EntityAttributeModifier.Operation.ADDITION)); + + if (toolMaterial.getCustomAttribute() != null && toolMaterial.getCustomAttribute() != EntityAttributes.GENERIC_ATTACK_SPEED) { + builder.put(toolMaterial.getCustomAttribute(), new EntityAttributeModifier(AttributeIdentifiers.WEAPON_BONUS_ATTRIBUTE, "Additional Armoury: Tool modifier", (double)toolMaterial.getCustomAttributeValue(), EntityAttributeModifier.Operation.ADDITION)); + } + + this.extraAttributeModifiers = builder.build(); + } + + @Override + public float getAttackDamage() { + return this.extraAttackDamage; + } + + @Override + public Multimap getAttributeModifiers(EquipmentSlot slot) { + if (slot == EquipmentSlot.MAINHAND) { + return this.extraAttributeModifiers; + } + return super.getAttributeModifiers(slot); + } +} diff --git a/src/main/java/com/provismet/AdditionalArmoury/items/AAExtraHoeItem.java b/src/main/java/com/provismet/AdditionalArmoury/items/AAExtraHoeItem.java new file mode 100644 index 0000000..87b3a0e --- /dev/null +++ b/src/main/java/com/provismet/AdditionalArmoury/items/AAExtraHoeItem.java @@ -0,0 +1,45 @@ +package com.provismet.AdditionalArmoury.items; + +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.Multimap; +import com.provismet.CombatPlusCore.utility.AttributeIdentifiers; + +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.attribute.EntityAttribute; +import net.minecraft.entity.attribute.EntityAttributeModifier; +import net.minecraft.entity.attribute.EntityAttributes; +import net.minecraft.item.HoeItem; + +public class AAExtraHoeItem extends HoeItem { + private final float extraAttackDamage; + private final Multimap extraAttributeModifiers; + + public AAExtraHoeItem (AAToolMaterials toolMaterial, int attackDamage, float attackSpeed, Settings settings) { + super(toolMaterial, attackDamage, attackSpeed, settings); + this.extraAttackDamage = attackDamage + toolMaterial.getAttackDamage(); + if (toolMaterial.getCustomAttribute() == EntityAttributes.GENERIC_ATTACK_SPEED) attackSpeed += toolMaterial.getCustomAttributeValue(); + + ImmutableMultimap.Builder builder = ImmutableMultimap.builder(); + builder.put(EntityAttributes.GENERIC_ATTACK_DAMAGE, new EntityAttributeModifier(ATTACK_DAMAGE_MODIFIER_ID, "Tool modifier", (double)this.extraAttackDamage, EntityAttributeModifier.Operation.ADDITION)); + builder.put(EntityAttributes.GENERIC_ATTACK_SPEED, new EntityAttributeModifier(ATTACK_SPEED_MODIFIER_ID, "Tool modifier", (double)attackSpeed, EntityAttributeModifier.Operation.ADDITION)); + + if (toolMaterial.getCustomAttribute() != null && toolMaterial.getCustomAttribute() != EntityAttributes.GENERIC_ATTACK_SPEED) { + builder.put(toolMaterial.getCustomAttribute(), new EntityAttributeModifier(AttributeIdentifiers.WEAPON_BONUS_ATTRIBUTE, "Additional Armoury: Tool modifier", (double)toolMaterial.getCustomAttributeValue(), EntityAttributeModifier.Operation.ADDITION)); + } + + this.extraAttributeModifiers = builder.build(); + } + + @Override + public float getAttackDamage() { + return this.extraAttackDamage; + } + + @Override + public Multimap getAttributeModifiers(EquipmentSlot slot) { + if (slot == EquipmentSlot.MAINHAND) { + return this.extraAttributeModifiers; + } + return super.getAttributeModifiers(slot); + } +} diff --git a/src/main/java/com/provismet/AdditionalArmoury/items/AAExtraPickaxeItem.java b/src/main/java/com/provismet/AdditionalArmoury/items/AAExtraPickaxeItem.java new file mode 100644 index 0000000..815544a --- /dev/null +++ b/src/main/java/com/provismet/AdditionalArmoury/items/AAExtraPickaxeItem.java @@ -0,0 +1,45 @@ +package com.provismet.AdditionalArmoury.items; + +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.Multimap; +import com.provismet.CombatPlusCore.utility.AttributeIdentifiers; + +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.attribute.EntityAttribute; +import net.minecraft.entity.attribute.EntityAttributeModifier; +import net.minecraft.entity.attribute.EntityAttributes; +import net.minecraft.item.PickaxeItem; + +public class AAExtraPickaxeItem extends PickaxeItem { + private final float extraAttackDamage; + private final Multimap extraAttributeModifiers; + + public AAExtraPickaxeItem (AAToolMaterials toolMaterial, int attackDamage, float attackSpeed, Settings settings) { + super(toolMaterial, attackDamage, attackSpeed, settings); + this.extraAttackDamage = attackDamage + toolMaterial.getAttackDamage(); + if (toolMaterial.getCustomAttribute() == EntityAttributes.GENERIC_ATTACK_SPEED) attackSpeed += toolMaterial.getCustomAttributeValue(); + + ImmutableMultimap.Builder builder = ImmutableMultimap.builder(); + builder.put(EntityAttributes.GENERIC_ATTACK_DAMAGE, new EntityAttributeModifier(ATTACK_DAMAGE_MODIFIER_ID, "Tool modifier", (double)this.extraAttackDamage, EntityAttributeModifier.Operation.ADDITION)); + builder.put(EntityAttributes.GENERIC_ATTACK_SPEED, new EntityAttributeModifier(ATTACK_SPEED_MODIFIER_ID, "Tool modifier", (double)attackSpeed, EntityAttributeModifier.Operation.ADDITION)); + + if (toolMaterial.getCustomAttribute() != null && toolMaterial.getCustomAttribute() != EntityAttributes.GENERIC_ATTACK_SPEED) { + builder.put(toolMaterial.getCustomAttribute(), new EntityAttributeModifier(AttributeIdentifiers.WEAPON_BONUS_ATTRIBUTE, "Additional Armoury: Tool modifier", (double)toolMaterial.getCustomAttributeValue(), EntityAttributeModifier.Operation.ADDITION)); + } + + this.extraAttributeModifiers = builder.build(); + } + + @Override + public float getAttackDamage() { + return this.extraAttackDamage; + } + + @Override + public Multimap getAttributeModifiers(EquipmentSlot slot) { + if (slot == EquipmentSlot.MAINHAND) { + return this.extraAttributeModifiers; + } + return super.getAttributeModifiers(slot); + } +} diff --git a/src/main/java/com/provismet/AdditionalArmoury/items/AAExtraShovelItem.java b/src/main/java/com/provismet/AdditionalArmoury/items/AAExtraShovelItem.java new file mode 100644 index 0000000..9c520e4 --- /dev/null +++ b/src/main/java/com/provismet/AdditionalArmoury/items/AAExtraShovelItem.java @@ -0,0 +1,45 @@ +package com.provismet.AdditionalArmoury.items; + +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.Multimap; +import com.provismet.CombatPlusCore.utility.AttributeIdentifiers; + +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.attribute.EntityAttribute; +import net.minecraft.entity.attribute.EntityAttributeModifier; +import net.minecraft.entity.attribute.EntityAttributes; +import net.minecraft.item.ShovelItem; + +public class AAExtraShovelItem extends ShovelItem { + private final float extraAttackDamage; + private final Multimap extraAttributeModifiers; + + public AAExtraShovelItem (AAToolMaterials toolMaterial, float attackDamage, float attackSpeed, Settings settings) { + super(toolMaterial, attackDamage, attackSpeed, settings); + this.extraAttackDamage = attackDamage + toolMaterial.getAttackDamage(); + if (toolMaterial.getCustomAttribute() == EntityAttributes.GENERIC_ATTACK_SPEED) attackSpeed += toolMaterial.getCustomAttributeValue(); + + ImmutableMultimap.Builder builder = ImmutableMultimap.builder(); + builder.put(EntityAttributes.GENERIC_ATTACK_DAMAGE, new EntityAttributeModifier(ATTACK_DAMAGE_MODIFIER_ID, "Tool modifier", (double)this.extraAttackDamage, EntityAttributeModifier.Operation.ADDITION)); + builder.put(EntityAttributes.GENERIC_ATTACK_SPEED, new EntityAttributeModifier(ATTACK_SPEED_MODIFIER_ID, "Tool modifier", (double)attackSpeed, EntityAttributeModifier.Operation.ADDITION)); + + if (toolMaterial.getCustomAttribute() != null && toolMaterial.getCustomAttribute() != EntityAttributes.GENERIC_ATTACK_SPEED) { + builder.put(toolMaterial.getCustomAttribute(), new EntityAttributeModifier(AttributeIdentifiers.WEAPON_BONUS_ATTRIBUTE, "Additional Armoury: Tool modifier", (double)toolMaterial.getCustomAttributeValue(), EntityAttributeModifier.Operation.ADDITION)); + } + + this.extraAttributeModifiers = builder.build(); + } + + @Override + public float getAttackDamage() { + return this.extraAttackDamage; + } + + @Override + public Multimap getAttributeModifiers(EquipmentSlot slot) { + if (slot == EquipmentSlot.MAINHAND) { + return this.extraAttributeModifiers; + } + return super.getAttributeModifiers(slot); + } +} diff --git a/src/main/java/com/provismet/AdditionalArmoury/items/AAExtraSwordItem.java b/src/main/java/com/provismet/AdditionalArmoury/items/AAExtraSwordItem.java new file mode 100644 index 0000000..947596e --- /dev/null +++ b/src/main/java/com/provismet/AdditionalArmoury/items/AAExtraSwordItem.java @@ -0,0 +1,45 @@ +package com.provismet.AdditionalArmoury.items; + +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.Multimap; +import com.provismet.CombatPlusCore.utility.AttributeIdentifiers; + +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.attribute.EntityAttribute; +import net.minecraft.entity.attribute.EntityAttributeModifier; +import net.minecraft.entity.attribute.EntityAttributes; +import net.minecraft.item.SwordItem; + +public class AAExtraSwordItem extends SwordItem { + private final float extraAttackDamage; + private final Multimap extraAttributeModifiers; + + public AAExtraSwordItem (AAToolMaterials toolMaterial, int attackDamage, float attackSpeed, Settings settings) { + super(toolMaterial, attackDamage, attackSpeed, settings); + this.extraAttackDamage = attackDamage + toolMaterial.getAttackDamage(); + if (toolMaterial.getCustomAttribute() == EntityAttributes.GENERIC_ATTACK_SPEED) attackSpeed += toolMaterial.getCustomAttributeValue(); + + ImmutableMultimap.Builder builder = ImmutableMultimap.builder(); + builder.put(EntityAttributes.GENERIC_ATTACK_DAMAGE, new EntityAttributeModifier(ATTACK_DAMAGE_MODIFIER_ID, "Weapon modifier", (double)this.extraAttackDamage, EntityAttributeModifier.Operation.ADDITION)); + builder.put(EntityAttributes.GENERIC_ATTACK_SPEED, new EntityAttributeModifier(ATTACK_SPEED_MODIFIER_ID, "Weapon modifier", (double)attackSpeed, EntityAttributeModifier.Operation.ADDITION)); + + if (toolMaterial.getCustomAttribute() != null && toolMaterial.getCustomAttribute() != EntityAttributes.GENERIC_ATTACK_SPEED) { + builder.put(toolMaterial.getCustomAttribute(), new EntityAttributeModifier(AttributeIdentifiers.WEAPON_BONUS_ATTRIBUTE, "Additional Armoury: Weapon modifier", (double)toolMaterial.getCustomAttributeValue(), EntityAttributeModifier.Operation.ADDITION)); + } + + this.extraAttributeModifiers = builder.build(); + } + + @Override + public float getAttackDamage() { + return this.extraAttackDamage; + } + + @Override + public Multimap getAttributeModifiers(EquipmentSlot slot) { + if (slot == EquipmentSlot.MAINHAND) { + return this.extraAttributeModifiers; + } + return super.getAttributeModifiers(slot); + } +} diff --git a/src/main/java/com/provismet/AdditionalArmoury/items/AAToolMaterials.java b/src/main/java/com/provismet/AdditionalArmoury/items/AAToolMaterials.java index 4915e49..30e2734 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/items/AAToolMaterials.java +++ b/src/main/java/com/provismet/AdditionalArmoury/items/AAToolMaterials.java @@ -6,12 +6,14 @@ import com.provismet.AdditionalArmoury.registries.AAItems; import net.fabricmc.yarn.constants.MiningLevels; +import net.minecraft.entity.attribute.EntityAttribute; +import net.minecraft.entity.attribute.EntityAttributes; import net.minecraft.item.ToolMaterial; import net.minecraft.recipe.Ingredient; public enum AAToolMaterials implements ToolMaterial { - OVERNETHER(MiningLevels.NETHERITE, 2031, 9.0f, 4.0f, 15, () -> Ingredient.ofItems(AAItems.OVERNETHER_INGOT)), - ENDERNETHER(MiningLevels.NETHERITE, 2031, 9.0f, 4.0f, 15, () -> Ingredient.ofItems(AAItems.ENDERNETHER_INGOT)); + OVERNETHER(MiningLevels.NETHERITE, 2031, 9.0f, 3.0f, 15, EntityAttributes.GENERIC_ATTACK_KNOCKBACK, 1.5f, () -> Ingredient.ofItems(AAItems.OVERNETHER_INGOT)), + ENDERNETHER(MiningLevels.NETHERITE, 2031, 9.0f, 3.0f, 15, EntityAttributes.GENERIC_ATTACK_SPEED, 0.2f, () -> Ingredient.ofItems(AAItems.ENDERNETHER_INGOT)); private final int miningLevel; private final int itemDurability; @@ -19,13 +21,17 @@ public enum AAToolMaterials implements ToolMaterial { private final float attackDamage; private final int enchantability; private final Supplier repairIngredient; + private final EntityAttribute customAttribute; + private final float customAttributeValue; - private AAToolMaterials (int miningLevel, int itemDurability, float miningSpeed, float attackDamage, int enchantability, Supplier repairIngredient) { + private AAToolMaterials (int miningLevel, int itemDurability, float miningSpeed, float attackDamage, int enchantability, EntityAttribute customAttribute, float customAttributeValue, Supplier repairIngredient) { this.miningLevel = miningLevel; this.itemDurability = itemDurability; this.miningSpeed = miningSpeed; this.attackDamage = attackDamage; this.enchantability = enchantability; + this.customAttribute = customAttribute; + this.customAttributeValue = customAttributeValue; this.repairIngredient = Suppliers.memoize(repairIngredient::get); } @@ -54,6 +60,14 @@ public int getEnchantability () { return this.enchantability; } + public EntityAttribute getCustomAttribute () { + return this.customAttribute; + } + + public float getCustomAttributeValue () { + return this.customAttributeValue; + } + @Override public Ingredient getRepairIngredient () { return this.repairIngredient.get(); diff --git a/src/main/java/com/provismet/AdditionalArmoury/items/DaggerItem.java b/src/main/java/com/provismet/AdditionalArmoury/items/DaggerItem.java index fa5dcc3..e6c8054 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/items/DaggerItem.java +++ b/src/main/java/com/provismet/AdditionalArmoury/items/DaggerItem.java @@ -8,6 +8,7 @@ import com.google.common.collect.Multimap; import com.provismet.AdditionalArmoury.registries.AAEnchantments; import com.provismet.CombatPlusCore.interfaces.DualWeapon; +import com.provismet.CombatPlusCore.utility.AttributeIdentifiers; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -48,9 +49,17 @@ public DaggerItem (ToolMaterial material, int attackDamage, float attackSpeed, S super(material, settings); this.attackDamage = attackDamage + material.getAttackDamage(); this.defaultTipColour = defaultTipColour; + + if (material instanceof AAToolMaterials extraMat && extraMat.getCustomAttribute() == EntityAttributes.GENERIC_ATTACK_SPEED) + attackSpeed += extraMat.getCustomAttributeValue(); + ImmutableMultimap.Builder builder = ImmutableMultimap.builder(); builder.put(EntityAttributes.GENERIC_ATTACK_DAMAGE, new EntityAttributeModifier(ATTACK_DAMAGE_MODIFIER_ID, "Weapon modifier", (double)this.attackDamage, EntityAttributeModifier.Operation.ADDITION)); builder.put(EntityAttributes.GENERIC_ATTACK_SPEED, new EntityAttributeModifier(ATTACK_SPEED_MODIFIER_ID, "Weapon modifier", (double)attackSpeed, EntityAttributeModifier.Operation.ADDITION)); + + if (material instanceof AAToolMaterials extraMat && extraMat.getCustomAttribute() != null && extraMat.getCustomAttribute() != EntityAttributes.GENERIC_ATTACK_SPEED) + builder.put(extraMat.getCustomAttribute(), new EntityAttributeModifier(AttributeIdentifiers.WEAPON_BONUS_ATTRIBUTE, "Additional Armoury: Weapon Modifier", extraMat.getCustomAttributeValue(), EntityAttributeModifier.Operation.ADDITION)); + this.attributeModifiers = builder.build(); } diff --git a/src/main/java/com/provismet/AdditionalArmoury/items/MaceItem.java b/src/main/java/com/provismet/AdditionalArmoury/items/MaceItem.java index 44ccc57..ab70305 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/items/MaceItem.java +++ b/src/main/java/com/provismet/AdditionalArmoury/items/MaceItem.java @@ -4,6 +4,7 @@ import com.google.common.collect.Multimap; import com.provismet.AdditionalArmoury.registries.AAStatusEffects; import com.provismet.CombatPlusCore.interfaces.MeleeWeapon; +import com.provismet.CombatPlusCore.utility.AttributeIdentifiers; import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.LivingEntity; @@ -22,9 +23,17 @@ public class MaceItem extends ToolItem implements MeleeWeapon { public MaceItem (ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) { super(material, settings); this.attackDamage = attackDamage + material.getAttackDamage(); + + if (material instanceof AAToolMaterials extraMat && extraMat.getCustomAttribute() == EntityAttributes.GENERIC_ATTACK_SPEED) + attackSpeed += extraMat.getCustomAttributeValue(); + ImmutableMultimap.Builder builder = ImmutableMultimap.builder(); builder.put(EntityAttributes.GENERIC_ATTACK_DAMAGE, new EntityAttributeModifier(ATTACK_DAMAGE_MODIFIER_ID, "Weapon modifier", (double)this.attackDamage, EntityAttributeModifier.Operation.ADDITION)); builder.put(EntityAttributes.GENERIC_ATTACK_SPEED, new EntityAttributeModifier(ATTACK_SPEED_MODIFIER_ID, "Weapon modifier", (double)attackSpeed, EntityAttributeModifier.Operation.ADDITION)); + + if (material instanceof AAToolMaterials extraMat && extraMat.getCustomAttribute() != null && extraMat.getCustomAttribute() != EntityAttributes.GENERIC_ATTACK_SPEED) + builder.put(extraMat.getCustomAttribute(), new EntityAttributeModifier(AttributeIdentifiers.WEAPON_BONUS_ATTRIBUTE, "Additional Armoury: Weapon Modifier", extraMat.getCustomAttributeValue(), EntityAttributeModifier.Operation.ADDITION)); + this.attributeModifiers = builder.build(); } diff --git a/src/main/java/com/provismet/AdditionalArmoury/registries/AAItems.java b/src/main/java/com/provismet/AdditionalArmoury/registries/AAItems.java index 5d9293d..6dce948 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/registries/AAItems.java +++ b/src/main/java/com/provismet/AdditionalArmoury/registries/AAItems.java @@ -4,6 +4,11 @@ import java.util.List; import com.provismet.AdditionalArmoury.AdditionalArmouryMain; +import com.provismet.AdditionalArmoury.items.AAExtraAxeItem; +import com.provismet.AdditionalArmoury.items.AAExtraHoeItem; +import com.provismet.AdditionalArmoury.items.AAExtraPickaxeItem; +import com.provismet.AdditionalArmoury.items.AAExtraShovelItem; +import com.provismet.AdditionalArmoury.items.AAExtraSwordItem; import com.provismet.AdditionalArmoury.items.AASmithingTemplateItem; import com.provismet.AdditionalArmoury.items.AAToolMaterials; import com.provismet.AdditionalArmoury.items.DaggerItem; @@ -30,16 +35,16 @@ public class AAItems { public static final Item OVERNETHER_UPGRADE_SMITHING_TEMPLATE = AASmithingTemplateItem.createOvernetherSmithingTemplate(); public static final Item ENDERNETHER_UPGRADE_SMITHING_TEMPLATE = AASmithingTemplateItem.createEndernetherSmithingTemplate(); - public static final SwordItem OVERNETHER_SWORD = new SwordItem(AAToolMaterials.OVERNETHER, 3, -2.4f, new FabricItemSettings().maxCount(1).fireproof()); - public static final SwordItem ENDERNETHER_SWORD = new SwordItem(AAToolMaterials.ENDERNETHER, 3, -2.4f, new FabricItemSettings().maxCount(1).fireproof()); - public static final AxeItem OVERNETHER_AXE = new AxeItem(AAToolMaterials.OVERNETHER, 5, -3f, new FabricItemSettings().maxCount(1).fireproof()); - public static final AxeItem ENDERNETHER_AXE = new AxeItem(AAToolMaterials.ENDERNETHER, 5, -3f, new FabricItemSettings().maxCount(1).fireproof()); - public static final PickaxeItem OVERNETHER_PICKAXE = new PickaxeItem(AAToolMaterials.OVERNETHER, 1, -2.8f, new FabricItemSettings().maxCount(1).fireproof()); - public static final PickaxeItem ENDERNETHER_PICKAXE = new PickaxeItem(AAToolMaterials.ENDERNETHER, 1, -2.8f, new FabricItemSettings().maxCount(1).fireproof()); - public static final ShovelItem OVERNETHER_SHOVEL = new ShovelItem(AAToolMaterials.OVERNETHER, 1.5f, -3f, new FabricItemSettings().maxCount(1).fireproof()); - public static final ShovelItem ENDERNETHER_SHOVEL = new ShovelItem(AAToolMaterials.ENDERNETHER, 1.5f, -3f, new FabricItemSettings().maxCount(1).fireproof()); - public static final HoeItem OVERNETHER_HOE = new HoeItem(AAToolMaterials.OVERNETHER, -4, 0f, new FabricItemSettings().maxCount(1).fireproof()); - public static final HoeItem ENDERNETHER_HOE = new HoeItem(AAToolMaterials.ENDERNETHER, -4, 0f, new FabricItemSettings().maxCount(1).fireproof()); + public static final SwordItem OVERNETHER_SWORD = new AAExtraSwordItem(AAToolMaterials.OVERNETHER, 3, -2.4f, new FabricItemSettings().maxCount(1).fireproof()); + public static final SwordItem ENDERNETHER_SWORD = new AAExtraSwordItem(AAToolMaterials.ENDERNETHER, 3, -2.4f, new FabricItemSettings().maxCount(1).fireproof()); + public static final AxeItem OVERNETHER_AXE = new AAExtraAxeItem(AAToolMaterials.OVERNETHER, 5, -3f, new FabricItemSettings().maxCount(1).fireproof()); + public static final AxeItem ENDERNETHER_AXE = new AAExtraAxeItem(AAToolMaterials.ENDERNETHER, 5, -3f, new FabricItemSettings().maxCount(1).fireproof()); + public static final PickaxeItem OVERNETHER_PICKAXE = new AAExtraPickaxeItem(AAToolMaterials.OVERNETHER, 1, -2.8f, new FabricItemSettings().maxCount(1).fireproof()); + public static final PickaxeItem ENDERNETHER_PICKAXE = new AAExtraPickaxeItem(AAToolMaterials.ENDERNETHER, 1, -2.8f, new FabricItemSettings().maxCount(1).fireproof()); + public static final ShovelItem OVERNETHER_SHOVEL = new AAExtraShovelItem(AAToolMaterials.OVERNETHER, 1.5f, -3f, new FabricItemSettings().maxCount(1).fireproof()); + public static final ShovelItem ENDERNETHER_SHOVEL = new AAExtraShovelItem(AAToolMaterials.ENDERNETHER, 1.5f, -3f, new FabricItemSettings().maxCount(1).fireproof()); + public static final HoeItem OVERNETHER_HOE = new AAExtraHoeItem(AAToolMaterials.OVERNETHER, -4, 0f, new FabricItemSettings().maxCount(1).fireproof()); + public static final HoeItem ENDERNETHER_HOE = new AAExtraHoeItem(AAToolMaterials.ENDERNETHER, -4, 0f, new FabricItemSettings().maxCount(1).fireproof()); public static final DaggerItem WOODEN_DAGGER = new DaggerItem(ToolMaterials.WOOD, new FabricItemSettings().maxCount(1), 0x372910); public static final DaggerItem STONE_DAGGER = new DaggerItem(ToolMaterials.STONE, new FabricItemSettings().maxCount(1), 0x494949);