etc/BiomesOPlenty
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #900 from GirafiStudios/textures

Browse source 
Fixed log models, Closes #899
This commit is contained in:
Adubbz 2016-11-17 23:31:48 +11:00 committed by GitHub
commit 6f5e025e61
23 changed files with 35 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/resources/assets/biomesoplenty/blockstates/log_0.json
View file

@ -1,20 +1,20 @@
{
"variants": {
"axis=y,variant=sacred_oak": { "model": "biomesoplenty:sacred_oak_log" },
"axis=z,variant=sacred_oak": { "model": "biomesoplenty:sacred_oak_log_side" },
"axis=x,variant=sacred_oak": { "model": "biomesoplenty:sacred_oak_log_side", "y": 90 },
"axis=z,variant=sacred_oak": { "model": "biomesoplenty:sacred_oak_log", "x": 90 },
"axis=x,variant=sacred_oak": { "model": "biomesoplenty:sacred_oak_log", "x": 90, "y": 90 },
"axis=none,variant=sacred_oak": { "model": "biomesoplenty:sacred_oak_bark" },
"axis=y,variant=cherry": { "model": "biomesoplenty:cherry_log" },
"axis=z,variant=cherry": { "model": "biomesoplenty:cherry_log_side" },
"axis=x,variant=cherry": { "model": "biomesoplenty:cherry_log_side", "y": 90 },
"axis=z,variant=cherry": { "model": "biomesoplenty:cherry_log", "x": 90 },
"axis=x,variant=cherry": { "model": "biomesoplenty:cherry_log", "x": 90, "y": 90 },
"axis=none,variant=cherry": { "model": "biomesoplenty:cherry_bark" },
"axis=y,variant=umbran": { "model": "biomesoplenty:umbran_log" },
"axis=z,variant=umbran": { "model": "biomesoplenty:umbran_log_side" },
"axis=x,variant=umbran": { "model": "biomesoplenty:umbran_log_side", "y": 90 },
"axis=z,variant=umbran": { "model": "biomesoplenty:umbran_log", "x": 90 },
"axis=x,variant=umbran": { "model": "biomesoplenty:umbran_log", "x": 90, "y": 90 },
"axis=none,variant=umbran": { "model": "biomesoplenty:umbran_bark" },
"axis=y,variant=fir": { "model": "biomesoplenty:fir_log" },
"axis=z,variant=fir": { "model": "biomesoplenty:fir_log_side" },
"axis=x,variant=fir": { "model": "biomesoplenty:fir_log_side", "y": 90 },
"axis=z,variant=fir": { "model": "biomesoplenty:fir_log", "x": 90 },
"axis=x,variant=fir": { "model": "biomesoplenty:fir_log", "x": 90, "y": 90 },
"axis=none,variant=fir": { "model": "biomesoplenty:fir_bark" }
}
}

16
src/main/resources/assets/biomesoplenty/blockstates/log_1.json
View file

@ -1,20 +1,20 @@
{
"variants": {
"axis=y,variant=ethereal": { "model": "biomesoplenty:ethereal_log" },
"axis=z,variant=ethereal": { "model": "biomesoplenty:ethereal_log_side" },
"axis=x,variant=ethereal": { "model": "biomesoplenty:ethereal_log_side", "y": 90 },
"axis=z,variant=ethereal": { "model": "biomesoplenty:ethereal_log", "x": 90 },
"axis=x,variant=ethereal": { "model": "biomesoplenty:ethereal_log", "x": 90, "y": 90 },
"axis=none,variant=ethereal": { "model": "biomesoplenty:ethereal_bark" },
"axis=y,variant=magic": { "model": "biomesoplenty:magic_log" },
"axis=z,variant=magic": { "model": "biomesoplenty:magic_log_side" },
"axis=x,variant=magic": { "model": "biomesoplenty:magic_log_side", "y": 90 },
"axis=z,variant=magic": { "model": "biomesoplenty:magic_log", "x": 90 },
"axis=x,variant=magic": { "model": "biomesoplenty:magic_log", "x": 90, "y": 90 },
"axis=none,variant=magic": { "model": "biomesoplenty:magic_bark" },
"axis=y,variant=mangrove": { "model": "biomesoplenty:mangrove_log" },
"axis=z,variant=mangrove": { "model": "biomesoplenty:mangrove_log_side" },
"axis=x,variant=mangrove": { "model": "biomesoplenty:mangrove_log_side", "y": 90 },
"axis=z,variant=mangrove": { "model": "biomesoplenty:mangrove_log", "x": 90 },
"axis=x,variant=mangrove": { "model": "biomesoplenty:mangrove_log", "x": 90, "y": 90 },
"axis=none,variant=mangrove": { "model": "biomesoplenty:mangrove_bark" },
"axis=y,variant=palm": { "model": "biomesoplenty:palm_log" },
"axis=z,variant=palm": { "model": "biomesoplenty:palm_log_side" },
"axis=x,variant=palm": { "model": "biomesoplenty:palm_log_side", "y": 90 },
"axis=z,variant=palm": { "model": "biomesoplenty:palm_log", "x": 90 },
"axis=x,variant=palm": { "model": "biomesoplenty:palm_log", "x": 90, "y": 90 },
"axis=none,variant=palm": { "model": "biomesoplenty:palm_bark" }
}
}

