nmd/PrimalEnergy
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merging

Browse Source
This commit is contained in:
Fluid1C3
2015-08-15 20:10:11 -05:00
parent cf52b3c950
commit 0eccc1bcf7
8 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -15,4 +15,5 @@ eula.txt
server.properties server.properties
crash-reports crash-reports
saves saves
usernamecache.json usernamecache.json
options.txt

0
Blends/Crank.blend1 → Blends/Crank1.blend
View File

11
src/main/java/nmd/primal/energy/Energy.java
View File

@@ -3,9 +3,6 @@ package nmd.primal.energy;
import nmd.primal.energy.common.CommonProxy; import nmd.primal.energy.common.CommonProxy;
import nmd.primal.energy.common.ModInfo; import nmd.primal.energy.common.ModInfo;
import nmd.primal.energy.crafting.CraftingHandler; 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.FMLCommonHandler;
import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.EventHandler;
@@ -29,14 +26,13 @@ public class Energy {
Energy.proxy.preInit(event); Energy.proxy.preInit(event);
// some example code // some example code
// System.out.println("DIRT BLOCK >> "+Blocks.dirt.getUnlocalizedName()); // System.out.println("DIRT BLOCK >> "+Blocks.dirt.getUnlocalizedName());
TileRegistry.init();
RenderID.init();
RenderRegistry.init();
} }
@EventHandler @EventHandler
public void init(FMLInitializationEvent event) { public void init(FMLInitializationEvent event) {
Energy.proxy.init(event);
FMLCommonHandler.instance().bus().register(new CraftingHandler()); FMLCommonHandler.instance().bus().register(new CraftingHandler());
// some example code // some example code
@@ -44,8 +40,9 @@ public class Energy {
} }
@EventHandler @EventHandler
public void postInit(FMLPostInitializationEvent e) { public void postInit(FMLPostInitializationEvent event) {
Energy.proxy.postInit(event);
System.out.println("U want some Body Massage?"); System.out.println("U want some Body Massage?");
// RenderingRegistry.registerEntityRenderingHandler(EntityShit.class, // RenderingRegistry.registerEntityRenderingHandler(EntityShit.class,
// new RenderSnowball(ModItems.itemShit)); // new RenderSnowball(ModItems.itemShit));

2
src/main/java/nmd/primal/energy/block/ModBlocks.java
View File

@@ -12,7 +12,7 @@ public static Block crankBlock;
public static final void init() { 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(crankBlock = new CrankBlock("CrankBlock", Material.wood), "CrankBlock");
//GameRegistry.registerBlock(mineralBlock = new MineralBlock("mineralBlock", Material.rock), "mineralBlock"); //GameRegistry.registerBlock(mineralBlock = new MineralBlock("mineralBlock", Material.rock), "mineralBlock");
} }

3
src/main/java/nmd/primal/energy/client/ClientProxy.java
View File

@@ -1,6 +1,7 @@
package nmd.primal.energy.client; package nmd.primal.energy.client;
import nmd.primal.energy.common.CommonProxy; 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.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent;
@@ -23,6 +24,8 @@ public class ClientProxy extends CommonProxy{
public void postInit(FMLPostInitializationEvent event) public void postInit(FMLPostInitializationEvent event)
{ {
super.postInit(event); super.postInit(event);
RenderRegistry.init();
} }
} }

4
src/main/java/nmd/primal/energy/common/CommonProxy.java
View File

@@ -4,7 +4,6 @@ import nmd.primal.energy.block.ModBlocks;
import nmd.primal.energy.crafting.ModCrafting; import nmd.primal.energy.crafting.ModCrafting;
import nmd.primal.energy.item.ModItems; import nmd.primal.energy.item.ModItems;
import nmd.primal.energy.render.RenderID; import nmd.primal.energy.render.RenderID;
import nmd.primal.energy.render.RenderRegistry;
import nmd.primal.energy.tileents.TileRegistry; import nmd.primal.energy.tileents.TileRegistry;
import nmd.primal.energy.util.CustomTab; import nmd.primal.energy.util.CustomTab;
import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -19,6 +18,7 @@ public class CommonProxy {
ModItems.registerItems(); ModItems.registerItems();
ModBlocks.init(); ModBlocks.init();
ModCrafting.init(); ModCrafting.init();
RenderID.init();
} }
@@ -29,7 +29,7 @@ public class CommonProxy {
public void postInit(FMLPostInitializationEvent event) public void postInit(FMLPostInitializationEvent event)
{ {
RenderRegistry.init();
} }

15
src/main/java/nmd/primal/energy/crafting/ModCrafting.java
View File

@@ -17,10 +17,10 @@ public class ModCrafting {
GameRegistry.addRecipe( GameRegistry.addRecipe(
new ItemStack(ModItems.schiselItem), new Object[]{ new ItemStack(ModItems.schiselItem), new Object[]{
" f", " f",
" t ", " t ",
"s ", "s ",
'f', Items.flint, 't', Items.string, 's', Items.stick}); 'f', Items.flint, 't', Items.string, 's', Items.stick});
GameRegistry.addRecipe( GameRegistry.addRecipe(
new ItemStack(ModItems.sgearItem), new Object[]{ new ItemStack(ModItems.sgearItem), new Object[]{
@@ -35,5 +35,12 @@ public class ModCrafting {
"sss", "sss",
's', Blocks.wooden_slab}); 's', Blocks.wooden_slab});
GameRegistry.addRecipe(
new ItemStack(ModBlocks.crankBlock), new Object[]{
" fs",
" s ",
" s ",
'f', Items.string, 's', Items.stick});
} }
} }

3
src/main/resources/assets/energy/lang/en_US.lang
View File

@@ -5,4 +5,5 @@ item.swheelItem.name=Standard Wheel
item.sgearItem.name=Standard Gear item.sgearItem.name=Standard Gear
item.saxleItem.name=Standard Axle item.saxleItem.name=Standard Axle
tile.SMBBlock.name=Standard Machine Box tile.SMBBlock.name=Standard Machine Box
tile.CrankBlock.name=Crank