Version 1.1.2

Added Cold Aercloud Material
Added Blue Aercloud Material
Added Golden Aercloud Material
Added Candy Cane Material
Added Cushy Trait
Added Festive Trait
Modified Enlightened Trait to also have a chance to drop Ambrosium on
kills
Modified Valkyrie Material's tool parts and tools appearance
Fixed Reach Trait's extended block reach never going away if you log out
with it active

Author: Shnupbups

src/main/java/shnupbups/tinkersaether/config/TAConfig.java

@@ -40,6 +40,22 @@ public class TAConfig extends Configuration {
     @Config.RequiresMcRestart
     public static boolean swet = true;
 
+    @Config.Comment("Whether Candy Cane is enabled or not.")
+    @Config.RequiresMcRestart
+    public static boolean candycane = true;
+
+    @Config.Comment("Whether Blue Aercloud is enabled or not.")
+    @Config.RequiresMcRestart
+    public static boolean aercloudBlue = true;
+
+    @Config.Comment("Whether Cold Aercloud is enabled or not.")
+    @Config.RequiresMcRestart
+    public static boolean aercloudCold = true;
+
+    @Config.Comment("Whether Gold Aercloud is enabled or not.")
+    @Config.RequiresMcRestart
+    public static boolean aercloudGold = true;
+
     @Config.Comment("Whether Darts and Dart Shooters are enabled or not.")
     @Config.RequiresMcRestart
     public static boolean darts = true;

src/main/java/shnupbups/tinkersaether/misc/OreDict.java

@@ -16,5 +16,12 @@ public static void register() {
         OreDictionary.registerOre("gemGoldenAmber",ItemsAether.golden_amber);
         OreDictionary.registerOre("slimeball",ItemsAether.swetty_ball);
         OreDictionary.registerOre("slimeballSwet",ItemsAether.swetty_ball);
+        OreDictionary.registerOre("aercloud",new ItemStack(BlocksAether.aercloud,1,0));
+        OreDictionary.registerOre("aercloudCold",new ItemStack(BlocksAether.aercloud,1,0));
+        OreDictionary.registerOre("aercloud",new ItemStack(BlocksAether.aercloud,1,1));
+        OreDictionary.registerOre("aercloudBlue",new ItemStack(BlocksAether.aercloud,1,1));
+        OreDictionary.registerOre("aercloud",new ItemStack(BlocksAether.aercloud,1,2));
+        OreDictionary.registerOre("aercloudGold",new ItemStack(BlocksAether.aercloud,1,2));
+        OreDictionary.registerOre("candyCane",ItemsAether.candy_cane);
     }
 }

src/main/java/shnupbups/tinkersaether/modules/ModuleBase.java

