diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index 88e97d05..9d209038 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -21,7 +21,6 @@ import tconstruct.library.crafting.LiquidCasting; import tconstruct.mechworks.TinkerMechworks; import tconstruct.mechworks.landmine.behavior.Behavior; import tconstruct.mechworks.landmine.behavior.stackCombo.SpecialStackHandler; -import tconstruct.plugins.imc.TinkerBuildcraft; import tconstruct.plugins.imc.TinkerThaumcraft; import tconstruct.plugins.nei.TinkerNEI; import tconstruct.smeltery.TinkerSmeltery; @@ -112,7 +111,6 @@ public class TConstruct pulsar.registerPulse(new TinkerArmor()); pulsar.registerPulse(new TinkerNEI()); pulsar.registerPulse(new TinkerThaumcraft()); - pulsar.registerPulse(new TinkerBuildcraft()); /*pulsar.registerPulse(new TinkerPrayers()); pulsar.registerPulse(new TinkerCropify());*/ diff --git a/src/main/java/tconstruct/plugins/imc/TinkerBuildcraft.java b/src/main/java/tconstruct/plugins/imc/TinkerBuildcraft.java deleted file mode 100644 index 112581a3..00000000 --- a/src/main/java/tconstruct/plugins/imc/TinkerBuildcraft.java +++ /dev/null @@ -1,37 +0,0 @@ -package tconstruct.plugins.imc; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import mantle.pulsar.pulse.Handler; -import mantle.pulsar.pulse.Pulse; -import tconstruct.TConstruct; -import tconstruct.smeltery.TinkerSmeltery; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; - -@ObjectHolder(TConstruct.modID) -@Pulse(id = "Tinkers Buildcraft addon", description = "The Builcraft addon for Tinkers.", modsRequired = "BuildCraft|Transport", forced = true) -public class TinkerBuildcraft { - - @Handler - public void init (FMLInitializationEvent event) - { - TConstruct.logger.info("[BC|Transport] Registering facades."); - // Smeltery Blocks - addFacade(TinkerSmeltery.smeltery, 2); - for (int sc = 4; sc < 11; sc++) - { - addFacade(TinkerSmeltery.smeltery, sc); - } - - addFacade(TinkerSmeltery.searedBlock, 0); - addFacade(TinkerSmeltery.searedBlockNether, 0); - } - - private void addFacade (Block b, int meta) - { - FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", new ItemStack(b, 1, meta)); - } - -} diff --git a/src/main/java/tconstruct/plugins/imc/TinkerThaumcraft.java b/src/main/java/tconstruct/plugins/imc/TinkerThaumcraft.java index efa6a81c..bad0b53b 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerThaumcraft.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerThaumcraft.java @@ -12,11 +12,12 @@ import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(TConstruct.modID) -@Pulse(id = "Tinkers Thaumcraft addon", description = "The Thaumcraft addon for Tinkers.", modsRequired = "Thaumcraft", forced = true) -public class TinkerThaumcraft { +@Pulse(id = "Tinkers Thaumcraft Compatibility", description = "Tinkers Construct compatibility for Thaumcraft", modsRequired = "Thaumcraft") +public class TinkerThaumcraft +{ @Handler - public void init(FMLInitializationEvent event) + public void init (FMLInitializationEvent event) { TConstruct.logger.info("[Thaumcraft] Registering harvestables."); FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerry, 1, 12)); diff --git a/src/main/java/tconstruct/plugins/nei/NEICompat.java b/src/main/java/tconstruct/plugins/nei/NEICompat.java new file mode 100644 index 00000000..9417aa90 --- /dev/null +++ b/src/main/java/tconstruct/plugins/nei/NEICompat.java @@ -0,0 +1,21 @@ +package tconstruct.plugins.nei; + +import tconstruct.tools.gui.CraftingStationGui; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.common.FMLCommonHandler; +import codechicken.nei.recipe.DefaultOverlayHandler; +import codechicken.nei.api.API; + +public class NEICompat +{ + + public static void registerNEICompat () + { + if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) + { + API.registerGuiOverlay(CraftingStationGui.class, "crafting"); + API.registerGuiOverlayHandler(CraftingStationGui.class, new DefaultOverlayHandler(), "crafting"); + } + } + +} diff --git a/src/main/java/tconstruct/plugins/nei/TinkerNEI.java b/src/main/java/tconstruct/plugins/nei/TinkerNEI.java index c4ed3abe..d3326fa2 100644 --- a/src/main/java/tconstruct/plugins/nei/TinkerNEI.java +++ b/src/main/java/tconstruct/plugins/nei/TinkerNEI.java @@ -1,28 +1,23 @@ package tconstruct.plugins.nei; -import codechicken.nei.api.API; -import codechicken.nei.recipe.DefaultOverlayHandler; import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; import tconstruct.TConstruct; -import tconstruct.tools.gui.CraftingStationGui; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; import cpw.mods.fml.relauncher.Side; @ObjectHolder(TConstruct.modID) -@Pulse(id = "Tinkers Not Enough Items Addon", description = "The NEI addon for Tinkers.", modsRequired = "NotEnoughItems", forced = true) -public class TinkerNEI { - +@Pulse(id = "Tinkers NEI Compatibility", description = "Tinkers Construct compatibility for NEI", modsRequired = "NotEnoughItems") +public class TinkerNEI +{ + @Handler public void init (FMLInitializationEvent event) { - if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) - { - API.registerGuiOverlay(CraftingStationGui.class, "crafting"); - API.registerGuiOverlayHandler(CraftingStationGui.class, new DefaultOverlayHandler(), "crafting"); - } + TConstruct.logger.info("NotEnoughItems detected. Registering TConstruct NEI plugin."); + NEICompat.registerNEICompat(); } - + }