Skip to content

Commit

Permalink
Merge pull request #143 from Gu-ZT/resource/1.20.1
Browse files Browse the repository at this point in the history 
改溜槽模型，加傻溜槽模型，改腐化信标模型，加树脂琥珀贴图
  • Loading branch information
@Gu-ZT
Gu-ZT authored Apr 2, 2024
2 parents 85e0329 + c23325c commit 495467d
Show file tree
Hide file tree
Showing 14 changed files with 141 additions and 41 deletions.
29 changes: 10 additions & 19 deletions src/main/resources/assets/anvilcraft/models/block/chute_side.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"particle": "anvilcraft:block/chute",
"side": "anvilcraft:block/chute",
"bottom": "anvilcraft:block/chute_bottom",
"top": "anvilcraft:block/chute_top"
"top": "anvilcraft:block/chute_top",
"simple": "anvilcraft:block/simple_chute"
},
"elements": [
{
Expand All @@ -21,26 +22,16 @@
}
},
{
"from": [3, 0.75, 6],
"to": [13, 9.25, 11],
"rotation": {"angle": 45, "axis": "x", "origin": [8, 5, 11]},
"faces": {
"east": {"uv": [3, 8, 8, 16], "texture": "#side"},
"south": {"uv": [3, 8, 13, 16], "texture": "#side"},
"west": {"uv": [3, 8, 8, 16], "texture": "#side"}
}
},
{
"from": [2.9, 1.9, -2.1],
"to": [13.1, 12.1, 8],
"from": [3.9, 3.9, -4.1],
"to": [12.1, 12.1, 11.9],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [3, 3, 13, 13], "rotation": 180, "texture": "#bottom"},
"east": {"uv": [3, 6, 13, 16], "rotation": 270, "texture": "#side"},
"south": {"uv": [3, 16, 13, 6], "rotation": 180, "texture": "#side"},
"west": {"uv": [13, 6, 3, 16], "rotation": 90, "texture": "#side"},
"up": {"uv": [13, 6, 3, 16], "rotation": 180, "texture": "#side"},
"down": {"uv": [13, 6, 3, 16], "texture": "#side"}
"north": {"uv": [4, 4, 12, 12], "rotation": 180, "texture": "#bottom"},
"east": {"uv": [4, 0, 12, 16], "rotation": 270, "texture": "#simple"},
"south": {"uv": [4, 16, 12, 8], "rotation": 180, "texture": "#side"},
"west": {"uv": [12, 0, 4, 16], "rotation": 90, "texture": "#simple"},
"up": {"uv": [12, 0, 4, 16], "rotation": 180, "texture": "#simple"},
"down": {"uv": [12, 0, 4, 16], "texture": "#simple"}
}
},
{
Expand Down
45 changes: 23 additions & 22 deletions src/main/resources/assets/anvilcraft/models/block/corrupted_beacon.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,21 @@
},
"elements": [
{
"from": [2, 0, 2],
"to": [14, 2, 14],
"from": [1, 0, 1],
"to": [15, 3, 15],
"faces": {
"north": {"uv": [2, 14, 14, 16], "texture": "#base"},
"east": {"uv": [2, 14, 14, 16], "texture": "#base"},
"south": {"uv": [2, 14, 14, 16], "texture": "#base"},
"west": {"uv": [2, 14, 14, 16], "texture": "#base"},
"up": {"uv": [2, 2, 14, 14], "texture": "#base"},
"down": {"uv": [2, 2, 14, 14], "texture": "#base"}
"north": {"uv": [0, 13, 14, 16], "texture": "#base"},
"east": {"uv": [0, 13, 14, 16], "texture": "#base"},
"south": {"uv": [0, 13, 14, 16], "texture": "#base"},
"west": {"uv": [0, 13, 14, 16], "texture": "#base"},
"up": {"uv": [0, 0, 14, 14], "texture": "#base"},
"down": {"uv": [0, 0, 14, 14], "texture": "#base"}
}
},
{
"from": [5, 5, 5],
"to": [11, 11, 11],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [13, 13, 15, 15], "texture": "#core"},
Expand All @@ -34,6 +35,20 @@
"down": {"uv": [13, 13, 15, 15], "texture": "#core"}
}
},
{
"from": [11.25, 11.25, 11.25],
"to": [4.75, 4.75, 4.75],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [1, 1, 3, 3], "texture": "#core"},
"east": {"uv": [1, 1, 3, 3], "texture": "#core"},
"south": {"uv": [1, 1, 3, 3], "texture": "#core"},
"west": {"uv": [1, 1, 3, 3], "texture": "#core"},
"up": {"uv": [1, 1, 3, 3], "texture": "#core"},
"down": {"uv": [1, 1, 3, 3], "texture": "#core"}
}
},
{
"from": [11.5, 11.5, 11.5],
"to": [4.5, 4.5, 4.5],
Expand Down Expand Up @@ -104,20 +119,6 @@
"down": {"uv": [1, 5, 3, 7], "texture": "#core"}
}
},
{
"from": [11.25, 11.25, 11.25],
"to": [4.75, 4.75, 4.75],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [1, 1, 3, 3], "texture": "#core"},
"east": {"uv": [1, 1, 3, 3], "texture": "#core"},
"south": {"uv": [1, 1, 3, 3], "texture": "#core"},
"west": {"uv": [1, 1, 3, 3], "texture": "#core"},
"up": {"uv": [1, 1, 3, 3], "texture": "#core"},
"down": {"uv": [1, 1, 3, 3], "texture": "#core"}
}
},
{
"from": [15.92, 15.92, 15.92],
"to": [0.08, 0.08, 0.08],
Expand Down
23 changes: 23 additions & 0 deletions src/main/resources/assets/anvilcraft/models/block/simple_chute.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"credit": "Made by XeKr with Blockbench",
"parent": "minecraft:block/block",
"textures": {
"particle": "anvilcraft:block/simple_chute",
"side": "anvilcraft:block/simple_chute",
"bottom": "anvilcraft:block/chute_bottom"
},
"elements": [
{
"from": [2, 0, 2],
"to": [14, 12, 14],
"faces": {
"north": {"uv": [2, 4, 14, 16], "texture": "#side"},
"east": {"uv": [2, 4, 14, 16], "texture": "#side"},
"south": {"uv": [2, 4, 14, 16], "texture": "#side"},
"west": {"uv": [2, 4, 14, 16], "texture": "#side"},
"up": {"uv": [2, 2, 14, 14], "texture": "#side", "cullface": "up"},
"down": {"uv": [2, 2, 14, 14], "texture": "#bottom"}
}
}
]
}
25 changes: 25 additions & 0 deletions src/main/resources/assets/anvilcraft/models/block/simple_chute_side.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"credit": "Made by XeKr with Blockbench",
"parent": "minecraft:block/block",
"textures": {
"2": "anvilcraft:block/simple_chute_directional",
"particle": "anvilcraft:block/simple_chute",
"side": "anvilcraft:block/simple_chute",
"bottom": "anvilcraft:block/chute_bottom"
},
"elements": [
{
"from": [3.9, 3.9, -4.1],
"to": [12.1, 12.1, 11.9],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [4, 4, 12, 12], "rotation": 180, "texture": "#bottom"},
"east": {"uv": [4, 0, 12, 16], "rotation": 270, "texture": "#2"},
"south": {"uv": [4, 16, 12, 8], "rotation": 180, "texture": "#side"},
"west": {"uv": [12, 0, 4, 16], "rotation": 90, "texture": "#2"},
"up": {"uv": [12, 0, 4, 16], "rotation": 180, "texture": "#2"},
"down": {"uv": [12, 0, 4, 16], "texture": "#2"}
}
}
]
}
37 changes: 37 additions & 0 deletions src/main/resources/assets/anvilcraft/models/block/simple_chute_side_tall.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"credit": "Made by XeKr with Blockbench",
"parent": "minecraft:block/block",
"textures": {
"2": "anvilcraft:block/simple_chute_directional",
"particle": "anvilcraft:block/simple_chute",
"side": "anvilcraft:block/simple_chute",
"bottom": "anvilcraft:block/chute_bottom"
},
"elements": [
{
"from": [3.9, 3.9, -4.1],
"to": [12.1, 12.1, 11.9],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [3, 3, 13, 13], "rotation": 180, "texture": "#bottom"},
"east": {"uv": [4, 0, 12, 16], "rotation": 270, "texture": "#side"},
"south": {"uv": [4, 16, 12, 8], "rotation": 180, "texture": "#side"},
"west": {"uv": [12, 0, 4, 16], "rotation": 90, "texture": "#side"},
"up": {"uv": [12, 0, 4, 16], "rotation": 180, "texture": "#side"},
"down": {"uv": [12, 0, 4, 16], "texture": "#2"}
}
},
{
"from": [2, 8, 2],
"to": [14, 16, 14],
"faces": {
"north": {"uv": [2, 0, 14, 8], "texture": "#side"},
"east": {"uv": [2, 0, 14, 8], "texture": "#side"},
"south": {"uv": [2, 0, 14, 8], "texture": "#side"},
"west": {"uv": [2, 0, 14, 8], "texture": "#side"},
"up": {"uv": [2, 2, 14, 14], "texture": "#bottom", "cullface": "up"},
"down": {"uv": [2, 2, 14, 14], "texture": "#side"}
}
}
]
}
23 changes: 23 additions & 0 deletions src/main/resources/assets/anvilcraft/models/block/simple_chute_tall.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"credit": "Made by XeKr with Blockbench",
"parent": "minecraft:block/block",
"textures": {
"particle": "anvilcraft:block/simple_chute",
"side": "anvilcraft:block/simple_chute",
"bottom": "anvilcraft:block/chute_bottom"
},
"elements": [
{
"from": [2, 0, 2],
"to": [14, 16, 14],
"faces": {
"north": {"uv": [2, 0, 14, 16], "texture": "#side"},
"east": {"uv": [2, 0, 14, 16], "texture": "#side"},
"south": {"uv": [2, 0, 14, 16], "texture": "#side"},
"west": {"uv": [2, 0, 14, 16], "texture": "#side"},
"up": {"uv": [2, 2, 14, 14], "texture": "#bottom", "cullface": "up"},
"down": {"uv": [2, 2, 14, 14], "texture": "#bottom"}
}
}
]
}
Binary file added src/main/resources/assets/anvilcraft/textures/block/amber_block.png
View file
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/corrupted_beacon_base.png
View file
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/corrupted_beacon_inner.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/anvilcraft/textures/block/resin_block.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/anvilcraft/textures/block/simple_chute.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/anvilcraft/textures/block/simple_chute_directional.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/anvilcraft/textures/item/amber.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/assets/anvilcraft/textures/item/resin.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 495467d

Please sign in to comment.