From 49baf7a3f7fd300504e0555b78400f37952a7441 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 26 Dec 2015 23:00:11 +0100 Subject: [PATCH] update forge + make grid work with forge model --- .gitignore | 4 +- build.gradle | 34 ++---- .../java/storagecraft/block/BlockBase.java | 2 +- src/main/java/storagecraft/gui/GuiBase.java | 4 +- src/main/resources/XXX.json | 100 ------------------ .../assets/storagecraft/blockstates/grid.json | 13 +-- 6 files changed, 20 insertions(+), 137 deletions(-) delete mode 100644 src/main/resources/XXX.json diff --git a/.gitignore b/.gitignore index dd967838b..0d7ba7163 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,6 @@ gradle/ .nb-gradle-properties .project gradlew -gradlew.bat \ No newline at end of file +gradlew.bat +*.launch +run/ \ No newline at end of file diff --git a/build.gradle b/build.gradle index efc8073eb..493c929a8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,37 +1,17 @@ -buildscript { - repositories { - 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' - } +plugins { + id "net.minecraftforge.gradle.forge" version "2.0.2" } -apply plugin: 'forge' - -version = "0.1" +version = "1.0" group = "storagecraft" archivesBaseName = "storagecraft" minecraft { - version = "1.8-11.14.1.1341" - runDir = "eclipse" + version = "1.8-11.14.4.1577" + runDir = "run" + mappings = "snapshot_20141130" } -repositories { - maven { - name 'CB Repo' - url "http://chickenbones.net/maven/" - } -} dependencies { } @@ -41,7 +21,7 @@ processResources { from(sourceSets.main.resources.srcDirs) { include 'mcmod.info' - + expand 'version':project.version, 'mcversion':project.minecraft.version } diff --git a/src/main/java/storagecraft/block/BlockBase.java b/src/main/java/storagecraft/block/BlockBase.java index a616c433d..2e149b1d9 100644 --- a/src/main/java/storagecraft/block/BlockBase.java +++ b/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)); } } diff --git a/src/main/java/storagecraft/gui/GuiBase.java b/src/main/java/storagecraft/gui/GuiBase.java index 2cc67c38a..44b1c8521 100644 --- a/src/main/java/storagecraft/gui/GuiBase.java +++ b/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; diff --git a/src/main/resources/XXX.json b/src/main/resources/XXX.json deleted file mode 100644 index b494681e5..000000000 --- a/src/main/resources/XXX.json +++ /dev/null @@ -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 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/storagecraft/blockstates/grid.json b/src/main/resources/assets/storagecraft/blockstates/grid.json index 4342c728f..e9446407f 100644 --- a/src/main/resources/assets/storagecraft/blockstates/grid.json +++ b/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 },