lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed rendering of .obj models in hand as well as a few small tweaks to attachment logic for routing nodes.

Browse source
This commit is contained in:
WayofTime 2016-03-22 11:11:11 -04:00
parent 95b10f35c8
commit 801355c051
39 changed files with 2819 additions and 3951 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/resources/assets/bloodmagic/blockstates/BlockDemonCrucible.json
View file

@ -4,18 +4,11 @@
"textures": { },
"model": "bloodmagic:BlockDemonCrucible.obj",
"custom": { "flip-v": true },
"transform": {
"translation": [ 0.5, 0, 0.5]
}
"transform" : "forge:default-block"
},
"variants": {
"normal": [{
}],
"inventory": [{
"transform": {
"translation": [0.44, -0.1, 0.44]
}
}]
}
}

20
src/main/resources/assets/bloodmagic/blockstates/BlockDemonCrystal.json
View file

@ -4,15 +4,12 @@
"textures": { "#crystal" : "bloodmagic:models/DefaultCrystal" },
"model": "bloodmagic:crystal/Crystal1.obj",
"custom": { "flip-v": true },
"transform": {
"translation": [ 0, 0, 1]
}
"transform" : "forge:default-block"
},
"variants": {
"attached": {
"down": {
"transform": {
"translation": [ 0, 0, -1 ],
"rotation": {"x": 180}
}
},
@ -20,25 +17,21 @@
},
"north": {
"transform": {
"translation": [ 0, 1, 0 ],
"rotation": {"x": -90}
}
},
"south": {
"transform": {
"translation": [ 0, -1, 0 ],
"rotation": {"x": 90}
}
},
"east": {
"transform": {
"translation": [ 0, 0, 1 ],
"rotation": {"z": -90}
}
},
"west": {
"transform": {
"translation": [ 0, 0, 1 ],
"rotation": {"z": 90}
}
}
@ -72,9 +65,7 @@
},
"age": {
"0": {
"textures": {
"#crystal" : "bloodmagic:models/VengefulCrystal"
}
},
"1": {
"submodel": "bloodmagic:crystal/Crystal2.obj"
@ -121,9 +112,6 @@
}
},
"inventory": [{
"transform": {
"translation": [0.44, -0.1, 0.44]
},
"variants": {
"type": {
"default": {
@ -149,9 +137,9 @@
"steadfast": {
"textures": {
"#crystal" : "bloodmagic:models/SteadfastCrystal"
}
}
}
}
}
}
}]
}

9
src/main/resources/assets/bloodmagic/blockstates/BlockDemonCrystallizer.json
View file

@ -4,18 +4,11 @@
"textures": { },
"model": "bloodmagic:BlockDemonCrystallizer.obj",
"custom": { "flip-v": true },
"transform": {
"translation": [ 0.5, 0, 0.5]
}
"transform" : "forge:default-block"
},
"variants": {
"normal": [{
}],
"inventory": [{
"transform": {
"translation": [0.44, -0.1, 0.44]
}
}]
}
}

9
src/main/resources/assets/bloodmagic/blockstates/BlockDemonPylon.json
View file

@ -4,18 +4,11 @@
"textures": { },
"model": "bloodmagic:BlockDemonPylon.obj",
"custom": { "flip-v": true },
"transform": {
"translation": [ 0.5, 0, 0.5]
}
"transform" : "forge:default-block"
},
"variants": {
"normal": [{
}],
"inventory": [{
"transform": {
"translation": [0.44, -0.1, 0.44]
}
}]
}
}

11
src/main/resources/assets/bloodmagic/blockstates/BlockIncenseAltar.json
View file

@ -4,20 +4,11 @@
"textures": { },
"model": "bloodmagic:BlockIncenseAltar.obj",
"custom": { "flip-v": true },
"transform": {
"translation": [ 0.44, -0.07, 0.44 ],
"scale": [ 0.85, 0.85, 0.85]
}
"transform" : "forge:default-block"
},
"variants": {
"normal": [{
}],
"inventory": [{
"transform": {
"translation": [0.44, -0.1, 0.44],
"scale": [ 0.85, 0.85, 0.85]
}
}]
}
}

