add bow / bow string stats to TIC materials. Close #736

Author: jaredlll08

src/main/java/com/blamejared/compat/tconstruct/actions/SetBowBonusDamageAction.java

@@ -0,0 +1,40 @@
+package com.blamejared.compat.tconstruct.actions;
+
+import com.blamejared.compat.tconstruct.materials.ITICMaterial;
+import crafttweaker.IAction;
+import slimeknights.tconstruct.library.materials.*;
+
+public class SetBowBonusDamageAction implements IAction {
+    
+    private final ITICMaterial material;
+    private final String stat;
+    private final float newValue;
+    
+    public SetBowBonusDamageAction(ITICMaterial material, String stat, float newValue) {
+        this.material = material;
+        this.stat = stat;
+        this.newValue = newValue;
+    }
+    
+    private static void set(Material material, String stat, float bonusDamage) {
+        IMaterialStats oldStat = material.getStats(stat);
+        if(oldStat instanceof BowMaterialStats) {
+            BowMaterialStats bowStat = (BowMaterialStats) oldStat;
+            BowMaterialStats newBow = new BowMaterialStats(bowStat.drawspeed, bowStat.range, bonusDamage);
+            material.addStats(newBow);
+        }
+        
+    }
+    
+    @Override
+    public void apply() {
+        set((Material) material.getInternal(), stat, newValue);
+    }
+    
+    
+    @Override
+    public String describe() {
+        return "Setting BonusDamage of " + material.getName() + " to " + newValue + " for " + stat;
+    }
+    
+}

src/main/java/com/blamejared/compat/tconstruct/actions/SetBowRangeAction.java

@@ -0,0 +1,40 @@
+package com.blamejared.compat.tconstruct.actions;
+
+import com.blamejared.compat.tconstruct.materials.ITICMaterial;
+import crafttweaker.IAction;
+import slimeknights.tconstruct.library.materials.*;
+
+public class SetBowRangeAction implements IAction {
+    
+    private final ITICMaterial material;
+    private final String stat;
+    private final float newValue;
+    
+    public SetBowRangeAction(ITICMaterial material, String stat, float newValue) {
+        this.material = material;
+        this.stat = stat;
+        this.newValue = newValue;
+    }
+    
+    private static void set(Material material, String stat, float range) {
+        IMaterialStats oldStat = material.getStats(stat);
+        if(oldStat instanceof BowMaterialStats) {
+            BowMaterialStats bowStat = (BowMaterialStats) oldStat;
+            BowMaterialStats newBow = new BowMaterialStats(bowStat.drawspeed, range, bowStat.bonusDamage);
+            material.addStats(newBow);
+        }
+        
+    }
+    
+    @Override
+    public void apply() {
+        set((Material) material.getInternal(), stat, newValue);
+    }
+    
+    
+    @Override
+    public String describe() {
+        return "Setting Range of " + material.getName() + " to " + newValue + " for " + stat;
+    }
+    
+}

src/main/java/com/blamejared/compat/tconstruct/actions/SetDrawSpeedAction.java

@@ -0,0 +1,40 @@
+package com.blamejared.compat.tconstruct.actions;
+
+import com.blamejared.compat.tconstruct.materials.ITICMaterial;
+import crafttweaker.IAction;
+import slimeknights.tconstruct.library.materials.*;
+
+public class SetDrawSpeedAction implements IAction {
+    
+    private final ITICMaterial material;
+    private final String stat;
+    private final float newValue;
+    
+    public SetDrawSpeedAction(ITICMaterial material, String stat, float newValue) {
+        this.material = material;
+        this.stat = stat;
+        this.newValue = newValue;
+    }
+    
+    private static void set(Material material, String stat, float drawSpeed) {
+        IMaterialStats oldStat = material.getStats(stat);
+        if(oldStat instanceof BowMaterialStats) {
+            BowMaterialStats bowStat = (BowMaterialStats) oldStat;
+            BowMaterialStats newBow = new BowMaterialStats(drawSpeed, bowStat.range, bowStat.bonusDamage);
+            material.addStats(newBow);
+        }
+        
+    }
+    
+    @Override
+    public void apply() {
+        set((Material) material.getInternal(), stat, newValue);
+    }
+    
+    
+    @Override
+    public String describe() {
+        return "Setting DrawSpeed of " + material.getName() + " to " + newValue + " for " + stat;
+    }
+    
+}

