From d844b446e4b010858e34804f1442eaf7b5adb843 Mon Sep 17 00:00:00 2001 From: Fenn Date: Sun, 10 Aug 2014 12:12:39 +0100 Subject: [PATCH] That -should- be a fix for PR marble stuff. Since it's now in scala i had to do a work around. --- .../java/info/jbcs/minecraft/chisel/Chisel.java | 7 +++++++ .../minecraft/chisel/ChiselModCompatibility.java | 13 ++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java index 37242474..cffa6595 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java @@ -2,6 +2,7 @@ package info.jbcs.minecraft.chisel; import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; @@ -153,6 +154,12 @@ public class Chisel MinecraftForge.EVENT_BUS.register(this); FMLCommonHandler.instance().bus().register(instance); + if(Loader.isModLoaded("ProjRed|Exploration") && GameRegistry.findBlock("ProjRed|Exploration", "stonemarble") != null) + { + Carving.chisel.addVariation("marble", GameRegistry.findBlock("ProjRed|Exploration", "stonemarble"), 0, 99); + GameRegistry.findBlock("ProjRed|Exploration", "stonemarble").setHarvestLevel("chisel", 0, 0); + } + FMLInterModComms.sendMessage("Waila", "register", "info.jbcs.minecraft.chisel.Waila.register"); } diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java index 293299f5..a8b13e2f 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselModCompatibility.java @@ -1,9 +1,8 @@ package info.jbcs.minecraft.chisel; -import cpw.mods.fml.common.Optional; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; import info.jbcs.minecraft.chisel.carving.Carving; import net.minecraft.block.Block; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; public class ChiselModCompatibility { @@ -116,15 +115,19 @@ public class ChiselModCompatibility block.setHarvestLevel("chisel", 0, 0); } }; - new ClassBlockCompat("mrtjp.projectred.ProjectRedExploration", "blockStones") + /*new ClassBlockCompat("mrtjp.projectred.blocks.DecorativeStoneDefs", "MARBLE") { @Override void action() { - Carving.chisel.addVariation("marble", block, 0, 99); - block.setHarvestLevel("chisel", 0, 0); + if(Loader.isModLoaded("ProjRed|Exploration") && GameRegistry.findBlock("ProjRed|Exploration", "stonemarble") != null) + { + Carving.chisel.addVariation("marble", GameRegistry.findBlock("ProjRed|Exploration", "stonemarble"), 0, 99); + GameRegistry.findBlock("ProjRed|Exploration", "stonemarble").setHarvestLevel("chisel", 0, 0); + } } }; + */ new ClassBlockCompat("mariculture.core.Core", "limestone") {