finished adobe brick bloom and forge blocks, refactored forge, bloomery, and anvil

1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java

@@ -16,10 +16,12 @@ import nmd.primal.forgecraft.proxy.CommonProxy;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.util.Locale;
+
 //import nmd.primal.forgecraft.common.init.*;
 
 @Mod(   modid = ModInfo.MOD_ID,
-        name = ModInfo.MOD_NAME,
+        name = ModInfo.MOD_ID,
         version = ModInfo.MOD_VERSION,
         acceptedMinecraftVersions = ModInfo.MC_VERSIONS,
         dependencies = ModInfo.DEPENDENCIES
@@ -38,6 +40,8 @@ public class ForgeCraft
     @EventHandler
     public void preInit(FMLPreInitializationEvent event)
     {
+        Locale.setDefault(Locale.ENGLISH);
+
 
         NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ModInfo.MOD_CHANNEL);
         NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler());
@@ -54,6 +58,7 @@ public class ForgeCraft
         //ModEvents.registerClientEvents();
 //        ModItems.registerRenders();
         proxy.preInit();
+
     }
 
     @EventHandler
@@ -73,15 +78,4 @@ public class ForgeCraft
         //this.proxy.postInit(event);
     }
 
-    /*@EventHandler
-    public void serverStarting(FMLServerStartingEvent event)
-    {
-        //event.registerServerCommand(new PrimalCommand());
-    }
-
-    //public File getConfigDirectory()
-    //{
-    //    return CONFIG_DIRECTORY;
-    //}
-    */
 }

1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java

@@ -83,19 +83,4 @@ public class ModInfo {
             return new ItemStack(ModItems.forgehammer);
         }
     };
-
-    /*
-        public static CreativeTabs TAB_PRIMAL = new CreativeTabs(MOD_ID)
-    {
-
-        @Override
-        @SideOnly(Side.CLIENT)
-        public ItemStack getTabIconItem() {
-            return new ItemStack(PrimalItems.FLINT_HATCHET);
-        }
-
-    };
-    */
-
-
 }

1.11/src/main/resources/assets/forgecraft/lang/en_us.lang

@@ -1,30 +1,81 @@
 itemGroup.forgecraft=ForgeCraft
 
+tile.bloomery_adobe.name=Adobe Bloomery
+tile.bloomery_brick.name=Brick Bloomery
 
 tile.forge_brick.name=Brick Forge
-tile.forge_brick.name=Adobe Forge
+tile.forge_adobe.name=Adobe Forge
-tile.bloomery.name=Bloomery
+
+tile.blockbreaker.name= Block Breaker
+
 tile.stoneanvil.name=Stone Anvil
+tile.ironanvil.name=Iron Anvil
+
 tile.pistonbellows.name=Wooden Piston Bellows
+
+tile.emptycruciblehot.name=Empty Hot Crucible
 tile.emptycrucible.name=Empty Crucible
 tile.emptycruciblehit.name=Hot Empty Crucible
 tile.emptycruciblecracked.name= Cracked Empty Crucible
 tile.emptycruciblecrackedhot.name=Cracked Hot Empty Crucible
+
 tile.rawironcrucible.name=Filled Iron Crucible
 tile.hotironcrucible.name=Hot Iron Crucible
 tile.hotcookedironcrucible.name=Hot Cooked Iron Crucible
 tile.coolironcrucible.name=Cool Iron Crucible
 tile.failedironcrucible.name=Failed Iron Crucible
 tile.failedironcruciblehot.name=Failed Iron Crucible Hot
-tile.ironball.name=Raw Iron Ingot
+
-tile.ironchunk.name=Iron Chunk
+tile.rawcleanironcrucible.name=Filled Clean Iron Crucible
+tile.hotcleanironcrucible.name=Hot Clean Iron Crucible
+tile.hotcookedcleanironcrucible.name=Hot Cooked Clean Iron Crucible
+tile.coolcleanironcrucible.name=Cool Clean Iron Crucible
+tile.failedcleanironcrucible.name=Failed Clean Iron Crucible
+tile.failedcleanironcrucible.name=Failed Clean Iron Crucible Hot
+
+tile.rawsteelcrucible.name=Filled Steel Crucible
+tile.hotsteelcrucible.name=Hot Steel Crucible
+tile.hotcookedsteelcrucible.name=Hot Cooked Steel Crucible
+tile.coolsteelcrucible.name=Cool Steel Crucible
+tile.failedsteelcrucible.name=Failed Steel Crucible
+tile.failedsteelcruciblehot.name=Failed Steel Crucible Hot
+
+tile.rawwootzcrucible.name=Filled Wootz Crucible
+tile.hotwootzcrucible.name=Hot Wootz Crucible
+tile.hotcookedwootzcrucible.name=Hot Cooked Wootz Crucible
+tile.coolwootzcrucible.name=Cool Wootz Crucible
+tile.failedwootzcrucible.name=Failed Wootz Crucible
+tile.failedwootzcruciblehot.name=Failed Wootz Crucible Hot
+
+
+tile.ironball.name=Wrought Iron Ingot
+tile.ironchunk.name=Wrought Iron Chunk
+tile.ironcleanball.name=Clean Iron Ingot
+tile.ironcleanchunk.name=Clean Iron Chunk
+tile.steelball.name=Steel Ingot
+tile.steelchunk.name=Steel Chunk
+tile.wootzball.name=Damascus Steel Ingot
+tile.wootzchunk.name=Damascus Steel Chunk
 
 item.bellowshandle.name=Bellows Handle
 item.softcrucible.name=Soft Crucible
 item.stonetongs.name=Stone Tongs
 item.forgehammer.name=Forge Hammer