@@ -43,6 +43,10 @@ public ModuleBase() {
     public static final Material gravitite = Materials.mat("gravitite", 0xCC55AA);
     public static final Material valkyrie = Materials.mat("valkyrie", 0xEEEEDD);
     public static final Material swet = Materials.mat("swet", 0x29A6D9);
+    public static final Material candycane = Materials.mat("candycane", 0xFF3333);
+    public static final Material aercloudBlue = Materials.mat("aercloudBlue", 0x99B2C2);
+    public static final Material aercloudCold = Materials.mat("aercloudCold", 0xAAAAAA);
+    public static final Material aercloudGold = Materials.mat("aercloudGold", 0xFFF1A1);
 
     public static final TAItem valkyrieIngot = new TAItem("valkyrie_ingot");
     public static final TAItem valkyrieNugget = new TAItem("valkyrie_nugget");
@@ -165,6 +169,61 @@ public void preInit() {
             TinkerRegistry.integrate(swetMi).preInit();
         }
 
+        if(TAConfig.candycane) {
+            TinkerRegistry.addMaterialStats(candycane,
+                    new HeadMaterialStats(250, 2.5f, 5.0f, STONE),
+                    new HandleMaterialStats(1.2f, -120),
+                    new ExtraMaterialStats(120),
+                    TinkersAether.plzNo);
+            candycane.setCraftable(true).setCastable(false);
+            candycane.addItem("candyCane", 1, Material.VALUE_Ingot);
+            candycane.addTrait(Festive.festive);
+            candycane.addTrait(tasty);
+            MaterialIntegration candycaneMi = new MaterialIntegration(candycane).setRepresentativeItem("candyCane");
+            TinkerRegistry.integrate(candycaneMi).preInit();
+        }
+
+        if(TAConfig.aercloudCold) {
+            TinkerRegistry.addMaterialStats(aercloudCold,
+                    new HeadMaterialStats(2000, 0.5f, 0.0f, STONE),
+                    new HandleMaterialStats(0.2f, -500),
+                    new ExtraMaterialStats(0),
+                    TinkersAether.plzNo);
+            aercloudCold.setCraftable(true).setCastable(false);
+            aercloudCold.addItem("aercloudCold", 1, Material.VALUE_Ingot);
+            aercloudCold.addTrait(Cushy.cushy);
+            MaterialIntegration aercloudColdMi = new MaterialIntegration(aercloudCold).setRepresentativeItem("aercloudCold");
+            TinkerRegistry.integrate(aercloudColdMi).preInit();
+        }
+
+        if(TAConfig.aercloudBlue) {
+            TinkerRegistry.addMaterialStats(aercloudBlue,
+                    new HeadMaterialStats(2000, 0.5f, 0.0f, STONE),
+                    new HandleMaterialStats(0.2f, -500),
+                    new ExtraMaterialStats(0),
+                    TinkersAether.plzNo);
+            aercloudBlue.setCraftable(true).setCastable(false);
+            aercloudBlue.addItem("aercloudBlue", 1, Material.VALUE_Ingot);
+            aercloudBlue.addTrait(Cushy.cushy);
+            aercloudBlue.addTrait(Cushy.cushy, MaterialTypes.HEAD);
+            aercloudBlue.addTrait(Launching.launching, MaterialTypes.HEAD);
+            MaterialIntegration aercloudBlueMi = new MaterialIntegration(aercloudBlue).setRepresentativeItem("aercloudBlue");
+            TinkerRegistry.integrate(aercloudBlueMi).preInit();
+        }
+
+        if(TAConfig.aercloudGold) {
+            TinkerRegistry.addMaterialStats(aercloudGold,
+                    new HeadMaterialStats(2500, 1.0f, 0.1f, STONE),
+                    new HandleMaterialStats(0.25f, -400),
+                    new ExtraMaterialStats(20),
+                    TinkersAether.plzNo);
+            aercloudGold.setCraftable(true).setCastable(false);
+            aercloudGold.addItem("aercloudGold", 1, Material.VALUE_Ingot);
+            aercloudGold.addTrait(Cushy.cushy);
+            MaterialIntegration aercloudGoldMi = new MaterialIntegration(aercloudGold).setRepresentativeItem("aercloudGold");
+            TinkerRegistry.integrate(aercloudGoldMi).preInit();
+        }
+
         TinkersAether.logger.info("Base Module - Materials Registered");
 
         TinkersAether.logger.info("Base Module - End PreInit");

src/main/java/shnupbups/tinkersaether/traits/Cushy.java

@@ -0,0 +1,27 @@
+package shnupbups.tinkersaether.traits;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.init.Enchantments;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import slimeknights.tconstruct.library.traits.AbstractTrait;
+import slimeknights.tconstruct.library.utils.ToolBuilder;
+
+public class Cushy extends AbstractTrait {
+    public static final Cushy cushy = new Cushy();
+
+    public Cushy() {
+        super("cushy", 0xBBBBBF);
+    }
+
+    @Override
+    public void applyEffect(NBTTagCompound rootCompound, NBTTagCompound modifierTag) {
+        super.applyEffect(rootCompound, modifierTag);
+        ToolBuilder.addEnchantment(rootCompound, Enchantments.SILK_TOUCH);
+    }
+
+    @Override
+    public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float newDamage, boolean isCritical) {
+        return newDamage*0.1f;
+    }
+}

src/main/java/shnupbups/tinkersaether/traits/Enlightened.java

@@ -24,4 +24,13 @@ public void afterBlockBreak(ItemStack tool, World world, IBlockState state, Bloc
             world.spawnEntity(amb);
         }
     }
+
+    @Override
+    public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damageDealt, boolean wasCritical, boolean wasHit) {
+        if(!target.isEntityAlive() && !target.getEntityWorld().isRemote && random.nextInt(20) == 0) {
+            EntityItem amb = new EntityItem(target.getEntityWorld(), target.getPosition().getX(), target.getPosition().getY(), target.getPosition().getZ());
+            amb.setItem(new ItemStack(ItemsAether.ambrosium_shard, 1));
+            target.getEntityWorld().spawnEntity(amb);
+        }
+    }
 }

src/main/java/shnupbups/tinkersaether/traits/Festive.java

