Skip to content

Commit

Permalink
Merge pull request #193 from Gu-ZT/assets
Browse files Browse the repository at this point in the history 
增加新物品贴图，调整一些旧模型
  • Loading branch information
@BOTXue
BOTXue authored Apr 8, 2024
2 parents f82b06a + e40c44c commit e550219
Show file tree
Hide file tree
Showing 38 changed files with 73 additions and 69 deletions.
4 changes: 2 additions & 2 deletions common/src/main/resources/assets/anvilcraft/models/block/chute_side.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
}
},
{
"from": [3.9, 3.9, -4.1],
"to": [12.1, 12.1, 11.9],
"from": [3.975, 3.975, -4.025],
"to": [12.025, 12.025, 11.975],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [4, 4, 12, 12], "rotation": 180, "texture": "#bottom"},
Expand Down
82 changes: 61 additions & 21 deletions common/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,60 @@
},
"elements": [
{
"from": [1, 0, 1],
"from": [1, 0, 14],
"to": [15, 3, 15],
"faces": {
"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"}
"north": {"uv": [1, 13, 15, 16], "texture": "#base"},
"east": {"uv": [1, 13, 2, 16], "texture": "#base"},
"south": {"uv": [1, 13, 15, 16], "texture": "#base"},
"west": {"uv": [14, 13, 15, 16], "texture": "#base"},
"up": {"uv": [1, 14, 15, 15], "texture": "#base"},
"down": {"uv": [1, 1, 15, 2], "texture": "#base"}
}
},
{
"from": [1, 0, 1],
"to": [15, 3, 2],
"faces": {
"north": {"uv": [1, 13, 15, 16], "texture": "#base"},
"east": {"uv": [14, 13, 15, 16], "texture": "#base"},
"south": {"uv": [1, 13, 15, 16], "texture": "#base"},
"west": {"uv": [1, 13, 2, 16], "texture": "#base"},
"up": {"uv": [1, 1, 15, 2], "texture": "#base"},
"down": {"uv": [1, 14, 15, 15], "texture": "#base"}
}
},
{
"from": [14, 0, 2],
"to": [15, 3, 14],
"faces": {
"east": {"uv": [2, 13, 14, 16], "texture": "#base"},
"west": {"uv": [2, 13, 14, 16], "texture": "#base"},
"up": {"uv": [14, 2, 15, 14], "texture": "#base"},
"down": {"uv": [14, 2, 15, 14], "texture": "#base"}
}
},
{
"from": [2, 0, 2],
"to": [14, 2, 14],
"faces": {
"up": {"uv": [2, 2, 14, 14], "texture": "#base"},
"down": {"uv": [2, 2, 14, 14], "texture": "#base"}
}
},
{
"from": [5, 5, 5],
"to": [11, 11, 11],
"from": [1, 0, 2],
"to": [2, 3, 14],
"faces": {
"east": {"uv": [2, 13, 14, 16], "texture": "#base"},
"west": {"uv": [2, 13, 14, 16], "texture": "#base"},
"up": {"uv": [1, 2, 2, 14], "texture": "#base"},
"down": {"uv": [1, 2, 2, 14], "texture": "#base"}
}
},
{
"from": [4, 4, 4],
"to": [12, 12, 12],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
Expand All @@ -36,8 +76,8 @@
}
},
{
"from": [11.25, 11.25, 11.25],
"to": [4.75, 4.75, 4.75],
"from": [12.25, 12.25, 12.25],
"to": [3.75, 3.75, 3.75],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
Expand All @@ -50,8 +90,8 @@
}
},
{
"from": [11.5, 11.5, 11.5],
"to": [4.5, 4.5, 4.5],
"from": [12.5, 12.5, 12.5],
"to": [3.5, 3.5, 3.5],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
Expand All @@ -64,8 +104,8 @@
}
},
{
"from": [11.75, 11.75, 11.75],
"to": [4.25, 4.25, 4.25],
"from": [12.75, 12.75, 12.75],
"to": [3.25, 3.25, 3.25],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
Expand All @@ -78,8 +118,8 @@
}
},
{
"from": [12, 12, 12],
"to": [4, 4, 4],
"from": [13, 13, 13],
"to": [3, 3, 3],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
Expand All @@ -92,8 +132,8 @@
}
},
{
"from": [12.25, 12.25, 12.25],
"to": [3.75, 3.75, 3.75],
"from": [13.25, 13.25, 13.25],
"to": [2.75, 2.75, 2.75],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
Expand All @@ -106,8 +146,8 @@
}
},
{
"from": [12.5, 12.5, 12.5],
"to": [3.5, 3.5, 3.5],
"from": [13.5, 13.5, 13.5],
"to": [2.5, 2.5, 2.5],
"shade": false,
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
"faces": {
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/resources/assets/anvilcraft/models/block/simple_chute_side.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
},
"elements": [
{
"from": [3.9, 3.9, -4.1],
"to": [12.1, 12.1, 11.9],
"from": [3.975, 3.975, -4.025],
"to": [12.025, 12.025, 11.975],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [4, 4, 12, 12], "rotation": 180, "texture": "#bottom"},
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/resources/assets/anvilcraft/models/block/simple_chute_side_tall.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
},
"elements": [
{
"from": [3.9, 3.9, -4.1],
"to": [12.1, 12.1, 11.9],
"from": [3.975, 3.975, -4.025],
"to": [12.025, 12.025, 11.975],
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [3, 3, 13, 13], "rotation": 180, "texture": "#bottom"},
Expand Down
2 changes: 1 addition & 1 deletion .../anvilcraft/models/item/amethyst_axe.json → .../anvilcraft/models/item/amethyst_axe.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:item/generated",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "anvilcraft:item/amethyst_axe"
}
Expand Down
2 changes: 1 addition & 1 deletion .../anvilcraft/models/item/amethyst_hoe.json → .../anvilcraft/models/item/amethyst_hoe.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:item/generated",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "anvilcraft:item/amethyst_hoe"
}
Expand Down
2 changes: 1 addition & 1 deletion ...ilcraft/models/item/amethyst_pickaxe.json → ...ilcraft/models/item/amethyst_pickaxe.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:item/generated",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "anvilcraft:item/amethyst_pickaxe"
}
Expand Down
2 changes: 1 addition & 1 deletion ...vilcraft/models/item/amethyst_shovel.json → ...vilcraft/models/item/amethyst_shovel.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:item/generated",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "anvilcraft:item/amethyst_shovel"
}
Expand Down
2 changes: 1 addition & 1 deletion ...nvilcraft/models/item/amethyst_sword.json → ...nvilcraft/models/item/amethyst_sword.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:item/generated",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "anvilcraft:item/amethyst_sword"
}
Expand Down
2 changes: 1 addition & 1 deletion ...raft/models/item/royal_steel_pickaxe.json → ...raft/models/item/royal_steel_pickaxe.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "minecraft:item/generated",
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "anvilcraft:item/royal_steel_pickaxe"
}
Expand Down
Binary file modified common/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 ...n/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 common/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 common/src/main/resources/assets/anvilcraft/textures/block/ruby_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 common/src/main/resources/assets/anvilcraft/textures/block/sapphire_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 common/src/main/resources/assets/anvilcraft/textures/block/topaz_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 common/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 removed common/src/main/resources/assets/anvilcraft/textures/item/blade_of_the_sea.png
View file
Binary file not shown.
Binary file added common/src/main/resources/assets/anvilcraft/textures/item/circuit_board.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 removed common/src/main/resources/assets/anvilcraft/textures/item/fruit_of_the_sea.png
View file
Binary file not shown.
Binary file added common/src/main/resources/assets/anvilcraft/textures/item/geode.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 common/src/main/resources/assets/anvilcraft/textures/item/hardend_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.
Binary file removed common/src/main/resources/assets/anvilcraft/textures/item/kernel_of_the_sea.png
View file
Binary file not shown.
Binary file added common/src/main/resources/assets/anvilcraft/textures/item/prismarine_blade.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 common/src/main/resources/assets/anvilcraft/textures/item/prismarine_cluster.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 common/src/main/resources/assets/anvilcraft/textures/item/ruby.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 common/src/main/resources/assets/anvilcraft/textures/item/sapphire.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 common/src/main/resources/assets/anvilcraft/textures/item/sea_heart_shell.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 ...on/src/main/resources/assets/anvilcraft/textures/item/sea_heart_shell_shard.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 removed common/src/main/resources/assets/anvilcraft/textures/item/seed_of_the_sea.png
View file
Binary file not shown.
Binary file removed common/src/main/resources/assets/anvilcraft/textures/item/tear_of_the_sea.png
View file
Binary file not shown.
Binary file added common/src/main/resources/assets/anvilcraft/textures/item/topaz.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.
6 changes: 0 additions & 6 deletions fabric/src/generated/resources/assets/anvilcraft/models/item/amethyst_pickaxe.json
View file

This file was deleted.

6 changes: 0 additions & 6 deletions fabric/src/generated/resources/assets/anvilcraft/models/item/amethyst_shovel.json
View file

This file was deleted.

6 changes: 0 additions & 6 deletions fabric/src/generated/resources/assets/anvilcraft/models/item/amethyst_sword.json
View file

This file was deleted.

6 changes: 0 additions & 6 deletions forge/src/generated/resources/assets/anvilcraft/models/item/amethyst_axe.json
View file

This file was deleted.

6 changes: 0 additions & 6 deletions forge/src/generated/resources/assets/anvilcraft/models/item/amethyst_hoe.json
View file

This file was deleted.

6 changes: 0 additions & 6 deletions forge/src/generated/resources/assets/anvilcraft/models/item/royal_steel_pickaxe.json
View file

This file was deleted.

0 comments on commit e550219

Please sign in to comment.