16
src/main/resources/assets/biomesoplenty/blockstates/log_2.json
View file

@ -1,20 +1,20 @@
{
"variants": {
"axis=y,variant=redwood": { "model": "biomesoplenty:redwood_log" },
"axis=z,variant=redwood": { "model": "biomesoplenty:redwood_log_side" },
"axis=x,variant=redwood": { "model": "biomesoplenty:redwood_log_side", "y": 90 },
"axis=z,variant=redwood": { "model": "biomesoplenty:redwood_log", "x": 90 },
"axis=x,variant=redwood": { "model": "biomesoplenty:redwood_log", "x": 90, "y": 90 },
"axis=none,variant=redwood": { "model": "biomesoplenty:redwood_bark" },
"axis=y,variant=willow": { "model": "biomesoplenty:willow_log" },
"axis=z,variant=willow": { "model": "biomesoplenty:willow_log_side" },
"axis=x,variant=willow": { "model": "biomesoplenty:willow_log_side", "y": 90 },
"axis=z,variant=willow": { "model": "biomesoplenty:willow_log", "x": 90 },
"axis=x,variant=willow": { "model": "biomesoplenty:willow_log", "x": 90, "y": 90 },
"axis=none,variant=willow": { "model": "biomesoplenty:willow_bark" },
"axis=y,variant=pine": { "model": "biomesoplenty:pine_log" },
"axis=z,variant=pine": { "model": "biomesoplenty:pine_log_side" },
"axis=x,variant=pine": { "model": "biomesoplenty:pine_log_side", "y": 90 },
"axis=z,variant=pine": { "model": "biomesoplenty:pine_log", "x": 90 },
"axis=x,variant=pine": { "model": "biomesoplenty:pine_log", "x": 90, "y": 90 },
"axis=none,variant=pine": { "model": "biomesoplenty:pine_bark" },
"axis=y,variant=hellbark": { "model": "biomesoplenty:hellbark_log" },
"axis=z,variant=hellbark": { "model": "biomesoplenty:hellbark_log_side" },
"axis=x,variant=hellbark": { "model": "biomesoplenty:hellbark_log_side", "y": 90 },
"axis=z,variant=hellbark": { "model": "biomesoplenty:hellbark_log", "x": 90 },
"axis=x,variant=hellbark": { "model": "biomesoplenty:hellbark_log", "x": 90, "y": 90 },
"axis=none,variant=hellbark": { "model": "biomesoplenty:hellbark_bark" }
}
}

16
src/main/resources/assets/biomesoplenty/blockstates/log_3.json
View file

