diff --git a/build.gradle b/build.gradle index 68c669b3..4864bb64 100644 --- a/build.gradle +++ b/build.gradle @@ -27,9 +27,9 @@ buildscript { repositories { - ivy { - name 'CB FS' - artifactPattern "http://www.chickenbones.craftsaddle.org/Files/New_Versions/1.6.4/[module]-dev%20[revision].[ext]" + maven { + name 'CB Maven FS' + url "http://chickenbones.net/maven/" } maven { name 'DVS1 Maven FS' @@ -63,7 +63,8 @@ dependencies { compile "mantle:Mantle:${config.minecraft_version}-${config.mantle_version}:deobf" compile "codechicken:CodeChickenLib:${config.minecraft_version}-${config.CCLIB_version}:dev" compile "codechicken:ForgeMultipart:${config.minecraft_version}-${config.FMP_version}:dev" - //compile name: 'NotEnoughItems', version: "${config.NEI_version}", type: 'jar' + compile "codechicken:CodeChickenCore:${config.minecraft_version}-${config.ccc_version}:dev" + compile "codechicken:NotEnoughItems:${config.minecraft_version}-${config.NEI_version}:dev" deployerJars 'org.apache.maven.wagon:wagon-ssh:2.2' } diff --git a/build.properties b/build.properties index a4371ebd..86cd78b0 100644 --- a/build.properties +++ b/build.properties @@ -2,6 +2,7 @@ minecraft_version=1.7.2 forge_version=10.12.0.1027 mantle_version=132.45b0b50 FMP_version=1.1.0.268 -CCLIB_version=1.1.0.73 -NEI_version=1.6.1.8 +CCLIB_version=1.1.0.77 +NEI_version=1.0.1 +ccc_version=1.0.0 mod_version=1.6.0 diff --git a/returning_eventually/nei/NotEnoughItems.java b/returning_eventually/nei/NotEnoughItems.java deleted file mode 100644 index 4a36c27d..00000000 --- a/returning_eventually/nei/NotEnoughItems.java +++ /dev/null @@ -1,29 +0,0 @@ -package tconstruct.plugins.nei; - -import tconstruct.TConstruct; -import tconstruct.plugins.ICompatPlugin; - -public class NotEnoughItems implements ICompatPlugin -{ - @Override - public String getModId() { - return "NotEnoughItems"; - } - - @Override - public void preInit() { - // Nothing - } - - @Override - public void init() { - TConstruct.logger.info("NotEnoughItems detected. Registering TConstruct NEI plugin."); - NEICompat.registerNEICompat(); - } - - @Override - public void postInit() { - // Nothing - } - -} diff --git a/src/main/java/tconstruct/plugins/ICompatPlugin.java b/src/main/java/tconstruct/plugins/ICompatPlugin.java deleted file mode 100644 index 804454d1..00000000 --- a/src/main/java/tconstruct/plugins/ICompatPlugin.java +++ /dev/null @@ -1,25 +0,0 @@ -package tconstruct.plugins; - -/** - * Interface for TiC compat plugins. - * - * Do not include mod API usage directly in this file except for IMC! This must - * be constructable even when the target mod isn't available due to Java not - * allowing static abstracts. - */ -public interface ICompatPlugin -{ - - // Mod ID the plugin handles - public abstract String getModId (); - - // Called during TCon PreInit - public abstract void preInit (); - - // Called during TCon Init - public abstract void init (); - - // Called during TCon PostInit - public abstract void postInit (); - -} diff --git a/src/main/java/tconstruct/plugins/PluginController.java b/src/main/java/tconstruct/plugins/PluginController.java index dc5de8a5..50ef099c 100644 --- a/src/main/java/tconstruct/plugins/PluginController.java +++ b/src/main/java/tconstruct/plugins/PluginController.java @@ -7,6 +7,7 @@ import tconstruct.plugins.imc.AppEng; import tconstruct.plugins.imc.BuildcraftTransport; import tconstruct.plugins.imc.Mystcraft; import tconstruct.plugins.imc.Thaumcraft; +import tconstruct.plugins.nei.NotEnoughItems; public class PluginController { @@ -24,6 +25,8 @@ public class PluginController moduleLoader.registerModule(ForgeMultiPart.class); moduleLoader.registerModule(IC2.class); moduleLoader.registerModule(Thaumcraft.class); - } + moduleLoader.registerModule(NotEnoughItems.class); + + } } diff --git a/src/main/java/tconstruct/plugins/fmp/ForgeMultiPart.java b/src/main/java/tconstruct/plugins/fmp/ForgeMultiPart.java index f1fd362d..c415e4f3 100644 --- a/src/main/java/tconstruct/plugins/fmp/ForgeMultiPart.java +++ b/src/main/java/tconstruct/plugins/fmp/ForgeMultiPart.java @@ -6,7 +6,6 @@ import mantle.module.ILoadableModule; import net.minecraft.block.Block; import tconstruct.TConstruct; import tconstruct.common.TRepo; -import tconstruct.plugins.ICompatPlugin; public class ForgeMultiPart implements ILoadableModule { diff --git a/src/main/java/tconstruct/plugins/ic2/IC2.java b/src/main/java/tconstruct/plugins/ic2/IC2.java index ef6f1ac8..2637367a 100644 --- a/src/main/java/tconstruct/plugins/ic2/IC2.java +++ b/src/main/java/tconstruct/plugins/ic2/IC2.java @@ -9,7 +9,6 @@ import net.minecraftforge.fluids.FluidStack; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.LiquidCasting; -import tconstruct.plugins.ICompatPlugin; public class IC2 implements ILoadableModule { diff --git a/src/main/java/tconstruct/plugins/imc/AppEng.java b/src/main/java/tconstruct/plugins/imc/AppEng.java index 5bc1ca9f..db5820e5 100644 --- a/src/main/java/tconstruct/plugins/imc/AppEng.java +++ b/src/main/java/tconstruct/plugins/imc/AppEng.java @@ -5,7 +5,6 @@ import java.util.List; import mantle.module.ILoadableModule; import tconstruct.TConstruct; -import tconstruct.plugins.ICompatPlugin; import cpw.mods.fml.common.event.FMLInterModComms; public class AppEng implements ILoadableModule diff --git a/src/main/java/tconstruct/plugins/imc/BuildcraftTransport.java b/src/main/java/tconstruct/plugins/imc/BuildcraftTransport.java index bfa59b12..10d723ee 100644 --- a/src/main/java/tconstruct/plugins/imc/BuildcraftTransport.java +++ b/src/main/java/tconstruct/plugins/imc/BuildcraftTransport.java @@ -5,7 +5,6 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import tconstruct.TConstruct; import tconstruct.common.TRepo; -import tconstruct.plugins.ICompatPlugin; import cpw.mods.fml.common.event.FMLInterModComms; public class BuildcraftTransport implements ILoadableModule diff --git a/src/main/java/tconstruct/plugins/imc/Mystcraft.java b/src/main/java/tconstruct/plugins/imc/Mystcraft.java index 6832ae31..ad983c68 100644 --- a/src/main/java/tconstruct/plugins/imc/Mystcraft.java +++ b/src/main/java/tconstruct/plugins/imc/Mystcraft.java @@ -3,7 +3,6 @@ package tconstruct.plugins.imc; import mantle.module.ILoadableModule; import net.minecraft.nbt.NBTTagCompound; import tconstruct.TConstruct; -import tconstruct.plugins.ICompatPlugin; import cpw.mods.fml.common.event.FMLInterModComms; public class Mystcraft implements ILoadableModule diff --git a/src/main/java/tconstruct/plugins/imc/Thaumcraft.java b/src/main/java/tconstruct/plugins/imc/Thaumcraft.java index 95680100..a70e1df5 100644 --- a/src/main/java/tconstruct/plugins/imc/Thaumcraft.java +++ b/src/main/java/tconstruct/plugins/imc/Thaumcraft.java @@ -4,7 +4,6 @@ import mantle.module.ILoadableModule; import net.minecraft.item.ItemStack; import tconstruct.TConstruct; import tconstruct.common.TRepo; -import tconstruct.plugins.ICompatPlugin; import cpw.mods.fml.common.event.FMLInterModComms; public class Thaumcraft implements ILoadableModule diff --git a/returning_eventually/nei/NEICompat.java b/src/main/java/tconstruct/plugins/nei/NotEnoughItems.java similarity index 53% rename from returning_eventually/nei/NEICompat.java rename to src/main/java/tconstruct/plugins/nei/NotEnoughItems.java index f53ee738..7fd6f01b 100644 --- a/returning_eventually/nei/NEICompat.java +++ b/src/main/java/tconstruct/plugins/nei/NotEnoughItems.java @@ -1,14 +1,33 @@ package tconstruct.plugins.nei; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.common.FMLCommonHandler; -import codechicken.nei.recipe.DefaultOverlayHandler; import codechicken.nei.api.API; +import codechicken.nei.recipe.DefaultOverlayHandler; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import mantle.module.ILoadableModule; +import tconstruct.TConstruct; import tconstruct.client.gui.CraftingStationGui; -public class NEICompat +public class NotEnoughItems implements ILoadableModule { + @SuppressWarnings("unused") + public static String modId = "NotEnoughItems"; + @Override + public void preInit() { + // Nothing + } + + @Override + public void init() { + TConstruct.logger.info("NotEnoughItems detected. Registering TConstruct NEI plugin."); + registerNEICompat(); + } + + @Override + public void postInit() { + // Nothing + } public static void registerNEICompat () { if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) @@ -18,4 +37,5 @@ public class NEICompat } } + }