Rework ancient silver material for Tinkers'

-Renamed Speed Demon tool trait to Silver Hoplite.
-Added Speed Demon trait for armor. Replacing the reused Lightweight trait.

Author: IcarussOne

src/main/java/drzhark/mocreatures/compat/tinkers/ConstructsArmoryIntegration.java

@@ -7,6 +7,7 @@
 import drzhark.mocreatures.compat.tinkers.traits.armor.TraitShellEffectArmor;
 import drzhark.mocreatures.compat.tinkers.traits.armor.TraitShellEffectPlayerArmor;
 import drzhark.mocreatures.compat.tinkers.traits.armor.TraitShellFireArmor;
+import drzhark.mocreatures.compat.tinkers.traits.armor.TraitSpeedDemonArmor;
 import drzhark.mocreatures.compat.tinkers.traits.armor.TraitThresherArmor;
 import net.minecraft.init.MobEffects;
 import slimeknights.tconstruct.library.TinkerRegistry;
@@ -20,6 +21,7 @@ public class ConstructsArmoryIntegration {
     public static final AbstractArmorTrait FROST_SHELL_ARMOR = new TraitShellEffectArmor(MoCConstants.MOD_ID + "." + "frost_shell", 0x1B7A87, 0.0625F, MobEffects.RESISTANCE, MobEffects.SLOWNESS, 0);
     public static final AbstractArmorTrait UNDEAD_SHELL_ARMOR = new TraitShellEffectPlayerArmor(MoCConstants.MOD_ID + "." + "undead_shell", 0x92B859, 0.0625F, MobEffects.STRENGTH,
             MobEffects.WITHER, MobEffects.BLINDNESS);
+    public static final AbstractArmorTrait SPEED_DEMON_ARMOR = new TraitSpeedDemonArmor();
     public static final AbstractArmorTrait THRESHER_ARMOR = new TraitThresherArmor();
 
     // Materials are already registered in the tools class, we are just registering support for armor sets here
@@ -68,7 +70,7 @@ public static void preInit() {
         ArmorMaterials.addArmorTrait(TinkersConstructIntegration.UNDEAD_CHITIN, ArmorTraits.spiny, ArmorMaterialType.CORE);
         ArmorMaterials.addArmorTrait(TinkersConstructIntegration.UNDEAD_CHITIN, ArmorTraits.spiny, ArmorMaterialType.PLATES);
         ArmorMaterials.addArmorTrait(TinkersConstructIntegration.UNDEAD_CHITIN, ArmorTraits.spiny, ArmorMaterialType.TRIM);
-        
+
         TinkerRegistry.addMaterialStats(TinkersConstructIntegration.BIG_CAT_CLAW,
                 new CoreMaterialStats(10.0F, 4.0F),
                 new PlatesMaterialStats(0.9F, 2.0F, 1.0F),
@@ -91,7 +93,7 @@ public static void preInit() {
                 new CoreMaterialStats(15.0F, 17.0F),
                 new PlatesMaterialStats(0.95F, 8.5F, 3.0F),
                 new TrimMaterialStats(4.0F));
-        ArmorMaterials.addArmorTrait(TinkersConstructIntegration.ANCIENT_SILVER, ArmorTraits.lightweight, ArmorMaterialType.CORE);
+        ArmorMaterials.addArmorTrait(TinkersConstructIntegration.ANCIENT_SILVER, SPEED_DEMON_ARMOR, ArmorMaterialType.CORE);
         ArmorMaterials.addArmorTrait(TinkersConstructIntegration.ANCIENT_SILVER, ArmorTraits.heavy, ArmorMaterialType.CORE);
         ArmorMaterials.addArmorTrait(TinkersConstructIntegration.ANCIENT_SILVER, ArmorTraits.heavy, ArmorMaterialType.PLATES);
         ArmorMaterials.addArmorTrait(TinkersConstructIntegration.ANCIENT_SILVER, ArmorTraits.heavy, ArmorMaterialType.TRIM);

src/main/java/drzhark/mocreatures/compat/tinkers/TinkersConstructIntegration.java

@@ -46,7 +46,7 @@ public class TinkersConstructIntegration {
     public static final AbstractTrait FIRE_STING = new TraitStingFire(MoCConstants.MOD_ID + "." + "fire_sting", 0xC62B13, 1.5F);
     public static final AbstractTrait FROST_STING = new TraitStingEffect(MoCConstants.MOD_ID + "." + "frost_sting", 0x1B7A87, 1.5F, MobEffects.SLOWNESS, 0);
     public static final AbstractTrait SEA_PREDATOR = new TraitSeaPredator(0.4F);
-    public static final AbstractTrait SPEED_DEMON = new TraitSpeedDemon(5.0F);
+    public static final AbstractTrait SILVER_HOPLITE = new TraitSilverHoplite(5.0F);
     public static final AbstractTrait UNDEAD_STING = new TraitStingEffectPlayer(MoCConstants.MOD_ID + "." + "undead_sting", 0x92B859, 1.5F, MobEffects.WITHER, MobEffects.BLINDNESS);
 
     public static final FluidMolten ANCIENT_SILVER_FLUID = new FluidMolten("ancient_silver", 0x9D9FA3, FluidMolten.ICON_MetalStill, FluidMolten.ICON_MetalFlowing);
@@ -136,7 +136,7 @@ public static void preInit() {
                 new HandleMaterialStats(1.1F, 120),
                 new ExtraMaterialStats(110),
                 new BowMaterialStats(0.4F, 2.0F, 9.0F));
-        ANCIENT_SILVER.addTrait(SPEED_DEMON, MaterialTypes.HEAD);
+        ANCIENT_SILVER.addTrait(SILVER_HOPLITE, MaterialTypes.HEAD);
         ANCIENT_SILVER.addTrait(TinkerTraits.heavy, MaterialTypes.HEAD);
         ANCIENT_SILVER.addTrait(TinkerTraits.heavy);
         TinkerRegistry.integrate(new MaterialIntegration(ANCIENT_SILVER, ANCIENT_SILVER_FLUID, "AncientSilver")).toolforge().preInit();

…mpat/tinkers/traits/TraitSpeedDemon.java …t/tinkers/traits/TraitSilverHoplite.javasrc/main/java/drzhark/mocreatures/compat/tinkers/traits/TraitSpeedDemon.java renamed to src/main/java/drzhark/mocreatures/compat/tinkers/traits/TraitSilverHoplite.java src/main/java/drzhark/mocreatures/compat/tinkers/traits/TraitSpeedDemon.java renamed to src/main/java/drzhark/mocreatures/compat/tinkers/traits/TraitSilverHoplite.java

@@ -11,11 +11,11 @@
 import slimeknights.tconstruct.library.Util;
 import slimeknights.tconstruct.library.traits.AbstractTrait;
 
-public class TraitSpeedDemon extends AbstractTrait {
+public class TraitSilverHoplite extends AbstractTrait {
     protected final float bonus;
 
-    public TraitSpeedDemon(float bonus) {
-        super(MoCConstants.MOD_ID + "." + "speed_demon", 0x8E8F93);
+    public TraitSilverHoplite(float bonus) {
+        super(MoCConstants.MOD_ID + "." + "silver_hoplite", 0x8E8F93);
 
         this.bonus = bonus;
     }

src/main/java/drzhark/mocreatures/compat/tinkers/traits/armor/TraitSpeedDemonArmor.java

@@ -0,0 +1,21 @@
+package drzhark.mocreatures.compat.tinkers.traits.armor;
+
+import c4.conarm.lib.traits.AbstractArmorTrait;
+import drzhark.mocreatures.MoCConstants;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.MobEffects;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.world.World;
+
+public class TraitSpeedDemonArmor extends AbstractArmorTrait {
+    public TraitSpeedDemonArmor() {
+        super(MoCConstants.MOD_ID + "." + "speed_demon", 0x8E8F93);
+    }
+
+    @Override
+    public void onAbilityTick(int level, World world, EntityPlayer player) {
+        if (player.isSprinting()) {
+            player.addPotionEffect(new PotionEffect(MobEffects.SPEED, 2, level - 1, true, false));
+        }
+    }
+}

src/main/resources/assets/mocreatures/lang/en_us.lang

@@ -459,8 +459,8 @@ modifier.mocreatures.fire_sting.desc=§oElemental Scorpions!§r\nYour tool sets
 modifier.mocreatures.sea_predator.name=Sea Predator
 modifier.mocreatures.sea_predator.desc=§oThere's a shark in the pond!§r\nYour tool deals +40% damage to all aquatic creatures or while you're under rain or in water.
 modifier.mocreatures.sea_predator.extra=Vs Aquatic: +%s
-modifier.mocreatures.speed_demon.name=Speed Demon
-modifier.mocreatures.speed_demon.desc=§oSpeedrunning!§r\nBonus damage is dealt while running.
+modifier.mocreatures.silver_hoplite.name=Silver Hoplite
+modifier.mocreatures.silver_hoplite.desc=§oFOR THE EMPIRE!§r\nBonus damage is dealt while running.
 modifier.mocreatures.speed_demon.extra=Speed Demon Damage: +%d
 modifier.mocreatures.undead_sting.name=Sting of Undead
 modifier.mocreatures.undead_sting.desc=§oElemental Scorpions!§r\nYour tool withers enemies (or blinds players) on hit and deals increased damage.
@@ -474,6 +474,8 @@ modifier.mocreatures.fire_shell_armor.name=Shell of Fire
 modifier.mocreatures.fire_shell_armor.desc=§oDodge this!§r\nThere is a small chance for damage to be ignored entirely, you'll also temporarily gain Fire Resistance while your target is set on fire.
 modifier.mocreatures.frost_shell_armor.name=Shell of Frost
 modifier.mocreatures.frost_shell_armor.desc=§oDodge this!§r\nThere is a small chance for damage to be ignored entirely, you'll also temporarily gain Resistance while your target is slowed.
+modifier.mocreatures.speed_demon_armor.name=Speed Demon
+modifier.mocreatures.speed_demon_armor.desc=§oSpeedrunning!§r\nSpeed is applied to you when running. The level of this effect also increases while more armor pieces with this trait are worn.
 modifier.mocreatures.thresher_armor.name=Thresher
 modifier.mocreatures.thresher_armor.desc=§oHoly Mackerel!§r\nDamages attackers on contact based on durability and provides extra protection from all aquatic creatures.
 modifier.mocreatures.thresher_armor.extra.damage=Thresher Damage: +%s