update forge + make grid work with forge model

.gitignore

@@ -9,3 +9,5 @@ gradle/
 .project
 gradlew
 gradlew.bat
+*.launch
+run/

build.gradle

@@ -1,37 +1,17 @@
-buildscript {
+plugins {
-    repositories {
+    id "net.minecraftforge.gradle.forge" version "2.0.2"
-        mavenCentral()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
-        }
-        maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/repositories/snapshots/"
-        }
-    }
-    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
-    }
 }
 
-apply plugin: 'forge'
+version = "1.0"
-
-version = "0.1"
 group = "storagecraft"
 archivesBaseName = "storagecraft"
 
 minecraft {
-    version = "1.8-11.14.1.1341"
+    version = "1.8-11.14.4.1577"
-    runDir = "eclipse"
+    runDir = "run"
+    mappings = "snapshot_20141130"
 }
 
-repositories {
-    maven {
-        name 'CB Repo'
-        url "http://chickenbones.net/maven/"
-    }
-}
 dependencies {
 }
 

src/main/java/storagecraft/block/BlockBase.java

@@ -114,7 +114,7 @@ public abstract class BlockBase extends Block
 
 		if (tile instanceof TileBase)
 		{
-			((TileBase) tile).setDirection(BlockPistonBase.func_180695_a(world, pos, player));
+			((TileBase) tile).setDirection(BlockPistonBase.getFacingFromEntity(world, pos, player));
 		}
 	}
 

src/main/java/storagecraft/gui/GuiBase.java

@@ -162,11 +162,11 @@ public abstract class GuiBase extends GuiContainer
 			font = fontRendererObj;
 		}
 
-		itemRender.func_180450_b(stack, x, y);
+		itemRender.renderItemIntoGUI(stack, x, y);
 
 		if (withOverlay)
 		{
-			itemRender.func_180453_a(font, stack, x, y, null);
+			itemRender.renderItemOverlayIntoGUI(font, stack, x, y, null);
 		}
 
 		zLevel = 0.0F;

src/main/resources/XXX.json

@@ -1,100 +0,0 @@
-{
-    "variants": {
-        "connected=true,direction=north,type=normal": {
-            "model": "storagecraft:grid_connected",
-            "y": 0
-        },
-        "connected=true,direction=north,type=crafting": {
-            "model": "storagecraft:grid_connected",
-            "y": 0
-        },
-        "connected=false,direction=north,type=normal": {
-            "model": "storagecraft:grid_disconnected",
-            "y": 0
-        },
-        "connected=false,direction=north,type=crafting": {
-            "model": "storagecraft:grid_disconnected",
-            "y": 0
-        },
-        "connected=true,direction=east,type=normal": {
-            "model": "storagecraft:grid_connected",
-            "y": 90
-        },
-        "connected=true,direction=east,type=crafting": {
-            "model": "storagecraft:grid_connected",
-            "y": 90
-        },
-        "connected=false,direction=east,type=normal": {
-            "model": "storagecraft:grid_disconnected",
-            "y": 90
-        },
-        "connected=false,direction=east,type=crafting": {
-            "model": "storagecraft:grid_disconnected",
-            "y": 90
-        },
-        "connected=true,direction=south,type=normal": {
-            "model": "storagecraft:grid_connected",
-            "y": 180
-        },
-        "connected=true,direction=south,type=crafting": {
-            "model": "storagecraft:grid_connected",
-            "y": 180
-        },
-        "connected=false,direction=south,type=normal": {
-            "model": "storagecraft:grid_disconnected",
-            "y": 180
-        },
-        "connected=false,direction=south,type=crafting": {
-            "model": "storagecraft:grid_disconnected",
-            "y": 180
-        },
-        "connected=true,direction=west,type=normal": {
-            "model": "storagecraft:grid_connected",
-            "y": 270
-        },
-        "connected=true,direction=west,type=crafting": {
-            "model": "storagecraft:grid_connected",
-            "y": 270
-        },
-        "connected=false,direction=west,type=normal": {
-            "model": "storagecraft:grid_disconnected",
-            "y": 270
-        },
-        "connected=false,direction=west,type=crafting": {
-            "model": "storagecraft:grid_disconnected",
-            "y": 270
-        },
-        "connected=true,direction=up,type=normal": {
-            "model": "storagecraft:grid_connected",
-            "x": 270
-        },
-        "connected=true,direction=up,type=crafting": {
-            "model": "storagecraft:grid_connected",
-            "x": 270
-        },
-        "connected=false,direction=up,type=normal": {
-            "model": "storagecraft:grid_disconnected",
-            "x": 270
-        },
-        "connected=false,direction=up,type=crafting": {
-            "model": "storagecraft:grid_disconnected",
-            "x": 270
-        },
-        "connected=true,direction=down,type=normal": {
-            "model": "storagecraft:grid_connected",
-            "x": 90
-        },
-        "connected=true,direction=down,type=crafting": {
-            "model": "storagecraft:grid_connected",
-            "x": 90
-        },
-        "connected=false,direction=down,type=normal": {
-            "model": "storagecraft:grid_disconnected",
-            "x": 90
-        },
-        "connected=false,direction=down,type=crafting": {
-            "model": "storagecraft:grid_disconnected",
-            "x": 90
-        }
-    }
-}

src/main/resources/assets/storagecraft/blockstates/grid.json

@@ -1,23 +1,24 @@
 {
     "forge_marker": 1,
-    "defaults": {
-        "model": "storagecraft:grid_disconnected"
-    },
     "variants": {
         "type": {
             "normal": {
             },
-            "crafing": {
+            "crafting": {
             }
         },
         "connected": {
             "true": {
                 "model": "storagecraft:grid_connected"
             },
-            "false": {}
+            "false": {
+                "model": "storagecraft:grid_disconnected"
+            }
         },
         "direction": {
-            "north": {},
+            "north": {
+                "y": 0
+            },
             "east": {
                 "y": 90
             },