26
src/main/resources/assets/bloodmagic/blockstates/BlockInputRoutingNode.json
View file

@ -1,19 +1,17 @@
{
"forge_marker": 1,
"defaults": {
"model": "bloodmagic:routing/ModelInputRoutingNodeCore.obj",
"transform": {
"translation": [ 0.5, 0, 0.5 ]
},
"textures": { "#node" : "bloodmagic:models/ModelInputRoutingNode" },
"model": "bloodmagic:routing/ModelRoutingNodeCore.obj",
"transform" : "forge:default-block",
"custom": { "flip-v": true },
"uvlock": true
},
"variants": {
"north": {
"true": {
"submodel": "bloodmagic:routing/ModelInputRoutingNodeBase.obj",
"submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj",
"transform": {
"translation": [ 0, -0.5, -0.5 ],
"rotation": {"x": 90}
}
},
@ -21,9 +19,8 @@
},
"south": {
"true": {
"submodel": "bloodmagic:routing/ModelInputRoutingNodeBase.obj",
"submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj",
"transform": {
"translation": [ 0, 0.5, -0.5 ],
"rotation": {"x": -90}
}
},
@ -31,9 +28,8 @@
},
"east": {
"true": {
"submodel": "bloodmagic:routing/ModelInputRoutingNodeBase.obj",
"submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj",
"transform": {
"translation": [ -0.5, 0.5, 0 ],
"rotation": {"z": 90}
}
},
@ -41,9 +37,8 @@
},
"west": {
"true": {
"submodel": "bloodmagic:routing/ModelInputRoutingNodeBase.obj",
"submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj",
"transform": {
"translation": [ -0.5, -0.5, 0 ],
"rotation": {"z": -90}
}
},
@ -51,22 +46,21 @@
},
"down": {
"true": {
"submodel": "bloodmagic:routing/ModelInputRoutingNodeBase.obj"
"submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj"
},
"false": {}
},
"up": {
"true": {
"submodel": "bloodmagic:routing/ModelInputRoutingNodeBase.obj",
"submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj",
"transform": {
"translation": [ -1, 0, 0 ],
"rotation": {"z": -180}
}
},
"false": {}
},
"inventory": [{
"submodel": "bloodmagic:routing/ModelInputRoutingNodeBase.obj"
"submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj"
}]
}
}

10
src/main/resources/assets/bloodmagic/blockstates/BlockItemRoutingNode.json
View file

