dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update forge + make grid work with forge model

Browse Source
This commit is contained in:
Raoul Van den Berge
2015-12-26 23:00:11 +01:00
parent e7fe264f5a
commit 49baf7a3f7
6 changed files with 20 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -8,4 +8,6 @@ gradle/
.nb-gradle-properties
.project
gradlew
gradlew.bat
gradlew.bat
*.launch
run/

34
build.gradle
View File

@@ -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
}

2
src/main/java/storagecraft/block/BlockBase.java
View File

@@ -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));
}
}

4
src/main/java/storagecraft/gui/GuiBase.java
View File

@@ -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;

100
src/main/resources/XXX.json
View File

@@ -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
}
}
}

13
src/main/resources/assets/storagecraft/blockstates/grid.json
View File

@@ -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
},