Merge branch 'featureMoreIron' of ssh://git.nmd.so:12000/nmd/ForgeCraft into featureMoreIron

1.11/To-Dos

@@ -1,9 +1,14 @@
 To-Dos
 
+*** Bugs ***
+- [ ] Duplication Bug for Tool Repair
+
 *** Priority ***
+- [ ] Move Ingot break into chunks logic out of the block and into the ForgeHammer
 - [ ] Make an Iron Anvil
-- [ ] Make Clean Iron Recipes and Tools
+  - [ ] Check Iron Anvil creation logic
- - [ ] Make Clean Ore Recipe
+- [ ] Make New Ore Tool, Tool Part, Ingot, and Chunk Assets
+- [ ] Make New Ore Recipes
 - [ ] Make Steel Recipes and Tools
 - [ ] Make Wootz Recipes and Tools
 - [ ] Add Yew

1.11/banned-ips.json

@@ -0,0 +1 @@
+[]

1.11/banned-players.json

@@ -0,0 +1 @@
+[]

1.11/eula.txt

@@ -1,3 +1,3 @@
 #By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).
 #Sat Apr 01 13:44:13 EDT 2017
-eula=false
+eula=true

1.11/ops.json

@@ -0,0 +1 @@
+[]

1.11/server.properties

@@ -1,2 +1,38 @@
 #Minecraft server properties
-#Mon Feb 13 22:08:20 EST 2017
+#Tue Apr 04 17:37:36 EDT 2017
+max-tick-time=60000
+generator-settings=
+allow-nether=true
+force-gamemode=false
+gamemode=0
+enable-query=false
+player-idle-timeout=0
+difficulty=1
+spawn-monsters=true
+op-permission-level=4
+announce-player-achievements=true
+pvp=true
+snooper-enabled=true
+level-type=DEFAULT
+hardcore=false
+enable-command-block=false
+max-players=20
+network-compression-threshold=256
+resource-pack-sha1=
+max-world-size=29999984
+server-port=25565
+server-ip=
+spawn-npcs=true
+allow-flight=false
+level-name=world
+view-distance=10
+resource-pack=
+spawn-animals=true
+white-list=false
+generate-structures=true
+online-mode=true
+max-build-height=256
+level-seed=
+prevent-proxy-connections=false
+motd=A Minecraft Server
+enable-rcon=false

1.11/src/main/java/nmd/primal/forgecraft/blocks/Forge.java

@@ -1,5 +1,6 @@
 package nmd.primal.forgecraft.blocks;
 