@ -1,10 +1,9 @@
{
"forge_marker": 1,
"defaults": {
"textures": { "#node" : "bloodmagic:models/modelroutingnode" },
"model": "bloodmagic:routing/ModelRoutingNodeCore.obj",
"transform": {
"translation": [ 0.5, 0, 0.5 ]
},
"transform" : "forge:default-block",
"custom": { "flip-v": true },
"uvlock": true
},
@ -13,7 +12,6 @@
"true": {
"submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj",
"transform": {
"translation": [ 0, -0.5, -0.5 ],
"rotation": {"x": 90}
}
},
@ -23,7 +21,6 @@
"true": {
"submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj",
"transform": {
"translation": [ 0, 0.5, -0.5 ],
"rotation": {"x": -90}
}
},
@ -33,7 +30,6 @@
"true": {
"submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj",
"transform": {
"translation": [ -0.5, 0.5, 0 ],
"rotation": {"z": 90}
}
},
@ -43,7 +39,6 @@
"true": {
"submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj",
"transform": {
"translation": [ -0.5, -0.5, 0 ],
"rotation": {"z": -90}
}
},
@ -59,7 +54,6 @@
"true": {
"submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj",
"transform": {
"translation": [ -1, 0, 0 ],
"rotation": {"z": -180}
}
},

9
src/main/resources/assets/bloodmagic/blockstates/BlockMasterRoutingNode.json
View file

@ -2,9 +2,7 @@
"forge_marker": 1,
"defaults": {
"model": "bloodmagic:routing/ModelMasterRoutingNodeCore.obj",
"transform": {
"translation": [ 0.5, 0, 0.5 ]
},
"transform" : "forge:default-block",
"custom": { "flip-v": true },
"uvlock": true
},
@ -13,7 +11,6 @@
"true": {
"submodel": "bloodmagic:routing/ModelMasterRoutingNodeBase.obj",
"transform": {
"translation": [ 0, -0.5, -0.5 ],
"rotation": {"x": 90}
}
},
@ -23,7 +20,6 @@
"true": {
"submodel": "bloodmagic:routing/ModelMasterRoutingNodeBase.obj",
"transform": {
"translation": [ 0, 0.5, -0.5 ],
"rotation": {"x": -90}
}
},
@ -33,7 +29,6 @@
"true": {
"submodel": "bloodmagic:routing/ModelMasterRoutingNodeBase.obj",
"transform": {
"translation": [ -0.5, 0.5, 0 ],
"rotation": {"z": 90}
}
},
@ -43,7 +38,6 @@
"true": {
"submodel": "bloodmagic:routing/ModelMasterRoutingNodeBase.obj",
"transform": {
"translation": [ -0.5, -0.5, 0 ],
"rotation": {"z": -90}
}
},
@ -59,7 +53,6 @@
"true": {
"submodel": "bloodmagic:routing/ModelMasterRoutingNodeBase.obj",
"transform": {
"translation": [ -1, 0, 0 ],
"rotation": {"z": -180}
}
},

26
src/main/resources/assets/bloodmagic/blockstates/BlockOutputRoutingNode.json
View file

@ -1,19 +1,17 @@
{
"forge_marker": 1,
"defaults": {
"model": "bloodmagic:routing/ModelOutputRoutingNodeCore.obj",
"transform": {
"translation": [ 0.5, 0, 0.5 ]
},
"textures": { "#node" : "bloodmagic:models/ModelOutputRoutingNode" },
"model": "bloodmagic:routing/ModelRoutingNodeCore.obj",
"transform" : "forge:default-block",
"custom": { "flip-v": true },
"uvlock": true
},
"variants": {
"north": {
"true": {
"submodel": "bloodmagic:routing/ModelOutputRoutingNodeBase.obj",
"submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj",
"transform": {
"translation": [ 0, -0.5, -0.5 ],
"rotation": {"x": 90}
}
},
@ -21,9 +19,8 @@
},
"south": {
"true": {
"submodel": "bloodmagic:routing/ModelOutputRoutingNodeBase.obj",
"submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj",
"transform": {
"translation": [ 0, 0.5, -0.5 ],
"rotation": {"x": -90}
}
},
@ -31,9 +28,8 @@
},
"east": {
"true": {
"submodel": "bloodmagic:routing/ModelOutputRoutingNodeBase.obj",
"submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj",
"transform": {
"translation": [ -0.5, 0.5, 0 ],
"rotation": {"z": 90}
}
},
@ -41,9 +37,8 @@
},
"west": {
"true": {
"submodel": "bloodmagic:routing/ModelOutputRoutingNodeBase.obj",
"submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj",
"transform": {
"translation": [ -0.5, -0.5, 0 ],
"rotation": {"z": -90}
}
},
@ -51,22 +46,21 @@
},
"down": {
"true": {
"submodel": "bloodmagic:routing/ModelOutputRoutingNodeBase.obj"
"submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj"
},
"false": {}
},
"up": {
"true": {
"submodel": "bloodmagic:routing/ModelOutputRoutingNodeBase.obj",
"submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj",
"transform": {
"translation": [ -1, 0, 0 ],
"rotation": {"z": -180}
}
},
"false": {}
},
"inventory": [{
"submodel": "bloodmagic:routing/ModelOutputRoutingNodeBase.obj"
"submodel": "bloodmagic:routing/ModelRoutingNodeBase.obj"
}]
}
}

9
src/main/resources/assets/bloodmagic/blockstates/BlockSoulForge.json
View file

@ -4,18 +4,11 @@
"textures": { },
"model": "bloodmagic:BlockHellfireForge.obj",
"custom": { "flip-v": true },
"transform": {
"translation": [ 0.5, 0, 0.5 ]
}
"transform" : "forge:default-block"
},
"variants": {
"normal": [{
}],
"inventory": [{
"transform": {
"translation": [0.5, 0, 0.5]
}
}]
}
}