From 6d5bda60b4da0efad1741725174d745648109d5b Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Thu, 1 Jan 2015 00:24:37 +0000 Subject: [PATCH] Move RC compat into postInit, make sure it happens after RC is loaded... --- .../java/com/cricketcraft/chisel/Chisel.java | 1 + .../cricketcraft/chisel/init/ModBlocks.java | 105 +++++++++--------- 2 files changed, 52 insertions(+), 54 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index bb1bf8b0..69382ee4 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -185,6 +185,7 @@ public class Chisel @EventHandler public void postInit(FMLPostInitializationEvent event) { + ModBlocks.postLoad(); ModIntegration.postInit(); Compatibility.init(event); } diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 84293d9b..ac073a1f 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -1605,9 +1605,59 @@ public class ModBlocks { arcane.carverHelper.register(arcane, "arcane"); Carving.chisel.registerOre("arcane", "arcane"); } + /* + //Twilight Forest - /* It no work + if(Configurations.featureEnabled("TFMazestone") && Loader.isModLoaded("Twilight Forest")) + { + Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 0, 0); + Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 1, 1); + Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 2, 2); + Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 3, 3); + Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 4, 4); + Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 5, 5); + Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 6, 6); + Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 7, 7); + Carving.chisel.registerOre("TFMazestone", "TFMazestone"); + } + if(Configurations.featureEnabled("TFTowerStone") && Loader.isModLoaded("TwilightForest")) + { + Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "TFTowerStone"), 0, 0); + Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "TFTowerStone"), 1, 1); + Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "TFTowerStone"), 2, 2); + Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "TFTowerStone"), 3, 3); + Carving.chisel.registerOre("TFTowerStone", "TFTowerStone"); + } + + if(Configurations.featureEnabled("TFUnderBrick") && Loader.isModLoaded("TwilightForest")) + { + Carving.chisel.addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "TFUnderBrick"), 0, 0); + Carving.chisel.addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "TFUnderBrick"), 1, 1); + Carving.chisel.addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "TFUnderBrick"), 2, 2); + Carving.chisel.registerOre("TFUnderBrick", "TFUnderBrick"); + } + + //Applied Energistics + + if(Configurations.featureEnabled("AECertusQuartz") && Loader.isModLoaded("appliedenergistics2")) + { + Carving.chisel.addVariation("AECertusQuartz", GameRegistry.findBlock("appliedenergistics2", "BlockQuartz"), 0, 0); + Carving.chisel.addVariation("AECertusQuartz", GameRegistry.findBlock("appliedenergistics2", "BlockQuartzPillar"), 0, 1); + Carving.chisel.addVariation("AECertusQuartz", GameRegistry.findBlock("appliedenergistics2", "BlockQuartzChiseled"), 0, 2); + Carving.chisel.registerOre("AECertusQuartz", "AECertusQuartz"); + } + + if(Configurations.featureEnabled("AESkyStone") && Loader.isModLoaded("appliedenergistics2")) + { + Carving.chisel.addVariation("AESkyStone", GameRegistry.findBlock("appliedenergistics2", "BlockSkyStone"), 1, 0); + Carving.chisel.addVariation("AESkyStone", GameRegistry.findBlock("appliedenergistics2", "BlockSkyStone"), 2, 1); + Carving.chisel.addVariation("AESkyStone", GameRegistry.findBlock("appliedenergistics2", "BlockSkyStone"), 3, 2); + Carving.chisel.registerOre("AESkyStone", "AESkyStone"); + }*/ + } + public static void postLoad() + { //Railcraft if(Configurations.featureEnabled("RCInfernalStone") && Loader.isModLoaded("Railcraft")) @@ -1674,58 +1724,5 @@ public class ModBlocks { Carving.chisel.addVariation("RCBloodStained", GameRegistry.findBlock("Railcraft", "railcraft.brick.bloodstained"), 5, 5); Carving.chisel.registerOre("RCBloodStained", "RCBloodStained"); } - - //Twilight Forest - - if(Configurations.featureEnabled("TFMazestone") && Loader.isModLoaded("Twilight Forest")) - { - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 0, 0); - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 1, 1); - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 2, 2); - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 3, 3); - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 4, 4); - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 5, 5); - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 6, 6); - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 7, 7); - Carving.chisel.registerOre("TFMazestone", "TFMazestone"); - } - - if(Configurations.featureEnabled("TFTowerStone") && Loader.isModLoaded("TwilightForest")) - { - Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "TFTowerStone"), 0, 0); - Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "TFTowerStone"), 1, 1); - Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "TFTowerStone"), 2, 2); - Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "TFTowerStone"), 3, 3); - Carving.chisel.registerOre("TFTowerStone", "TFTowerStone"); - } - - if(Configurations.featureEnabled("TFUnderBrick") && Loader.isModLoaded("TwilightForest")) - { - Carving.chisel.addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "TFUnderBrick"), 0, 0); - Carving.chisel.addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "TFUnderBrick"), 1, 1); - Carving.chisel.addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "TFUnderBrick"), 2, 2); - Carving.chisel.registerOre("TFUnderBrick", "TFUnderBrick"); - } - - //Applied Energistics - - if(Configurations.featureEnabled("AECertusQuartz") && Loader.isModLoaded("appliedenergistics2")) - { - Carving.chisel.addVariation("AECertusQuartz", GameRegistry.findBlock("appliedenergistics2", "BlockQuartz"), 0, 0); - Carving.chisel.addVariation("AECertusQuartz", GameRegistry.findBlock("appliedenergistics2", "BlockQuartzPillar"), 0, 1); - Carving.chisel.addVariation("AECertusQuartz", GameRegistry.findBlock("appliedenergistics2", "BlockQuartzChiseled"), 0, 2); - Carving.chisel.registerOre("AECertusQuartz", "AECertusQuartz"); - } - - if(Configurations.featureEnabled("AESkyStone") && Loader.isModLoaded("appliedenergistics2")) - { - Carving.chisel.addVariation("AESkyStone", GameRegistry.findBlock("appliedenergistics2", "BlockSkystone"), 1, 0); - Carving.chisel.addVariation("AESkyStone", GameRegistry.findBlock("appliedenergistics2", "BlockSkystone"), 2, 1); - Carving.chisel.addVariation("AESkyStone", GameRegistry.findBlock("appliedenergistics2", "BlockSkystone"), 3, 2); - Carving.chisel.registerOre("AESkyStone", "AESkyStone"); - } - - */ - } }