src/main/java/com/blamejared/compat/tconstruct/actions/SetModifierAction.java

@@ -26,10 +26,13 @@ private static void set(Material material, String stat, float modifier) {
             ArrowShaftMaterialStats shaftStat = (ArrowShaftMaterialStats) oldStat;
             ArrowShaftMaterialStats newShaft = new ArrowShaftMaterialStats(modifier, shaftStat.bonusAmmo);
             material.addStats(newShaft);
-        }else if(oldStat instanceof FletchingMaterialStats) {
+        } else if(oldStat instanceof FletchingMaterialStats) {
             FletchingMaterialStats fletch = (FletchingMaterialStats) oldStat;
             FletchingMaterialStats newShaft = new FletchingMaterialStats(fletch.accuracy, modifier);
             material.addStats(newShaft);
+        }else if(oldStat instanceof BowStringMaterialStats) {
+            BowStringMaterialStats newBowString = new BowStringMaterialStats( modifier);
+            material.addStats(newBowString);
         }
 
 

src/main/java/com/blamejared/compat/tconstruct/materials/ITICMaterial.java

@@ -86,4 +86,30 @@ public interface ITICMaterial {
     @ZenGetter("fletchingAccuracy")
     float getFletchingAccuracy();
 
+    @ZenGetter("bowDrawSpeed")
+    float getBowDrawSpeed();
+    
+    @ZenSetter("bowDrawSpeed")
+    void setBowDrawSpeed(float drawSpeed);
+    
+    @ZenGetter("bowRange")
+    float getBowRange();
+    
+    @ZenSetter("bowRange")
+    void setBowRange(float range);
+    
+    @ZenGetter("bonusDamage")
+    float getBonusDamage();
+    
+    @ZenSetter("bonusDamage")
+    void setBonusDamage(float bonusDamage);
+    
+    @ZenGetter("bowStringModifier")
+    float getBowStringModifier();
+    
+    @ZenSetter("bowStringModifier")
+    void setBowStringModifier(float modifier);
+    
+    
+    
 }

src/main/java/com/blamejared/compat/tconstruct/materials/TICMaterial.java

@@ -100,7 +100,7 @@ public void setDurabilityExtra(int durability) {
 
     @Override
     public int getDurabilityExtra() {
-        return ((ExtraMaterialStats ) material.getStats("extra")).extraDurability;
+        return ((ExtraMaterialStats) material.getStats("extra")).extraDurability;
     }
 
     @Override
@@ -143,5 +143,47 @@ public float getFletchingAccuracy() {
         return ((FletchingMaterialStats) material.getStats("fletching")).accuracy;
     }
 
+    @Override
+    public float getBowDrawSpeed() {
+        return ((BowMaterialStats) material.getStats("bow")).drawspeed;
+    }
+    
+    @Override
+    public void setBowDrawSpeed(float drawSpeed) {
+        CraftTweakerAPI.apply(new SetDrawSpeedAction(this, "bow", drawSpeed));
+    }
+    
+    @Override
+    public float getBowRange() {
+        return ((BowMaterialStats) material.getStats("bow")).range;
+    }
+    
+    @Override
+    public void setBowRange(float range) {
+        CraftTweakerAPI.apply(new SetBowRangeAction(this, "bow", range));
+    }
+    
+    @Override
+    public float getBonusDamage() {
+        return ((BowMaterialStats) material.getStats("bow")).bonusDamage;
+    }
+    
+    @Override
+    public void setBonusDamage(float bonusDamage) {
+        CraftTweakerAPI.apply(new SetBowBonusDamageAction(this, "bow", bonusDamage));
+    }
+    
+    @Override
+    public float getBowStringModifier() {
+        return ((BowStringMaterialStats) material.getStats("bowstring")).modifier;
+        
+    }
+    
+    @Override
+    public void setBowStringModifier(float modifier) {
+        CraftTweakerAPI.apply(new SetModifierAction(this, "bowstring", modifier));
+        
+    }
+    
 
 }