Update to 1.8.8 and disable NEI integration (for now)

SlimeKnights · Nov 24, 2015 · 08f1501 · 08f1501
1 parent 628a4c1
commit 08f1501
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git 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
@@ -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
@@ -19,17 +19,14 @@
 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 @@ protected ContainerMultiModule getContainer() {
   }
 
   /* NEI INTEGRATION */
-
+  // todo: NEI
+/*
   @Override
   @Optional.Method(modid = "NotEnoughItems")
   public VisiblityData modifyVisiblity(GuiContainer guiContainer, VisiblityData visiblityData) {
@@ -360,4 +358,5 @@ public boolean hideItemPanelSlot(GuiContainer guiContainer, int x, int y, int w,
 
     return false;
   }
+  */
 }