Skip to content

Commit

Permalink
backport #2182 candle model assets -INooBTooMuch
Browse files Browse the repository at this point in the history
  • Loading branch information
@Lothrazar
Lothrazar committed Apr 2, 2024
1 parent 6690949 commit 9726cf5
Show file tree
Hide file tree
Showing 8 changed files with 226 additions and 216 deletions.
91 changes: 91 additions & 0 deletions src/main/resources/assets/cyclic/models/block/my_water_candle.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
{
"credit": "Made with Blockbench @INooBTooMuch https://github.com/Lothrazar/Cyclic/issues/2182",
"parent": "block/block",
"textures": {
"holder": "cyclic:blocks/machine/water_candle_holder",
"2": "cyclic:blocks/machine/water_candle",
"sides": "cyclic:blocks/machine/water_candle_sides"
},
"elements": [
{
"name": "pillar",
"from": [7, 0.25, 7],
"to": [9, 8, 9],
"rotation": {"angle": 0, "axis": "z", "origin": [1, 0, 0]},
"faces": {
"north": {"uv": [0, 0, 3, 12], "texture": "#sides"},
"east": {"uv": [6, 0, 9, 12], "texture": "#sides"},
"south": {"uv": [3, 0, 6, 12], "texture": "#sides"},
"west": {"uv": [9, 0, 12, 12], "texture": "#sides"},
"up": {"uv": [15, 2, 12, 0], "texture": "#sides"},
"down": {"uv": [15, 2, 12, 4], "texture": "#sides"}
}
},
{
"name": "center",
"from": [4, 0, 4],
"to": [12, 0.25, 12],
"faces": {
"north": {"uv": [10, 0, 9, 6], "texture": "#holder"},
"east": {"uv": [10, 0, 9, 6], "texture": "#holder"},
"south": {"uv": [10, 0, 9, 6], "texture": "#holder"},
"west": {"uv": [10, 0, 9, 6], "texture": "#holder"},
"up": {"uv": [9, 9, 0, 0], "texture": "#holder"},
"down": {"uv": [9, 0, 0, 9], "texture": "#holder"}
}
},
{
"name": "sh",
"from": [4, 0, 3],
"to": [12, 0.75, 4],
"faces": {
"north": {"uv": [0, 0, 8, 1], "texture": "#2"},
"east": {"uv": [0, 4, 1, 5], "texture": "#2"},
"south": {"uv": [0, 1, 8, 2], "texture": "#2"},
"west": {"uv": [1, 4, 2, 5], "texture": "#2"},
"up": {"uv": [8, 3, 0, 2], "texture": "#2"},
"down": {"uv": [8, 3, 0, 4], "texture": "#2"}
}
},
{
"name": "sh",
"from": [3, 0, 4],
"to": [4, 0.75, 12],
"faces": {
"north": {"uv": [0, 4, 1, 5], "texture": "#2"},
"east": {"uv": [0, 15, 8, 16], "texture": "#2"},
"south": {"uv": [1, 4, 2, 5], "texture": "#2"},
"west": {"uv": [0, 14, 8, 15], "texture": "#2"},
"up": {"uv": [14, 8, 15, 16], "texture": "#2"},
"down": {"uv": [15, 8, 16, 16], "texture": "#2"}
}
},
{
"name": "sh",
"from": [12, 0, 4],
"to": [13, 0.75, 12],
"faces": {
"north": {"uv": [0, 4, 1, 5], "texture": "#2"},
"east": {"uv": [0, 12, 8, 13], "texture": "#2"},
"south": {"uv": [1, 4, 2, 5], "texture": "#2"},
"west": {"uv": [0, 13, 8, 14], "texture": "#2"},
"up": {"uv": [14, 0, 15, 8], "texture": "#2"},
"down": {"uv": [15, 0, 16, 8], "texture": "#2"}
}
},
{
"name": "sh",
"from": [4, 0, 12],
"to": [12, 0.75, 13],
"faces": {
"north": {"uv": [0, 11, 8, 12], "texture": "#2"},
"east": {"uv": [0, 4, 1, 5], "texture": "#2"},
"south": {"uv": [0, 8, 8, 9], "texture": "#2"},
"west": {"uv": [1, 4, 2, 5], "texture": "#2"},
"up": {"uv": [0, 9, 8, 10], "texture": "#2"},
"down": {"uv": [0, 7, 8, 8], "texture": "#2"}
}
}
],
"display": {}
}
132 changes: 132 additions & 0 deletions src/main/resources/assets/cyclic/models/block/my_water_candle_lit.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
{
"credit": "Made with Blockbench @INooBTooMuch https://github.com/Lothrazar/Cyclic/issues/2182",
"parent": "block/block",
"textures": {
"holder": "cyclic:blocks/machine/water_candle_holder",
"2": "cyclic:blocks/machine/water_candle",
"centerwater": "cyclic:blocks/water_fake",
"sides": "cyclic:blocks/machine/water_candle_sides",
"flame": "cyclic:blocks/machine/gold"
},
"elements": [
{
"name": "centerwater",
"from": [4, 0.4, 4],
"to": [12, 0.6, 12],
"faces": {
"north": {"uv": [0, 0, 9, 0.25], "texture": "#centerwater"},
"east": {"uv": [0, 0, 8, 0.25], "texture": "#centerwater"},
"south": {"uv": [0, 0, 9, 0.25], "texture": "#centerwater"},
"west": {"uv": [0, 0, 8, 0.25], "texture": "#centerwater"},
"up": {"uv": [0, 0, 9, 8], "texture": "#centerwater"},
"down": {"uv": [0, 0, 9, 8], "texture": "#centerwater"}
}
},
{
"name": "flame",
"from": [7, 8, 8],
"to": [9, 10, 8],
"faces": {
"north": {"uv": [0, 0, 2, 2], "texture": "#flame"},
"east": {"uv": [0, 0, 0, 2], "texture": "#flame"},
"south": {"uv": [0, 0, 2, 2], "texture": "#flame"},
"west": {"uv": [0, 0, 0, 2], "texture": "#flame"},
"up": {"uv": [0, 0, 2, 0], "texture": "#flame"},
"down": {"uv": [0, 0, 2, 0], "texture": "#flame"}
}
},
{
"name": "flame",
"from": [8, 8, 7],
"to": [8, 10, 9],
"faces": {
"north": {"uv": [0, 0, 0, 2], "texture": "#flame"},
"east": {"uv": [0, 0, 2, 2], "texture": "#flame"},
"south": {"uv": [0, 0, 0, 2], "texture": "#flame"},
"west": {"uv": [0, 0, 2, 2], "texture": "#flame"},
"up": {"uv": [0, 0, 0, 2], "texture": "#flame"},
"down": {"uv": [0, 0, 0, 2], "texture": "#flame"}
}
},
{
"name": "pillar",
"from": [7, 0.25, 7],
"to": [9, 8, 9],
"rotation": {"angle": 0, "axis": "z", "origin": [1, 0, 0]},
"faces": {
"north": {"uv": [0, 0, 3, 12], "texture": "#sides"},
"east": {"uv": [6, 0, 9, 12], "texture": "#sides"},
"south": {"uv": [3, 0, 6, 12], "texture": "#sides"},
"west": {"uv": [9, 0, 12, 12], "texture": "#sides"},
"up": {"uv": [15, 2, 12, 0], "texture": "#sides"},
"down": {"uv": [15, 2, 12, 4], "texture": "#sides"}
}
},
{
"name": "center",
"from": [4, 0, 4],
"to": [12, 0.25, 12],
"faces": {
"north": {"uv": [10, 0, 9, 6], "texture": "#holder"},
"east": {"uv": [10, 0, 9, 6], "texture": "#holder"},
"south": {"uv": [10, 0, 9, 6], "texture": "#holder"},
"west": {"uv": [10, 0, 9, 6], "texture": "#holder"},
"up": {"uv": [9, 9, 0, 0], "texture": "#holder"},
"down": {"uv": [9, 0, 0, 9], "texture": "#holder"}
}
},
{
"name": "sh",
"from": [4, 0, 3],
"to": [12, 0.75, 4],
"faces": {
"north": {"uv": [0, 0, 8, 1], "texture": "#2"},
"east": {"uv": [0, 4, 1, 5], "texture": "#2"},
"south": {"uv": [0, 1, 8, 2], "texture": "#2"},
"west": {"uv": [1, 4, 2, 5], "texture": "#2"},
"up": {"uv": [8, 3, 0, 2], "texture": "#2"},
"down": {"uv": [8, 3, 0, 4], "texture": "#2"}
}
},
{
"name": "sh",
"from": [3, 0, 4],
"to": [4, 0.75, 12],
"faces": {
"north": {"uv": [0, 4, 1, 5], "texture": "#2"},
"east": {"uv": [0, 15, 8, 16], "texture": "#2"},
"south": {"uv": [1, 4, 2, 5], "texture": "#2"},
"west": {"uv": [0, 14, 8, 15], "texture": "#2"},
"up": {"uv": [14, 8, 15, 16], "texture": "#2"},
"down": {"uv": [15, 8, 16, 16], "texture": "#2"}
}
},
{
"name": "sh",
"from": [12, 0, 4],
"to": [13, 0.75, 12],
"faces": {
"north": {"uv": [0, 4, 1, 5], "texture": "#2"},
"east": {"uv": [0, 12, 8, 13], "texture": "#2"},
"south": {"uv": [1, 4, 2, 5], "texture": "#2"},
"west": {"uv": [0, 13, 8, 14], "texture": "#2"},
"up": {"uv": [14, 0, 15, 8], "texture": "#2"},
"down": {"uv": [15, 0, 16, 8], "texture": "#2"}
}
},
{
"name": "sh",
"from": [4, 0, 12],
"to": [12, 0.75, 13],
"faces": {
"north": {"uv": [0, 11, 8, 12], "texture": "#2"},
"east": {"uv": [0, 4, 1, 5], "texture": "#2"},
"south": {"uv": [0, 8, 8, 9], "texture": "#2"},
"west": {"uv": [1, 4, 2, 5], "texture": "#2"},
"up": {"uv": [0, 9, 8, 10], "texture": "#2"},
"down": {"uv": [0, 7, 8, 8], "texture": "#2"}
}
}
],
"display": {}
}
89 changes: 1 addition & 88 deletions src/main/resources/assets/cyclic/models/block/water_candle.json
View file
Original file line number Diff line number Diff line change
@@ -1,90 +1,3 @@
{
"credit": "Made with Blockbench, a free, modern block model editor by JannisX11",
"parent": "block/block",
"textures": {
"pillar": "cyclic:blocks/machine/lapis",
"center": "cyclic:blocks/machine/gold",
"base": "cyclic:blocks/machine/stone",
"particle": "cyclic:blocks/machine/gold"
},
"elements": [
{
"name": "pillar",
"from": [7, 0.25, 7],
"to": [9, 12, 9],
"faces": {
"north": {"uv": [0, 0, 2, 11.75], "texture": "#pillar"},
"east": {"uv": [0, 0, 2, 11.75], "texture": "#pillar"},
"south": {"uv": [0, 0, 2, 11.75], "texture": "#pillar"},
"west": {"uv": [0, 0, 2, 11.75], "texture": "#pillar"},
"up": {"uv": [0, 0, 2, 2], "texture": "#pillar"},
"down": {"uv": [0, 0, 2, 2], "texture": "#pillar"}
}
},
{
"name": "center",
"from": [3, 0, 4],
"to": [12, 0.25, 12],
"faces": {
"north": {"uv": [0, 0, 9, 0.25], "texture": "#center"},
"east": {"uv": [0, 0, 8, 0.25], "texture": "#center"},
"south": {"uv": [0, 0, 9, 0.25], "texture": "#center"},
"west": {"uv": [0, 0, 8, 0.25], "texture": "#center"},
"up": {"uv": [0, 0, 9, 8], "texture": "#center"},
"down": {"uv": [1, 2, 10, 10], "texture": "#center"}
}
},
{
"name": "sh",
"from": [3, 0, 2],
"to": [12, 0.75, 4],
"faces": {
"north": {"uv": [0, 0, 9, 0.75], "texture": "#base"},
"east": {"uv": [0, 0, 2, 0.75], "texture": "#base"},
"south": {"uv": [0, 0, 9, 0.75], "texture": "#base"},
"west": {"uv": [0, 0, 2, 0.75], "texture": "#base"},
"up": {"uv": [2, 0, 11, 2], "texture": "#base"},
"down": {"uv": [0, 0, 9, 2], "texture": "#base"}
}
},
{
"name": "sh",
"from": [1, 0, 4],
"to": [3, 0.75, 12],
"faces": {
"north": {"uv": [0, 0, 2, 0.75], "texture": "#base"},
"east": {"uv": [0, 0, 8, 0.75], "texture": "#base"},
"south": {"uv": [0, 0, 2, 0.75], "texture": "#base"},
"west": {"uv": [0, 0, 8, 0.75], "texture": "#base"},
"up": {"uv": [0, 1, 2, 9], "texture": "#base"},
"down": {"uv": [0, 0, 2, 8], "texture": "#base"}
}
},
{
"name": "sh",
"from": [12, 0, 4],
"to": [14, 0.75, 12],
"faces": {
"north": {"uv": [0, 0, 2, 0.75], "texture": "#base"},
"east": {"uv": [0, 0, 8, 0.75], "texture": "#base"},
"south": {"uv": [0, 0, 2, 0.75], "texture": "#base"},
"west": {"uv": [0, 0, 8, 0.75], "texture": "#base"},
"up": {"uv": [14, 3, 16, 11], "texture": "#base"},
"down": {"uv": [0, 0, 2, 8], "texture": "#base"}
}
},
{
"name": "sh",
"from": [3, 0, 12],
"to": [12, 0.75, 14],
"faces": {
"north": {"uv": [0, 0, 9, 0.75], "texture": "#base"},
"east": {"uv": [0, 0, 2, 0.75], "texture": "#base"},
"south": {"uv": [0, 0, 9, 0.75], "texture": "#base"},
"west": {"uv": [0, 0, 2, 0.75], "texture": "#base"},
"up": {"uv": [4, 14, 13, 16], "texture": "#base"},
"down": {"uv": [0, 0, 9, 2], "texture": "#base"}
}
}
]
"parent": "cyclic:block/my_water_candle"
}
Loading

0 comments on commit 9726cf5

Please sign in to comment.