Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

炼药锅视觉调整 #1363

Merged
merged 4 commits into from
Dec 19, 2024
Merged

炼药锅视觉调整 #1363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
223d29a
炼药锅视觉调整
XeKr Dec 19, 2024
07236f3
铜水槽模型
XeKr Dec 19, 2024
54c78b8
炼药锅模型兼容性
XeKr Dec 19, 2024
3a143dc
修正剔除面
XeKr Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/main/resources/assets/anvilcraft/blockstates/fire_cauldron.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,47 +2,47 @@
"multipart": [
{
"apply": {
"model": "anvilcraft:block/oil_cauldron_level1"
"model": "anvilcraft:block/fire_cauldron_fire1"
},
"when": {
"level": "1"
}
},
{
"apply": {
"model": "anvilcraft:block/fire_cauldron_fire1"
"model": "anvilcraft:block/oil_cauldron_level1"
},
"when": {
"level": "1"
}
},
{
"apply": {
"model": "anvilcraft:block/oil_cauldron_level2"
"model": "anvilcraft:block/fire_cauldron_fire2"
},
"when": {
"level": "2"
}
},
{
"apply": {
"model": "anvilcraft:block/fire_cauldron_fire2"
"model": "anvilcraft:block/oil_cauldron_level2"
},
"when": {
"level": "2"
}
},
{
"apply": {
"model": "anvilcraft:block/oil_cauldron_full"
"model": "anvilcraft:block/fire_cauldron_fire3"
},
"when": {
"level": "3"
}
},
{
"apply": {
"model": "anvilcraft:block/fire_cauldron_fire3"
"model": "anvilcraft:block/oil_cauldron_full"
},
"when": {
"level": "3"
Expand Down
121 changes: 65 additions & 56 deletions src/main/resources/assets/anvilcraft/models/block/copper_sink.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,95 +6,104 @@
"1": "anvilcraft:block/copper_sink_inner",
"2": "anvilcraft:block/copper_sink_side",
"3": "anvilcraft:block/copper_sink_top",
"4": "anvilcraft:block/copper_sink_cut",
"5": "anvilcraft:block/copper_sink_inner_side",
"4": "anvilcraft:block/copper_sink_inner_side",
"particle": "anvilcraft:block/copper_sink_side"
},
"elements": [
{
"from": [0, 3, 0],
"to": [16, 16, 16],
"from": [0, 0, 0],
"to": [16, 2, 16],
"faces": {
"north": {"uv": [0, 0, 16, 13], "texture": "#2", "cullface": "north"},
"east": {"uv": [0, 0, 16, 13], "texture": "#2", "cullface": "east"},
"south": {"uv": [0, 0, 16, 13], "texture": "#2", "cullface": "south"},
"west": {"uv": [0, 0, 16, 13], "texture": "#2"},
"up": {"uv": [0, 0, 16, 16], "texture": "#3", "cullface": "up"},
"down": {"uv": [0, 0, 16, 16], "texture": "#1"}
"north": {"uv": [0, 14, 16, 16], "texture": "#2", "cullface": "north"},
"east": {"uv": [0, 14, 16, 16], "texture": "#2", "cullface": "east"},
"south": {"uv": [0, 14, 16, 16], "texture": "#2", "cullface": "south"},
"west": {"uv": [0, 14, 16, 16], "texture": "#2", "cullface": "west"},
"up": {"uv": [0, 0, 16, 16], "texture": "#1"},
"down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"}
}
},
{
"name": "cube inverted",
"from": [16, 14, 11],
"to": [0, 4, 5],
"from": [14, 2, 0],
"to": [16, 16, 2],
"faces": {
"north": {"uv": [0, 10, 16, 0], "texture": "#4", "cullface": "south"},
"south": {"uv": [0, 10, 16, 0], "texture": "#4", "cullface": "north"},
"up": {"uv": [16, 2, 0, 8], "texture": "#4"},
"down": {"uv": [16, 2, 0, 8], "texture": "#4", "cullface": "up"}
"north": {"uv": [0, 0, 2, 14], "texture": "#2", "cullface": "north"},
"east": {"uv": [14, 0, 16, 14], "texture": "#2", "cullface": "east"},
"south": {"uv": [14, 0, 16, 14], "texture": "#4"},
"west": {"uv": [0, 0, 2, 14], "texture": "#4"},
"up": {"uv": [14, 0, 16, 2], "texture": "#3", "cullface": "up"}
}
},
{
"name": "cube inverted",
"from": [11, 14, 16],
"to": [5, 4, 0],
"from": [0, 2, 0],
"to": [2, 16, 2],
"faces": {
"east": {"uv": [0, 10, 16, 0], "texture": "#4", "cullface": "north"},
"west": {"uv": [0, 10, 16, 0], "texture": "#4", "cullface": "south"},
"up": {"uv": [16, 2, 0, 8], "rotation": 270, "texture": "#4"},
"down": {"uv": [16, 2, 0, 8], "rotation": 90, "texture": "#4", "cullface": "up"}
"north": {"uv": [14, 0, 16, 14], "texture": "#2", "cullface": "north"},
"east": {"uv": [14, 0, 16, 14], "texture": "#4"},
"south": {"uv": [0, 0, 2, 14], "texture": "#4"},
"west": {"uv": [0, 0, 2, 14], "texture": "#2", "cullface": "west"},
"up": {"uv": [0, 0, 2, 2], "texture": "#3", "cullface": "up"}
}
},
{
"name": "cube inverted",
"from": [14, 16, 14],
"to": [2, 4, 2],
"from": [0, 2, 14],
"to": [2, 16, 16],
"faces": {
"north": {"uv": [14, 12, 2, 0], "texture": "#5", "cullface": "south"},
"east": {"uv": [14, 12, 2, 0], "texture": "#5"},
"south": {"uv": [14, 12, 2, 0], "texture": "#5", "cullface": "north"},
"west": {"uv": [14, 12, 2, 0], "texture": "#5", "cullface": "east"},
"up": {"uv": [14, 14, 2, 2], "texture": "#1"}
"north": {"uv": [14, 0, 16, 14], "texture": "#4"},
"east": {"uv": [0, 0, 2, 14], "texture": "#4"},
"south": {"uv": [0, 0, 2, 14], "texture": "#2", "cullface": "south"},
"west": {"uv": [14, 0, 16, 14], "texture": "#2", "cullface": "west"},
"up": {"uv": [0, 14, 2, 16], "texture": "#3", "cullface": "up"}
}
},
{
"from": [0, 0, 0],
"to": [16, 3, 16],
"from": [14, 2, 14],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 0, 2, 14], "texture": "#4"},
"east": {"uv": [0, 0, 2, 14], "texture": "#2", "cullface": "east"},
"south": {"uv": [14, 0, 16, 14], "texture": "#2", "cullface": "south"},
"west": {"uv": [14, 0, 16, 14], "texture": "#4"},
"up": {"uv": [14, 14, 16, 16], "texture": "#3", "cullface": "up"}
}
},
{
"from": [2, 14, 14],
"to": [14, 16, 16],
"faces": {
"north": {"uv": [0, 13, 16, 16], "texture": "#2", "cullface": "north"},
"east": {"uv": [0, 13, 16, 16], "texture": "#2", "cullface": "east"},
"south": {"uv": [0, 13, 16, 16], "texture": "#2", "cullface": "south"},
"west": {"uv": [0, 13, 16, 16], "texture": "#2"},
"down": {"uv": [0, 0, 16, 16], "texture": "#0"}
"north": {"uv": [2, 0, 14, 2], "texture": "#4"},
"south": {"uv": [2, 0, 14, 2], "texture": "#2", "cullface": "south"},
"up": {"uv": [2, 14, 14, 16], "texture": "#3", "cullface": "up"},
"down": {"uv": [2, 0, 14, 2], "texture": "#1"}
}
},
{
"name": "cube inverted",
"from": [16, 3, 12],
"to": [0, 0, 4],
"from": [2, 14, 0],
"to": [14, 16, 2],
"faces": {
"north": {"uv": [16, 16, 0, 13], "texture": "#4", "cullface": "south"},
"south": {"uv": [16, 16, 0, 13], "texture": "#4", "cullface": "north"}
"north": {"uv": [2, 0, 14, 2], "texture": "#2", "cullface": "north"},
"south": {"uv": [2, 0, 14, 2], "texture": "#4"},
"up": {"uv": [2, 0, 14, 2], "texture": "#3", "cullface": "up"},
"down": {"uv": [2, 14, 14, 16], "texture": "#1"}
}
},
{
"name": "cube inverted",
"from": [12, 3, 16],
"to": [4, 0, 0],
"from": [0, 14, 2],
"to": [2, 16, 14],
"faces": {
"east": {"uv": [16, 16, 0, 13], "texture": "#4", "cullface": "north"},
"west": {"uv": [16, 16, 0, 13], "texture": "#4", "cullface": "south"}
"east": {"uv": [2, 0, 14, 2], "texture": "#4"},
"west": {"uv": [2, 0, 14, 2], "texture": "#2", "cullface": "west"},
"up": {"uv": [0, 2, 2, 14], "texture": "#3", "cullface": "up"},
"down": {"uv": [0, 2, 2, 14], "texture": "#1"}
}
},
{
"name": "cube inverted",
"from": [14, 3, 14],
"to": [2, 0, 2],
"from": [14, 14, 2],
"to": [16, 16, 14],
"faces": {
"north": {"uv": [2, 16, 14, 13], "texture": "#2", "cullface": "south"},
"east": {"uv": [2, 16, 14, 13], "texture": "#2"},
"south": {"uv": [2, 16, 14, 13], "texture": "#2", "cullface": "north"},
"west": {"uv": [2, 16, 14, 13], "texture": "#2", "cullface": "east"}
"east": {"uv": [2, 0, 14, 2], "texture": "#2", "cullface": "east"},
"west": {"uv": [2, 0, 14, 2], "texture": "#4"},
"up": {"uv": [14, 2, 16, 14], "texture": "#3", "cullface": "up"},
"down": {"uv": [14, 2, 16, 14], "texture": "#1"}
}
}
]
Expand Down
Binary file modified src/main/resources/assets/anvilcraft/textures/block/copper_sink_bottom.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/main/resources/assets/anvilcraft/textures/block/copper_sink_cut.png
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/assets/anvilcraft/textures/block/copper_sink_inner_side.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/assets/anvilcraft/textures/block/copper_sink_side.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
155 changes: 155 additions & 0 deletions ...resources/resourcepacks/transparent_cauldron/assets/amendments/models/block/cauldron.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
{
"credit": "Made by XeKr with Blockbench",
"ambientocclusion": false,
"render_type": "minecraft:cutout",
"textures": {
"top": "block/cauldron_top",
"bottom": "block/cauldron_bottom",
"particle": "block/cauldron_side",
"side": "block/cauldron_side",
"inner": "block/cauldron_inner",
"inside": "block/cauldron_inner_side"
},
"elements": [
{
"from": [14, 14, 2],
"to": [16, 16, 14],
"faces": {
"east": {"uv": [2, 0, 14, 2], "texture": "#side", "cullface": "east"},
"west": {"uv": [2, 0, 14, 2], "texture": "#inside"},
"up": {"uv": [14, 2, 16, 14], "texture": "#top", "cullface": "up"},
"down": {"uv": [14, 2, 16, 14], "texture": "#inner"}
}
},
{
"from": [0, 14, 2],
"to": [2, 16, 14],
"faces": {
"east": {"uv": [2, 0, 14, 2], "texture": "#inside"},
"west": {"uv": [2, 0, 14, 2], "texture": "#side", "cullface": "west"},
"up": {"uv": [0, 2, 2, 14], "texture": "#top", "cullface": "up"},
"down": {"uv": [0, 2, 2, 14], "texture": "#inner"}
}
},
{
"from": [2, 14, 14],
"to": [14, 16, 16],
"faces": {
"north": {"uv": [2, 0, 14, 2], "texture": "#inside"},
"south": {"uv": [2, 0, 14, 2], "texture": "#side", "cullface": "south"},
"up": {"uv": [2, 14, 14, 16], "texture": "#top", "cullface": "up"},
"down": {"uv": [2, 0, 14, 2], "texture": "#inner"}
}
},
{
"from": [2, 14, 0],
"to": [14, 16, 2],
"faces": {
"north": {"uv": [2, 0, 14, 2], "texture": "#side", "cullface": "north"},
"south": {"uv": [2, 0, 14, 2], "texture": "#inside"},
"up": {"uv": [2, 0, 14, 2], "texture": "#top", "cullface": "up"},
"down": {"uv": [2, 14, 14, 16], "texture": "#inner"}
}
},
{
"from": [14, 4, 0],
"to": [16, 16, 2],
"faces": {
"north": {"uv": [0, 0, 2, 12], "texture": "#side", "cullface": "north"},
"east": {"uv": [14, 0, 16, 12], "texture": "#side", "cullface": "east"},
"south": {"uv": [14, 0, 16, 12], "texture": "#inside"},
"west": {"uv": [0, 0, 2, 12], "texture": "#inside"},
"up": {"uv": [14, 0, 16, 2], "texture": "#top", "cullface": "up"}
}
},
{
"from": [0, 4, 14],
"to": [2, 16, 16],
"faces": {
"north": {"uv": [14, 0, 16, 12], "texture": "#inside"},
"east": {"uv": [0, 0, 2, 12], "texture": "#inside"},
"south": {"uv": [0, 0, 2, 12], "texture": "#side", "cullface": "south"},
"west": {"uv": [14, 0, 16, 12], "texture": "#side", "cullface": "west"},
"up": {"uv": [0, 14, 2, 16], "texture": "#top", "cullface": "up"}
}
},
{
"from": [14, 4, 14],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 0, 2, 12], "texture": "#inside"},
"east": {"uv": [0, 0, 2, 12], "texture": "#side", "cullface": "east"},
"south": {"uv": [14, 0, 16, 12], "texture": "#side", "cullface": "south"},
"west": {"uv": [14, 0, 16, 12], "texture": "#inside"},
"up": {"uv": [14, 14, 16, 16], "texture": "#top", "cullface": "up"}
}
},
{
"from": [0, 4, 0],
"to": [2, 16, 2],
"faces": {
"north": {"uv": [14, 0, 16, 12], "texture": "#side", "cullface": "north"},
"east": {"uv": [14, 0, 16, 12], "texture": "#inside"},
"south": {"uv": [0, 0, 2, 12], "texture": "#inside"},
"west": {"uv": [0, 0, 2, 12], "texture": "#side", "cullface": "west"},
"up": {"uv": [0, 0, 2, 2], "texture": "#top", "cullface": "up"}
}
},
{
"from": [0, 3, 0],
"to": [16, 4, 16],
"faces": {
"north": {"uv": [0, 12, 16, 13], "texture": "#side", "cullface": "north"},
"east": {"uv": [0, 12, 16, 13], "texture": "#side", "cullface": "east"},
"south": {"uv": [0, 12, 16, 13], "texture": "#side", "cullface": "south"},
"west": {"uv": [0, 12, 16, 13], "texture": "#side", "cullface": "west"},
"up": {"uv": [0, 0, 16, 16], "texture": "#inner"},
"down": {"uv": [0, 0, 16, 16], "texture": "#inner"}
}
},
{
"from": [0, 0, 0],
"to": [4, 3, 4],
"faces": {
"north": {"uv": [12, 13, 16, 16], "texture": "#inside", "cullface": "north"},
"east": {"uv": [12, 13, 16, 16], "texture": "#inside"},
"south": {"uv": [0, 13, 4, 16], "texture": "#inside"},
"west": {"uv": [0, 13, 4, 16], "texture": "#inside", "cullface": "west"},
"down": {"uv": [0, 12, 4, 16], "texture": "#bottom", "cullface": "down"}
}
},
{
"from": [0, 0, 12],
"to": [4, 3, 16],
"faces": {
"north": {"uv": [12, 13, 16, 16], "texture": "#inside"},
"east": {"uv": [0, 13, 4, 16], "texture": "#inside"},
"south": {"uv": [0, 13, 4, 16], "texture": "#inside", "cullface": "south"},
"west": {"uv": [12, 13, 16, 16], "texture": "#inside", "cullface": "west"},
"down": {"uv": [0, 0, 4, 4], "texture": "#bottom", "cullface": "down"}
}
},
{
"from": [12, 0, 12],
"to": [16, 3, 16],
"faces": {
"north": {"uv": [0, 13, 4, 16], "texture": "#inside"},
"east": {"uv": [0, 13, 4, 16], "texture": "#inside", "cullface": "east"},
"south": {"uv": [12, 13, 16, 16], "texture": "#inside", "cullface": "south"},
"west": {"uv": [12, 13, 16, 16], "texture": "#inside"},
"down": {"uv": [12, 0, 16, 4], "texture": "#bottom", "cullface": "down"}
}
},
{
"from": [12, 0, 0],
"to": [16, 3, 4],
"faces": {
"north": {"uv": [0, 13, 4, 16], "texture": "#inside", "cullface": "north"},
"east": {"uv": [12, 13, 16, 16], "texture": "#inside", "cullface": "east"},
"south": {"uv": [12, 13, 16, 16], "texture": "#inside"},
"west": {"uv": [0, 13, 4, 16], "texture": "#inside"},
"down": {"uv": [12, 12, 16, 16], "texture": "#bottom", "cullface": "down"}
}
}
]
}
18 changes: 18 additions & 0 deletions .../resourcepacks/transparent_cauldron/assets/amendments/models/block/cauldron_level_11.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"credit": "Made with Blockbench",
"ambientocclusion": false,
"elements": [
{
"from": [1, 4, 1],
"to": [15, 11, 15],
"shade": false,
"faces": {
"north": {"uv": [1, 5, 15, 12], "texture": "#content", "tintindex": 1},
"east": {"uv": [1, 5, 15, 12], "texture": "#content", "tintindex": 1},
"south": {"uv": [1, 5, 15, 12], "texture": "#content", "tintindex": 1},
"west": {"uv": [1, 5, 15, 12], "texture": "#content", "tintindex": 1},
"up": {"uv": [1, 1, 15, 15], "texture": "#content", "tintindex": 1}
}
}
]
}
Loading
Loading