diff --git a/src/main/resources/assets/betterend/blockstates/violecite_brick_slab.json b/src/main/resources/assets/betterend/blockstates/violecite_brick_slab.json index cb44f1b7..607275c8 100644 --- a/src/main/resources/assets/betterend/blockstates/violecite_brick_slab.json +++ b/src/main/resources/assets/betterend/blockstates/violecite_brick_slab.json @@ -4,7 +4,7 @@ "model": "betterend:block/violecite_brick_half_slab" }, "type=double": { - "model": "betterend:block/violecite_brick_planks" + "model": "betterend:block/violecite_bricks" }, "type=top": { "model": "betterend:block/violecite_brick_half_slab", diff --git a/src/main/resources/assets/betterend/blockstates/violecite_brick_wall.json b/src/main/resources/assets/betterend/blockstates/violecite_brick_wall.json index c41190bc..dd4890b5 100644 --- a/src/main/resources/assets/betterend/blockstates/violecite_brick_wall.json +++ b/src/main/resources/assets/betterend/blockstates/violecite_brick_wall.json @@ -5,7 +5,7 @@ "up": "true" }, "apply": { - "model": "minecraft:block/violecite_brick_wall_post" + "model": "betterend:block/violecite_brick_wall_post" } }, { @@ -13,7 +13,7 @@ "north": "low" }, "apply": { - "model": "minecraft:block/violecite_brick_wall_side", + "model": "betterend:block/violecite_brick_wall_side", "uvlock": true } }, @@ -22,7 +22,7 @@ "east": "low" }, "apply": { - "model": "minecraft:block/violecite_brick_wall_side", + "model": "betterend:block/violecite_brick_wall_side", "y": 90, "uvlock": true } @@ -32,7 +32,7 @@ "south": "low" }, "apply": { - "model": "minecraft:block/violecite_brick_wall_side", + "model": "betterend:block/violecite_brick_wall_side", "y": 180, "uvlock": true } @@ -42,7 +42,7 @@ "west": "low" }, "apply": { - "model": "minecraft:block/violecite_brick_wall_side", + "model": "betterend:block/violecite_brick_wall_side", "y": 270, "uvlock": true } @@ -52,7 +52,7 @@ "north": "tall" }, "apply": { - "model": "minecraft:block/violecite_brick_wall_side_tall", + "model": "betterend:block/violecite_brick_wall_side_tall", "uvlock": true } }, @@ -61,7 +61,7 @@ "east": "tall" }, "apply": { - "model": "minecraft:block/violecite_brick_wall_side_tall", + "model": "betterend:block/violecite_brick_wall_side_tall", "y": 90, "uvlock": true } @@ -71,7 +71,7 @@ "south": "tall" }, "apply": { - "model": "minecraft:block/violecite_brick_wall_side_tall", + "model": "betterend:block/violecite_brick_wall_side_tall", "y": 180, "uvlock": true } @@ -81,7 +81,7 @@ "west": "tall" }, "apply": { - "model": "minecraft:block/violecite_brick_wall_side_tall", + "model": "betterend:block/violecite_brick_wall_side_tall", "y": 270, "uvlock": true } diff --git a/src/main/resources/assets/betterend/blockstates/violecite_pillar.json b/src/main/resources/assets/betterend/blockstates/violecite_pillar.json index 3eb5a9cf..122c20b5 100644 --- a/src/main/resources/assets/betterend/blockstates/violecite_pillar.json +++ b/src/main/resources/assets/betterend/blockstates/violecite_pillar.json @@ -1,6 +1,6 @@ { "variants": { - "axis=x": { "model": "betterend:block/violecite_pillar", "x": 90, "y": 90 }, + "axis=x": { "model": "betterend:block/violecite_pillar", "x": 90, "y": 270 }, "axis=y": { "model": "betterend:block/violecite_pillar" }, "axis=z": { "model": "betterend:block/violecite_pillar", "x": 90 } } diff --git a/src/main/resources/assets/betterend/blockstates/violecite_slab.json b/src/main/resources/assets/betterend/blockstates/violecite_slab.json index a231e15f..1e4a0b4c 100644 --- a/src/main/resources/assets/betterend/blockstates/violecite_slab.json +++ b/src/main/resources/assets/betterend/blockstates/violecite_slab.json @@ -4,7 +4,7 @@ "model": "betterend:block/violecite_half_slab" }, "type=double": { - "model": "betterend:block/violecite_planks" + "model": "betterend:block/violecite" }, "type=top": { "model": "betterend:block/violecite_half_slab", diff --git a/src/main/resources/assets/betterend/blockstates/violecite_wall.json b/src/main/resources/assets/betterend/blockstates/violecite_wall.json index 15c6f3e5..fae6a469 100644 --- a/src/main/resources/assets/betterend/blockstates/violecite_wall.json +++ b/src/main/resources/assets/betterend/blockstates/violecite_wall.json @@ -5,7 +5,7 @@ "up": "true" }, "apply": { - "model": "minecraft:block/violecite_wall_post" + "model": "betterend:block/violecite_wall_post" } }, { @@ -13,7 +13,7 @@ "north": "low" }, "apply": { - "model": "minecraft:block/violecite_wall_side", + "model": "betterend:block/violecite_wall_side", "uvlock": true } }, @@ -22,7 +22,7 @@ "east": "low" }, "apply": { - "model": "minecraft:block/violecite_wall_side", + "model": "betterend:block/violecite_wall_side", "y": 90, "uvlock": true } @@ -32,7 +32,7 @@ "south": "low" }, "apply": { - "model": "minecraft:block/violecite_wall_side", + "model": "betterend:block/violecite_wall_side", "y": 180, "uvlock": true } @@ -42,7 +42,7 @@ "west": "low" }, "apply": { - "model": "minecraft:block/violecite_wall_side", + "model": "betterend:block/violecite_wall_side", "y": 270, "uvlock": true } @@ -52,7 +52,7 @@ "north": "tall" }, "apply": { - "model": "minecraft:block/violecite_wall_side_tall", + "model": "betterend:block/violecite_wall_side_tall", "uvlock": true } }, @@ -61,7 +61,7 @@ "east": "tall" }, "apply": { - "model": "minecraft:block/violecite_wall_side_tall", + "model": "betterend:block/violecite_wall_side_tall", "y": 90, "uvlock": true } @@ -71,7 +71,7 @@ "south": "tall" }, "apply": { - "model": "minecraft:block/violecite_wall_side_tall", + "model": "betterend:block/violecite_wall_side_tall", "y": 180, "uvlock": true } @@ -81,7 +81,7 @@ "west": "tall" }, "apply": { - "model": "minecraft:block/violecite_wall_side_tall", + "model": "betterend:block/violecite_wall_side_tall", "y": 270, "uvlock": true } diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 0f80aefb..88b88bfa 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -127,5 +127,19 @@ "block.betterend.end_lily": "End Lily", "block.betterend.end_lily_seed": "End Lily Seed", "item.betterend.end_lily_leaf": "End Lily Leaf", - "item.betterend.end_lily_leaf_dried": "End Lily Leaf Dried" + "item.betterend.end_lily_leaf_dried": "End Lily Leaf Dried", + + "block.betterend.violecite": "Violecite", + "block.betterend.violecite_bricks": "Violecite Bricks", + "block.betterend.violecite_brick_slab": "Violecite Brick Slab", + "block.betterend.violecite_brick_stairs": "Violecite Brick Stairs", + "block.betterend.violecite_brick_wall": "Violecite Brick Wall", + "block.betterend.violecite_button": "Violecite Button", + "block.betterend.violecite_pillar": "Violecite Pillar", + "block.betterend.violecite_plate": "Violecite Plate", + "block.betterend.violecite_slab": "Violecite Slab", + "block.betterend.violecite_small_tiles": "Violecite Small Tiles", + "block.betterend.violecite_stairs": "Violecite Stairs", + "block.betterend.violecite_tile": "Violecite Tile", + "block.betterend.violecite_wall": "Violecite Wall" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 73c11f44..b84bf42e 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -127,5 +127,19 @@ "block.betterend.end_lily": "Лилия Края", "block.betterend.end_lily_seed": "Семя лилии Края", "item.betterend.end_lily_leaf": "Лист лилии Края", - "item.betterend.end_lily_leaf_dried": "Высушенный лист лилии Края" + "item.betterend.end_lily_leaf_dried": "Высушенный лист лилии Края", + + "block.betterend.violecite": "Виолецит", + "block.betterend.violecite_bricks": "Виолецитовые кирпичи", + "block.betterend.violecite_brick_slab": "Плита из виолецитовых кирпичей", + "block.betterend.violecite_brick_stairs": "Ступени из виолецитовых кирпичей", + "block.betterend.violecite_brick_wall": "Стена из виолецитовых кирпичей", + "block.betterend.violecite_button": "Виолецитовая кнопка", + "block.betterend.violecite_pillar": "Виолецитовая колонна", + "block.betterend.violecite_plate": "Виолецитовая нажимная плита", + "block.betterend.violecite_slab": "Виолецитовая плита", + "block.betterend.violecite_small_tiles": "Маленькая виолецитовая плитка", + "block.betterend.violecite_stairs": "Виолецитовые ступени", + "block.betterend.violecite_tile": "Виолецитовая плитка", + "block.betterend.violecite_wall": "Виолецитовая стена" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/violecite_brick_half_slab.json b/src/main/resources/assets/betterend/models/block/violecite_brick_half_slab.json new file mode 100644 index 00000000..6d52e930 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_brick_half_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab", + "textures": { + "bottom": "betterend:block/violecite_bricks", + "side": "betterend:block/violecite_bricks", + "top": "betterend:block/violecite_bricks" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_brick_wall_inventory.json b/src/main/resources/assets/betterend/models/block/violecite_brick_wall_inventory.json index 1e9673e3..8955de3f 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_brick_wall_inventory.json +++ b/src/main/resources/assets/betterend/models/block/violecite_brick_wall_inventory.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_inventory", "textures": { - "wall": "minecraft:block/violecite_bricks" + "wall": "betterend:block/violecite_bricks" } } diff --git a/src/main/resources/assets/betterend/models/block/violecite_brick_wall_post.json b/src/main/resources/assets/betterend/models/block/violecite_brick_wall_post.json index 5304434e..87799b7b 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_brick_wall_post.json +++ b/src/main/resources/assets/betterend/models/block/violecite_brick_wall_post.json @@ -1,6 +1,22 @@ { - "parent": "minecraft:block/template_wall_post", - "textures": { - "wall": "minecraft:block/violecite_bricks" - } + "parent": "block/block", + "textures": { + "side": "betterend:block/violecite_post_side", + "top": "betterend:block/violecite_post_top", + "particle": "#side" + }, + "elements": [ + { + "from": [ 4, 0, 4 ], + "to": [ 12, 16, 12 ], + "faces": { + "down": { "uv": [ 4, 4, 12, 12 ], "texture": "#top", "cullface": "down" }, + "up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top", "cullface": "up" }, + "north": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, + "south": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, + "west": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" }, + "east": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" } + } + } + ] } diff --git a/src/main/resources/assets/betterend/models/block/violecite_brick_wall_side.json b/src/main/resources/assets/betterend/models/block/violecite_brick_wall_side.json index 819543a2..1ac148cb 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_brick_wall_side.json +++ b/src/main/resources/assets/betterend/models/block/violecite_brick_wall_side.json @@ -1,6 +1,20 @@ { - "parent": "minecraft:block/template_wall_side", - "textures": { - "wall": "minecraft:block/violecite_bricks" - } + "textures": { + "wall": "betterend:block/violecite_bricks", + "top": "betterend:block/violecite_bricks_wall_top", + "particle": "#wall" + }, + "elements": [ + { + "from": [ 5, 0, 0 ], + "to": [ 11, 14, 8 ], + "faces": { + "down": { "texture": "#top", "cullface": "down" }, + "up": { "texture": "#top" }, + "north": { "texture": "#wall", "cullface": "north" }, + "west": { "texture": "#wall" }, + "east": { "texture": "#wall" } + } + } + ] } diff --git a/src/main/resources/assets/betterend/models/block/violecite_brick_wall_side_tall.json b/src/main/resources/assets/betterend/models/block/violecite_brick_wall_side_tall.json index 2966dff0..df0eb919 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_brick_wall_side_tall.json +++ b/src/main/resources/assets/betterend/models/block/violecite_brick_wall_side_tall.json @@ -1,6 +1,20 @@ { - "parent": "minecraft:block/template_wall_side_tall", - "textures": { - "wall": "minecraft:block/violecite_bricks" - } + "textures": { + "wall": "betterend:block/violecite_bricks", + "top": "betterend:block/violecite_bricks_wall_top", + "particle": "#wall" + }, + "elements": [ + { + "from": [ 5, 0, 0 ], + "to": [ 11, 16, 8 ], + "faces": { + "down": { "texture": "#top", "cullface": "down" }, + "up": { "texture": "#top", "cullface": "up"}, + "north": { "texture": "#wall", "cullface": "north" }, + "west": { "texture": "#wall" }, + "east": { "texture": "#wall" } + } + } + ] } diff --git a/src/main/resources/assets/betterend/models/block/violecite_half_slab.json b/src/main/resources/assets/betterend/models/block/violecite_half_slab.json new file mode 100644 index 00000000..55194684 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/violecite_half_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab", + "textures": { + "bottom": "betterend:block/violecite", + "side": "betterend:block/violecite", + "top": "betterend:block/violecite" + } +} diff --git a/src/main/resources/assets/betterend/models/block/violecite_wall_inventory.json b/src/main/resources/assets/betterend/models/block/violecite_wall_inventory.json index 799d84b0..479a780d 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_wall_inventory.json +++ b/src/main/resources/assets/betterend/models/block/violecite_wall_inventory.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_inventory", "textures": { - "wall": "minecraft:block/violecite" + "wall": "betterend:block/violecite" } } diff --git a/src/main/resources/assets/betterend/models/block/violecite_wall_post.json b/src/main/resources/assets/betterend/models/block/violecite_wall_post.json index 80d13460..ec0c961c 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_wall_post.json +++ b/src/main/resources/assets/betterend/models/block/violecite_wall_post.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_post", "textures": { - "wall": "minecraft:block/violecite" + "wall": "betterend:block/violecite" } } diff --git a/src/main/resources/assets/betterend/models/block/violecite_wall_side.json b/src/main/resources/assets/betterend/models/block/violecite_wall_side.json index 75fcfcf4..9ec704d3 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_wall_side.json +++ b/src/main/resources/assets/betterend/models/block/violecite_wall_side.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_side", "textures": { - "wall": "minecraft:block/violecite" + "wall": "betterend:block/violecite" } } diff --git a/src/main/resources/assets/betterend/models/block/violecite_wall_side_tall.json b/src/main/resources/assets/betterend/models/block/violecite_wall_side_tall.json index 847be061..4054b5fc 100644 --- a/src/main/resources/assets/betterend/models/block/violecite_wall_side_tall.json +++ b/src/main/resources/assets/betterend/models/block/violecite_wall_side_tall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_side_tall", "textures": { - "wall": "minecraft:block/violecite" + "wall": "betterend:block/violecite" } } diff --git a/src/main/resources/assets/betterend/models/item/violecite_brick_slab.json b/src/main/resources/assets/betterend/models/item/violecite_brick_slab.json index 80081c59..25eadef2 100644 --- a/src/main/resources/assets/betterend/models/item/violecite_brick_slab.json +++ b/src/main/resources/assets/betterend/models/item/violecite_brick_slab.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/violecite_brick_slab" + "parent": "betterend:block/violecite_brick_half_slab" } diff --git a/src/main/resources/assets/betterend/models/item/violecite_slab.json b/src/main/resources/assets/betterend/models/item/violecite_slab.json index db568062..9fe4c049 100644 --- a/src/main/resources/assets/betterend/models/item/violecite_slab.json +++ b/src/main/resources/assets/betterend/models/item/violecite_slab.json @@ -1,3 +1,3 @@ { - "parent": "betterend:block/violecite_slab" + "parent": "betterend:block/violecite_half_slab" } diff --git a/src/main/resources/assets/betterend/textures/block/violecite b/src/main/resources/assets/betterend/textures/block/violecite deleted file mode 100644 index 88788b5a..00000000 Binary files a/src/main/resources/assets/betterend/textures/block/violecite and /dev/null differ diff --git a/src/main/resources/assets/betterend/textures/block/violecite_bricks.png b/src/main/resources/assets/betterend/textures/block/violecite_bricks.png new file mode 100644 index 00000000..98ff67c5 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/violecite_bricks.png differ diff --git a/src/main/resources/assets/betterend/textures/block/violecite_bricks_wall_top.png b/src/main/resources/assets/betterend/textures/block/violecite_bricks_wall_top.png new file mode 100644 index 00000000..efa46ed1 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/violecite_bricks_wall_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/violecite_pilar_side.png b/src/main/resources/assets/betterend/textures/block/violecite_pillar_side.png similarity index 100% rename from src/main/resources/assets/betterend/textures/block/violecite_pilar_side.png rename to src/main/resources/assets/betterend/textures/block/violecite_pillar_side.png diff --git a/src/main/resources/assets/betterend/textures/block/violecite_pillar_top.png b/src/main/resources/assets/betterend/textures/block/violecite_pillar_top.png index 1f7c62e6..4e566140 100644 Binary files a/src/main/resources/assets/betterend/textures/block/violecite_pillar_top.png and b/src/main/resources/assets/betterend/textures/block/violecite_pillar_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/violecite_post_side.png b/src/main/resources/assets/betterend/textures/block/violecite_post_side.png new file mode 100644 index 00000000..4021ef89 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/violecite_post_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/violecite_post_top.png b/src/main/resources/assets/betterend/textures/block/violecite_post_top.png new file mode 100644 index 00000000..2f4ffe2d Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/violecite_post_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/violecite_tile.png b/src/main/resources/assets/betterend/textures/block/violecite_tile.png new file mode 100644 index 00000000..b940eb48 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/violecite_tile.png differ