@ -1,20 +1,20 @@
{
"variants": {
"axis=y,variant=jacaranda": { "model": "biomesoplenty:jacaranda_log" },
"axis=z,variant=jacaranda": { "model": "biomesoplenty:jacaranda_log_side" },
"axis=x,variant=jacaranda": { "model": "biomesoplenty:jacaranda_log_side", "y": 90 },
"axis=z,variant=jacaranda": { "model": "biomesoplenty:jacaranda_log", "x": 90 },
"axis=x,variant=jacaranda": { "model": "biomesoplenty:jacaranda_log", "x": 90, "y": 90 },
"axis=none,variant=jacaranda": { "model": "biomesoplenty:jacaranda_bark" },
"axis=y,variant=mahogany": { "model": "biomesoplenty:mahogany_log" },
"axis=z,variant=mahogany": { "model": "biomesoplenty:mahogany_log_side" },
"axis=x,variant=mahogany": { "model": "biomesoplenty:mahogany_log_side", "y": 90 },
"axis=z,variant=mahogany": { "model": "biomesoplenty:mahogany_log", "x": 90 },
"axis=x,variant=mahogany": { "model": "biomesoplenty:mahogany_log", "x": 90, "y": 90 },
"axis=none,variant=mahogany": { "model": "biomesoplenty:mahogany_bark" },
"axis=y,variant=ebony": { "model": "biomesoplenty:ebony_log" },
"axis=z,variant=ebony": { "model": "biomesoplenty:ebony_log_side" },
"axis=x,variant=ebony": { "model": "biomesoplenty:ebony_log_side", "y": 90 },
"axis=z,variant=ebony": { "model": "biomesoplenty:ebony_log", "x": 90 },
"axis=x,variant=ebony": { "model": "biomesoplenty:ebony_log", "x": 90, "y": 90 },
"axis=none,variant=ebony": { "model": "biomesoplenty:ebony_bark" },
"axis=y,variant=eucalyptus": { "model": "biomesoplenty:eucalyptus_log" },
"axis=z,variant=eucalyptus": { "model": "biomesoplenty:eucalyptus_log_side" },
"axis=x,variant=eucalyptus": { "model": "biomesoplenty:eucalyptus_log_side", "y": 90 },
"axis=z,variant=eucalyptus": { "model": "biomesoplenty:eucalyptus_log", "x": 90 },
"axis=x,variant=eucalyptus": { "model": "biomesoplenty:eucalyptus_log", "x": 90, "y": 90 },
"axis=none,variant=eucalyptus": { "model": "biomesoplenty:eucalyptus_bark" }
}
}

4
src/main/resources/assets/biomesoplenty/blockstates/log_4.json
View file

@ -5,8 +5,8 @@
"axis=x,variant=giant_flower": { "model": "biomesoplenty:giant_flower_stem_side", "y": 90 },
"axis=none,variant=giant_flower": { "model": "biomesoplenty:giant_flower_bark" },
"axis=y,variant=dead": { "model": "biomesoplenty:dead_log" },
"axis=z,variant=dead": { "model": "biomesoplenty:dead_log_side" },
"axis=x,variant=dead": { "model": "biomesoplenty:dead_log_side", "y": 90 },
"axis=z,variant=dead": { "model": "biomesoplenty:dead_log", "x": 90 },
"axis=x,variant=dead": { "model": "biomesoplenty:dead_log", "x": 90, "y": 90 },
"axis=none,variant=dead": { "model": "biomesoplenty:dead_bark" }
}
}

7
src/main/resources/assets/biomesoplenty/models/block/cherry_log_side.json
View file

@ -1,7 +0,0 @@
{
"parent": "block/column_side",
"textures": {
"end": "biomesoplenty:blocks/cherry_log_top",
"side": "biomesoplenty:blocks/cherry_log"
}
}

7
src/main/resources/assets/biomesoplenty/models/block/dead_log_side.json
View file

@ -1,7 +0,0 @@
{
"parent": "block/column_side",
"textures": {
"end": "biomesoplenty:blocks/dead_log_top",
"side": "biomesoplenty:blocks/dead_log"
}
}

7
src/main/resources/assets/biomesoplenty/models/block/ebony_log_side.json
View file

@ -1,7 +0,0 @@
{
"parent": "block/column_side",
"textures": {
"end": "biomesoplenty:blocks/ebony_log_top",
"side": "biomesoplenty:blocks/ebony_log"
}
}

7
src/main/resources/assets/biomesoplenty/models/block/ethereal_log_side.json
View file

@ -1,7 +0,0 @@
{
"parent": "block/column_side",
"textures": {
"end": "biomesoplenty:blocks/ethereal_log_top",
"side": "biomesoplenty:blocks/ethereal_log"
}
}

7
src/main/resources/assets/biomesoplenty/models/block/eucalyptus_log_side.json
View file

