From 65ff510b3ce1cd9467d3e16082e3aac2d40df85a Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Sat, 26 Oct 2013 19:18:44 -0400 Subject: [PATCH] move AE imc messages to TCon from a plugin --- resources/mcmod.info | 19 ------ src/tconstruct/common/TContent.java | 4 ++ src/tconstruct/plugins/appeng/AppEng.java | 69 -------------------- src/tconstruct/util/config/AEImcHandler.java | 45 +++++++++++++ 4 files changed, 49 insertions(+), 88 deletions(-) delete mode 100644 src/tconstruct/plugins/appeng/AppEng.java create mode 100644 src/tconstruct/util/config/AEImcHandler.java diff --git a/resources/mcmod.info b/resources/mcmod.info index 9a93eb48..5da9dced 100644 --- a/resources/mcmod.info +++ b/resources/mcmod.info @@ -90,25 +90,6 @@ "TConstruct" ] }, - { - "modid": "TConstruct|CompatAE", - "name": "TConstruct Compat: AE", - "description": "TConstruct support for AppliedEnergistics Spatial IO", - "version": "@VERSION@", - "mcversion": "@MCVERSION@", - "url": "http://www.minecraftforum.net/topic/1659892-tinkers-construct", - "updateUrl": "", - "authors": [ - "mDiyo", "fuj1n", "ProgWML6", "Sunstrike" - ], - "credits": "Slime Knights", - "logoFile": "", - "screenshots": [], - "parent":"TConstruct", - "dependencies": [ - "TConstruct" - ] - }, { "modid": "TConstruct|CompatWaila", "name": "TConstruct Compat: Waila", diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index a8de7a4d..89d9dcc1 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -1983,6 +1983,10 @@ public class TContent implements IFuelHandler String builderItems = "builder@" + String.valueOf(stoneTorch.blockID) + ":*"; FMLInterModComms.sendMessage("Forestry", "add-backpack-items", builderItems); } + if (!Loader.isModLoaded("AppliedEnergistics")) + { + AEImcHandler.registerForSpatialIO(); + } } private static boolean initRecipes; diff --git a/src/tconstruct/plugins/appeng/AppEng.java b/src/tconstruct/plugins/appeng/AppEng.java deleted file mode 100644 index e8952be0..00000000 --- a/src/tconstruct/plugins/appeng/AppEng.java +++ /dev/null @@ -1,69 +0,0 @@ -package tconstruct.plugins.appeng; - -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.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.network.NetworkMod; - -import java.util.Arrays; -import java.util.List; -import java.util.logging.Logger; - -@Mod(modid = "TConstruct|CompatAE", name = "TConstruct Compat: AE", version = "0.0.1", dependencies = "after:AppliedEnergistics;required-after:TConstruct") -@NetworkMod(clientSideRequired = false, serverSideRequired = false) -public class AppEng { - - public static Logger logger = Logger.getLogger("TConstruct AE"); - private static List spatialIOLogics = Arrays.asList( - "AdaptiveSmelteryLogic", - "AdvancedDrawbridgeLogic", - "AqueductLogic", - "CastingBasinLogic", - "CastingChannelLogic", - "CastingTableLogic", - "CraftingStationLogic", - "DrawbridgeLogic", - "DryingRackLogic", - "EssenceExtractorLogic", - "FaucetLogic", - "FirestarterLogic", - "FrypanLogic", - "GolemPedestalLogic", - "LavaTankLogic", - "PartBuilderLogic", - "PatternChestLogic", - "RedwireLogic", - "SmelteryDrainLogic", - "SmelteryLogic", - "StencilTableLogic", - "TankAirLogic", - "TileEntityLandmine", - "ToolForgeLogic", - "ToolStationLogic", - "TowerFurnaceLogic", - "MultiServantLogic" - ); - - @EventHandler - public static void load (FMLInitializationEvent ev) - { - logger.setParent(FMLCommonHandler.instance().getFMLLogger()); - - if (!Loader.isModLoaded("AppliedEnergistics")) { - logger.warning("Applied Energistics missing - TConstruct Compat: AE not loading."); - } else { - logger.info("Applied Energistics detected. Registering for Spatial IO."); - registerForSpatialIO(); - } - } - - private static void registerForSpatialIO() { - for (String s : spatialIOLogics) { - FMLInterModComms.sendMessage("AppliedEnergistics", "movabletile", "tconstruct.blocks.logic." + s); - } - } - -} diff --git a/src/tconstruct/util/config/AEImcHandler.java b/src/tconstruct/util/config/AEImcHandler.java new file mode 100644 index 00000000..be6bdc5f --- /dev/null +++ b/src/tconstruct/util/config/AEImcHandler.java @@ -0,0 +1,45 @@ +package tconstruct.util.config; + +import java.util.Arrays; +import java.util.List; + +import cpw.mods.fml.common.event.FMLInterModComms; + +public class AEImcHandler +{ + private static List spatialIOLogics = Arrays.asList( + "AdaptiveSmelteryLogic", + "AdvancedDrawbridgeLogic", + "AqueductLogic", + "CastingBasinLogic", + "CastingChannelLogic", + "CastingTableLogic", + "CraftingStationLogic", + "DrawbridgeLogic", + "DryingRackLogic", + "EssenceExtractorLogic", + "FaucetLogic", + "FirestarterLogic", + "FrypanLogic", + "GolemPedestalLogic", + "LavaTankLogic", + "PartBuilderLogic", + "PatternChestLogic", + "RedwireLogic", + "SmelteryDrainLogic", + "SmelteryLogic", + "StencilTableLogic", + "TankAirLogic", + "TileEntityLandmine", + "ToolForgeLogic", + "ToolStationLogic", + "TowerFurnaceLogic", + "MultiServantLogic" + ); + + public static void registerForSpatialIO() { + for (String s : spatialIOLogics) { + FMLInterModComms.sendMessage("AppliedEnergistics", "movabletile", "tconstruct.blocks.logic." + s); + } + } +}