Anvilcraft/aether-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed axe damage.

Browse source
This commit is contained in:
bconlon 2020-07-15 01:50:39 -07:00
parent b6d3027a53
commit 6ca6ccb2a1
7 changed files with 27 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/main/java/com/legacy/aether/items/ItemsAether.java
View file

@ -125,25 +125,25 @@ public class ItemsAether {
aechor_petal = register("aechor_petal", new ItemAether(AetherCreativeTabs.material).setTextureName(Aether.find("misc/aechor_petal"))); aechor_petal = register("aechor_petal", new ItemAether(AetherCreativeTabs.material).setTextureName(Aether.find("misc/aechor_petal")));
swet_ball = register("swet_ball", new ItemSwettyBall(AetherCreativeTabs.material).setTextureName(Aether.find("misc/swet_ball"))); swet_ball = register("swet_ball", new ItemSwettyBall(AetherCreativeTabs.material).setTextureName(Aether.find("misc/swet_ball")));
skyroot_pickaxe = register("skyroot_pickaxe", new ItemSkyrootTool(EnumAetherToolType.PICKAXE).setTextureName(Aether.find("tools/skyroot_pickaxe"))); skyroot_pickaxe = register("skyroot_pickaxe", new ItemSkyrootTool(2.0F, EnumAetherToolType.PICKAXE).setTextureName(Aether.find("tools/skyroot_pickaxe")));
skyroot_axe = register("skyroot_axe", new ItemSkyrootTool(EnumAetherToolType.AXE).setTextureName(Aether.find("tools/skyroot_axe"))); skyroot_axe = register("skyroot_axe", new ItemSkyrootTool(3.0F, EnumAetherToolType.AXE).setTextureName(Aether.find("tools/skyroot_axe")));
skyroot_shovel = register("skyroot_shovel", new ItemSkyrootTool(EnumAetherToolType.SHOVEL).setTextureName(Aether.find("tools/skyroot_shovel"))); skyroot_shovel = register("skyroot_shovel", new ItemSkyrootTool(1.0F, EnumAetherToolType.SHOVEL).setTextureName(Aether.find("tools/skyroot_shovel")));
holystone_pickaxe = register("holystone_pickaxe", new ItemHolystoneTool(EnumAetherToolType.PICKAXE).setTextureName(Aether.find("tools/holystone_pickaxe"))); holystone_pickaxe = register("holystone_pickaxe", new ItemHolystoneTool(2.0F, EnumAetherToolType.PICKAXE).setTextureName(Aether.find("tools/holystone_pickaxe")));
holystone_axe = register("holystone_axe", new ItemHolystoneTool(EnumAetherToolType.AXE).setTextureName(Aether.find("tools/holystone_axe"))); holystone_axe = register("holystone_axe", new ItemHolystoneTool(3.0F, EnumAetherToolType.AXE).setTextureName(Aether.find("tools/holystone_axe")));
holystone_shovel = register("holystone_shovel", new ItemHolystoneTool(EnumAetherToolType.SHOVEL).setTextureName(Aether.find("tools/holystone_shovel"))); holystone_shovel = register("holystone_shovel", new ItemHolystoneTool(1.0F, EnumAetherToolType.SHOVEL).setTextureName(Aether.find("tools/holystone_shovel")));
zanite_pickaxe = register("zanite_pickaxe", new ItemZaniteTool(EnumAetherToolType.PICKAXE).setTextureName(Aether.find("tools/zanite_pickaxe"))); zanite_pickaxe = register("zanite_pickaxe", new ItemZaniteTool(2.0F, EnumAetherToolType.PICKAXE).setTextureName(Aether.find("tools/zanite_pickaxe")));
zanite_axe = register("zanite_axe", new ItemZaniteTool(EnumAetherToolType.AXE).setTextureName(Aether.find("tools/zanite_axe"))); zanite_axe = register("zanite_axe", new ItemZaniteTool(3.0F, EnumAetherToolType.AXE).setTextureName(Aether.find("tools/zanite_axe")));
zanite_shovel = register("zanite_shovel", new ItemZaniteTool(EnumAetherToolType.SHOVEL).setTextureName(Aether.find("tools/zanite_shovel"))); zanite_shovel = register("zanite_shovel", new ItemZaniteTool(1.0F, EnumAetherToolType.SHOVEL).setTextureName(Aether.find("tools/zanite_shovel")));
gravitite_pickaxe = register("gravitite_pickaxe", new ItemGravititeTool(EnumAetherToolType.PICKAXE).setTextureName(Aether.find("tools/gravitite_pickaxe"))); gravitite_pickaxe = register("gravitite_pickaxe", new ItemGravititeTool(2.0F, EnumAetherToolType.PICKAXE).setTextureName(Aether.find("tools/gravitite_pickaxe")));
gravitite_axe = register("gravitite_axe", new ItemGravititeTool(EnumAetherToolType.AXE).setTextureName(Aether.find("tools/gravitite_axe"))); gravitite_axe = register("gravitite_axe", new ItemGravititeTool(3.0F, EnumAetherToolType.AXE).setTextureName(Aether.find("tools/gravitite_axe")));
gravitite_shovel = register("gravitite_shovel", new ItemGravititeTool(EnumAetherToolType.SHOVEL).setTextureName(Aether.find("tools/gravitite_shovel"))); gravitite_shovel = register("gravitite_shovel", new ItemGravititeTool(1.0F, EnumAetherToolType.SHOVEL).setTextureName(Aether.find("tools/gravitite_shovel")));
valkyrie_pickaxe = register("valkyrie_pickaxe", new ItemValkyrieTool(EnumAetherToolType.PICKAXE).setTextureName(Aether.find("tools/valkyrie_pickaxe"))); valkyrie_pickaxe = register("valkyrie_pickaxe", new ItemValkyrieTool(2.0F, EnumAetherToolType.PICKAXE).setTextureName(Aether.find("tools/valkyrie_pickaxe")));
valkyrie_axe = register("valkyrie_axe", new ItemValkyrieTool(EnumAetherToolType.AXE).setTextureName(Aether.find("tools/valkyrie_axe"))); valkyrie_axe = register("valkyrie_axe", new ItemValkyrieTool(3.0F, EnumAetherToolType.AXE).setTextureName(Aether.find("tools/valkyrie_axe")));
valkyrie_shovel = register("valkyrie_shovel", new ItemValkyrieTool(EnumAetherToolType.SHOVEL).setTextureName(Aether.find("tools/valkyrie_shovel"))); valkyrie_shovel = register("valkyrie_shovel", new ItemValkyrieTool(1.0F, EnumAetherToolType.SHOVEL).setTextureName(Aether.find("tools/valkyrie_shovel")));
zanite_helmet = register("zanite_helmet", new ItemZaniteArmor(0, ArmorMaterial.IRON, "zanite", zanite_gemstone, 0x711ae8).setTextureName(Aether.find("armor/zanite_helmet"))); zanite_helmet = register("zanite_helmet", new ItemZaniteArmor(0, ArmorMaterial.IRON, "zanite", zanite_gemstone, 0x711ae8).setTextureName(Aether.find("armor/zanite_helmet")));
zanite_chestplate = register("zanite_chestplate", new ItemZaniteArmor(1, ArmorMaterial.IRON, "zanite", zanite_gemstone, 0x711ae8).setTextureName(Aether.find("armor/zanite_chestplate"))); zanite_chestplate = register("zanite_chestplate", new ItemZaniteArmor(1, ArmorMaterial.IRON, "zanite", zanite_gemstone, 0x711ae8).setTextureName(Aether.find("armor/zanite_chestplate")));

9
src/main/java/com/legacy/aether/items/tools/ItemAetherTool.java
View file

@ -15,8 +15,6 @@ import com.legacy.aether.registry.creative_tabs.AetherCreativeTabs;
public abstract class ItemAetherTool extends ItemTool { public abstract class ItemAetherTool extends ItemTool {
private static final float[] ATTACK_DAMAGES = new float[]{6.0F, 8.0F, 8.0F, 8.0F, 6.0F};
private float attackDamage; private float attackDamage;
private String toolClass; private String toolClass;
@ -25,20 +23,17 @@ public abstract class ItemAetherTool extends ItemTool {
public EnumAetherToolType toolType; public EnumAetherToolType toolType;
public ItemAetherTool(ToolMaterial toolMaterial, EnumAetherToolType toolType) { public ItemAetherTool(float damage, ToolMaterial toolMaterial, EnumAetherToolType toolType) {
super(1.0F, toolMaterial, toolType.getToolBlockSet()); super(damage, toolMaterial, toolType.getToolBlockSet());
this.toolType = toolType; this.toolType = toolType;
if (toolType == EnumAetherToolType.PICKAXE) { if (toolType == EnumAetherToolType.PICKAXE) {
this.toolClass = "pickaxe"; this.toolClass = "pickaxe";
this.attackDamage = 1.0F + toolMaterial.getDamageVsEntity();
} else if (toolType == EnumAetherToolType.AXE) { } else if (toolType == EnumAetherToolType.AXE) {
this.toolClass = "axe"; this.toolClass = "axe";
this.attackDamage = ATTACK_DAMAGES[toolMaterial.ordinal()] + toolMaterial.getDamageVsEntity();
} else if (toolType == EnumAetherToolType.SHOVEL) { } else if (toolType == EnumAetherToolType.SHOVEL) {
this.toolClass = "shovel"; this.toolClass = "shovel";
this.attackDamage = 1.5F + toolMaterial.getDamageVsEntity();
} }
this.setCreativeTab(AetherCreativeTabs.tools); this.setCreativeTab(AetherCreativeTabs.tools);

4
src/main/java/com/legacy/aether/items/tools/ItemGravititeTool.java
View file

@ -13,8 +13,8 @@ import com.legacy.aether.items.util.EnumAetherToolType;
public class ItemGravititeTool extends ItemAetherTool { public class ItemGravititeTool extends ItemAetherTool {
public ItemGravititeTool(EnumAetherToolType toolType) { public ItemGravititeTool(float damage, EnumAetherToolType toolType) {
super(ToolMaterial.EMERALD, toolType); super(damage, ToolMaterial.EMERALD, toolType);
} }
@Override @Override

4
src/main/java/com/legacy/aether/items/tools/ItemHolystoneTool.java
View file

@ -13,8 +13,8 @@ import com.legacy.aether.items.util.EnumAetherToolType;
public class ItemHolystoneTool extends ItemAetherTool { public class ItemHolystoneTool extends ItemAetherTool {
public ItemHolystoneTool(EnumAetherToolType toolType) { public ItemHolystoneTool(float damage, EnumAetherToolType toolType) {
super(ToolMaterial.STONE, toolType); super(damage, ToolMaterial.STONE, toolType);
} }
@Override @Override

4
src/main/java/com/legacy/aether/items/tools/ItemSkyrootTool.java
View file

@ -8,8 +8,8 @@ import com.legacy.aether.items.util.EnumAetherToolType;
public class ItemSkyrootTool extends ItemAetherTool { public class ItemSkyrootTool extends ItemAetherTool {
public ItemSkyrootTool(EnumAetherToolType toolType) { public ItemSkyrootTool(float damage, EnumAetherToolType toolType) {
super(ToolMaterial.WOOD, toolType); super(damage, ToolMaterial.WOOD, toolType);
} }
@Override @Override

4
src/main/java/com/legacy/aether/items/tools/ItemValkyrieTool.java
View file

@ -15,8 +15,8 @@ import com.legacy.aether.items.util.EnumAetherToolType;
public class ItemValkyrieTool extends ItemAetherTool { public class ItemValkyrieTool extends ItemAetherTool {
public ItemValkyrieTool(EnumAetherToolType toolType) { public ItemValkyrieTool(float damage, EnumAetherToolType toolType) {
super(ToolMaterial.EMERALD, toolType); super(damage, ToolMaterial.EMERALD, toolType);
} }
@Override @Override

4
src/main/java/com/legacy/aether/items/tools/ItemZaniteTool.java
View file

@ -10,8 +10,8 @@ public class ItemZaniteTool extends ItemAetherTool {
public float[] level = new float[]{2F, 4F, 6F, 8F, 12F}; public float[] level = new float[]{2F, 4F, 6F, 8F, 12F};
public ItemZaniteTool(EnumAetherToolType toolType) { public ItemZaniteTool(float damage, EnumAetherToolType toolType) {
super(ToolMaterial.IRON, toolType); super(damage, ToolMaterial.IRON, toolType);
} }
@Override @Override