+import net.minecraft.block.Block;
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
@@ -156,16 +157,11 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/
                  ***********************/
                 //REMOVE COOL INGOT
                 if(facing == EnumFacing.UP ) {
-                    if (pItem.isEmpty()) {
+                    /*if (pItem.isEmpty()) {
                         for (int i = 2; i < tile.getSlotListSize(); i++) {
                             //System.out.println(i);
                             if (!tile.getSlotStack(i).isEmpty()) {
-                                if (tile.getSlotStack(i).getItem().equals(new ItemStack(ModBlocks.ironchunk).getItem())) {
+                                if (Block.getBlockFromItem(tile.getSlotStack(i).getItem()) instanceof IngotBall) {
-                                    CommonUtils.spawnItemEntity(world, player, tile.getSlotStack(i));
-                                    tile.setSlotStack(i, ItemStack.EMPTY);
-                                    return true;
-                                }
-                                if (tile.getSlotStack(i).getItem().equals(new ItemStack(ModBlocks.ironball).getItem())) {
                                     CommonUtils.spawnItemEntity(world, player, tile.getSlotStack(i));
                                     tile.setSlotStack(i, ItemStack.EMPTY);
                                     return true;
@@ -177,13 +173,12 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/
                                         return true;
                                     }
                                 }
-
-                            }
                             }
                         }
+                    }*/
 
 
-                    if (pItem.getItem().equals(new ItemStack(ModBlocks.ironchunk).getItem())) {
+                    if (Block.getBlockFromItem(pItem.getItem()) instanceof IngotBall) {
                         //System.out.println("Activating");
                         for (int i = 2; i <= tile.getSlotListSize(); i++) {
                             if (tile.getSlotStack(i).isEmpty()) {
@@ -193,15 +188,6 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider/
                             }
                         }
                     }
-                    if (pItem.getItem().equals(new ItemStack(ModBlocks.ironball).getItem())) {
-                        for (int i = 2; i < tile.getSlotListSize(); i++) {
-                            if (tile.getSlotStack(i).isEmpty()) {
-                                tile.setSlotStack(i, new ItemStack(pItem.getItem(), 1));
-                                pItem.shrink(1);
-                                return true;
-                            }
-                        }
-                    }
                     //Needs Ore Dictionary Compat
                     if (pItem.getItem().equals(new ItemStack(Items.IRON_INGOT).getItem())) {
                         for (int i = 2; i < 7; i++) {

1.11/src/main/java/nmd/primal/forgecraft/init/ModBlocks.java

@@ -24,6 +24,7 @@ import nmd.primal.core.common.blocks.PrimalBlock;
 import nmd.primal.core.common.items.tools.WorkMallet;
 import nmd.primal.forgecraft.CommonUtils;
 import nmd.primal.forgecraft.blocks.*;
+import nmd.primal.forgecraft.items.ForgeHammer;
 import nmd.primal.forgecraft.items.blocks.ItemBlockIngotBall;
 import nmd.primal.forgecraft.tiles.TileAnvil;
 
@@ -106,12 +107,174 @@ public class ModBlocks {
                         //CommonUtils.spawnItemEntityFromWorld(world, pos, new ItemStack(ModBlocks.stoneanvil, 1));
                         return true;
                     }
+                    /*if (pItem instanceof ForgeHammer && world.getBlockState(belowPos).getBlock().equals(Blocks.IRON_BLOCK)) {
+                        player.swingArm(hand);
+                        world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2);
+                        world.setBlockState(belowPos, ModBlocks.ironanvil.getDefaultState().withProperty(Anvil.FACING, player.getHorizontalFacing()), 2);
+                        world.playEvent(1031, pos, 0);
+                        //CommonUtils.spawnItemEntityFromWorld(world, pos, new ItemStack(ModBlocks.stoneanvil, 1));
+                        return true;
+                    }*/
                     if (pItem instanceof WorkMallet || pItem.equals(ModItems.forgehammer)) {
                         if(world.getBlockState(belowPos).getBlock().equals(ModBlocks.stoneanvil)) {
 
+                            TileAnvil tile = (TileAnvil) world.getTileEntity(belowPos);
+
+                            if (tile.getSlotStack(6).isEmpty() &&
+                                    tile.getSlotStack(7).isEmpty() &&
+                                    tile.getSlotStack(8).isEmpty() &&
+                                    tile.getSlotStack(11).isEmpty() &&
+                                    tile.getSlotStack(12).isEmpty() &&
+                                    tile.getSlotStack(13).isEmpty() &&
+                                    tile.getSlotStack(16).isEmpty() &&
+                                    tile.getSlotStack(17).isEmpty() &&
+                                    tile.getSlotStack(18).isEmpty()
+                                    ) {
+                                player.swingArm(hand);
+                                world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2);
+                                tile.setSlotStack(6, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(7, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(8, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(11, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(12, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(13, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(16, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(17, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(18, new ItemStack(ModItems.ironchunkhot, 1));
+                                world.playEvent(1031, pos, 0);
+                                return true;
+                            }
+                        }
+                    }
+
+                }
+                return false;
+            }
+        };
+        ironcleanball = new IngotBall(Material.IRON, "ironcleanball", 5.0f, "ingot") {
+            @Override
+            public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitx, float hity, float hitz)
+            {
+                if(!world.isRemote){
+                    Item pItem = player.getHeldItem(hand).getItem();
+                    BlockPos belowPos = pos.down();
+                    //System.out.println("Activating");
+                    if (pItem instanceof ForgeHammer && world.getBlockState(belowPos).getBlock().equals(Blocks.IRON_BLOCK)) {
+                        player.swingArm(hand);
+                        world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2);
+                        world.setBlockState(belowPos, ModBlocks.ironanvil.getDefaultState().withProperty(Anvil.FACING, player.getHorizontalFacing()), 2);
+                        world.playEvent(1031, pos, 0);
+                        //CommonUtils.spawnItemEntityFromWorld(world, pos, new ItemStack(ModBlocks.stoneanvil, 1));
+                        return true;
+                    }
+                    if (pItem instanceof WorkMallet || pItem.equals(ModItems.forgehammer)) {
+                        if(world.getBlockState(belowPos).getBlock() instanceof Anvil) {
 
                             TileAnvil tile = (TileAnvil) world.getTileEntity(belowPos);
 
+                            if (tile.getSlotStack(6).isEmpty() &&
+                                    tile.getSlotStack(7).isEmpty() &&
+                                    tile.getSlotStack(8).isEmpty() &&
+                                    tile.getSlotStack(11).isEmpty() &&
+                                    tile.getSlotStack(12).isEmpty() &&
+                                    tile.getSlotStack(13).isEmpty() &&
+                                    tile.getSlotStack(16).isEmpty() &&
+                                    tile.getSlotStack(17).isEmpty() &&
+                                    tile.getSlotStack(18).isEmpty()
+                                    ) {
+                                player.swingArm(hand);
+                                world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2);
+                                tile.setSlotStack(6, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(7, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(8, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(11, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(12, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(13, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(16, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(17, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(18, new ItemStack(ModItems.ironchunkhot, 1));
+                                world.playEvent(1031, pos, 0);
+                                return true;
+                            }
+                        }
+                    }
+
+                }
+                return false;
+            }
+        };
+        steelball = new IngotBall(Material.IRON, "steelball", 6.0f, "ingot"){
+            @Override
+            public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitx, float hity, float hitz)
+            {
+                if(!world.isRemote){
+                    Item pItem = player.getHeldItem(hand).getItem();
+                    BlockPos belowPos = pos.down();
+                    //System.out.println("Activating");
+                    if (pItem instanceof ForgeHammer && world.getBlockState(belowPos).getBlock().equals(Blocks.IRON_BLOCK)) {
+                        player.swingArm(hand);
+                        world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2);
+                        world.setBlockState(belowPos, ModBlocks.ironanvil.getDefaultState().withProperty(Anvil.FACING, player.getHorizontalFacing()), 2);
+                        world.playEvent(1031, pos, 0);
+                        //CommonUtils.spawnItemEntityFromWorld(world, pos, new ItemStack(ModBlocks.stoneanvil, 1));
+                        return true;
+                    }
+                    if (pItem instanceof WorkMallet || pItem.equals(ModItems.forgehammer)) {
+                        if(world.getBlockState(belowPos).getBlock() instanceof Anvil) {
+
+                            TileAnvil tile = (TileAnvil) world.getTileEntity(belowPos);
+
+                            if (tile.getSlotStack(6).isEmpty() &&
+                                    tile.getSlotStack(7).isEmpty() &&
+                                    tile.getSlotStack(8).isEmpty() &&
+                                    tile.getSlotStack(11).isEmpty() &&
+                                    tile.getSlotStack(12).isEmpty() &&
+                                    tile.getSlotStack(13).isEmpty() &&
+                                    tile.getSlotStack(16).isEmpty() &&
+                                    tile.getSlotStack(17).isEmpty() &&
+                                    tile.getSlotStack(18).isEmpty()
+                                    ) {
+                                player.swingArm(hand);
+                                world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2);
+                                tile.setSlotStack(6, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(7, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(8, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(11, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(12, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(13, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(16, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(17, new ItemStack(ModItems.ironchunkhot, 1));
+                                tile.setSlotStack(18, new ItemStack(ModItems.ironchunkhot, 1));
+                                world.playEvent(1031, pos, 0);
+                                return true;
+                            }
+                        }
+                    }
+
+                }
+                return false;
+            }
+        };
+        wootzball = new IngotBall(Material.IRON, "wootzball", 6.0f, "ingot") {
+        @Override
+        public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitx, float hity, float hitz)
+        {
+            if(!world.isRemote){
+                Item pItem = player.getHeldItem(hand).getItem();
+                BlockPos belowPos = pos.down();
+                //System.out.println("Activating");
+                if (pItem instanceof ForgeHammer && world.getBlockState(belowPos).getBlock().equals(Blocks.IRON_BLOCK)) {
+                    player.swingArm(hand);
+                    world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2);
+                    world.setBlockState(belowPos, ModBlocks.ironanvil.getDefaultState().withProperty(Anvil.FACING, player.getHorizontalFacing()), 2);
+                    world.playEvent(1031, pos, 0);
+                    //CommonUtils.spawnItemEntityFromWorld(world, pos, new ItemStack(ModBlocks.stoneanvil, 1));
+                    return true;
+                }
+                if (pItem instanceof WorkMallet || pItem.equals(ModItems.forgehammer)) {
+                    if(world.getBlockState(belowPos).getBlock() instanceof Anvil) {
+
+                        TileAnvil tile = (TileAnvil) world.getTileEntity(belowPos);
 
                         if (tile.getSlotStack(6).isEmpty() &&
                                 tile.getSlotStack(7).isEmpty() &&
@@ -146,9 +309,12 @@ public class ModBlocks {
     };
 
         ironchunk = new IngotBall(Material.IRON, "ironchunk", 5.0F, "chunk");
+        ironcleanchunk = new IngotBall(Material.IRON, "ironcleanchunk", 5.0F, "chunk");
+        steelchunk = new IngotBall(Material.IRON, "steelchunk", 6.0f, "chunk");
+        wootzchunk = new IngotBall(Material.IRON, "wootzchunk", 6.0f, "chunk");
 
-        stoneanvil = new Anvil(Material.ROCK, "stoneanvil", 5.0f);
+        stoneanvil = new Anvil(Material.ANVIL, "stoneanvil", 5.0f);
-        ironanvil = new Anvil(Material.IRON, "ironanvil", 6.0f);
+        ironanvil = new Anvil(Material.ANVIL, "ironanvil", 6.0f);
         //ironballitemcool = new ItemBlockIngotBall(ironball);
         //ironballitemhot = new ItemBlockIngotBall(ironball);
 
@@ -180,10 +346,20 @@ public class ModBlocks {
 
         registerBlock(ironball);
         registerBlock(ironchunk);
+
+        registerBlock(ironcleanball);
+        registerBlock(ironcleanchunk);
+
+        registerBlock(steelball);
+        registerBlock(steelchunk);
+
+        registerBlock(wootzball);
+        registerBlock(wootzchunk);
         //registerBlockSubType(ironball, ironballitemcool, "ironcool");
         //registerBlockSubType(ironball, ironballitemhot, "ironhot");
 
         registerBlock(stoneanvil);
+        registerBlock(ironanvil);
     }
 
     @SideOnly(Side.CLIENT)
@@ -210,10 +386,20 @@ public class ModBlocks {
 
         registerRender(ironball);
         registerRender(ironchunk);
+
+        registerRender(ironcleanball);
+        registerRender(ironcleanchunk);
+
+        registerRender(steelball);
+        registerRender(steelchunk);
+
+        registerRender(wootzball);
+        registerRender(wootzchunk);
         //registerRenderCustom(ironballitemcool, 0, new ModelResourceLocation(ironballitemcool.getUnlocalizedName()));
         //registerRenderCustom(ironballitemhot, 1, new ModelResourceLocation(ironballitemhot.getUnlocalizedName()));
 
         registerRender(stoneanvil);
+        registerRender(ironanvil);
 
     }
 

1.11/src/main/java/nmd/primal/forgecraft/init/ModItems.java

@@ -45,18 +45,60 @@ public class ModItems {
     public static Item ironchunkhot;
     public static Item ironcleaningotballhot;
     public static Item ironcleanchunkhot;
+    public static Item steelingotballhot;
+    public static Item steelchunkhot;
+    public static Item wootzingotballhot;
+    public static Item wootzchunkhot;
+
+
 
     public static Item pickaxehead;
     public static Item ironaxehead;
     public static Item ironshovelhead;
     public static Item ironhoehead;
 
+    public static Item cleanironpickaxehead;
+    public static Item cleanironaxehead;
+    public static Item cleanironshovelhead;
+    public static Item cleanironhoehead;
+
+    public static Item steelpickaxehead;
+    public static Item steelaxehead;
+    public static Item steelshovelhead;
+    public static Item steelhoehead;
+
+    public static Item wootzpickaxehead;
+    public static Item wootzaxehead;
+    public static Item wootzshovelhead;
+    public static Item wootzhoehead;
+
+
+
     public static Item ironpickaxe;
     public static Item ironaxe;
     public static Item ironshovel;
     public static Item ironhoe;
 
+    public static Item cleanironpickaxe;
+    public static Item cleanironaxe;
+    public static Item cleanironshovel;
+    public static Item cleanironhoe;
+
+    public static Item steelpickaxe;
+    public static Item steelaxe;
+    public static Item steelshovel;
+    public static Item steelhoe;
+
+    public static Item wootzpickaxe;
+    public static Item wootzaxe;
+    public static Item wootzshovel;
+    public static Item wootzhoe;
+
     public static Item ironsword;
+    public static Item cleanironsword;
+    public static Item steelsword;
+    public static Item wootzsword;
+
     public static Item matchlockmusket;
 
     //public static Item forgingmanual;
@@ -67,57 +109,75 @@ public class ModItems {
         softcrucible = new ItemSoftCrucible();
         stonetongs = new ItemStoneTongs("stonetongs");
         forgehammer = new ForgeHammer("forgehammer");
+        matchlockmusket = new Musket("matchlock_musket");
 
+        /**********
+         TOOL PARTS
+         **********/
         pickaxehead = new ToolPart("ironpickaxehead", ModMaterials.TOOL_WROUGHT_IRON);
         ironaxehead = new ToolPart("ironaxehead", ModMaterials.TOOL_WROUGHT_IRON);
         ironshovelhead = new ToolPart("ironshovelhead", ModMaterials.TOOL_WROUGHT_IRON);
         ironhoehead = new ToolPart("ironhoehead", ModMaterials.TOOL_WROUGHT_IRON);
 
+        cleanironpickaxehead = new ToolPart("cleanironpickaxehead", ModMaterials.CLEAN_IRON);
+        cleanironaxehead = new ToolPart("cleanironaxehead", ModMaterials.CLEAN_IRON);
+        cleanironshovelhead = new ToolPart("cleanironshovelhead", ModMaterials.CLEAN_IRON);
+        cleanironhoehead = new ToolPart("cleanironhoehead", ModMaterials.CLEAN_IRON);
+
+        steelpickaxehead = new ToolPart("steelpickaxehead", ModMaterials.BASIC_STEEL);
+        steelaxehead = new ToolPart("steelaxehead", ModMaterials.BASIC_STEEL);
+        steelshovelhead = new ToolPart("steelshovelhead", ModMaterials.BASIC_STEEL);
+        steelhoehead = new ToolPart("steelhoehead", ModMaterials.BASIC_STEEL);
+
+        wootzpickaxehead = new ToolPart("wootzpickaxehead", ModMaterials.WOOTZ_STEEL);
+        wootzaxehead = new ToolPart("wootzaxehead", ModMaterials.WOOTZ_STEEL);
+        wootzshovelhead = new ToolPart("wootzshovelhead", ModMaterials.WOOTZ_STEEL);
+        wootzhoehead = new ToolPart("wootzhoehead", ModMaterials.WOOTZ_STEEL);
+        /**********
+         TOOLS
+         **********/
         ironpickaxe = new CustomPickaxe("ironpickaxe", ModMaterials.TOOL_WROUGHT_IRON);
         ironaxe = new CustomAxe("ironaxe", ModMaterials.TOOL_WROUGHT_IRON);
         ironshovel = new CustomShovel("ironshovel", ModMaterials.TOOL_WROUGHT_IRON);
         ironhoe = new CustomHoe("ironhoe", ModMaterials.TOOL_WROUGHT_IRON);
 
-        ironsword = new CustomSword("ironsword", ModMaterials.TOOL_WROUGHT_IRON);
+        cleanironpickaxe = new CustomPickaxe("cleanironpickaxe", ModMaterials.CLEAN_IRON);
-        //ironingotballcool = new BaseMultiItem("ironingotcool") {};
+        cleanironaxe = new CustomAxe("cleanironaxe", ModMaterials.CLEAN_IRON);
-        //test = new ItemTest("ironsword");
+        cleanironshovel = new CustomShovel("cleanironshovel", ModMaterials.CLEAN_IRON);
-        matchlockmusket = new Musket("matchlock_musket");
+        cleanironhoe = new CustomHoe("cleanironhoe", ModMaterials.CLEAN_IRON);
 
+        steelpickaxe = new CustomPickaxe("steelpickaxe", ModMaterials.BASIC_STEEL);
+        steelaxe = new CustomAxe("steelironaxe", ModMaterials.BASIC_STEEL);
+        steelshovel = new CustomShovel("steelironshovel", ModMaterials.BASIC_STEEL);
+        steelhoe = new CustomHoe("steelironhoe", ModMaterials.BASIC_STEEL);
+
+        wootzpickaxe = new CustomPickaxe("wootzpickaxe", ModMaterials.WOOTZ_STEEL);
+        wootzaxe = new CustomAxe("wootzironaxe", ModMaterials.WOOTZ_STEEL);
+        wootzshovel = new CustomShovel("wootzironshovel", ModMaterials.WOOTZ_STEEL);
+        wootzhoe = new CustomHoe("wootzironhoe", ModMaterials.WOOTZ_STEEL);
+
+        /**********
+         WEAPONS
+         **********/
+        ironsword = new CustomSword("ironsword", ModMaterials.TOOL_WROUGHT_IRON);
+        cleanironsword = new CustomSword("ironsword", ModMaterials.CLEAN_IRON);
+        steelsword = new CustomSword("ironsword", ModMaterials.BASIC_STEEL);
+        wootzsword = new CustomSword("ironsword", ModMaterials.WOOTZ_STEEL);
+
+        /**********
+         INGOTS AND CHUNKS
+         **********/
         ironingotballhot = new BaseMultiItem("ironingothot", ModMaterials.TOOL_WROUGHT_IRON);
         ironchunkhot = new BaseMultiItem("ironchunkhot", ModMaterials.TOOL_WROUGHT_IRON);
-        /*ironingotballhot = new BaseMultiItem("ironingothot", ModMaterials.TOOL_WROUGHT_IRON) {
+        ironcleaningotballhot= new BaseMultiItem("ironcleaningotballhot", ModMaterials.CLEAN_IRON);
-            public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
+        ironcleanchunkhot= new BaseMultiItem("ironcleanchunkhot", ModMaterials.CLEAN_IRON);
-                if(!world.isRemote) {
+        steelingotballhot= new BaseMultiItem("steelingotballhot", ModMaterials.BASIC_STEEL);
-                    ItemStack itemstack = player.getHeldItem(hand);
+        steelchunkhot= new BaseMultiItem("steelchunkhot", ModMaterials.BASIC_STEEL);
-                    if (world.getBlockState(pos).getBlock() != ModBlocks.firebox) {
+        wootzingotballhot= new BaseMultiItem("wootzingotballhot", ModMaterials.WOOTZ_STEEL);
-                        BlockPos tempPos = new BlockPos(pos.getX(), pos.getY() + 1, pos.getZ());
+        wootzchunkhot= new BaseMultiItem("wootzchunkhot", ModMaterials.WOOTZ_STEEL);
-                        if(world.getBlockState(tempPos).getBlock() == Blocks.AIR){
+
-                            world.setBlockState(tempPos, ModBlocks.ironball.getDefaultState().withProperty(IngotBall.ACTIVE, true), 3);
-                            itemstack.shrink(1);
-                            return EnumActionResult.SUCCESS;
-                        }
-                    }
-                }
-                return EnumActionResult.FAIL;
-            }
-        };
-        ironchunkhot = new BaseMultiItem("ironchunkhot", ModMaterials.TOOL_WROUGHT_IRON) {
-            public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
-                if(!world.isRemote) {
-                    ItemStack itemstack = player.getHeldItem(hand);
-                    if (world.getBlockState(pos).getBlock() != ModBlocks.firebox) {
-                        BlockPos tempPos = new BlockPos(pos.getX(), pos.getY() + 1, pos.getZ());
-                        if(world.getBlockState(tempPos).getBlock() == Blocks.AIR){
-                            world.setBlockState(tempPos, ModBlocks.ironchunk.getDefaultState().withProperty(IngotBall.ACTIVE, true), 3);
-                            itemstack.shrink(1);
-                            return EnumActionResult.SUCCESS;
-                        }
-                    }
-                }
-                return EnumActionResult.FAIL;
-            }
-        };*/
         //forgingmanual = new ItemForgingManual();
+        //test = new ItemTest("ironsword");
     }
 
     public static void register() {

1.11/src/main/java/nmd/primal/forgecraft/items/ForgeHammer.java

@@ -15,6 +15,7 @@ public class ForgeHammer extends Item {
         //this.setHasSubtypes(true);  //This just says the item has metadata
         this.setMaxStackSize(1);
         this.setCreativeTab(ModInfo.TAB_FORGECRAFT);
+
     }
 
 }

1.11/src/main/java/nmd/primal/forgecraft/items/ItemStoneTongs.java

@@ -39,7 +39,7 @@ public class ItemStoneTongs extends Item {
         this.setCreativeTab(ModInfo.TAB_FORGECRAFT);
     }
 
-
+    @Override
     public void onUpdate(ItemStack item, World world, Entity player, int itemSlot, boolean isSelected) {
         if (!item.hasTagCompound()) {
             item.setTagCompound(new NBTTagCompound());
@@ -64,7 +64,7 @@ public class ItemStoneTongs extends Item {
     }
 
 
-
+    @Override
     public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ)
     {
 

1.11/src/main/resources/assets/forgecraft/blockstates/ironanvil.json

@@ -0,0 +1,17 @@
+{
+  "forge_marker":1,
+  "defaults": {
+    "textures": {
+      "particle": "forgecraft:blocks/anvil_base",
+      "texture": "forgecraft:blocks/anvil_base",
+      "texture1": "forgecraft:blocks/anvil_base_top"
+    },
+    "parent": "forgecraft:ironanvil"
+  },
+  "variants": {
+    "facing=north": { "model": "forgecraft:ironanvil" },
+    "facing=east":  { "model": "forgecraft:ironanvil", "y": 90 },
+    "facing=south": { "model": "forgecraft:ironanvil", "y": 180 },
+    "facing=west":  { "model": "forgecraft:ironanvil", "y": 270 }
+  }
+}

1.11/src/main/resources/assets/forgecraft/blockstates/ironball.json

@@ -1,6 +1,3 @@
-
-
-
 {
   "forge_marker":1,
   "defaults": {

1.11/src/main/resources/assets/forgecraft/blockstates/ironcleanball.json

@@ -0,0 +1,26 @@
+{
+  "forge_marker":1,
+  "defaults": {
+    "textures": {
+      "particle": "forgecraft:blocks/clean_iron_ingot",
+      "texture": "forgecraft:blocks/clean_iron_ingot"
+    },
+    "parent": "forgecraft:ironball"
+  },
+  "variants": {
+    "active=false": {
+      "model": "forgecraft:ironball",
+      "textures": {
+        "particle": "forgecraft:blocks/clean_iron_ingot",
+        "texture": "forgecraft:blocks/clean_iron_ingot"
+      }
+    },
+    "active=true": {
+      "model": "forgecraft:ironball",
+      "textures": {
+        "particle": "forgecraft:blocks/clean_iron_ingot_hot",
+        "texture": "forgecraft:blocks/clean_iron_ingot_hot"
+      }
+    }
+  }
+}

1.11/src/main/resources/assets/forgecraft/models/block/ironanvil.json

@@ -0,0 +1,119 @@
+{
+  "__comment": "Designed by Kitsushadow with Cubik Studio - https://cubik.studio",
+  "textures": {
+    "particle": "forgecraft:blocks/anvil_base",
+    "texture": "forgecraft:blocks/anvil_base",
+    "texture1": "forgecraft:blocks/anvil_base_top"
+  },
+  "elements": [
+    {
+      "__comment": "Cube1",
+      "from": [ 0, 0, 0 ],
+      "to": [ 16, 3, 16 ],
+      "faces": {
+        "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" },
+        "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" },
+        "north": { "uv": [ 0, 13, 16, 16 ], "texture": "#texture" },
+        "south": { "uv": [ 0, 13, 16, 16 ], "texture": "#texture" },
+        "west": { "uv": [ 0, 13, 16, 16 ], "texture": "#texture" },
+        "east": { "uv": [ 0, 13, 16, 16 ], "texture": "#texture" }
+      }
+    },
+    {
+      "__comment": "Cube1",
+      "from": [ 0, 12, 0 ],
+      "to": [ 16, 16, 16 ],
+      "faces": {
+        "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" },
+        "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" },
+        "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture" },
+        "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture" },
+        "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture" },
+        "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#texture" }
+      }
+    },
+    {
+      "__comment": "Cube6",
+      "from": [ 1, 3, 1 ],
+      "to": [ 4, 12, 4 ],
+      "faces": {
+        "down": { "uv": [ 1, 12, 4, 15 ], "texture": "#texture" },
+        "up": { "uv": [ 1, 1, 4, 4 ], "texture": "#texture" },
+        "north": { "uv": [ 12, 4, 15, 13 ], "texture": "#texture" },
+        "south": { "uv": [ 1, 4, 4, 13 ], "texture": "#texture" },
+        "west": { "uv": [ 1, 4, 4, 13 ], "texture": "#texture" },
+        "east": { "uv": [ 12, 4, 15, 13 ], "texture": "#texture" }
+      }
+    },
+    {
+      "__comment": "Cube6",
+      "from": [ 12, 3, 1 ],
+      "to": [ 15, 12, 4 ],
+      "faces": {
+        "down": { "uv": [ 1, 12, 4, 15 ], "texture": "#texture" },
+        "up": { "uv": [ 1, 1, 4, 4 ], "texture": "#texture" },
+        "north": { "uv": [ 12, 11, 15, 14 ], "texture": "#texture" },
+        "south": { "uv": [ 1, 11, 4, 14 ], "texture": "#texture" },
+        "west": { "uv": [ 1, 11, 4, 14 ], "texture": "#texture" },
+        "east": { "uv": [ 12, 11, 15, 14 ], "texture": "#texture" }
+      }
+    },
+    {
+      "__comment": "Cube6",
+      "from": [ 1, 3, 12 ],
+      "to": [ 4, 12, 15 ],
+      "faces": {
+        "down": { "uv": [ 1, 12, 4, 15 ], "texture": "#texture" },
+        "up": { "uv": [ 1, 1, 4, 4 ], "texture": "#texture" },
+        "north": { "uv": [ 12, 11, 15, 14 ], "texture": "#texture" },
+        "south": { "uv": [ 1, 11, 4, 14 ], "texture": "#texture" },
+        "west": { "uv": [ 1, 11, 4, 14 ], "texture": "#texture" },
+        "east": { "uv": [ 12, 11, 15, 14 ], "texture": "#texture" }
+      }
+    },
+    {
+      "__comment": "Cube6",
+      "from": [ 12, 3, 12 ],
+      "to": [ 15, 12, 15 ],
+      "faces": {
+        "down": { "uv": [ 1, 12, 4, 15 ], "texture": "#texture" },
+        "up": { "uv": [ 1, 1, 4, 4 ], "texture": "#texture" },
+        "north": { "uv": [ 12, 11, 15, 14 ], "texture": "#texture" },
+        "south": { "uv": [ 1, 11, 4, 14 ], "texture": "#texture" },
+        "west": { "uv": [ 1, 11, 4, 14 ], "texture": "#texture" },
+        "east": { "uv": [ 12, 11, 15, 14 ], "texture": "#texture" }
+      }
+    }
+  ],
+  "display": {
+    "thirdperson_righthand": {
+      "rotation":  [ 75, 45, 0 ],
+      "translation":  [ 0, 2.5, 0 ],
+      "scale":  [ 0.375, 0.375, 0.375 ]
+    },
+    "thirdperson_lefthand": {
+      "rotation":  [ 75, 45, 0 ],
+      "translation":  [ 0, 2.5, 0 ],
+      "scale":  [ 0.375, 0.375, 0.375 ]
+    },
+    "firstperson_righthand": {
+      "rotation":  [ 0, 45, 0 ],
+      "scale":  [ 0.4, 0.4, 0.4 ]
+    },
+    "firstperson_lefthand": {
+      "rotation":  [ 0, 45, 0 ],
+      "scale":  [ 0.4, 0.4, 0.4 ]
+    },
+    "gui": {
+      "rotation":  [ 30, 225, 0 ],
+      "scale":  [ 0.625, 0.625, 0.625 ]
+    },
+    "ground": {
+      "translation":  [ 0, 3, 0 ],
+      "scale":  [ 0.25, 0.25, 0.25 ]
+    },
+    "fixed": {
+      "scale":  [ 0.5, 0.5, 0.5 ]
+    }
+  }
+}

1.11/src/main/resources/assets/forgecraft/models/item/ironanvil.json

@@ -0,0 +1,9 @@
+{
+  "forge_marker":1,
+  "textures": {
+    "particle": "forgecraft:blocks/anvil_base",
+    "texture": "forgecraft:blocks/anvil_base",
+    "texture1": "forgecraft:blocks/anvil_base_top"
+  },
+  "parent": "forgecraft:block/ironanvil"
+}

1.11/src/main/resources/assets/forgecraft/models/item/ironcleanball.json

@@ -0,0 +1,8 @@
+{
+  "forge_marker":1,
+  "textures": {
+    "particle": "forgecraft:blocks/clean_iron_ingot",
+    "texture": "forgecraft:blocks/clean_iron_ingot"
+  },
+  "parent": "forgecraft:block/ironball"
+}

1.11/whitelist.json

@@ -0,0 +1 @@
+[]

push.sh

@@ -5,6 +5,8 @@ git status
 git add --all :/
 IFS= read -r -p "Enter commit message: " com
 git commit -m "${com}"
+#echo $(git branch)
+git branch
 IFS= read -r -p "Enter Branch name: " com1
 git push nmd ${com1}
 git push github ${com1}