Fix powered tools combat stats. Closes #2468
This commit is contained in:
parent
fd9d776b43
commit
38aaeabf3c
5 changed files with 9 additions and 5 deletions
|
@ -159,7 +159,7 @@ dependencies {
|
||||||
api project(":RebornCore")
|
api project(":RebornCore")
|
||||||
include project(":RebornCore")
|
include project(":RebornCore")
|
||||||
|
|
||||||
optionalDependency "me.shedaniel:RoughlyEnoughItems-fabric:6.0.264-alpha"
|
optionalDependency "me.shedaniel:RoughlyEnoughItems-fabric:6.0.267-alpha"
|
||||||
disabledOptionalDependency "com.github.emilyploszaj:trinkets:3.0.2"
|
disabledOptionalDependency "com.github.emilyploszaj:trinkets:3.0.2"
|
||||||
disabledOptionalDependency "com.github.dexman545:autoswitch-api:-SNAPSHOT"
|
disabledOptionalDependency "com.github.dexman545:autoswitch-api:-SNAPSHOT"
|
||||||
disabledOptionalDependency 'net.oskarstrom:DashLoader:2.0'
|
disabledOptionalDependency 'net.oskarstrom:DashLoader:2.0'
|
||||||
|
|
|
@ -55,7 +55,8 @@ public class ChainsawItem extends AxeItem implements EnergyHolder, ItemDurabilit
|
||||||
public final EnergyTier tier;
|
public final EnergyTier tier;
|
||||||
|
|
||||||
public ChainsawItem(ToolMaterials material, int energyCapacity, EnergyTier tier, int cost, float poweredSpeed, float unpoweredSpeed, Item referenceTool) {
|
public ChainsawItem(ToolMaterials material, int energyCapacity, EnergyTier tier, int cost, float poweredSpeed, float unpoweredSpeed, Item referenceTool) {
|
||||||
super(material, (int) material.getAttackDamage(), unpoweredSpeed, new Item.Settings().group(TechReborn.ITEMGROUP).maxCount(1).maxDamage(-1));
|
// combat stats same as for diamond axe. Fix for #2468
|
||||||
|
super(material, 5.0F, -3.0F, new Item.Settings().group(TechReborn.ITEMGROUP).maxCount(1).maxDamage(-1));
|
||||||
this.maxCharge = energyCapacity;
|
this.maxCharge = energyCapacity;
|
||||||
this.tier = tier;
|
this.tier = tier;
|
||||||
this.cost = cost;
|
this.cost = cost;
|
||||||
|
|
|
@ -55,7 +55,8 @@ public class DrillItem extends PickaxeItem implements EnergyHolder, ItemDurabili
|
||||||
public final EnergyTier tier;
|
public final EnergyTier tier;
|
||||||
|
|
||||||
public DrillItem(ToolMaterials material, int energyCapacity, EnergyTier tier, int cost, float poweredSpeed, float unpoweredSpeed, MiningLevel miningLevel) {
|
public DrillItem(ToolMaterials material, int energyCapacity, EnergyTier tier, int cost, float poweredSpeed, float unpoweredSpeed, MiningLevel miningLevel) {
|
||||||
super(material, (int) material.getAttackDamage(), unpoweredSpeed, new Item.Settings().group(TechReborn.ITEMGROUP).maxCount(1).maxDamage(-1));
|
// combat stats same as for diamond pickaxe. Fix for #2468
|
||||||
|
super(material, 1, -2.8F, new Item.Settings().group(TechReborn.ITEMGROUP).maxCount(1).maxDamage(-1));
|
||||||
this.maxCharge = energyCapacity;
|
this.maxCharge = energyCapacity;
|
||||||
this.cost = cost;
|
this.cost = cost;
|
||||||
this.poweredSpeed = poweredSpeed;
|
this.poweredSpeed = poweredSpeed;
|
||||||
|
|
|
@ -57,7 +57,8 @@ public class JackhammerItem extends PickaxeItem implements EnergyHolder, ItemDur
|
||||||
protected final float unpoweredSpeed = 0.5F;
|
protected final float unpoweredSpeed = 0.5F;
|
||||||
|
|
||||||
public JackhammerItem(int energyCapacity, EnergyTier tier, int cost) {
|
public JackhammerItem(int energyCapacity, EnergyTier tier, int cost) {
|
||||||
super(ToolMaterials.DIAMOND, (int) ToolMaterials.DIAMOND.getAttackDamage(), 1F, new Item.Settings().group(TechReborn.ITEMGROUP).maxCount(1).maxDamage(-1));
|
// combat stats same as for diamond pickaxe. Fix for #2468
|
||||||
|
super(ToolMaterials.DIAMOND, 1, -2.8F, new Item.Settings().group(TechReborn.ITEMGROUP).maxCount(1).maxDamage(-1));
|
||||||
this.maxCharge = energyCapacity;
|
this.maxCharge = energyCapacity;
|
||||||
this.tier = tier;
|
this.tier = tier;
|
||||||
this.cost = cost;
|
this.cost = cost;
|
||||||
|
|
|
@ -55,7 +55,8 @@ public class RockCutterItem extends PickaxeItem implements EnergyHolder, ItemDur
|
||||||
|
|
||||||
// 400k FE with 1k FE\t charge rate
|
// 400k FE with 1k FE\t charge rate
|
||||||
public RockCutterItem() {
|
public RockCutterItem() {
|
||||||
super(ToolMaterials.DIAMOND, 1, 1, new Item.Settings().group(TechReborn.ITEMGROUP).maxCount(1).maxDamage(-1));
|
// combat stats same as for diamond pickaxe. Fix for #2468
|
||||||
|
super(ToolMaterials.DIAMOND, 1, -2.8F, new Item.Settings().group(TechReborn.ITEMGROUP).maxCount(1).maxDamage(-1));
|
||||||
}
|
}
|
||||||
|
|
||||||
// PickaxeItem
|
// PickaxeItem
|
||||||
|
|
Loading…
Reference in a new issue