diff --git a/src/main/resources/assets/unicopia/blockstates/flower_pot.json b/src/main/resources/assets/unicopia/blockstates/flower_pot.json index 5836f110..9b81edac 100644 --- a/src/main/resources/assets/unicopia/blockstates/flower_pot.json +++ b/src/main/resources/assets/unicopia/blockstates/flower_pot.json @@ -1,7 +1,7 @@ { "variants": { - "plant=none": { "model": "minecraft:flower_pot" }, - "plant=quill": { "model": "unicopia:flower_pot_feather" }, - "plant=meadowbrook": { "model": "unicopia:flower_pot_meadowbrook" } + "plant=empty": { "model": "minecraft:flower_pot" }, + "plant=quill": { "model": "unicopia:flower_pot/feather" }, + "plant=meadowbrook": { "model": "unicopia:flower_pot/meadowbrook" } } } diff --git a/src/main/resources/assets/unicopia/models/block/flower_pot/cross_rotated.json b/src/main/resources/assets/unicopia/models/block/flower_pot/cross_rotated.json new file mode 100644 index 00000000..0f044592 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/flower_pot/cross_rotated.json @@ -0,0 +1,65 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "blocks/flower_pot", + "flowerpot": "blocks/flower_pot", + "dirt": "blocks/dirt" + }, + "elements": [ + { "from": [ 5, 0, 5 ], + "to": [ 6, 6, 11 ], + "faces": { + "down": { "uv": [ 5, 5, 6, 11 ], "texture": "#flowerpot", "cullface": "down" }, + "up": { "uv": [ 5, 5, 6, 11 ], "texture": "#flowerpot" }, + "north": { "uv": [ 10, 10, 11, 16 ], "texture": "#flowerpot" }, + "south": { "uv": [ 5, 10, 6, 16 ], "texture": "#flowerpot" }, + "west": { "uv": [ 5, 10, 11, 16 ], "texture": "#flowerpot" }, + "east": { "uv": [ 5, 10, 11, 16 ], "texture": "#flowerpot" } + } + }, + { "from": [ 10, 0, 5 ], + "to": [ 11, 6, 11 ], + "faces": { + "down": { "uv": [ 10, 5, 11, 11 ], "texture": "#flowerpot", "cullface": "down" }, + "up": { "uv": [ 10, 5, 11, 11 ], "texture": "#flowerpot" }, + "north": { "uv": [ 5, 10, 6, 16 ], "texture": "#flowerpot" }, + "south": { "uv": [ 10, 10, 11, 16 ], "texture": "#flowerpot" }, + "west": { "uv": [ 5, 10, 11, 16 ], "texture": "#flowerpot" }, + "east": { "uv": [ 5, 10, 11, 16 ], "texture": "#flowerpot" } + } + }, + { "from": [ 6, 0, 5 ], + "to": [ 10, 6, 6 ], + "faces": { + "down": { "uv": [ 6, 10, 10, 11 ], "texture": "#flowerpot", "cullface": "down" }, + "up": { "uv": [ 6, 5, 10, 6 ], "texture": "#flowerpot" }, + "north": { "uv": [ 6, 10, 10, 16 ], "texture": "#flowerpot" }, + "south": { "uv": [ 6, 10, 10, 16 ], "texture": "#flowerpot" } + } + }, + { "from": [ 6, 0, 10 ], + "to": [ 10, 6, 11 ], + "faces": { + "down": { "uv": [ 6, 5, 10, 6 ], "texture": "#flowerpot", "cullface": "down" }, + "up": { "uv": [ 6, 10, 10, 11 ], "texture": "#flowerpot" }, + "north": { "uv": [ 6, 10, 10, 16 ], "texture": "#flowerpot" }, + "south": { "uv": [ 6, 10, 10, 16 ], "texture": "#flowerpot" } + } + }, + { "from": [ 6, 0, 6 ], + "to": [ 10, 4, 10 ], + "faces": { + "down": { "uv": [ 6, 6, 10, 10 ], "texture": "#flowerpot", "cullface": "down" }, + "up": { "uv": [ 6, 6, 10, 10 ], "texture": "#dirt" } + } + }, + { "from": [ 8, 4, 4.6 ], + "to": [ 8, 16, 15.4 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": false }, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#plant" }, + "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#plant" } + } + } + ] +} diff --git a/src/main/resources/assets/unicopia/models/block/flower_pot_feather.json b/src/main/resources/assets/unicopia/models/block/flower_pot/feather.json similarity index 55% rename from src/main/resources/assets/unicopia/models/block/flower_pot_feather.json rename to src/main/resources/assets/unicopia/models/block/flower_pot/feather.json index 91196422..45fc9246 100644 --- a/src/main/resources/assets/unicopia/models/block/flower_pot_feather.json +++ b/src/main/resources/assets/unicopia/models/block/flower_pot/feather.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/flower_pot_cross", + "parent": "unicopia:block/flower_pot/cross_rotated", "textures": { "plant": "minecraft:items/feather" } diff --git a/src/main/resources/assets/unicopia/models/block/flower_pot_meadowbrook.json b/src/main/resources/assets/unicopia/models/block/flower_pot/meadowbrook.json similarity index 58% rename from src/main/resources/assets/unicopia/models/block/flower_pot_meadowbrook.json rename to src/main/resources/assets/unicopia/models/block/flower_pot/meadowbrook.json index 7e90a89a..6d7381c8 100644 --- a/src/main/resources/assets/unicopia/models/block/flower_pot_meadowbrook.json +++ b/src/main/resources/assets/unicopia/models/block/flower_pot/meadowbrook.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/flower_pot_cross", + "parent": "unicopia:block/flower_pot/cross_rotated", "textures": { "plant": "unicopia:items/staff_meadow_brook" }