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

Merge branch 'DEV' of ssh://git.nmd.so:12000/kitsu/nmdenergy into DEV

Browse Source 
Fluid weird

Conflicts:
	src/main/java/nmd/primal/energy/Main.java
This commit is contained in:
Fluid1C3
2015-08-11 19:15:11 -05:00
parent aa7ef158b8 71867cff5f
commit 27c951fcde
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/nmd/primal/energy/Main.java
View File

@@ -3,6 +3,8 @@ package nmd.primal.energy;
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;
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.FMLPreInitializationEvent;
@Mod(modid = Main.MODID, version = Main.VERSION) @Mod(modid = Main.MODID, version = Main.VERSION)
public class Main public class Main
@@ -10,10 +12,29 @@ public class Main
public static final String MODID = "energy"; public static final String MODID = "energy";
public static final String VERSION = "1.0"; public static final String VERSION = "1.0";
@EventHandler
public void preinit(FMLPreInitializationEvent event)
{
// some example code
//System.out.println("DIRT BLOCK >> "+Blocks.dirt.getUnlocalizedName());
}
@EventHandler @EventHandler
public void init(FMLInitializationEvent event) public void init(FMLInitializationEvent event)
{ {
// some example code // some example code
//System.out.println("DIRT BLOCK >> "+Blocks.dirt.getUnlocalizedName()); //System.out.println("DIRT BLOCK >> "+Blocks.dirt.getUnlocalizedName());
} }
<<<<<<< HEAD
=======
@EventHandler
public void postInit(FMLPostInitializationEvent e) {
System.out.println("U want some Body Massage?");
//RenderingRegistry.registerEntityRenderingHandler(EntityShit.class, new RenderSnowball(ModItems.itemShit));
}
//Fluids comment
>>>>>>> 71867cff5f48b73b986b837d8f6e04f57d3ee247
} }