Skip to content

Commit d14c6b6

Browse files
Gu-ZTGu-ZT
authored
Merge pull request #3229 from XeKr/assets/1.21
add exp fluid assets
2 parents 9cc22f0 + 0003354 commit d14c6b6

19 files changed

Lines changed: 105 additions & 4 deletions

src/main/resources/assets/anvilcraft/models/block/experience_cauldron_full.json renamed to src/main/resources/assets/anvilcraft/models/block/exp_cauldron_full.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"parent": "minecraft:block/template_cauldron_full",
33
"textures": {
44
"bottom": "minecraft:block/cauldron_bottom",
5-
"content": "anvilcraft:block/experience_fluid",
5+
"content": "anvilcraft:block/exp_fluid",
66
"inside": "minecraft:block/cauldron_inner",
77
"particle": "minecraft:block/cauldron_side",
88
"side": "minecraft:block/cauldron_side",

src/main/resources/assets/anvilcraft/models/block/experience_cauldron_level1.json renamed to src/main/resources/assets/anvilcraft/models/block/exp_cauldron_level1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"parent": "anvilcraft:block/template_cauldron_level1of4",
33
"textures": {
44
"bottom": "minecraft:block/cauldron_bottom",
5-
"content": "anvilcraft:block/experience_fluid",
5+
"content": "anvilcraft:block/exp_fluid",
66
"inside": "minecraft:block/cauldron_inner",
77
"particle": "minecraft:block/cauldron_side",
88
"side": "minecraft:block/cauldron_side",

src/main/resources/assets/anvilcraft/models/block/experience_cauldron_level2.json renamed to src/main/resources/assets/anvilcraft/models/block/exp_cauldron_level2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"parent": "anvilcraft:block/template_cauldron_level2of4",
33
"textures": {
44
"bottom": "minecraft:block/cauldron_bottom",
5-
"content": "anvilcraft:block/experience_fluid",
5+
"content": "anvilcraft:block/exp_fluid",
66
"inside": "minecraft:block/cauldron_inner",
77
"particle": "minecraft:block/cauldron_side",
88
"side": "minecraft:block/cauldron_side",

src/main/resources/assets/anvilcraft/models/block/experience_cauldron_level3.json renamed to src/main/resources/assets/anvilcraft/models/block/exp_cauldron_level3.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"parent": "anvilcraft:block/template_cauldron_level3of4",
33
"textures": {
44
"bottom": "minecraft:block/cauldron_bottom",
5-
"content": "anvilcraft:block/experience_fluid",
5+
"content": "anvilcraft:block/exp_fluid",
66
"inside": "minecraft:block/cauldron_inner",
77
"particle": "minecraft:block/cauldron_side",
88
"side": "minecraft:block/cauldron_side",

‎src/main/resources/assets/anvilcraft/models/block/exp_collector.json‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
{
2+
"format_version": "1.9.0",
3+
"credit": "Made by XeKr with Blockbench",
4+
"parent": "minecraft:block/cube",
5+
"textures": {
6+
"particle": "anvilcraft:block/exp_collector_bottom",
7+
"bottom": "anvilcraft:block/exp_collector_bottom",
8+
"side": "anvilcraft:block/exp_collector_side",
9+
"top": "anvilcraft:block/exp_collector_top"
10+
},
11+
"elements": [
12+
{
13+
"from": [0, 0, 0],
14+
"to": [16, 4, 16],
15+
"faces": {
16+
"north": {"uv": [0, 12, 16, 16], "texture": "#side", "cullface": "north"},
17+
"east": {"uv": [0, 12, 16, 16], "texture": "#side", "cullface": "east"},
18+
"south": {"uv": [0, 12, 16, 16], "texture": "#side", "cullface": "south"},
19+
"west": {"uv": [0, 12, 16, 16], "texture": "#side", "cullface": "west"},
20+
"up": {"uv": [0, 0, 16, 16], "texture": "#bottom"},
21+
"down": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down"}
22+
}
23+
},
24+
{
25+
"from": [0, 4, 15],
26+
"to": [16, 12, 16],
27+
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
28+
"faces": {
29+
"north": {"uv": [0, 4, 16, 12], "texture": "#side"},
30+
"south": {"uv": [0, 4, 16, 12], "texture": "#side", "cullface": "south"}
31+
}
32+
},
33+
{
34+
"from": [0, 4, 0],
35+
"to": [1, 12, 16],
36+
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
37+
"faces": {
38+
"east": {"uv": [0, 4, 16, 12], "texture": "#side"},
39+
"west": {"uv": [0, 4, 16, 12], "texture": "#side", "cullface": "west"}
40+
}
41+
},
42+
{
43+
"from": [0, 4, 0],
44+
"to": [16, 12, 1],
45+
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
46+
"faces": {
47+
"north": {"uv": [0, 4, 16, 12], "texture": "#side", "cullface": "north"},
48+
"south": {"uv": [0, 4, 16, 12], "texture": "#side"}
49+
}
50+
},
51+
{
52+
"from": [15, 4, 0],
53+
"to": [16, 12, 16],
54+
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
55+
"faces": {
56+
"east": {"uv": [0, 4, 16, 12], "texture": "#side", "cullface": "east"},
57+
"west": {"uv": [0, 4, 16, 12], "texture": "#side"}
58+
}
59+
},
60+
{
61+
"from": [0, 12, 0],
62+
"to": [16, 16, 16],
63+
"rotation": {"angle": 0, "axis": "y", "origin": [0, 12, 0]},
64+
"faces": {
65+
"north": {"uv": [0, 0, 16, 4], "texture": "#side", "cullface": "north"},
66+
"east": {"uv": [0, 0, 16, 4], "texture": "#side", "cullface": "east"},
67+
"south": {"uv": [0, 0, 16, 4], "texture": "#side", "cullface": "south"},
68+
"west": {"uv": [0, 0, 16, 4], "texture": "#side", "cullface": "west"},
69+
"up": {"uv": [0, 0, 16, 16], "texture": "#top", "cullface": "up"},
70+
"down": {"uv": [0, 0, 16, 16], "texture": "#bottom"}
71+
}
72+
}
73+
]
74+
}

‎src/main/resources/assets/anvilcraft/models/block/exp_collector_off.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"credit": "Made by XeKr with Blockbench",
3+
"parent": "anvilcraft:block/exp_collector",
4+
"textures": {
5+
"bottom": "anvilcraft:block/exp_collector_bottom",
6+
"side": "anvilcraft:block/exp_collector_side_off",
7+
"top": "anvilcraft:block/exp_collector_top_off"
8+
}
9+
}

‎src/main/resources/assets/anvilcraft/models/block/exp_collector_overload.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"credit": "Made by XeKr with Blockbench",
3+
"parent": "anvilcraft:block/exp_collector",
4+
"textures": {
5+
"bottom": "anvilcraft:block/exp_collector_bottom",
6+
"side": "anvilcraft:block/exp_collector_side_overload",
7+
"top": "anvilcraft:block/exp_collector_top_overload"
8+
}
9+
}

‎src/main/resources/assets/anvilcraft/textures/block/exp_collector_bottom.png‎

240 Bytes
Loading

‎src/main/resources/assets/anvilcraft/textures/block/exp_collector_side.png‎

315 Bytes
Loading

‎src/main/resources/assets/anvilcraft/textures/block/exp_collector_side_off.png‎

308 Bytes
Loading

0 commit comments

Comments
 (0)