diff --git a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java index 74f33adf..86e80402 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java @@ -23,6 +23,7 @@ import info.jbcs.minecraft.chisel.client.gui.GuiAutoChisel; import info.jbcs.minecraft.chisel.client.gui.GuiChisel; import info.jbcs.minecraft.chisel.client.gui.GuiPresent; import info.jbcs.minecraft.chisel.compat.Compatibility; +import info.jbcs.minecraft.chisel.compat.FMPIntegration; import info.jbcs.minecraft.chisel.compat.ModIntegration; import info.jbcs.minecraft.chisel.init.ModBlocks; import info.jbcs.minecraft.chisel.init.ModItems; @@ -68,8 +69,9 @@ public class Chisel @SideOnly(Side.CLIENT) private static void initModIntegration() { - //To be added back at a different time - //ModIntegration.addMod(FMPIntegration.class); + if(Configurations.enableFMP) { + ModIntegration.addMod(FMPIntegration.class); + } ModIntegration.init(); } diff --git a/src/main/java/info/jbcs/minecraft/chisel/Configurations.java b/src/main/java/info/jbcs/minecraft/chisel/Configurations.java index d87bccd2..2918f600 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Configurations.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Configurations.java @@ -17,6 +17,7 @@ public class Configurations public static boolean chiselRecipe; public static boolean autoChisel; public static boolean fancy; + public static boolean enableFMP; public static int factoryBlockAmount; public static int particlesTickrate; @@ -41,7 +42,8 @@ public class Configurations marbleAmount = config.get("worldgen", "marbleAmount", 7, "Amount of marble to generate in the world; use 0 for none").getInt(7); limestoneAmount = config.get("worldgen", "limestoneAmount", 8, "Amount of limestone to generate in the world; use 0 for none").getInt(8); chiselRecipe = config.get("general", "chiselAlternateRecipe", false, "Use alternative crafting recipe for the chisel").getBoolean(false); - autoChisel = config.get("general", "autoChisel", true, "Should people be allowed to use the auto chisel").getBoolean(false); + autoChisel = config.get("general", "autoChisel", true, "Should people be allowed to use the auto chisel").getBoolean(true); + enableFMP = config.get("general", "enableFMP", true, "Do you want to enable FMP").getBoolean(true); if(config.hasChanged()) { diff --git a/src/main/java/info/jbcs/minecraft/chisel/compat/FMPIntegration.java b/src/main/java/info/jbcs/minecraft/chisel/compat/FMPIntegration.java index 4a54bec8..dcf5d679 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/compat/FMPIntegration.java +++ b/src/main/java/info/jbcs/minecraft/chisel/compat/FMPIntegration.java @@ -15,38 +15,74 @@ public class FMPIntegration implements IModIntegration{ @Override public void onInit(){ registerMaterial(ModBlocks.marble); - registerMaterial(ModBlocks.marblePillar); registerMaterial(ModBlocks.limestone); - registerMaterial(ModBlocks.cobblestone); - registerMaterial(ModBlocks.glass); + registerMaterial(ModBlocks.cobblestone, 1, 15); + registerMaterial(ModBlocks.glass, 1, 15); registerMaterial(ModBlocks.sandstone, 3, 15); + registerMaterial(ModBlocks.sandSnakestone, 1, 1); + registerMaterial(ModBlocks.sandSnakestone, 13, 13); registerMaterial(ModBlocks.sandstoneScribbles); registerMaterial(ModBlocks.concrete, 0, 10); registerMaterial(ModBlocks.iron, 1, 15); registerMaterial(ModBlocks.gold, 1, 14); registerMaterial(ModBlocks.diamond, 1, 12); - registerMaterial(ModBlocks.lightstone, 1, 15); + registerMaterial(ModBlocks.lightstone, 1, 15); //This is glowstone registerMaterial(ModBlocks.lapis, 1, 8); registerMaterial(ModBlocks.emerald, 1, 11); - registerMaterial(ModBlocks.netherBrick, 1, 15); + registerMaterial(ModBlocks.netherBrick, 1, 5); registerMaterial(ModBlocks.netherrack, 1, 14); registerMaterial(ModBlocks.cobblestoneMossy, 1, 15); registerMaterial(ModBlocks.stoneBrick, 4, 15); - registerMaterial(ModBlocks.dirt, 0, 12); + registerMaterial(ModBlocks.snakestone, 1, 1); + registerMaterial(ModBlocks.snakestone, 13, 13); + registerMaterial(ModBlocks.dirt, 0, 3); + registerMaterial(ModBlocks.dirt, 6, 7); + registerMaterial(ModBlocks.dirt, 11, 11); registerMaterial(ModBlocks.ice, 1, 15); registerMaterial(ModBlocks.icePillar); + for(int x = 0; x < 4; x++){ + registerMaterial(ModBlocks.planks[x], 1, 15); // Oak, Spruce, Birch and Jungle + } + //Accacia + registerMaterial(ModBlocks.planks[4], 1, 1); + registerMaterial(ModBlocks.planks[4], 2, 2); + registerMaterial(ModBlocks.planks[4], 6, 6); + registerMaterial(ModBlocks.planks[4], 8, 11); + registerMaterial(ModBlocks.planks[4], 13, 13); + + //Dark Oak + registerMaterial(ModBlocks.planks[5], 1, 1); + registerMaterial(ModBlocks.planks[5], 2, 2); + registerMaterial(ModBlocks.planks[5], 6, 6); + registerMaterial(ModBlocks.planks[5], 8, 11); + registerMaterial(ModBlocks.planks[5], 13, 13); + registerMaterial(ModBlocks.obsidian, 1, 15); + registerMaterial(ModBlocks.obsidianSnakestone, 1, 1); + registerMaterial(ModBlocks.obsidianSnakestone, 13, 13); registerMaterial(ModBlocks.redstone, 1, 15); registerMaterial(ModBlocks.holystone, 0, 13); + registerMaterial(ModBlocks.carpet); registerMaterial(ModBlocks.lavastone, 0, 6); - registerMaterial(ModBlocks.fantasy); - registerMaterial(ModBlocks.carpetFloor); + registerMaterial(ModBlocks.fantasy, 0, 1); + registerMaterial(ModBlocks.fantasy, 3, 14); registerMaterial(ModBlocks.tyrian); - registerMaterial(ModBlocks.temple); - registerMaterial(ModBlocks.templeMossy); - registerMaterial(ModBlocks.cloud, 0, 0); - registerMaterial(ModBlocks.factory); - registerMaterial(ModBlocks.laboratory); + registerMaterial(ModBlocks.temple, 1, 2); + registerMaterial(ModBlocks.temple, 4, 15); + registerMaterial(ModBlocks.templeMossy, 1, 2); + registerMaterial(ModBlocks.templeMossy, 4, 15); + registerMaterial(ModBlocks.factory, 0, 12); + registerMaterial(ModBlocks.factory, 14, 14); + registerMaterial(ModBlocks.stainedGlass[0]); //White + registerMaterial(ModBlocks.stainedGlass[4]); //Yellow + registerMaterial(ModBlocks.stainedGlass[8]); //Light Gray + registerMaterial(ModBlocks.stainedGlass[12]); //Brown + registerMaterial(ModBlocks.woolenClay); + registerMaterial(ModBlocks.laboratory, 2, 3); + registerMaterial(ModBlocks.laboratory, 5, 12); + registerMaterial(ModBlocks.voidstone, 0, 3); + registerMaterial(ModBlocks.voidstone, 12, 15); + registerMaterial(ModBlocks.waterstone); } @Override