+
+
 item.ironingothot.name=Iron Ingot Hot
 item.ironchunkhot.name=Iron Chunk Hot
+
+item.cleanironingothot.name=Clean Iron Ingot Hot
+item.cleanironchunkhot.name=Clean Iron Chunk Hot
+
+item.steelingothot.name=Steel Ingot Hot
+item.steelchunkhot.name=Steel Chunk Hot
+
+item.wootzingothot.name=Damascus Steel Ingot Hot
+item.wootzchunkhot.name=Damascus Steel Chunk Hot
+
+
 item.ironpickaxehead.name=Iron Pickaxe Head
 item.ironaxehead.name=Iron Axe Head
 item.ironshovelhead.name=Iron Shovel Head
@@ -35,6 +86,36 @@ item.ironshovel.name=Iron Shovel
 item.ironhoe.name=Iron Hoe
 item.ironsword.name=Iron Sword
 
+item.cleanironpickaxehead.name=Clean Iron Pickaxe Head
+item.cleanironaxehead.name=Clean Iron Axe Head
+item.cleanironshovelhead.name=Clean Iron Shovel Head
+item.cleanironhoehead.name=Clean Iron Hoe Head
+item.cleanironpickaxe.name=Clean Iron Pickaxe
+item.cleanironaxe.name=Clean Iron Axe
+item.cleanironshovel.name=Clean Iron Shovel
+item.cleanironhoe.name=Clean Iron Hoe
+#item.cleanironsword.name=Clean Iron Sword
+
+item.steelpickaxehead.name=Steel Pickaxe Head
+item.steelaxehead.name=Steel Axe Head
+item.steelshovelhead.name=Steel Shovel Head
+item.steelhoehead.name=Steel Hoe Head
+item.steelpickaxe.name=Steel Pickaxe
+item.steelaxe.name=Steel Axe
+item.steelshovel.name=Steel Shovel
+item.steelhoe.name=Steel Hoe
+#item.steelsword.name=Steel Sword
+
+item.wootzpickaxehead.name=Damascus Steel Pickaxe Head
+item.wootzaxehead.name=Damascus Steel Axe Head
+item.wootzshovelhead.name=Damascus Steel Shovel Head
+item.wootzhoehead.name=Damascus Steel Hoe Head
+item.wootzpickaxe.name=Damascus Steel Pickaxe
+item.wootzaxe.name=Damascus Steel Axe
+item.wootzshovel.name=Damascus Steel Shovel
+item.wootzhoe.name=Damascus Steel Hoe
+#item.wootzsword.name=Damascus Steel Sword
+
 # -- configuration -- #
 forgecraft.config.title=ForgeCraft Config
 

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

@@ -673,20 +673,24 @@
 	],
 	"display": {
 		"thirdperson_righthand": {
-			"translation":  [ 0.1, 1.1, -2.35 ]
+			"rotation":  [ 75, 45, 0 ],
+			"translation":  [ 0, 2.5, 0 ],
+			"scale":  [ 0.375, 0.375, 0.375 ]
 		},
 		"firstperson_righthand": {
-			"translation":  [ 0, 4, 0 ]
+			"rotation":  [ 0, 45, 0 ],
+			"scale":  [ 0.4, 0.4, 0.4 ]
 		},
 		"gui": {
-			"translation":  [ 0, 4, 0 ]
+			"rotation":  [ 30, 225, 0 ],
+			"scale":  [ 0.625, 0.625, 0.625 ]
 		},
 		"ground": {
-			"translation":  [ 0, 4, 0 ]
+			"translation":  [ 0, 3, 0 ],
+			"scale":  [ 0.25, 0.25, 0.25 ]
 		},
 		"fixed": {
-			"rotation":  [ 45, 45, 0 ],
+			"scale":  [ 0.5, 0.5, 0.5 ]
-			"translation":  [ 0, 4, 0 ]
 		}
 	}
 }

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

@@ -657,20 +657,24 @@
 	],
 	"display": {
 		"thirdperson_righthand": {
-			"translation":  [ 0.1, 1.1, -2.35 ]
+			"rotation":  [ 75, 45, 0 ],
+			"translation":  [ 0, 2.5, 0 ],
+			"scale":  [ 0.375, 0.375, 0.375 ]
 		},
 		"firstperson_righthand": {
-			"translation":  [ 0, 4, 0 ]
+			"rotation":  [ 0, 45, 0 ],
+			"scale":  [ 0.4, 0.4, 0.4 ]
 		},
 		"gui": {
-			"translation":  [ 0, 4, 0 ]
+			"rotation":  [ 30, 225, 0 ],
+			"scale":  [ 0.625, 0.625, 0.625 ]
 		},
 		"ground": {
-			"translation":  [ 0, 4, 0 ]
+			"translation":  [ 0, 3, 0 ],
+			"scale":  [ 0.25, 0.25, 0.25 ]
 		},
 		"fixed": {
-			"rotation":  [ 45, 45, 0 ],
+			"scale":  [ 0.5, 0.5, 0.5 ]
-			"translation":  [ 0, 4, 0 ]
 		}
 	}
 }

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

@@ -0,0 +1,10 @@
+{
+  "forge_marker":1,
+  "textures": {
+		"particle": "forgecraft:blocks/brick",
+		"texture": "forgecraft:blocks/brick",
+		"texture1": "forgecraft:blocks/brick",
+		"texture2": "forgecraft:blocks/brick"
+  },
+  "parent": "forgecraft:block/bloomery_adobe"
+}

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

@@ -4,5 +4,5 @@
     "particle": "forgecraft:blocks/brick",
     "texture": "forgecraft:blocks/brick"
   },
-  "parent": "forgecraft:block/bloomery"
+  "parent": "forgecraft:block/bloomery_brick"
 }