Version 1.1.0

Added Swet Material
Added Swet Crystals
Added Valkyrie Material
Added Valkyrie Metal Ingots, Nuggets, Blocks
Added Molten Valkyrie Metal
Added Swetty trait (basically Slimy but with swets instead of slimes)
Added Reach trait (gives extra reach)
Added config options to disable Valkyrie, Swet
Added config option to disable Valkyrie Metal Tool Forges
Tweaked Golden Amber Colour
Removed Config being logged on load

Author: Shnupbups

build.gradle

@@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
 
-version = "1.0.3"
+version = "1.1.0"
 group = "shnupbups.tinkersaether" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "tinkersaether"
 

src/main/java/shnupbups/tinkersaether/TinkersAether.java

@@ -26,7 +26,7 @@
 public class TinkersAether {
     public static final String modid = "tinkersaether";
     public static final String name = "MoreTiC";
-    public static final String version = "1.0.3";
+    public static final String version = "1.1.0";
 
     @Mod.Instance(modid)
     public static TinkersAether instance;
@@ -50,8 +50,6 @@ public void preInit(FMLPreInitializationEvent event) {
 
     @Mod.EventHandler
     public void init(FMLInitializationEvent event) {
-        logger.info(TAConfig.getConfig());
-
         if(TAConfig.darts) {
             proxy.initToolGuis();
         }

src/main/java/shnupbups/tinkersaether/blocks/TABlock.java

@@ -0,0 +1,16 @@
+package shnupbups.tinkersaether.blocks;
+
+import com.legacy.aether.registry.creative_tabs.AetherCreativeTabs;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import shnupbups.tinkersaether.TinkersAether;
+
+public class TABlock extends Block {
+
+    public TABlock(String name, Material material) {
+        super(material);
+        this.setUnlocalizedName(name);
+        this.setRegistryName(TinkersAether.modid, name);
+        this.setCreativeTab(AetherCreativeTabs.blocks);
+    }
+}

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

@@ -32,9 +32,13 @@ public class TAConfig extends Configuration {
     @Config.RequiresMcRestart
     public static boolean goldenamber = true;
 
-    /*@Config.Comment("Whether Valkyrie is enabled or not.")
+    @Config.Comment("Whether Valkyrie Metal is enabled or not.")
     @Config.RequiresMcRestart
-    public static boolean valkyrie = true;*/
+    public static boolean valkyrie = true;
+
+    @Config.Comment("Whether Swet is enabled or not.")
+    @Config.RequiresMcRestart
+    public static boolean swet = true;
 
     @Config.Comment("Whether Darts and Dart Shooters are enabled or not.")
     @Config.RequiresMcRestart
@@ -44,6 +48,10 @@ public class TAConfig extends Configuration {
     @Config.RequiresMcRestart
     public static boolean gravititeForge = true;
 
+    @Config.Comment("Whether Valkyrie Metal (if enabled) can be used to make a tool forge.")
+    @Config.RequiresMcRestart
+    public static boolean valkyrieForge = true;
+
     @Mod.EventBusSubscriber(modid = TinkersAether.modid)
     private static class EventHandler {
         @SubscribeEvent
@@ -53,8 +61,4 @@ public static void onConfigChanged(final ConfigChangedEvent.OnConfigChangedEvent
             }
         }
     }
-
-    public static String getConfig() {
-        return "Skyroot: "+skyroot+" Holystone: "+holystone+" Zanite: "+zanite+" Gravitite: "+gravitite+" Darts: "+darts+" GravititeForge: "+gravititeForge;
-    }
 }

src/main/java/shnupbups/tinkersaether/items/TAItem.java

@@ -0,0 +1,15 @@
+package shnupbups.tinkersaether.items;
+
+import com.legacy.aether.registry.creative_tabs.AetherCreativeTabs;
+import net.minecraft.item.Item;
+import shnupbups.tinkersaether.TinkersAether;
+
+public class TAItem extends Item {
+
+    public TAItem(String name) {
+        super();
+        this.setUnlocalizedName(name);
+        this.setRegistryName(TinkersAether.modid, name);
+        this.setCreativeTab(AetherCreativeTabs.material);
+    }
+}

src/main/java/shnupbups/tinkersaether/misc/OreDictAether.java renamed to src/main/java/shnupbups/tinkersaether/misc/OreDict.java

@@ -5,7 +5,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
-public class OreDictAether {
+public class OreDict {
 
     public static void register() {
         OreDictionary.registerOre("plankSkyroot", BlocksAether.skyroot_plank);
@@ -14,5 +14,7 @@ public static void register() {
         OreDictionary.registerOre("stickSkyroot", ItemsAether.skyroot_stick);
         OreDictionary.registerOre("holystone",BlocksAether.holystone);
         OreDictionary.registerOre("gemGoldenAmber",ItemsAether.golden_amber);
+        OreDictionary.registerOre("slimeball",ItemsAether.swetty_ball);
+        OreDictionary.registerOre("slimeballSwet",ItemsAether.swetty_ball);
     }
 }

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

@@ -1,16 +1,24 @@
 package shnupbups.tinkersaether.modules;
 
+import com.legacy.aether.items.ItemsAether;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.RegistryEvent;
+import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.registries.IForgeRegistry;
 import shnupbups.tinkersaether.Materials;
 import shnupbups.tinkersaether.TinkersAether;
+import shnupbups.tinkersaether.blocks.TABlock;
 import shnupbups.tinkersaether.config.TAConfig;
 import shnupbups.tinkersaether.fluids.FluidHelper;
+import shnupbups.tinkersaether.items.TAItem;
 import shnupbups.tinkersaether.misc.MiscUtils;
-import shnupbups.tinkersaether.misc.OreDictAether;
+import shnupbups.tinkersaether.misc.OreDict;
 import shnupbups.tinkersaether.traits.*;
 import slimeknights.tconstruct.library.MaterialIntegration;
 import slimeknights.tconstruct.library.TinkerRegistry;
@@ -21,6 +29,7 @@
 import static slimeknights.tconstruct.library.utils.HarvestLevels.*;
 import static slimeknights.tconstruct.tools.TinkerTraits.*;
 
+@Mod.EventBusSubscriber(modid = TinkersAether.modid)
 public class ModuleBase {
     public static ModuleBase aether = new ModuleBase();
 
@@ -30,10 +39,17 @@ public ModuleBase() {
 
     public static final Material skyroot = Materials.mat("skyroot", 0x6C633E);
     public static final Material holystone = Materials.mat("holystone", 0xA8AAA8);
-    public static final Material goldenAmber = Materials.mat("goldenamber", 0xFFDF1A);
+    public static final Material goldenAmber = Materials.mat("goldenamber", 0xFFE41C);
     public static final Material zanite = Materials.mat("zanite", 0x6611DD);
     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 TAItem valkyrieIngot = new TAItem("valkyrie_ingot");
+    public static final TAItem valkyrieNugget = new TAItem("valkyrie_nugget");
+    public static final TABlock valkyrieBlock = new TABlock("valkyrie_block", net.minecraft.block.material.Material.IRON);
+
+    public static final TAItem swetCrystal = new TAItem("swet_crystal");
 
     public void preInit() {
         TinkersAether.logger.info("Base Module - Begin PreInit");
@@ -116,6 +132,40 @@ public void preInit() {
             TinkerRegistry.integrate(goldenAmberMi).preInit();
         }
 
+        if(TAConfig.valkyrie) {
+            TinkerRegistry.addMaterialStats(valkyrie,
+                    new HeadMaterialStats(1000, 8.0f, 7.00f, COBALT),
+                    new HandleMaterialStats(1.0f, 80),
+                    new ExtraMaterialStats(70),
+                    TinkersAether.plzNo);
+            valkyrie.setCraftable(false).setCastable(true);
+            valkyrie.addItem("blockValkyrie", 1, Material.VALUE_Block);
+            valkyrie.addItem(valkyrieBlock, Material.VALUE_Block);
+            valkyrie.addItem("ingotValkryie", 1, Material.VALUE_Ingot);
+            valkyrie.addItem(valkyrieIngot, 1, Material.VALUE_Ingot);
+            valkyrie.addItem("nuggetValkryie", 1, Material.VALUE_Nugget);
+            valkyrie.addItem(valkyrieNugget, 1, Material.VALUE_Nugget);
+            valkyrie.addTrait(Gilded.gilded, MaterialTypes.HEAD);
+            valkyrie.addTrait(Reach.reach, MaterialTypes.HEAD);
+            valkyrie.addTrait(Reach.reach);
+            MaterialIntegration valkyrieMi = new MaterialIntegration(null, valkyrie, FluidHelper.createFluid(valkyrie, 1000), "Valkyrie");
+            TinkerRegistry.integrate(valkyrieMi).preInit();
+        }
+
+        if(TAConfig.swet) {
+            TinkerRegistry.addMaterialStats(swet,
+                    new HeadMaterialStats(1100, 4.5f, 2.0f, STONE),
+                    new HandleMaterialStats(0.7f, -100),
+                    new ExtraMaterialStats(360),
+                    new BowMaterialStats(1.0f, 1.5f, 0.5f));
+            swet.setCraftable(true).setCastable(false);
+            swet.addItem("slimecrystalSwet", 1, Material.VALUE_Ingot);
+            swet.addItem(swetCrystal, 1, Material.VALUE_Ingot);
+            swet.addTrait(Swetty.swetty);
+            MaterialIntegration swetMi = new MaterialIntegration(swet).setRepresentativeItem("slimecrystalSwet");
+            TinkerRegistry.integrate(swetMi).preInit();
+        }
+
         TinkersAether.logger.info("Base Module - Materials Registered");
 
         TinkersAether.logger.info("Base Module - End PreInit");
@@ -124,7 +174,7 @@ public void preInit() {
     public void init() {
         TinkersAether.logger.info("Base Module - Begin Init");
 
-        OreDictAether.register();
+        OreDict.register();
 
         TinkersAether.logger.info("Base Module - OreDict Registered");
 
@@ -133,6 +183,13 @@ public void init() {
             TinkerRegistry.registerBasinCasting(new CastingRecipe(MiscUtils.stackFromOreDict("blockEnchantedGravitite"), gravitite.getFluid(), Material.VALUE_Ingot, 180));
         }
 
+        if(TAConfig.valkyrie) {
+            TinkerRegistry.registerMelting(ItemsAether.valkyrie_boots, valkyrie.getFluid(), Material.VALUE_Ingot*4);
+            TinkerRegistry.registerMelting(ItemsAether.valkyrie_chestplate, valkyrie.getFluid(), Material.VALUE_Ingot*8);
+            TinkerRegistry.registerMelting(ItemsAether.valkyrie_helmet, valkyrie.getFluid(), Material.VALUE_Ingot*5);
+            TinkerRegistry.registerMelting(ItemsAether.valkyrie_leggings, valkyrie.getFluid(), Material.VALUE_Ingot*7);
+        }
+
         TinkersAether.logger.info("Base Module - Gravitite Stuffs Registered");
 
         TinkersAether.logger.info("Base Module - End Init");
@@ -144,6 +201,44 @@ public void registerRecipes(RegistryEvent.Register<IRecipe> event) {
         if(TAConfig.gravititeForge) {
             TinkerTools.registerToolForgeBlock(registry, "blockEnchantedGravitite");
         }
+        if(TAConfig.valkyrie && TAConfig.valkyrieForge) {
+            TinkerTools.registerToolForgeBlock(registry, "blockValkyrie");
+        }
         TinkersAether.logger.info("Base Module - Recipes Registered");
     }
+
+    @SubscribeEvent
+    public static void registerItems(RegistryEvent.Register<Item> event) {
+        IForgeRegistry<Item> registry = event.getRegistry();
+        if(TAConfig.valkyrie) {
+            registry.register(valkyrieIngot);
+            registry.register(valkyrieNugget);
+            Item valkBlock = new ItemBlock(valkyrieBlock).setRegistryName(valkyrieBlock.getRegistryName()).setUnlocalizedName(valkyrieBlock.getUnlocalizedName());
+            registry.register(valkBlock);
+            TinkersAether.proxy.registerItemRenderer(valkyrieIngot, 0, "valkyrie_ingot");
+            TinkersAether.proxy.registerItemRenderer(valkyrieNugget, 0, "valkyrie_nugget");
+            TinkersAether.proxy.registerItemRenderer(valkBlock,0,"valkyrie_block");
+            OreDictionary.registerOre("ingotValkyrie",valkyrieIngot);
+            OreDictionary.registerOre("nuggetValkyrie",valkyrieNugget);
+            OreDictionary.registerOre("blockValkyrie",valkyrieBlock);
+        }
+        if(TAConfig.swet) {
+            registry.register(swetCrystal);
+            TinkersAether.proxy.registerItemRenderer(swetCrystal, 0, "swet_crystal");
+            OreDictionary.registerOre("slimecrystal",swetCrystal);
+            OreDictionary.registerOre("slimecrystalSwet",swetCrystal);
+        }
+        TinkersAether.logger.info("Base Module - Items Registered");
+    }
+
+    @SubscribeEvent
+    public static void registerBlocks(RegistryEvent.Register<Block> event) {
+        IForgeRegistry<Block> registry = event.getRegistry();
+        if(TAConfig.valkyrie) {
+            valkyrieBlock.setHarvestLevel("pickaxe",3);
+            valkyrieBlock.setHardness(4.0f);
+            registry.register(valkyrieBlock);
+        }
+        TinkersAether.logger.info("Base Module - Blocks Registered");
+    }
 }

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

@@ -37,7 +37,7 @@ public class ModuleTools {
     public static final List<IToolPart> parts = new ArrayList<>();
 
     @SubscribeEvent
-    public static void initItems(RegistryEvent.Register<Item> event) {
+    public static void registerItems(RegistryEvent.Register<Item> event) {
         TinkersAether.logger.info("Tools Module - Begin ItemInit");
 
         if(TAConfig.darts) {

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

@@ -0,0 +1,35 @@
+package shnupbups.tinkersaether.traits;
+
+import net.minecraft.entity.ai.attributes.AttributeModifier;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.living.LivingEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import slimeknights.tconstruct.library.traits.AbstractTrait;
+
+import java.util.UUID;
+
+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 Reach() {
+        super("reach",0xEEEEDD);
+        MinecraftForge.EVENT_BUS.register(this);
+    }
+
+    @SubscribeEvent
+    public void onPlayerUpdate(LivingEvent.LivingUpdateEvent event) {
+        if ((event.getEntityLiving() instanceof EntityPlayer)) {
+            EntityPlayer player = (EntityPlayer) event.getEntityLiving();
+            ItemStack stack = player.getHeldItemMainhand();
+            if (!player.getEntityAttribute(EntityPlayer.REACH_DISTANCE).hasModifier(this.reachModifier) && isToolWithTrait(stack)) {
+                player.getEntityAttribute(EntityPlayer.REACH_DISTANCE).applyModifier(this.reachModifier);
+            } else if (player.getEntityAttribute(EntityPlayer.REACH_DISTANCE).hasModifier(this.reachModifier) && !isToolWithTrait(stack)) {
+                player.getEntityAttribute(EntityPlayer.REACH_DISTANCE).removeModifier(this.reachModifier);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,42 @@
+package shnupbups.tinkersaether.traits;
+
+import com.legacy.aether.entities.passive.mountable.EntitySwet;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import slimeknights.tconstruct.library.traits.AbstractTrait;
+
+public class Swetty extends AbstractTrait {
+
+    public static final Swetty swetty = new Swetty();
+
+    private static float chance = 0.0033f;
+
+    public Swetty() {
+        super("swetty", 0x7777FF);
+    }
+
+    @Override
+    public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) {
+        if(wasEffective && !world.isRemote && random.nextFloat() < chance) {
+            spawnSwet(player, pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5, world);
+        }
+    }
+
+    @Override
+    public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damageDealt, boolean wasCritical, boolean wasHit) {
+        if(!target.isEntityAlive() && !target.getEntityWorld().isRemote && random.nextFloat() < chance) {
+            spawnSwet(player, target.posX, target.posY, target.posZ, target.getEntityWorld());
+        }
+    }
+
+    protected void spawnSwet(EntityLivingBase player, double x, double y, double z, World world) {
+        EntitySwet entity = new EntitySwet(world);
+        entity.setPosition(x, y, z);
+        world.spawnEntity(entity);
+        entity.setLastAttackedEntity(player);
+        entity.playLivingSound();
+    }
+}