@ -1,7 +0,0 @@
{
"parent": "block/column_side",
"textures": {
"end": "biomesoplenty:blocks/eucalyptus_log_top",
"side": "biomesoplenty:blocks/eucalyptus_log"
}
}

7
src/main/resources/assets/biomesoplenty/models/block/fir_log_side.json
View file

@ -1,7 +0,0 @@
{
"parent": "block/column_side",
"textures": {
"end": "biomesoplenty:blocks/fir_log_top",
"side": "biomesoplenty:blocks/fir_log"
}
}

2
src/main/resources/assets/biomesoplenty/models/block/giant_flower_stem_side.json
View file

@ -1,5 +1,5 @@
{
"parent": "block/column_side",
"parent": "block/cube_column",
"textures": {
"end": "biomesoplenty:blocks/giant_flower_stem_top",
"side": "biomesoplenty:blocks/giant_flower_stem"

7
src/main/resources/assets/biomesoplenty/models/block/hellbark_log_side.json
View file

@ -1,7 +0,0 @@
{
"parent": "block/column_side",
"textures": {
"end": "biomesoplenty:blocks/hellbark_log_top",
"side": "biomesoplenty:blocks/hellbark_log"
}
}

7
src/main/resources/assets/biomesoplenty/models/block/jacaranda_log_side.json
View file

@ -1,7 +0,0 @@
{
"parent": "block/column_side",
"textures": {
"end": "biomesoplenty:blocks/jacaranda_log_top",
"side": "biomesoplenty:blocks/jacaranda_log"
}
}

7
src/main/resources/assets/biomesoplenty/models/block/magic_log_side.json
View file

@ -1,7 +0,0 @@
{
"parent": "block/column_side",
"textures": {
"end": "biomesoplenty:blocks/magic_log_top",
"side": "biomesoplenty:blocks/magic_log"
}
}

7
src/main/resources/assets/biomesoplenty/models/block/mahogany_log_side.json
View file

@ -1,7 +0,0 @@
{
"parent": "block/column_side",
"textures": {
"end": "biomesoplenty:blocks/mahogany_log_top",
"side": "biomesoplenty:blocks/mahogany_log"
}
}

7
src/main/resources/assets/biomesoplenty/models/block/mangrove_log_side.json
View file

@ -1,7 +0,0 @@
{
"parent": "block/column_side",
"textures": {
"end": "biomesoplenty:blocks/mangrove_log_top",
"side": "biomesoplenty:blocks/mangrove_log"
}
}

7
src/main/resources/assets/biomesoplenty/models/block/palm_log_side.json
View file

@ -1,7 +0,0 @@
{
"parent": "block/column_side",
"textures": {
"end": "biomesoplenty:blocks/palm_log_top",
"side": "biomesoplenty:blocks/palm_log"
}
}

7
src/main/resources/assets/biomesoplenty/models/block/pine_log_side.json
View file

@ -1,7 +0,0 @@
{
"parent": "block/column_side",
"textures": {
"end": "biomesoplenty:blocks/pine_log_top",
"side": "biomesoplenty:blocks/pine_log"
}
}

7
src/main/resources/assets/biomesoplenty/models/block/redwood_log_side.json
View file

@ -1,7 +0,0 @@
{
"parent": "block/column_side",
"textures": {
"end": "biomesoplenty:blocks/redwood_log_top",
"side": "biomesoplenty:blocks/redwood_log"
}
}

7
src/main/resources/assets/biomesoplenty/models/block/sacred_oak_log_side.json
View file

@ -1,7 +0,0 @@
{
"parent": "block/column_side",
"textures": {
"end": "biomesoplenty:blocks/sacred_oak_log_top",
"side": "biomesoplenty:blocks/sacred_oak_log"
}
}

7
src/main/resources/assets/biomesoplenty/models/block/umbran_log_side.json
View file

@ -1,7 +0,0 @@
{
"parent": "block/column_side",
"textures": {
"end": "biomesoplenty:blocks/umbran_log_top",
"side": "biomesoplenty:blocks/umbran_log"
}
}

7
src/main/resources/assets/biomesoplenty/models/block/willow_log_side.json
View file

@ -1,7 +0,0 @@
{
"parent": "block/column_side",
"textures": {
"end": "biomesoplenty:blocks/willow_log_top",
"side": "biomesoplenty:blocks/willow_log"
}
}