diff --git a/.gitignore b/.gitignore index 0400922..3f36f4a 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,5 @@ eula.txt server.properties crash-reports saves -usernamecache.json \ No newline at end of file +usernamecache.json +options.txt \ No newline at end of file diff --git a/Blends/Crank.blend1 b/Blends/Crank1.blend similarity index 100% rename from Blends/Crank.blend1 rename to Blends/Crank1.blend diff --git a/src/main/java/nmd/primal/energy/Energy.java b/src/main/java/nmd/primal/energy/Energy.java index 2aca7ed..7107df4 100644 --- a/src/main/java/nmd/primal/energy/Energy.java +++ b/src/main/java/nmd/primal/energy/Energy.java @@ -3,9 +3,6 @@ package nmd.primal.energy; import nmd.primal.energy.common.CommonProxy; import nmd.primal.energy.common.ModInfo; import nmd.primal.energy.crafting.CraftingHandler; -import nmd.primal.energy.render.RenderID; -import nmd.primal.energy.render.RenderRegistry; -import nmd.primal.energy.tileents.TileRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; @@ -29,14 +26,13 @@ public class Energy { Energy.proxy.preInit(event); // some example code // System.out.println("DIRT BLOCK >> "+Blocks.dirt.getUnlocalizedName()); - TileRegistry.init(); - RenderID.init(); - RenderRegistry.init(); + } @EventHandler public void init(FMLInitializationEvent event) { + Energy.proxy.init(event); FMLCommonHandler.instance().bus().register(new CraftingHandler()); // some example code @@ -44,8 +40,9 @@ public class Energy { } @EventHandler - public void postInit(FMLPostInitializationEvent e) { + public void postInit(FMLPostInitializationEvent event) { + Energy.proxy.postInit(event); System.out.println("U want some Body Massage?"); // RenderingRegistry.registerEntityRenderingHandler(EntityShit.class, // new RenderSnowball(ModItems.itemShit)); diff --git a/src/main/java/nmd/primal/energy/block/ModBlocks.java b/src/main/java/nmd/primal/energy/block/ModBlocks.java index ce30abb..7b6db47 100644 --- a/src/main/java/nmd/primal/energy/block/ModBlocks.java +++ b/src/main/java/nmd/primal/energy/block/ModBlocks.java @@ -12,7 +12,7 @@ public static Block crankBlock; public static final void init() { - GameRegistry.registerBlock(SMBBlock = new SMBBlock("SMBBlock", Material.iron), "SMBBlock"); + GameRegistry.registerBlock(SMBBlock = new SMBBlock("SMBBlock", Material.wood), "SMBBlock"); GameRegistry.registerBlock(crankBlock = new CrankBlock("CrankBlock", Material.wood), "CrankBlock"); //GameRegistry.registerBlock(mineralBlock = new MineralBlock("mineralBlock", Material.rock), "mineralBlock"); } diff --git a/src/main/java/nmd/primal/energy/client/ClientProxy.java b/src/main/java/nmd/primal/energy/client/ClientProxy.java index b57a4c9..1d7aeed 100644 --- a/src/main/java/nmd/primal/energy/client/ClientProxy.java +++ b/src/main/java/nmd/primal/energy/client/ClientProxy.java @@ -1,6 +1,7 @@ package nmd.primal.energy.client; import nmd.primal.energy.common.CommonProxy; +import nmd.primal.energy.render.RenderRegistry; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; @@ -23,6 +24,8 @@ public class ClientProxy extends CommonProxy{ public void postInit(FMLPostInitializationEvent event) { super.postInit(event); + RenderRegistry.init(); + } } diff --git a/src/main/java/nmd/primal/energy/common/CommonProxy.java b/src/main/java/nmd/primal/energy/common/CommonProxy.java index 4e7d7ef..052eb17 100644 --- a/src/main/java/nmd/primal/energy/common/CommonProxy.java +++ b/src/main/java/nmd/primal/energy/common/CommonProxy.java @@ -4,7 +4,6 @@ import nmd.primal.energy.block.ModBlocks; import nmd.primal.energy.crafting.ModCrafting; import nmd.primal.energy.item.ModItems; import nmd.primal.energy.render.RenderID; -import nmd.primal.energy.render.RenderRegistry; import nmd.primal.energy.tileents.TileRegistry; import nmd.primal.energy.util.CustomTab; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -19,6 +18,7 @@ public class CommonProxy { ModItems.registerItems(); ModBlocks.init(); ModCrafting.init(); + RenderID.init(); } @@ -29,7 +29,7 @@ public class CommonProxy { public void postInit(FMLPostInitializationEvent event) { - RenderRegistry.init(); + } diff --git a/src/main/java/nmd/primal/energy/crafting/ModCrafting.java b/src/main/java/nmd/primal/energy/crafting/ModCrafting.java index a56550d..c14a9d2 100644 --- a/src/main/java/nmd/primal/energy/crafting/ModCrafting.java +++ b/src/main/java/nmd/primal/energy/crafting/ModCrafting.java @@ -17,10 +17,10 @@ public class ModCrafting { GameRegistry.addRecipe( new ItemStack(ModItems.schiselItem), new Object[]{ - " f", - " t ", - "s ", - 'f', Items.flint, 't', Items.string, 's', Items.stick}); + " f", + " t ", + "s ", + 'f', Items.flint, 't', Items.string, 's', Items.stick}); GameRegistry.addRecipe( new ItemStack(ModItems.sgearItem), new Object[]{ @@ -35,5 +35,12 @@ public class ModCrafting { "sss", 's', Blocks.wooden_slab}); + GameRegistry.addRecipe( + new ItemStack(ModBlocks.crankBlock), new Object[]{ + " fs", + " s ", + " s ", + 'f', Items.string, 's', Items.stick}); + } } diff --git a/src/main/resources/assets/energy/lang/en_US.lang b/src/main/resources/assets/energy/lang/en_US.lang index 2fd3dc6..1e9f160 100644 --- a/src/main/resources/assets/energy/lang/en_US.lang +++ b/src/main/resources/assets/energy/lang/en_US.lang @@ -5,4 +5,5 @@ item.swheelItem.name=Standard Wheel item.sgearItem.name=Standard Gear item.saxleItem.name=Standard Axle -tile.SMBBlock.name=Standard Machine Box \ No newline at end of file +tile.SMBBlock.name=Standard Machine Box +tile.CrankBlock.name=Crank \ No newline at end of file