upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-12 16:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	src/main/java/info/jbcs/minecraft/chisel/Chisel.java
This commit is contained in:
TheCricket committed 2014-11-02 17:05:14 -05:00
2 parents 3d95f34824 8bd24df242
commit 28adcaf9a7
1 file changed
+11 -5
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/info/jbcs/minecraft/chisel/Chisel.java
+11 -5
View File
@@ -1,6 +1,7 @@
package info.jbcs.minecraft.chisel;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import info.jbcs.minecraft.chisel.block.BlockCarvable;
import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel;
import info.jbcs.minecraft.chisel.client.gui.GuiAutoChisel;
@@ -48,11 +49,11 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.GameRegistry.Type;
@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = "2.0.0.2", guiFactory = "info.jbcs.minecraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;")
@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = "2.0.0.1", guiFactory = "info.jbcs.minecraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;")
public class Chisel
{
public static final String MOD_ID = "chisel";
public static final String MOD_NAME = "Chisel";
public static final String MOD_NAME = "Chisel 2";
public static boolean multipartLoaded = false;
@@ -171,9 +172,7 @@ public class Chisel
GameRegistry.registerWorldGenerator(new GeneratorLimestone(ModBlocks.limestone, 32, Configurations.limestoneAmount), 1000);
if(event.getSide() == Side.CLIENT){
ModIntegration.addMod(FMPIntegration.class);
ModIntegration.init();
initModIntegration();
}
proxy.init();
@@ -201,4 +200,11 @@ public class Chisel
}
}
@SideOnly(Side.CLIENT)
private static void initModIntegration(){
ModIntegration.addMod(FMPIntegration.class);
ModIntegration.init();
}
}