@@ -0,0 +1,36 @@
+package shnupbups.tinkersaether.traits;
+
+import com.legacy.aether.items.ItemsAether;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import slimeknights.tconstruct.library.traits.AbstractTrait;
+
+public class Festive extends AbstractTrait {
+    public static final Festive festive = new Festive();
+
+    public Festive() {
+        super("festive",0xEEEE11);
+    }
+
+    @Override
+    public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) {
+        if (!world.isRemote && world.rand.nextBoolean()) {
+            EntityItem amb = new EntityItem(world, pos.getX(), pos.getY(), pos.getZ());
+            amb.setItem(new ItemStack(ItemsAether.candy_cane, 1));
+            world.spawnEntity(amb);
+        }
+    }
+
+    @Override
+    public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damageDealt, boolean wasCritical, boolean wasHit) {
+        if(!target.isEntityAlive() && !target.getEntityWorld().isRemote && random.nextBoolean()) {
+            EntityItem amb = new EntityItem(target.getEntityWorld(), target.getPosition().getX(), target.getPosition().getY(), target.getPosition().getZ());
+            amb.setItem(new ItemStack(ItemsAether.candy_cane, 1));
+            target.getEntityWorld().spawnEntity(amb);
+        }
+    }
+}

src/main/java/shnupbups/tinkersaether/traits/Reach.java

@@ -7,6 +7,7 @@
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.Vec3d;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.EntityJoinWorldEvent;
 import net.minecraftforge.event.entity.living.LivingEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -20,13 +21,22 @@
 public class Reach extends AbstractTrait {
     public static final Reach reach = new Reach();
 
-    public static final AttributeModifier reachModifier = new AttributeModifier(UUID.randomUUID(), "Tinkers Aether Reach Modifier", 5.0D, 0);
+    public static final AttributeModifier reachModifier = new AttributeModifier(UUID.fromString("df6eabe7-6947-4a56-9099-002f90370708"), "Tinkers Aether Reach Modifier", 5.0D, 0);
 
     public Reach() {
         super("reach",0xEEEEDD);
         MinecraftForge.EVENT_BUS.register(this);
     }
 
+    //Made a mistake in previous versions... this should fix it!
+    @SubscribeEvent
+    public void onPlayerJoin(EntityJoinWorldEvent event) {
+        if ((event.getEntity() instanceof EntityPlayer)) {
+            EntityPlayer player = (EntityPlayer) event.getEntity();
+            player.getEntityAttribute(EntityPlayer.REACH_DISTANCE).removeAllModifiers();
+        }
+    }
+
     @SubscribeEvent
     public void onPlayerUpdate(LivingEvent.LivingUpdateEvent event) {
         if ((event.getEntityLiving() instanceof EntityPlayer)) {

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

@@ -5,6 +5,10 @@ material.holystone.name=Holystone
 material.goldenamber.name=Golden Amber
 material.valkyrie.name=Valkyrie
 material.swet.name=Swet
+material.candycane.name=Candy Cane
+material.aercloudblue.name=Blue Aercloud
+material.aercloudcold.name=Cold Aercloud
+material.aercloudgold.name=Golden Aercloud
 
 fluid.gravitite.name=Molten Gravitite
 fluid.valkyrie.name=Molten Valkyrie Metal
@@ -41,5 +45,9 @@ modifier.reach.name=Reach
 modifier.reach.desc=§oAngelic arms!§r\nWhilst holding this tool, you can reach further.
 modifier.swetty.name=Swetty
 modifier.swetty.desc=§oEww, gooey!§r\nIt'll wash off.
+modifier.festive.name=Festive
+modifier.festive.desc=§oCandy canes!§r\nLick them in a spear and kill your enemies.
+modifier.cushy.name=Cushy
+modifier.cushy.desc=§oLike a cushion.§r\nSilky, but doesn't hurt much.
 
 tinkersaether.config.title=Tinker's Aether Configuration

src/main/resources/assets/tinkersaether/materials/candycane.json

@@ -0,0 +1,6 @@
+{
+  "type": "block",
+  "parameters": {
+    "texture": "tinkersaether:materials/candycane"
+  }
+}

src/main/resources/assets/tinkersaether/materials/valkyrie.json

@@ -1,6 +1,6 @@
 {
   "type": "block",
   "parameters": {
-    "texture": "tinkersaether:blocks/valkyrie_block"
+    "texture": "tinkersaether:materials/valkyrie"
   }
 }