From 08f1501810ab5b16e01de5d560636c574bc9c8ab Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Mon, 23 Nov 2015 21:46:05 +0100 Subject: [PATCH] Update to 1.8.8 and disable NEI integration (for now) --- build.gradle | 10 +++++----- build.properties | 6 +++--- .../mantle/client/gui/GuiMultiModule.java | 11 +++++------ 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 82b66a6..32a4548 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' } } apply plugin: 'net.minecraftforge.gradle.forge' @@ -75,7 +75,7 @@ task buildInfo { } ext.artifact_version = 'NFG' if (System.getenv().ARTIFACT_VERSION == null) { - artifact_version = "${config.mod_version}.${project.buildInfo.buildNum}" + artifact_version = "${config.mod_version}" } if (System.getenv().ARTIFACT_VERSION != null) { artifact_version = "${system.getenv().ARTIFACT_VERSION}" @@ -96,9 +96,9 @@ configurations { } dependencies { - compile "codechicken:CodeChickenLib:${config.minecraft_version}-${config.CCLIB_version}:dev" - compile "codechicken:CodeChickenCore:${config.minecraft_version}-${config.ccc_version}:dev" - compile "codechicken:NotEnoughItems:${config.minecraft_version}-${config.NEI_version}:dev" + //compile "codechicken:CodeChickenLib:${config.minecraft_version}-${config.CCLIB_version}:dev" + //compile "codechicken:CodeChickenCore:${config.minecraft_version}-${config.ccc_version}:dev" + //compile "codechicken:NotEnoughItems:${config.minecraft_version}-${config.NEI_version}:dev" // Configuration shade "ninja.leaping.configurate:configurate-hocon:${config.configurate_version}" shade "ninja.leaping.configurate:configurate-gson:${config.configurate_version}" diff --git a/build.properties b/build.properties index 2eccd2c..997b44b 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ mod_version=0.5 -minecraft_version=1.8 -forge_version=11.14.3.1543 -mappings=snapshot_20150918 +minecraft_version=1.8.8 +forge_version=11.14.4.1576-1.8.8 +mappings=snapshot_20151122 CCLIB_version=1.1.2.133 ccc_version=1.0.5.36 diff --git a/src/main/java/slimeknights/mantle/client/gui/GuiMultiModule.java b/src/main/java/slimeknights/mantle/client/gui/GuiMultiModule.java index cb8e919..30ade5e 100644 --- a/src/main/java/slimeknights/mantle/client/gui/GuiMultiModule.java +++ b/src/main/java/slimeknights/mantle/client/gui/GuiMultiModule.java @@ -19,17 +19,14 @@ import java.lang.reflect.Field; import java.util.Collections; import java.util.List; -import codechicken.nei.LayoutManager; -import codechicken.nei.VisiblityData; -import codechicken.nei.api.INEIGuiHandler; -import codechicken.nei.api.TaggedInventoryArea; import slimeknights.mantle.Mantle; import slimeknights.mantle.inventory.ContainerMultiModule; import slimeknights.mantle.inventory.SlotWrapper; @SideOnly(Side.CLIENT) @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") -public class GuiMultiModule extends GuiContainer implements INEIGuiHandler { +// todo: NEI +public class GuiMultiModule extends GuiContainer { //implements INEIGuiHandler { // NEI-stuff >:( private static Field NEI_Manager; @@ -308,7 +305,8 @@ public class GuiMultiModule extends GuiContainer implements INEIGuiHandler { } /* NEI INTEGRATION */ - + // todo: NEI +/* @Override @Optional.Method(modid = "NotEnoughItems") public VisiblityData modifyVisiblity(GuiContainer guiContainer, VisiblityData visiblityData) { @@ -360,4 +358,5 @@ public class GuiMultiModule extends GuiContainer implements INEIGuiHandler { return false; } + */ }