Browse Source

Fixed the other Chainsaws too, oops XD

Gregorius Techneticies 3 months ago
parent
commit
8ab9a1b6dc
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 1B693EA14F2FD70F

+ 5
- 5
src/main/java/gregtech/items/tools/early/GT_Tool_Axe.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -53,8 +53,8 @@ public class GT_Tool_Axe extends ToolStats {
53 53
 	}
54 54
 	
55 55
 	@Override
56
-	public int getToolDamagePerDropConversion() {
57
-		return 1;
56
+	public int getToolDamagePerEntityAttack() {
57
+		return 200;
58 58
 	}
59 59
 	
60 60
 	@Override
@@ -63,8 +63,8 @@ public class GT_Tool_Axe extends ToolStats {
63 63
 	}
64 64
 	
65 65
 	@Override
66
-	public int getToolDamagePerEntityAttack() {
67
-		return 200;
66
+	public int getToolDamagePerDropConversion() {
67
+		return 1;
68 68
 	}
69 69
 	
70 70
 	@Override

+ 7
- 41
src/main/java/gregtech/items/tools/electric/GT_Tool_Chainsaw_HV.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2019 Gregorius Techneticies
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -26,46 +26,12 @@ import gregapi.old.Textures;
26 26
 import gregapi.render.IIconContainer;
27 27
 import net.minecraft.item.ItemStack;
28 28
 
29
-public class GT_Tool_Chainsaw_HV extends GT_Tool_Chainsaw_LV {
30
-	@Override
31
-	public int getToolDamagePerBlockBreak() {
32
-		return 800;
33
-	}
34
-	
35
-	@Override
36
-	public int getToolDamagePerDropConversion() {
37
-		return 20;
38
-	}
39
-	
40
-	@Override
41
-	public int getToolDamagePerContainerCraft() {
42
-		return 3200;
43
-	}
44
-	
45
-	@Override
46
-	public int getToolDamagePerEntityAttack() {
47
-		return 3200;
48
-	}
49
-	
50
-	@Override
51
-	public int getBaseQuality() {
52
-		return 1;
53
-	}
54
-	
55
-	@Override
56
-	public float getBaseDamage() {
57
-		return 4.0F;
58
-	}
59
-	
60
-	@Override
61
-	public float getSpeedMultiplier() {
62
-		return 4.0F;
63
-	}
64
-	
65
-	@Override
66
-	public float getMaxDurabilityMultiplier() {
67
-		return 4.0F;
68
-	}
29
+public class GT_Tool_Chainsaw_HV extends GT_Tool_Chainsaw_MV {
30
+	@Override public int getToolDamagePerBlockBreak     () {return super.getToolDamagePerBlockBreak  () * 4;}
31
+	@Override public int getToolDamagePerEntityAttack   () {return super.getToolDamagePerEntityAttack() * 4;}
32
+	@Override public float getBaseDamage                () {return 4.0F;}
33
+	@Override public float getSpeedMultiplier           () {return 4.0F;}
34
+	@Override public float getMaxDurabilityMultiplier   () {return 4.0F;}
69 35
 	
70 36
 	@Override
71 37
 	public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

+ 7
- 29
src/main/java/gregtech/items/tools/electric/GT_Tool_Chainsaw_LV.java View File

@@ -49,15 +49,13 @@ import net.minecraftforge.common.IShearable;
49 49
 import net.minecraftforge.event.world.BlockEvent;
50 50
 
51 51
 public class GT_Tool_Chainsaw_LV extends GT_Tool_Axe {
52
-	@Override
53
-	public int getToolDamagePerContainerCraft() {
54
-		return 200;
55
-	}
56
-	
57
-	@Override
58
-	public int getToolDamagePerEntityAttack() {
59
-		return 200;
60
-	}
52
+	@Override public int getBaseQuality                () {return 1;}
53
+	@Override public int getToolDamagePerContainerCraft() {return 200;}
54
+	@Override public int getToolDamagePerEntityAttack  () {return super.getToolDamagePerEntityAttack() * 4;}
55
+	@Override public float getSpeedMultiplier          () {return 2.0F;}
56
+	@Override public String getCraftingSound           () {return SFX.IC_CHAINSAW_01;}
57
+	@Override public String getEntityHitSound          () {return SFX.IC_CHAINSAW_02;}
58
+	@Override public String getMiningSound             () {return SFX.IC_CHAINSAW_01;}
61 59
 	
62 60
 	@Override
63 61
 	public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) {
@@ -83,26 +81,6 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Axe {
83 81
 		return super.getDamageSource(aPlayer, aEntity);
84 82
 	}
85 83
 	
86
-	@Override
87
-	public float getSpeedMultiplier() {
88
-		return 2.0F;
89
-	}
90
-	
91
-	@Override
92
-	public String getCraftingSound() {
93
-		return SFX.IC_CHAINSAW_01;
94
-	}
95
-	
96
-	@Override
97
-	public String getEntityHitSound() {
98
-		return SFX.IC_CHAINSAW_02;
99
-	}
100
-	
101
-	@Override
102
-	public String getMiningSound() {
103
-		return SFX.IC_CHAINSAW_01;
104
-	}
105
-	
106 84
 	@Override
107 85
 	public boolean isMinableBlock(Block aBlock, byte aMetaData) {
108 86
 		String tTool = aBlock.getHarvestTool(aMetaData);

+ 6
- 40
src/main/java/gregtech/items/tools/electric/GT_Tool_Chainsaw_MV.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2019 Gregorius Techneticies
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -27,45 +27,11 @@ import gregapi.render.IIconContainer;
27 27
 import net.minecraft.item.ItemStack;
28 28
 
29 29
 public class GT_Tool_Chainsaw_MV extends GT_Tool_Chainsaw_LV {
30
-	@Override
31
-	public int getToolDamagePerBlockBreak() {
32
-		return 200;
33
-	}
34
-	
35
-	@Override
36
-	public int getToolDamagePerDropConversion() {
37
-		return 10;
38
-	}
39
-	
40
-	@Override
41
-	public int getToolDamagePerContainerCraft() {
42
-		return 800;
43
-	}
44
-	
45
-	@Override
46
-	public int getToolDamagePerEntityAttack() {
47
-		return 8000;
48
-	}
49
-	
50
-	@Override
51
-	public int getBaseQuality() {
52
-		return 1;
53
-	}
54
-	
55
-	@Override
56
-	public float getBaseDamage() {
57
-		return 3.5F;
58
-	}
59
-	
60
-	@Override
61
-	public float getSpeedMultiplier() {
62
-		return 3.0F;
63
-	}
64
-	
65
-	@Override
66
-	public float getMaxDurabilityMultiplier() {
67
-		return 2.0F;
68
-	}
30
+	@Override public int getToolDamagePerBlockBreak     () {return super.getToolDamagePerBlockBreak  () * 4;}
31
+	@Override public int getToolDamagePerEntityAttack   () {return super.getToolDamagePerEntityAttack() * 4;}
32
+	@Override public float getBaseDamage                () {return 3.5F;}
33
+	@Override public float getSpeedMultiplier           () {return 3.0F;}
34
+	@Override public float getMaxDurabilityMultiplier   () {return 2.0F;}
69 35
 	
70 36
 	@Override
71 37
 	public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {

Loading…
Cancel
Save