From 4e27feb292baed4808d4ee1fa723a7acea6658ad Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Wed, 31 Jul 2024 19:51:27 +0200 Subject: [PATCH] Optimize models --- build.gradle | 1 + gradle.properties | 2 +- .../block/black_double_lamp_off_top.json | 145 +---------- .../block/black_double_lamp_on_top.json | 145 +---------- .../models/block/black_lamp_off.json | 159 +---------- .../models/block/black_lamp_on.json | 159 +---------- .../block/blue_double_lamp_off_top.json | 145 +---------- .../models/block/blue_double_lamp_on_top.json | 145 +---------- .../models/block/blue_lamp_off.json | 159 +---------- .../decorative/models/block/blue_lamp_on.json | 159 +---------- .../block/brown_double_lamp_off_top.json | 145 +---------- .../block/brown_double_lamp_on_top.json | 145 +---------- .../models/block/brown_lamp_off.json | 159 +---------- .../models/block/brown_lamp_on.json | 159 +---------- .../models/block/christmas_lights_on.json | 245 +---------------- .../block/cyan_double_lamp_off_top.json | 145 +---------- .../models/block/cyan_double_lamp_on_top.json | 145 +---------- .../models/block/cyan_lamp_off.json | 159 +---------- .../decorative/models/block/cyan_lamp_on.json | 159 +---------- .../block/gray_double_lamp_off_top.json | 145 +---------- .../models/block/gray_double_lamp_on_top.json | 145 +---------- .../models/block/gray_lamp_off.json | 159 +---------- .../decorative/models/block/gray_lamp_on.json | 159 +---------- .../block/green_double_lamp_off_top.json | 145 +---------- .../block/green_double_lamp_on_top.json | 145 +---------- .../models/block/green_lamp_off.json | 159 +---------- .../models/block/green_lamp_on.json | 159 +---------- .../block/light_blue_double_lamp_off_top.json | 145 +---------- .../block/light_blue_double_lamp_on_top.json | 145 +---------- .../models/block/light_blue_lamp_off.json | 159 +---------- .../models/block/light_blue_lamp_on.json | 159 +---------- .../block/light_gray_double_lamp_off_top.json | 145 +---------- .../block/light_gray_double_lamp_on_top.json | 145 +---------- .../models/block/light_gray_lamp_off.json | 159 +---------- .../models/block/light_gray_lamp_on.json | 159 +---------- .../block/lime_double_lamp_off_top.json | 145 +---------- .../models/block/lime_double_lamp_on_top.json | 145 +---------- .../models/block/lime_lamp_off.json | 159 +---------- .../decorative/models/block/lime_lamp_on.json | 159 +---------- .../block/magenta_double_lamp_off_top.json | 145 +---------- .../block/magenta_double_lamp_on_top.json | 145 +---------- .../models/block/magenta_lamp_off.json | 159 +---------- .../models/block/magenta_lamp_on.json | 159 +---------- .../block/orange_double_lamp_off_top.json | 145 +---------- .../block/orange_double_lamp_on_top.json | 145 +---------- .../models/block/orange_lamp_off.json | 159 +---------- .../models/block/orange_lamp_on.json | 159 +---------- .../models/block/pennant_chain.json | 246 ------------------ .../block/pink_double_lamp_off_top.json | 145 +---------- .../models/block/pink_double_lamp_on_top.json | 145 +---------- .../models/block/pink_lamp_off.json | 159 +---------- .../decorative/models/block/pink_lamp_on.json | 159 +---------- .../block/purple_double_lamp_off_top.json | 145 +---------- .../block/purple_double_lamp_on_top.json | 145 +---------- .../models/block/purple_lamp_off.json | 159 +---------- .../models/block/purple_lamp_on.json | 159 +---------- .../models/block/red_double_lamp_off_top.json | 145 +---------- .../models/block/red_double_lamp_on_top.json | 145 +---------- .../decorative/models/block/red_lamp_off.json | 159 +---------- .../decorative/models/block/red_lamp_on.json | 159 +---------- .../block/white_double_lamp_on_top.json | 145 +---------- .../models/block/white_lamp_on.json | 159 +---------- .../block/yellow_double_lamp_off_top.json | 145 +---------- .../block/yellow_double_lamp_on_top.json | 145 +---------- .../models/block/yellow_lamp_off.json | 159 +---------- .../models/block/yellow_lamp_on.json | 159 +---------- .../models/item/black_double_lamp.json | 210 +-------------- .../models/item/blue_double_lamp.json | 210 +-------------- .../models/item/brown_double_lamp.json | 210 +-------------- .../models/item/cyan_double_lamp.json | 210 +-------------- .../models/item/gray_double_lamp.json | 210 +-------------- .../models/item/green_double_lamp.json | 210 +-------------- .../models/item/light_blue_double_lamp.json | 210 +-------------- .../models/item/light_gray_double_lamp.json | 210 +-------------- .../models/item/lime_double_lamp.json | 210 +-------------- .../models/item/magenta_double_lamp.json | 210 +-------------- .../models/item/orange_double_lamp.json | 210 +-------------- .../models/item/pink_double_lamp.json | 210 +-------------- .../models/item/purple_double_lamp.json | 210 +-------------- .../models/item/red_double_lamp.json | 210 +-------------- .../models/item/yellow_double_lamp.json | 210 +-------------- .../decorative/optifine/emissive.properties | 1 - 82 files changed, 236 insertions(+), 12833 deletions(-) delete mode 100755 src/main/resources/assets/decorative/models/block/pennant_chain.json delete mode 100755 src/main/resources/assets/decorative/optifine/emissive.properties diff --git a/build.gradle b/build.gradle index 8e19302..b876854 100755 --- a/build.gradle +++ b/build.gradle @@ -65,6 +65,7 @@ dependencies { modImplementation include("eu.pb4:polymer-blocks:${polymer_version}") modImplementation include("eu.pb4:polymer-resource-pack:${polymer_version}") modImplementation include("eu.pb4:polymer-virtual-entity:${polymer_version}") + modImplementation include("eu.pb4:polymer-autohost:${polymer_version}") modImplementation include("eu.pb4:factorytools:${factorytools_version}") } diff --git a/gradle.properties b/gradle.properties index d3fee91..613ac44 100755 --- a/gradle.properties +++ b/gradle.properties @@ -17,5 +17,5 @@ org.gradle.jvmargs=-Xmx2G fabric_version=0.100.7+1.21 midnightlib_version=1.5.7-fabric patchouli_version=1.18.2-67-FABRIC - polymer_version=0.9.6+1.21 + polymer_version=0.9.7+1.21 factorytools_version=0.3.1+1.21 diff --git a/src/main/resources/assets/decorative/models/block/black_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/black_double_lamp_off_top.json index 6e2a4a0..1d77b3e 100755 --- a/src/main/resources/assets/decorative/models/block/black_double_lamp_off_top.json +++ b/src/main/resources/assets/decorative/models/block/black_double_lamp_off_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_off_top", "textures": { - "2": "block/black_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/black_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/black_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/black_double_lamp_on_top.json index cb39d10..a7de161 100755 --- a/src/main/resources/assets/decorative/models/block/black_double_lamp_on_top.json +++ b/src/main/resources/assets/decorative/models/block/black_double_lamp_on_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_on_top", "textures": { - "2": "block/black_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/black_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/black_lamp_off.json b/src/main/resources/assets/decorative/models/block/black_lamp_off.json index 475c477..5ed7d2b 100755 --- a/src/main/resources/assets/decorative/models/block/black_lamp_off.json +++ b/src/main/resources/assets/decorative/models/block/black_lamp_off.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_off", "textures": { - "0": "block/iron_block", - "2": "block/black_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/black_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/black_lamp_on.json b/src/main/resources/assets/decorative/models/block/black_lamp_on.json index becba45..33db780 100755 --- a/src/main/resources/assets/decorative/models/block/black_lamp_on.json +++ b/src/main/resources/assets/decorative/models/block/black_lamp_on.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_on", "textures": { - "0": "block/iron_block", - "2": "block/black_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/black_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/blue_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/blue_double_lamp_off_top.json index 46f7002..3d24a6b 100755 --- a/src/main/resources/assets/decorative/models/block/blue_double_lamp_off_top.json +++ b/src/main/resources/assets/decorative/models/block/blue_double_lamp_off_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_off_top", "textures": { - "2": "block/blue_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/blue_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/blue_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/blue_double_lamp_on_top.json index e0f0fe3..93b4da8 100755 --- a/src/main/resources/assets/decorative/models/block/blue_double_lamp_on_top.json +++ b/src/main/resources/assets/decorative/models/block/blue_double_lamp_on_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_on_top", "textures": { - "2": "block/blue_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/blue_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/blue_lamp_off.json b/src/main/resources/assets/decorative/models/block/blue_lamp_off.json index a1995e3..fa9205a 100755 --- a/src/main/resources/assets/decorative/models/block/blue_lamp_off.json +++ b/src/main/resources/assets/decorative/models/block/blue_lamp_off.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_off", "textures": { - "0": "block/iron_block", - "2": "block/blue_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/blue_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/blue_lamp_on.json b/src/main/resources/assets/decorative/models/block/blue_lamp_on.json index 1671fa1..8d6e7ca 100755 --- a/src/main/resources/assets/decorative/models/block/blue_lamp_on.json +++ b/src/main/resources/assets/decorative/models/block/blue_lamp_on.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_on", "textures": { - "0": "block/iron_block", - "2": "block/blue_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/blue_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/brown_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/brown_double_lamp_off_top.json index 9ea63d8..49ef837 100755 --- a/src/main/resources/assets/decorative/models/block/brown_double_lamp_off_top.json +++ b/src/main/resources/assets/decorative/models/block/brown_double_lamp_off_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_off_top", "textures": { - "2": "block/brown_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/brown_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/brown_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/brown_double_lamp_on_top.json index 4d4709e..479069c 100755 --- a/src/main/resources/assets/decorative/models/block/brown_double_lamp_on_top.json +++ b/src/main/resources/assets/decorative/models/block/brown_double_lamp_on_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_on_top", "textures": { - "2": "block/brown_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/brown_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/brown_lamp_off.json b/src/main/resources/assets/decorative/models/block/brown_lamp_off.json index e15c052..20325d1 100755 --- a/src/main/resources/assets/decorative/models/block/brown_lamp_off.json +++ b/src/main/resources/assets/decorative/models/block/brown_lamp_off.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_off", "textures": { - "0": "block/iron_block", - "2": "block/brown_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/brown_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/brown_lamp_on.json b/src/main/resources/assets/decorative/models/block/brown_lamp_on.json index 56acce6..c282c42 100755 --- a/src/main/resources/assets/decorative/models/block/brown_lamp_on.json +++ b/src/main/resources/assets/decorative/models/block/brown_lamp_on.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_on", "textures": { - "0": "block/iron_block", - "2": "block/brown_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/brown_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/christmas_lights_on.json b/src/main/resources/assets/decorative/models/block/christmas_lights_on.json index 208d19f..528f2c8 100755 --- a/src/main/resources/assets/decorative/models/block/christmas_lights_on.json +++ b/src/main/resources/assets/decorative/models/block/christmas_lights_on.json @@ -1,246 +1,7 @@ { - "credit": "made by Motschen", + "parent": "decorative:block/christmas_lights_off", "textures": { - "1": "block/black_concrete", "2": "decorative:block/red_lamp", - "4": "decorative:block/green_lamp", - "particle": "block/black_concrete" - }, - "elements": [ - { - "from": [-8, 4.6, 8], - "to": [3, 5.6, 9], - "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 0, 11, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 11, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 11, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 11, 1], "texture": "#1"} - } - }, - { - "from": [13.1, 4.6, 8], - "to": [24.1, 5.6, 9], - "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 0, 11, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 11, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 11, 1], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 11, 1], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [0.5, 7.1, 8], - "to": [15.53, 8.1, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 0, 15.03, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 15.03, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 15.03, 1], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 15.03, 1], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [20, 24, 8], - "to": [21, 32, 9], - "rotation": {"angle": -45, "axis": "z", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"}, - "east": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"}, - "south": {"uv": [0, 0, 8, 1], "rotation": 270, "texture": "#1"}, - "west": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-5, 24, 8], - "to": [-4, 32, 9], - "rotation": {"angle": 45, "axis": "z", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 0, 8, 1], "rotation": 270, "texture": "#1"}, - "east": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"}, - "south": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"}, - "west": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [1, 4, 7], - "to": [4, 7, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [9, 12, 8]}, - "faces": { - "north": {"uv": [9, 9, 12, 12], "texture": "#2"}, - "east": {"uv": [11, 10, 14, 13], "texture": "#2"}, - "south": {"uv": [4, 2, 7, 5], "texture": "#2"}, - "west": {"uv": [2, 3, 5, 6], "texture": "#2"}, - "up": {"uv": [11, 11, 14, 14], "texture": "#2"}, - "down": {"uv": [7, 4, 10, 7], "texture": "#2"} - } - }, - { - "from": [6.5, 4, 7], - "to": [9.5, 7, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 8]}, - "faces": { - "north": {"uv": [9, 9, 12, 12], "texture": "#4"}, - "east": {"uv": [11, 10, 14, 13], "texture": "#4"}, - "south": {"uv": [4, 2, 7, 5], "texture": "#4"}, - "west": {"uv": [2, 3, 5, 6], "texture": "#4"}, - "up": {"uv": [11, 11, 14, 14], "texture": "#4"}, - "down": {"uv": [7, 4, 10, 7], "texture": "#4"} - } - }, - { - "from": [12, 4, 7], - "to": [15, 7, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 12, 8]}, - "faces": { - "north": {"uv": [9, 9, 12, 12], "texture": "#2"}, - "east": {"uv": [11, 10, 14, 13], "texture": "#2"}, - "south": {"uv": [4, 2, 7, 5], "texture": "#2"}, - "west": {"uv": [2, 3, 5, 6], "texture": "#2"}, - "up": {"uv": [11, 11, 14, 14], "texture": "#2"}, - "down": {"uv": [7, 4, 10, 7], "texture": "#2"} - } - }, - { - "from": [15.5, 9, 7], - "to": [18.5, 12, 10], - "rotation": {"angle": 22.5, "axis": "z", "origin": [27, 14, 8]}, - "faces": { - "north": {"uv": [9, 9, 12, 12], "texture": "#4"}, - "east": {"uv": [11, 10, 14, 13], "texture": "#4"}, - "south": {"uv": [4, 2, 7, 5], "texture": "#4"}, - "west": {"uv": [2, 3, 5, 6], "texture": "#4"}, - "up": {"uv": [11, 11, 14, 14], "texture": "#4"}, - "down": {"uv": [7, 4, 10, 7], "texture": "#4"} - } - }, - { - "from": [-2.5, 3, 7], - "to": [0.5, 6, 10], - "rotation": {"angle": -22.5, "axis": "z", "origin": [5, 12, 8]}, - "faces": { - "north": {"uv": [9, 9, 12, 12], "texture": "#4"}, - "east": {"uv": [11, 10, 14, 13], "texture": "#4"}, - "south": {"uv": [4, 2, 7, 5], "texture": "#4"}, - "west": {"uv": [2, 3, 5, 6], "texture": "#4"}, - "up": {"uv": [11, 11, 14, 14], "texture": "#4"}, - "down": {"uv": [7, 4, 10, 7], "texture": "#4"} - } - }, - { - "from": [22, 10, 7], - "to": [25, 13, 10], - "rotation": {"angle": 22.5, "axis": "z", "origin": [30, 12, 8]}, - "faces": { - "north": {"uv": [9, 9, 12, 12], "texture": "#2"}, - "east": {"uv": [11, 10, 14, 13], "texture": "#2"}, - "south": {"uv": [4, 2, 7, 5], "texture": "#2"}, - "west": {"uv": [2, 3, 5, 6], "texture": "#2"}, - "up": {"uv": [11, 11, 14, 14], "texture": "#2"}, - "down": {"uv": [7, 4, 10, 7], "texture": "#2"} - } - }, - { - "from": [-8, 7.5, 7], - "to": [-5, 10.5, 10], - "rotation": {"angle": -22.5, "axis": "z", "origin": [-7, 12, 8]}, - "faces": { - "north": {"uv": [9, 9, 12, 12], "texture": "#2"}, - "east": {"uv": [11, 10, 14, 13], "texture": "#2"}, - "south": {"uv": [4, 2, 7, 5], "texture": "#2"}, - "west": {"uv": [2, 3, 5, 6], "texture": "#2"}, - "up": {"uv": [11, 11, 14, 14], "texture": "#2"}, - "down": {"uv": [7, 4, 10, 7], "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 1, 0], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "translation": [0, 1, 0], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [0, -23, 0], - "translation": [-0.25, 1.75, 0], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [0, -23, 0], - "translation": [0, 2.25, 0], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [25, -25, 0], - "translation": [0, -1.25, 0], - "scale": [0.32, 0.32, 0.32] - }, - "head": { - "translation": [0, 7.5, 0], - "scale": [0.25, 0.25, 0.25] - }, - "fixed": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [ - { - "name": "hanginglights", - "origin": [8, 8, 8], - "children": [0, 1, 2, 3, 4, - { - "name": "light1", - "origin": [8, 8, 8], - "children": [5] - }, - { - "name": "light2", - "origin": [8, 8, 8], - "children": [6] - }, - { - "name": "light1", - "origin": [8, 8, 8], - "children": [7] - }, - { - "name": "light2", - "origin": [8, 8, 8], - "children": [8] - }, - { - "name": "light2", - "origin": [8, 8, 8], - "children": [9] - }, - { - "name": "light1", - "origin": [8, 8, 8], - "children": [10] - }, - { - "name": "light1", - "origin": [8, 8, 8], - "children": [11] - } - ] - } - ] + "4": "decorative:block/green_lamp" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/cyan_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/cyan_double_lamp_off_top.json index 537e383..f6aaa7c 100755 --- a/src/main/resources/assets/decorative/models/block/cyan_double_lamp_off_top.json +++ b/src/main/resources/assets/decorative/models/block/cyan_double_lamp_off_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_off_top", "textures": { - "2": "block/cyan_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/cyan_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/cyan_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/cyan_double_lamp_on_top.json index be9053f..9c2dd4d 100755 --- a/src/main/resources/assets/decorative/models/block/cyan_double_lamp_on_top.json +++ b/src/main/resources/assets/decorative/models/block/cyan_double_lamp_on_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_on_top", "textures": { - "2": "block/cyan_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/cyan_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/cyan_lamp_off.json b/src/main/resources/assets/decorative/models/block/cyan_lamp_off.json index eafb989..5ff5e43 100755 --- a/src/main/resources/assets/decorative/models/block/cyan_lamp_off.json +++ b/src/main/resources/assets/decorative/models/block/cyan_lamp_off.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_off", "textures": { - "0": "block/iron_block", - "2": "block/cyan_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/cyan_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/cyan_lamp_on.json b/src/main/resources/assets/decorative/models/block/cyan_lamp_on.json index 345b5cf..6056065 100755 --- a/src/main/resources/assets/decorative/models/block/cyan_lamp_on.json +++ b/src/main/resources/assets/decorative/models/block/cyan_lamp_on.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_on", "textures": { - "0": "block/iron_block", - "2": "block/cyan_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/cyan_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/gray_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/gray_double_lamp_off_top.json index b20a597..7d3b8e9 100755 --- a/src/main/resources/assets/decorative/models/block/gray_double_lamp_off_top.json +++ b/src/main/resources/assets/decorative/models/block/gray_double_lamp_off_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_off_top", "textures": { - "2": "block/gray_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/gray_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/gray_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/gray_double_lamp_on_top.json index 3b7ee2e..5c86480 100755 --- a/src/main/resources/assets/decorative/models/block/gray_double_lamp_on_top.json +++ b/src/main/resources/assets/decorative/models/block/gray_double_lamp_on_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_on_top", "textures": { - "2": "block/gray_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/gray_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/gray_lamp_off.json b/src/main/resources/assets/decorative/models/block/gray_lamp_off.json index 0d40616..43f3d0d 100755 --- a/src/main/resources/assets/decorative/models/block/gray_lamp_off.json +++ b/src/main/resources/assets/decorative/models/block/gray_lamp_off.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_off", "textures": { - "0": "block/iron_block", - "2": "block/gray_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/gray_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/gray_lamp_on.json b/src/main/resources/assets/decorative/models/block/gray_lamp_on.json index a45dcf5..88fb353 100755 --- a/src/main/resources/assets/decorative/models/block/gray_lamp_on.json +++ b/src/main/resources/assets/decorative/models/block/gray_lamp_on.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_on", "textures": { - "0": "block/iron_block", - "2": "block/gray_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/gray_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/green_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/green_double_lamp_off_top.json index 77a9da4..e8f70b3 100755 --- a/src/main/resources/assets/decorative/models/block/green_double_lamp_off_top.json +++ b/src/main/resources/assets/decorative/models/block/green_double_lamp_off_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_off_top", "textures": { - "2": "block/green_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/green_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/green_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/green_double_lamp_on_top.json index 3e37b6a..26e071d 100755 --- a/src/main/resources/assets/decorative/models/block/green_double_lamp_on_top.json +++ b/src/main/resources/assets/decorative/models/block/green_double_lamp_on_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_on_top", "textures": { - "2": "block/green_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/green_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/green_lamp_off.json b/src/main/resources/assets/decorative/models/block/green_lamp_off.json index c19b368..ad41baf 100755 --- a/src/main/resources/assets/decorative/models/block/green_lamp_off.json +++ b/src/main/resources/assets/decorative/models/block/green_lamp_off.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_off", "textures": { - "0": "block/iron_block", - "2": "block/green_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/green_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/green_lamp_on.json b/src/main/resources/assets/decorative/models/block/green_lamp_on.json index 2a49148..66f0224 100755 --- a/src/main/resources/assets/decorative/models/block/green_lamp_on.json +++ b/src/main/resources/assets/decorative/models/block/green_lamp_on.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_on", "textures": { - "0": "block/iron_block", - "2": "block/green_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/green_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/light_blue_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/light_blue_double_lamp_off_top.json index b2ce89f..ba03be5 100755 --- a/src/main/resources/assets/decorative/models/block/light_blue_double_lamp_off_top.json +++ b/src/main/resources/assets/decorative/models/block/light_blue_double_lamp_off_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_off_top", "textures": { - "2": "block/light_blue_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/light_blue_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/light_blue_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/light_blue_double_lamp_on_top.json index d50a2a2..7e26eb1 100755 --- a/src/main/resources/assets/decorative/models/block/light_blue_double_lamp_on_top.json +++ b/src/main/resources/assets/decorative/models/block/light_blue_double_lamp_on_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_on_top", "textures": { - "2": "block/light_blue_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/light_blue_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/light_blue_lamp_off.json b/src/main/resources/assets/decorative/models/block/light_blue_lamp_off.json index 4b703da..ae04b3f 100755 --- a/src/main/resources/assets/decorative/models/block/light_blue_lamp_off.json +++ b/src/main/resources/assets/decorative/models/block/light_blue_lamp_off.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_off", "textures": { - "0": "block/iron_block", - "2": "block/light_blue_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/light_blue_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/light_blue_lamp_on.json b/src/main/resources/assets/decorative/models/block/light_blue_lamp_on.json index 600d21c..01b9f6f 100755 --- a/src/main/resources/assets/decorative/models/block/light_blue_lamp_on.json +++ b/src/main/resources/assets/decorative/models/block/light_blue_lamp_on.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_on", "textures": { - "0": "block/iron_block", - "2": "block/light_blue_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/light_blue_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/light_gray_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/light_gray_double_lamp_off_top.json index eebc6b7..d44bccd 100755 --- a/src/main/resources/assets/decorative/models/block/light_gray_double_lamp_off_top.json +++ b/src/main/resources/assets/decorative/models/block/light_gray_double_lamp_off_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_off_top", "textures": { - "2": "block/light_gray_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/light_gray_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/light_gray_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/light_gray_double_lamp_on_top.json index 8bcd23b..d170d83 100755 --- a/src/main/resources/assets/decorative/models/block/light_gray_double_lamp_on_top.json +++ b/src/main/resources/assets/decorative/models/block/light_gray_double_lamp_on_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_on_top", "textures": { - "2": "block/light_gray_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/light_gray_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/light_gray_lamp_off.json b/src/main/resources/assets/decorative/models/block/light_gray_lamp_off.json index d25a895..087a36a 100755 --- a/src/main/resources/assets/decorative/models/block/light_gray_lamp_off.json +++ b/src/main/resources/assets/decorative/models/block/light_gray_lamp_off.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_off", "textures": { - "0": "block/iron_block", - "2": "block/light_gray_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/light_gray_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/light_gray_lamp_on.json b/src/main/resources/assets/decorative/models/block/light_gray_lamp_on.json index fa5a4d0..0aa6ecb 100755 --- a/src/main/resources/assets/decorative/models/block/light_gray_lamp_on.json +++ b/src/main/resources/assets/decorative/models/block/light_gray_lamp_on.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_on", "textures": { - "0": "block/iron_block", - "2": "block/light_gray_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/light_gray_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/lime_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/lime_double_lamp_off_top.json index de440a9..3794865 100755 --- a/src/main/resources/assets/decorative/models/block/lime_double_lamp_off_top.json +++ b/src/main/resources/assets/decorative/models/block/lime_double_lamp_off_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_off_top", "textures": { - "2": "block/lime_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/lime_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/lime_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/lime_double_lamp_on_top.json index e9ab4ab..874bf1b 100755 --- a/src/main/resources/assets/decorative/models/block/lime_double_lamp_on_top.json +++ b/src/main/resources/assets/decorative/models/block/lime_double_lamp_on_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_on_top", "textures": { - "2": "block/lime_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/lime_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/lime_lamp_off.json b/src/main/resources/assets/decorative/models/block/lime_lamp_off.json index f539816..8456eda 100755 --- a/src/main/resources/assets/decorative/models/block/lime_lamp_off.json +++ b/src/main/resources/assets/decorative/models/block/lime_lamp_off.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_off", "textures": { - "0": "block/iron_block", - "2": "block/lime_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/lime_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/lime_lamp_on.json b/src/main/resources/assets/decorative/models/block/lime_lamp_on.json index 37dd3d5..17296be 100755 --- a/src/main/resources/assets/decorative/models/block/lime_lamp_on.json +++ b/src/main/resources/assets/decorative/models/block/lime_lamp_on.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_on", "textures": { - "0": "block/iron_block", - "2": "block/lime_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/lime_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/magenta_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/magenta_double_lamp_off_top.json index 6f86cc2..20b58f0 100755 --- a/src/main/resources/assets/decorative/models/block/magenta_double_lamp_off_top.json +++ b/src/main/resources/assets/decorative/models/block/magenta_double_lamp_off_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_off_top", "textures": { - "2": "block/magenta_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/magenta_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/magenta_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/magenta_double_lamp_on_top.json index 7095f5e..5321764 100755 --- a/src/main/resources/assets/decorative/models/block/magenta_double_lamp_on_top.json +++ b/src/main/resources/assets/decorative/models/block/magenta_double_lamp_on_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_on_top", "textures": { - "2": "block/magenta_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/magenta_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/magenta_lamp_off.json b/src/main/resources/assets/decorative/models/block/magenta_lamp_off.json index dfba953..16460bd 100755 --- a/src/main/resources/assets/decorative/models/block/magenta_lamp_off.json +++ b/src/main/resources/assets/decorative/models/block/magenta_lamp_off.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_off", "textures": { - "0": "block/iron_block", - "2": "block/magenta_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/magenta_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/magenta_lamp_on.json b/src/main/resources/assets/decorative/models/block/magenta_lamp_on.json index 0b5e27b..4833df3 100755 --- a/src/main/resources/assets/decorative/models/block/magenta_lamp_on.json +++ b/src/main/resources/assets/decorative/models/block/magenta_lamp_on.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_on", "textures": { - "0": "block/iron_block", - "2": "block/magenta_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/magenta_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/orange_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/orange_double_lamp_off_top.json index 7264d80..1919de7 100755 --- a/src/main/resources/assets/decorative/models/block/orange_double_lamp_off_top.json +++ b/src/main/resources/assets/decorative/models/block/orange_double_lamp_off_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_off_top", "textures": { - "2": "block/orange_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/orange_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/orange_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/orange_double_lamp_on_top.json index 82c72ad..559623c 100755 --- a/src/main/resources/assets/decorative/models/block/orange_double_lamp_on_top.json +++ b/src/main/resources/assets/decorative/models/block/orange_double_lamp_on_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_on_top", "textures": { - "2": "block/orange_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/orange_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/orange_lamp_off.json b/src/main/resources/assets/decorative/models/block/orange_lamp_off.json index a8b8f2f..9336d0b 100755 --- a/src/main/resources/assets/decorative/models/block/orange_lamp_off.json +++ b/src/main/resources/assets/decorative/models/block/orange_lamp_off.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_off", "textures": { - "0": "block/iron_block", - "2": "block/orange_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/orange_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/orange_lamp_on.json b/src/main/resources/assets/decorative/models/block/orange_lamp_on.json index 773633b..4368cc6 100755 --- a/src/main/resources/assets/decorative/models/block/orange_lamp_on.json +++ b/src/main/resources/assets/decorative/models/block/orange_lamp_on.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_on", "textures": { - "0": "block/iron_block", - "2": "block/orange_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/orange_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/pennant_chain.json b/src/main/resources/assets/decorative/models/block/pennant_chain.json deleted file mode 100755 index 9e00b55..0000000 --- a/src/main/resources/assets/decorative/models/block/pennant_chain.json +++ /dev/null @@ -1,246 +0,0 @@ -{ - "credit": "made by Motschen", - "textures": { - "1": "block/black_concrete", - "2": "decorative:block/red_lamp_off", - "4": "decorative:block/green_lamp_off", - "particle": "block/black_concrete" - }, - "elements": [ - { - "from": [-8, 4.6, 8], - "to": [3, 5.6, 9], - "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 0, 11, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 11, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 11, 1], "texture": "#1"}, - "down": {"uv": [0, 0, 11, 1], "texture": "#1"} - } - }, - { - "from": [13.1, 4.6, 8], - "to": [24.1, 5.6, 9], - "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 0, 11, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 11, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 11, 1], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 11, 1], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [0.5, 7.1, 8], - "to": [15.53, 8.1, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 0, 15.03, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 15.03, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 15.03, 1], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 0, 15.03, 1], "rotation": 180, "texture": "#1"} - } - }, - { - "from": [20, 24, 8], - "to": [21, 32, 9], - "rotation": {"angle": -45, "axis": "z", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"}, - "east": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"}, - "south": {"uv": [0, 0, 8, 1], "rotation": 270, "texture": "#1"}, - "west": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 270, "texture": "#1"} - } - }, - { - "from": [-5, 24, 8], - "to": [-4, 32, 9], - "rotation": {"angle": 45, "axis": "z", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 0, 8, 1], "rotation": 270, "texture": "#1"}, - "east": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"}, - "south": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"}, - "west": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#1"}, - "up": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 1, 1], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [1, 4, 7], - "to": [4, 7, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [9, 12, 8]}, - "faces": { - "north": {"uv": [9, 9, 12, 12], "texture": "#2"}, - "east": {"uv": [11, 10, 14, 13], "texture": "#2"}, - "south": {"uv": [4, 2, 7, 5], "texture": "#2"}, - "west": {"uv": [2, 3, 5, 6], "texture": "#2"}, - "up": {"uv": [11, 11, 14, 14], "texture": "#2"}, - "down": {"uv": [7, 4, 10, 7], "texture": "#2"} - } - }, - { - "from": [6.5, 4, 7], - "to": [9.5, 7, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 8]}, - "faces": { - "north": {"uv": [9, 9, 12, 12], "texture": "#4"}, - "east": {"uv": [11, 10, 14, 13], "texture": "#4"}, - "south": {"uv": [4, 2, 7, 5], "texture": "#4"}, - "west": {"uv": [2, 3, 5, 6], "texture": "#4"}, - "up": {"uv": [11, 11, 14, 14], "texture": "#4"}, - "down": {"uv": [7, 4, 10, 7], "texture": "#4"} - } - }, - { - "from": [12, 4, 7], - "to": [15, 7, 10], - "rotation": {"angle": 0, "axis": "y", "origin": [20, 12, 8]}, - "faces": { - "north": {"uv": [9, 9, 12, 12], "texture": "#2"}, - "east": {"uv": [11, 10, 14, 13], "texture": "#2"}, - "south": {"uv": [4, 2, 7, 5], "texture": "#2"}, - "west": {"uv": [2, 3, 5, 6], "texture": "#2"}, - "up": {"uv": [11, 11, 14, 14], "texture": "#2"}, - "down": {"uv": [7, 4, 10, 7], "texture": "#2"} - } - }, - { - "from": [15.5, 9, 7], - "to": [18.5, 12, 10], - "rotation": {"angle": 22.5, "axis": "z", "origin": [27, 14, 8]}, - "faces": { - "north": {"uv": [9, 9, 12, 12], "texture": "#4"}, - "east": {"uv": [11, 10, 14, 13], "texture": "#4"}, - "south": {"uv": [4, 2, 7, 5], "texture": "#4"}, - "west": {"uv": [2, 3, 5, 6], "texture": "#4"}, - "up": {"uv": [11, 11, 14, 14], "texture": "#4"}, - "down": {"uv": [7, 4, 10, 7], "texture": "#4"} - } - }, - { - "from": [-2.5, 3, 7], - "to": [0.5, 6, 10], - "rotation": {"angle": -22.5, "axis": "z", "origin": [5, 12, 8]}, - "faces": { - "north": {"uv": [9, 9, 12, 12], "texture": "#4"}, - "east": {"uv": [11, 10, 14, 13], "texture": "#4"}, - "south": {"uv": [4, 2, 7, 5], "texture": "#4"}, - "west": {"uv": [2, 3, 5, 6], "texture": "#4"}, - "up": {"uv": [11, 11, 14, 14], "texture": "#4"}, - "down": {"uv": [7, 4, 10, 7], "texture": "#4"} - } - }, - { - "from": [22, 10, 7], - "to": [25, 13, 10], - "rotation": {"angle": 22.5, "axis": "z", "origin": [30, 12, 8]}, - "faces": { - "north": {"uv": [9, 9, 12, 12], "texture": "#2"}, - "east": {"uv": [11, 10, 14, 13], "texture": "#2"}, - "south": {"uv": [4, 2, 7, 5], "texture": "#2"}, - "west": {"uv": [2, 3, 5, 6], "texture": "#2"}, - "up": {"uv": [11, 11, 14, 14], "texture": "#2"}, - "down": {"uv": [7, 4, 10, 7], "texture": "#2"} - } - }, - { - "from": [-8, 7.5, 7], - "to": [-5, 10.5, 10], - "rotation": {"angle": -22.5, "axis": "z", "origin": [-7, 12, 8]}, - "faces": { - "north": {"uv": [9, 9, 12, 12], "texture": "#2"}, - "east": {"uv": [11, 10, 14, 13], "texture": "#2"}, - "south": {"uv": [4, 2, 7, 5], "texture": "#2"}, - "west": {"uv": [2, 3, 5, 6], "texture": "#2"}, - "up": {"uv": [11, 11, 14, 14], "texture": "#2"}, - "down": {"uv": [7, 4, 10, 7], "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 1, 0], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "translation": [0, 1, 0], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [0, -23, 0], - "translation": [-0.25, 1.75, 0], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [0, -23, 0], - "translation": [0, 2.25, 0], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [25, -25, 0], - "translation": [0, -1.25, 0], - "scale": [0.32, 0.32, 0.32] - }, - "head": { - "translation": [0, 7.5, 0], - "scale": [0.25, 0.25, 0.25] - }, - "fixed": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [ - { - "name": "hanginglights", - "origin": [8, 8, 8], - "children": [0, 1, 2, 3, 4, - { - "name": "light1", - "origin": [8, 8, 8], - "children": [5] - }, - { - "name": "light2", - "origin": [8, 8, 8], - "children": [6] - }, - { - "name": "light1", - "origin": [8, 8, 8], - "children": [7] - }, - { - "name": "light2", - "origin": [8, 8, 8], - "children": [8] - }, - { - "name": "light2", - "origin": [8, 8, 8], - "children": [9] - }, - { - "name": "light1", - "origin": [8, 8, 8], - "children": [10] - }, - { - "name": "light1", - "origin": [8, 8, 8], - "children": [11] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/pink_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/pink_double_lamp_off_top.json index 52d8d98..83b7502 100755 --- a/src/main/resources/assets/decorative/models/block/pink_double_lamp_off_top.json +++ b/src/main/resources/assets/decorative/models/block/pink_double_lamp_off_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_off_top", "textures": { - "2": "block/pink_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/pink_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/pink_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/pink_double_lamp_on_top.json index 1fbcc1e..7f5aadd 100755 --- a/src/main/resources/assets/decorative/models/block/pink_double_lamp_on_top.json +++ b/src/main/resources/assets/decorative/models/block/pink_double_lamp_on_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_on_top", "textures": { - "2": "block/pink_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/pink_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/pink_lamp_off.json b/src/main/resources/assets/decorative/models/block/pink_lamp_off.json index 41eee4a..7336391 100755 --- a/src/main/resources/assets/decorative/models/block/pink_lamp_off.json +++ b/src/main/resources/assets/decorative/models/block/pink_lamp_off.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_off", "textures": { - "0": "block/iron_block", - "2": "block/pink_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/pink_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/pink_lamp_on.json b/src/main/resources/assets/decorative/models/block/pink_lamp_on.json index 0d93d2d..c18c33d 100755 --- a/src/main/resources/assets/decorative/models/block/pink_lamp_on.json +++ b/src/main/resources/assets/decorative/models/block/pink_lamp_on.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_on", "textures": { - "0": "block/iron_block", - "2": "block/pink_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/pink_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/purple_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/purple_double_lamp_off_top.json index 3e0cf2b..a93c9dc 100755 --- a/src/main/resources/assets/decorative/models/block/purple_double_lamp_off_top.json +++ b/src/main/resources/assets/decorative/models/block/purple_double_lamp_off_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_off_top", "textures": { - "2": "block/purple_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/purple_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/purple_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/purple_double_lamp_on_top.json index 168b6ea..9dac423 100755 --- a/src/main/resources/assets/decorative/models/block/purple_double_lamp_on_top.json +++ b/src/main/resources/assets/decorative/models/block/purple_double_lamp_on_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_on_top", "textures": { - "2": "block/purple_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/purple_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/purple_lamp_off.json b/src/main/resources/assets/decorative/models/block/purple_lamp_off.json index 232344d..ac3ca19 100755 --- a/src/main/resources/assets/decorative/models/block/purple_lamp_off.json +++ b/src/main/resources/assets/decorative/models/block/purple_lamp_off.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_off", "textures": { - "0": "block/iron_block", - "2": "block/purple_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/purple_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/purple_lamp_on.json b/src/main/resources/assets/decorative/models/block/purple_lamp_on.json index 56d92bd..ff38089 100755 --- a/src/main/resources/assets/decorative/models/block/purple_lamp_on.json +++ b/src/main/resources/assets/decorative/models/block/purple_lamp_on.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_on", "textures": { - "0": "block/iron_block", - "2": "block/purple_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/purple_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/red_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/red_double_lamp_off_top.json index 52bc028..56b9df1 100755 --- a/src/main/resources/assets/decorative/models/block/red_double_lamp_off_top.json +++ b/src/main/resources/assets/decorative/models/block/red_double_lamp_off_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_off_top", "textures": { - "2": "block/red_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/red_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/red_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/red_double_lamp_on_top.json index 5654809..5f36e5c 100755 --- a/src/main/resources/assets/decorative/models/block/red_double_lamp_on_top.json +++ b/src/main/resources/assets/decorative/models/block/red_double_lamp_on_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_on_top", "textures": { - "2": "block/red_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/red_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/red_lamp_off.json b/src/main/resources/assets/decorative/models/block/red_lamp_off.json index 13697c0..9baf7c0 100755 --- a/src/main/resources/assets/decorative/models/block/red_lamp_off.json +++ b/src/main/resources/assets/decorative/models/block/red_lamp_off.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_off", "textures": { - "0": "block/iron_block", - "2": "block/red_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/red_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/red_lamp_on.json b/src/main/resources/assets/decorative/models/block/red_lamp_on.json index b66c752..1e44bc5 100755 --- a/src/main/resources/assets/decorative/models/block/red_lamp_on.json +++ b/src/main/resources/assets/decorative/models/block/red_lamp_on.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_on", "textures": { - "0": "block/iron_block", - "2": "block/red_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/red_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/white_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/white_double_lamp_on_top.json index c9683a9..f96b167 100755 --- a/src/main/resources/assets/decorative/models/block/white_double_lamp_on_top.json +++ b/src/main/resources/assets/decorative/models/block/white_double_lamp_on_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_off_top", "textures": { - "2": "block/white_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "3": "block/redstone_lamp_on" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/white_lamp_on.json b/src/main/resources/assets/decorative/models/block/white_lamp_on.json index 13d8638..d6cabbd 100755 --- a/src/main/resources/assets/decorative/models/block/white_lamp_on.json +++ b/src/main/resources/assets/decorative/models/block/white_lamp_on.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_off", "textures": { - "0": "block/iron_block", - "2": "block/white_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "3": "block/redstone_lamp_on" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/yellow_double_lamp_off_top.json b/src/main/resources/assets/decorative/models/block/yellow_double_lamp_off_top.json index 447f067..5c1579b 100755 --- a/src/main/resources/assets/decorative/models/block/yellow_double_lamp_off_top.json +++ b/src/main/resources/assets/decorative/models/block/yellow_double_lamp_off_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_off_top", "textures": { - "2": "block/yellow_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/yellow_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/yellow_double_lamp_on_top.json b/src/main/resources/assets/decorative/models/block/yellow_double_lamp_on_top.json index e0a9e02..a474b12 100755 --- a/src/main/resources/assets/decorative/models/block/yellow_double_lamp_on_top.json +++ b/src/main/resources/assets/decorative/models/block/yellow_double_lamp_on_top.json @@ -1,145 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_double_lamp_on_top", "textures": { - "2": "block/yellow_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [7, 0, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/yellow_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/yellow_lamp_off.json b/src/main/resources/assets/decorative/models/block/yellow_lamp_off.json index ee0f289..e3436dc 100755 --- a/src/main/resources/assets/decorative/models/block/yellow_lamp_off.json +++ b/src/main/resources/assets/decorative/models/block/yellow_lamp_off.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_off", "textures": { - "0": "block/iron_block", - "2": "block/yellow_wool", - "3": "block/redstone_lamp", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/yellow_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/block/yellow_lamp_on.json b/src/main/resources/assets/decorative/models/block/yellow_lamp_on.json index ad87646..3cd8344 100755 --- a/src/main/resources/assets/decorative/models/block/yellow_lamp_on.json +++ b/src/main/resources/assets/decorative/models/block/yellow_lamp_on.json @@ -1,159 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:block/white_lamp_on", "textures": { - "0": "block/iron_block", - "2": "block/yellow_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 4, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 12], "texture": "#5"}, - "east": {"uv": [0, 13, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 10], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 5], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 5, 7], - "to": [9, 7, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 13, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 4, 7.25], - "to": [8.75, 5, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 4.25, 7.75], - "to": [7.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 4.25, 7.75], - "to": [11.25, 4.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 12, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 8.75], - "to": [8.25, 4.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 4.25, 4.75], - "to": [8.25, 4.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 12, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 4, 5], - "to": [5, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 4, 5], - "to": [12, 10, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 12, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 4, 11], - "to": [11, 10, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 4, 4], - "to": [11, 10, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ] + "2": "block/yellow_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/black_double_lamp.json b/src/main/resources/assets/decorative/models/item/black_double_lamp.json index deaf5ea..db08417 100755 --- a/src/main/resources/assets/decorative/models/item/black_double_lamp.json +++ b/src/main/resources/assets/decorative/models/item/black_double_lamp.json @@ -1,210 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:item/white_double_lamp", "textures": { - "0": "block/iron_block", - "2": "block/black_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 16, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [4, 1, 6, 16], "texture": "#5"}, - "east": {"uv": [0, 1, 2, 16], "texture": "#5"}, - "south": {"uv": [6, 1, 8, 16], "texture": "#5"}, - "west": {"uv": [13, 0, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 16, 7], - "to": [9, 20, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 25, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 21, 7], - "to": [9, 23, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 29, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 20, 7.25], - "to": [8.75, 21, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 20.25, 7.75], - "to": [7.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 20.25, 7.75], - "to": [11.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 8.75], - "to": [8.25, 20.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 4.75], - "to": [8.25, 20.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 20, 5], - "to": [5, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 20, 5], - "to": [12, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 20, 11], - "to": [11, 26, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 20, 4], - "to": [11, 26, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "translation": [0, 0.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "translation": [0, 1.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [45, 45, 0], - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "translation": [0, -5.75, 0] - }, - "fixed": { - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [0, 1, - { - "name": "double_lamp_on_top", - "origin": [8, 8, 8], - "children": [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] + "2": "block/black_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/blue_double_lamp.json b/src/main/resources/assets/decorative/models/item/blue_double_lamp.json index 76c4e01..cf47705 100755 --- a/src/main/resources/assets/decorative/models/item/blue_double_lamp.json +++ b/src/main/resources/assets/decorative/models/item/blue_double_lamp.json @@ -1,210 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:item/white_double_lamp", "textures": { - "0": "block/iron_block", - "2": "block/blue_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 16, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [4, 1, 6, 16], "texture": "#5"}, - "east": {"uv": [0, 1, 2, 16], "texture": "#5"}, - "south": {"uv": [6, 1, 8, 16], "texture": "#5"}, - "west": {"uv": [13, 0, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 16, 7], - "to": [9, 20, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 25, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 21, 7], - "to": [9, 23, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 29, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 20, 7.25], - "to": [8.75, 21, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 20.25, 7.75], - "to": [7.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 20.25, 7.75], - "to": [11.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 8.75], - "to": [8.25, 20.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 4.75], - "to": [8.25, 20.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 20, 5], - "to": [5, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 20, 5], - "to": [12, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 20, 11], - "to": [11, 26, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 20, 4], - "to": [11, 26, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "translation": [0, 0.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "translation": [0, 1.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [45, 45, 0], - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "translation": [0, -5.75, 0] - }, - "fixed": { - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [0, 1, - { - "name": "double_lamp_on_top", - "origin": [8, 8, 8], - "children": [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] + "2": "block/blue_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/brown_double_lamp.json b/src/main/resources/assets/decorative/models/item/brown_double_lamp.json index 2a1208d..bba3e83 100755 --- a/src/main/resources/assets/decorative/models/item/brown_double_lamp.json +++ b/src/main/resources/assets/decorative/models/item/brown_double_lamp.json @@ -1,210 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:item/white_double_lamp", "textures": { - "0": "block/iron_block", - "2": "block/brown_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 16, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [4, 1, 6, 16], "texture": "#5"}, - "east": {"uv": [0, 1, 2, 16], "texture": "#5"}, - "south": {"uv": [6, 1, 8, 16], "texture": "#5"}, - "west": {"uv": [13, 0, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 16, 7], - "to": [9, 20, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 25, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 21, 7], - "to": [9, 23, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 29, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 20, 7.25], - "to": [8.75, 21, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 20.25, 7.75], - "to": [7.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 20.25, 7.75], - "to": [11.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 8.75], - "to": [8.25, 20.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 4.75], - "to": [8.25, 20.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 20, 5], - "to": [5, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 20, 5], - "to": [12, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 20, 11], - "to": [11, 26, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 20, 4], - "to": [11, 26, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "translation": [0, 0.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "translation": [0, 1.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [45, 45, 0], - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "translation": [0, -5.75, 0] - }, - "fixed": { - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [0, 1, - { - "name": "double_lamp_on_top", - "origin": [8, 8, 8], - "children": [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] + "2": "block/brown_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/cyan_double_lamp.json b/src/main/resources/assets/decorative/models/item/cyan_double_lamp.json index 2d7c5a1..eb8775a 100755 --- a/src/main/resources/assets/decorative/models/item/cyan_double_lamp.json +++ b/src/main/resources/assets/decorative/models/item/cyan_double_lamp.json @@ -1,210 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:item/white_double_lamp", "textures": { - "0": "block/iron_block", - "2": "block/cyan_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 16, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [4, 1, 6, 16], "texture": "#5"}, - "east": {"uv": [0, 1, 2, 16], "texture": "#5"}, - "south": {"uv": [6, 1, 8, 16], "texture": "#5"}, - "west": {"uv": [13, 0, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 16, 7], - "to": [9, 20, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 25, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 21, 7], - "to": [9, 23, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 29, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 20, 7.25], - "to": [8.75, 21, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 20.25, 7.75], - "to": [7.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 20.25, 7.75], - "to": [11.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 8.75], - "to": [8.25, 20.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 4.75], - "to": [8.25, 20.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 20, 5], - "to": [5, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 20, 5], - "to": [12, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 20, 11], - "to": [11, 26, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 20, 4], - "to": [11, 26, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "translation": [0, 0.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "translation": [0, 1.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [45, 45, 0], - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "translation": [0, -5.75, 0] - }, - "fixed": { - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [0, 1, - { - "name": "double_lamp_on_top", - "origin": [8, 8, 8], - "children": [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] + "2": "block/cyan_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/gray_double_lamp.json b/src/main/resources/assets/decorative/models/item/gray_double_lamp.json index 73a0b45..d602898 100755 --- a/src/main/resources/assets/decorative/models/item/gray_double_lamp.json +++ b/src/main/resources/assets/decorative/models/item/gray_double_lamp.json @@ -1,210 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:item/white_double_lamp", "textures": { - "0": "block/iron_block", - "2": "block/gray_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 16, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [4, 1, 6, 16], "texture": "#5"}, - "east": {"uv": [0, 1, 2, 16], "texture": "#5"}, - "south": {"uv": [6, 1, 8, 16], "texture": "#5"}, - "west": {"uv": [13, 0, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 16, 7], - "to": [9, 20, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 25, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 21, 7], - "to": [9, 23, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 29, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 20, 7.25], - "to": [8.75, 21, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 20.25, 7.75], - "to": [7.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 20.25, 7.75], - "to": [11.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 8.75], - "to": [8.25, 20.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 4.75], - "to": [8.25, 20.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 20, 5], - "to": [5, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 20, 5], - "to": [12, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 20, 11], - "to": [11, 26, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 20, 4], - "to": [11, 26, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "translation": [0, 0.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "translation": [0, 1.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [45, 45, 0], - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "translation": [0, -5.75, 0] - }, - "fixed": { - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [0, 1, - { - "name": "double_lamp_on_top", - "origin": [8, 8, 8], - "children": [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] + "2": "block/gray_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/green_double_lamp.json b/src/main/resources/assets/decorative/models/item/green_double_lamp.json index 6dbbb98..3f7202f 100755 --- a/src/main/resources/assets/decorative/models/item/green_double_lamp.json +++ b/src/main/resources/assets/decorative/models/item/green_double_lamp.json @@ -1,210 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:item/white_double_lamp", "textures": { - "0": "block/iron_block", - "2": "block/green_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 16, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [4, 1, 6, 16], "texture": "#5"}, - "east": {"uv": [0, 1, 2, 16], "texture": "#5"}, - "south": {"uv": [6, 1, 8, 16], "texture": "#5"}, - "west": {"uv": [13, 0, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 16, 7], - "to": [9, 20, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 25, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 21, 7], - "to": [9, 23, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 29, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 20, 7.25], - "to": [8.75, 21, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 20.25, 7.75], - "to": [7.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 20.25, 7.75], - "to": [11.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 8.75], - "to": [8.25, 20.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 4.75], - "to": [8.25, 20.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 20, 5], - "to": [5, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 20, 5], - "to": [12, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 20, 11], - "to": [11, 26, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 20, 4], - "to": [11, 26, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "translation": [0, 0.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "translation": [0, 1.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [45, 45, 0], - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "translation": [0, -5.75, 0] - }, - "fixed": { - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [0, 1, - { - "name": "double_lamp_on_top", - "origin": [8, 8, 8], - "children": [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] + "2": "block/green_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/light_blue_double_lamp.json b/src/main/resources/assets/decorative/models/item/light_blue_double_lamp.json index 19ec985..eef2e80 100755 --- a/src/main/resources/assets/decorative/models/item/light_blue_double_lamp.json +++ b/src/main/resources/assets/decorative/models/item/light_blue_double_lamp.json @@ -1,210 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:item/white_double_lamp", "textures": { - "0": "block/iron_block", - "2": "block/light_blue_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 16, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [4, 1, 6, 16], "texture": "#5"}, - "east": {"uv": [0, 1, 2, 16], "texture": "#5"}, - "south": {"uv": [6, 1, 8, 16], "texture": "#5"}, - "west": {"uv": [13, 0, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 16, 7], - "to": [9, 20, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 25, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 21, 7], - "to": [9, 23, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 29, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 20, 7.25], - "to": [8.75, 21, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 20.25, 7.75], - "to": [7.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 20.25, 7.75], - "to": [11.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 8.75], - "to": [8.25, 20.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 4.75], - "to": [8.25, 20.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 20, 5], - "to": [5, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 20, 5], - "to": [12, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 20, 11], - "to": [11, 26, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 20, 4], - "to": [11, 26, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "translation": [0, 0.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "translation": [0, 1.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [45, 45, 0], - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "translation": [0, -5.75, 0] - }, - "fixed": { - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [0, 1, - { - "name": "double_lamp_on_top", - "origin": [8, 8, 8], - "children": [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] + "2": "block/light_blue_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/light_gray_double_lamp.json b/src/main/resources/assets/decorative/models/item/light_gray_double_lamp.json index 03f8f07..93df3d5 100755 --- a/src/main/resources/assets/decorative/models/item/light_gray_double_lamp.json +++ b/src/main/resources/assets/decorative/models/item/light_gray_double_lamp.json @@ -1,210 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:item/white_double_lamp", "textures": { - "0": "block/iron_block", - "2": "block/light_gray_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 16, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [4, 1, 6, 16], "texture": "#5"}, - "east": {"uv": [0, 1, 2, 16], "texture": "#5"}, - "south": {"uv": [6, 1, 8, 16], "texture": "#5"}, - "west": {"uv": [13, 0, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 16, 7], - "to": [9, 20, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 25, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 21, 7], - "to": [9, 23, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 29, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 20, 7.25], - "to": [8.75, 21, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 20.25, 7.75], - "to": [7.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 20.25, 7.75], - "to": [11.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 8.75], - "to": [8.25, 20.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 4.75], - "to": [8.25, 20.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 20, 5], - "to": [5, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 20, 5], - "to": [12, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 20, 11], - "to": [11, 26, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 20, 4], - "to": [11, 26, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "translation": [0, 0.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "translation": [0, 1.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [45, 45, 0], - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "translation": [0, -5.75, 0] - }, - "fixed": { - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [0, 1, - { - "name": "double_lamp_on_top", - "origin": [8, 8, 8], - "children": [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] + "2": "block/light_gray_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/lime_double_lamp.json b/src/main/resources/assets/decorative/models/item/lime_double_lamp.json index f9236bd..6d1890a 100755 --- a/src/main/resources/assets/decorative/models/item/lime_double_lamp.json +++ b/src/main/resources/assets/decorative/models/item/lime_double_lamp.json @@ -1,210 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:item/white_double_lamp", "textures": { - "0": "block/iron_block", - "2": "block/lime_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 16, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [4, 1, 6, 16], "texture": "#5"}, - "east": {"uv": [0, 1, 2, 16], "texture": "#5"}, - "south": {"uv": [6, 1, 8, 16], "texture": "#5"}, - "west": {"uv": [13, 0, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 16, 7], - "to": [9, 20, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 25, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 21, 7], - "to": [9, 23, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 29, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 20, 7.25], - "to": [8.75, 21, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 20.25, 7.75], - "to": [7.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 20.25, 7.75], - "to": [11.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 8.75], - "to": [8.25, 20.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 4.75], - "to": [8.25, 20.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 20, 5], - "to": [5, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 20, 5], - "to": [12, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 20, 11], - "to": [11, 26, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 20, 4], - "to": [11, 26, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "translation": [0, 0.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "translation": [0, 1.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [45, 45, 0], - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "translation": [0, -5.75, 0] - }, - "fixed": { - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [0, 1, - { - "name": "double_lamp_on_top", - "origin": [8, 8, 8], - "children": [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] + "2": "block/lime_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/magenta_double_lamp.json b/src/main/resources/assets/decorative/models/item/magenta_double_lamp.json index 8f73ceb..5871ab8 100755 --- a/src/main/resources/assets/decorative/models/item/magenta_double_lamp.json +++ b/src/main/resources/assets/decorative/models/item/magenta_double_lamp.json @@ -1,210 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:item/white_double_lamp", "textures": { - "0": "block/iron_block", - "2": "block/magenta_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 16, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [4, 1, 6, 16], "texture": "#5"}, - "east": {"uv": [0, 1, 2, 16], "texture": "#5"}, - "south": {"uv": [6, 1, 8, 16], "texture": "#5"}, - "west": {"uv": [13, 0, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 16, 7], - "to": [9, 20, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 25, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 21, 7], - "to": [9, 23, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 29, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 20, 7.25], - "to": [8.75, 21, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 20.25, 7.75], - "to": [7.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 20.25, 7.75], - "to": [11.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 8.75], - "to": [8.25, 20.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 4.75], - "to": [8.25, 20.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 20, 5], - "to": [5, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 20, 5], - "to": [12, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 20, 11], - "to": [11, 26, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 20, 4], - "to": [11, 26, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "translation": [0, 0.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "translation": [0, 1.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [45, 45, 0], - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "translation": [0, -5.75, 0] - }, - "fixed": { - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [0, 1, - { - "name": "double_lamp_on_top", - "origin": [8, 8, 8], - "children": [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] + "2": "block/magenta_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/orange_double_lamp.json b/src/main/resources/assets/decorative/models/item/orange_double_lamp.json index 0e8035c..3c4c59f 100755 --- a/src/main/resources/assets/decorative/models/item/orange_double_lamp.json +++ b/src/main/resources/assets/decorative/models/item/orange_double_lamp.json @@ -1,210 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:item/white_double_lamp", "textures": { - "0": "block/iron_block", - "2": "block/orange_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 16, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [4, 1, 6, 16], "texture": "#5"}, - "east": {"uv": [0, 1, 2, 16], "texture": "#5"}, - "south": {"uv": [6, 1, 8, 16], "texture": "#5"}, - "west": {"uv": [13, 0, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 16, 7], - "to": [9, 20, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 25, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 21, 7], - "to": [9, 23, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 29, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 20, 7.25], - "to": [8.75, 21, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 20.25, 7.75], - "to": [7.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 20.25, 7.75], - "to": [11.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 8.75], - "to": [8.25, 20.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 4.75], - "to": [8.25, 20.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 20, 5], - "to": [5, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 20, 5], - "to": [12, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 20, 11], - "to": [11, 26, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 20, 4], - "to": [11, 26, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "translation": [0, 0.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "translation": [0, 1.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [45, 45, 0], - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "translation": [0, -5.75, 0] - }, - "fixed": { - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [0, 1, - { - "name": "double_lamp_on_top", - "origin": [8, 8, 8], - "children": [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] + "2": "block/orange_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/pink_double_lamp.json b/src/main/resources/assets/decorative/models/item/pink_double_lamp.json index 19e2ca5..b6571c7 100755 --- a/src/main/resources/assets/decorative/models/item/pink_double_lamp.json +++ b/src/main/resources/assets/decorative/models/item/pink_double_lamp.json @@ -1,210 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:item/white_double_lamp", "textures": { - "0": "block/iron_block", - "2": "block/pink_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 16, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [4, 1, 6, 16], "texture": "#5"}, - "east": {"uv": [0, 1, 2, 16], "texture": "#5"}, - "south": {"uv": [6, 1, 8, 16], "texture": "#5"}, - "west": {"uv": [13, 0, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 16, 7], - "to": [9, 20, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 25, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 21, 7], - "to": [9, 23, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 29, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 20, 7.25], - "to": [8.75, 21, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 20.25, 7.75], - "to": [7.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 20.25, 7.75], - "to": [11.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 8.75], - "to": [8.25, 20.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 4.75], - "to": [8.25, 20.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 20, 5], - "to": [5, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 20, 5], - "to": [12, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 20, 11], - "to": [11, 26, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 20, 4], - "to": [11, 26, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "translation": [0, 0.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "translation": [0, 1.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [45, 45, 0], - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "translation": [0, -5.75, 0] - }, - "fixed": { - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [0, 1, - { - "name": "double_lamp_on_top", - "origin": [8, 8, 8], - "children": [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] + "2": "block/pink_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/purple_double_lamp.json b/src/main/resources/assets/decorative/models/item/purple_double_lamp.json index 7b1628d..a4d380f 100755 --- a/src/main/resources/assets/decorative/models/item/purple_double_lamp.json +++ b/src/main/resources/assets/decorative/models/item/purple_double_lamp.json @@ -1,210 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:item/white_double_lamp", "textures": { - "0": "block/iron_block", - "2": "block/purple_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 16, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [4, 1, 6, 16], "texture": "#5"}, - "east": {"uv": [0, 1, 2, 16], "texture": "#5"}, - "south": {"uv": [6, 1, 8, 16], "texture": "#5"}, - "west": {"uv": [13, 0, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 16, 7], - "to": [9, 20, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 25, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 21, 7], - "to": [9, 23, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 29, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 20, 7.25], - "to": [8.75, 21, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 20.25, 7.75], - "to": [7.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 20.25, 7.75], - "to": [11.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 8.75], - "to": [8.25, 20.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 4.75], - "to": [8.25, 20.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 20, 5], - "to": [5, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 20, 5], - "to": [12, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 20, 11], - "to": [11, 26, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 20, 4], - "to": [11, 26, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "translation": [0, 0.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "translation": [0, 1.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [45, 45, 0], - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "translation": [0, -5.75, 0] - }, - "fixed": { - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [0, 1, - { - "name": "double_lamp_on_top", - "origin": [8, 8, 8], - "children": [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] + "2": "block/purple_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/red_double_lamp.json b/src/main/resources/assets/decorative/models/item/red_double_lamp.json index b3b51f7..cbf2a87 100755 --- a/src/main/resources/assets/decorative/models/item/red_double_lamp.json +++ b/src/main/resources/assets/decorative/models/item/red_double_lamp.json @@ -1,210 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:item/white_double_lamp", "textures": { - "0": "block/iron_block", - "2": "block/red_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 16, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [4, 1, 6, 16], "texture": "#5"}, - "east": {"uv": [0, 1, 2, 16], "texture": "#5"}, - "south": {"uv": [6, 1, 8, 16], "texture": "#5"}, - "west": {"uv": [13, 0, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 16, 7], - "to": [9, 20, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 25, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 21, 7], - "to": [9, 23, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 29, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 20, 7.25], - "to": [8.75, 21, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 20.25, 7.75], - "to": [7.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 20.25, 7.75], - "to": [11.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 8.75], - "to": [8.25, 20.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 4.75], - "to": [8.25, 20.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 20, 5], - "to": [5, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 20, 5], - "to": [12, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 20, 11], - "to": [11, 26, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 20, 4], - "to": [11, 26, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "translation": [0, 0.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "translation": [0, 1.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [45, 45, 0], - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "translation": [0, -5.75, 0] - }, - "fixed": { - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [0, 1, - { - "name": "double_lamp_on_top", - "origin": [8, 8, 8], - "children": [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] + "2": "block/red_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/models/item/yellow_double_lamp.json b/src/main/resources/assets/decorative/models/item/yellow_double_lamp.json index 96d9c8f..3177b08 100755 --- a/src/main/resources/assets/decorative/models/item/yellow_double_lamp.json +++ b/src/main/resources/assets/decorative/models/item/yellow_double_lamp.json @@ -1,210 +1,6 @@ { - "credit": "made by Motschen", - "parent": "block/block", + "parent": "decorative:item/white_double_lamp", "textures": { - "0": "block/iron_block", - "2": "block/yellow_wool", - "3": "block/redstone_lamp_on", - "4": "block/gray_concrete", - "5": "block/spruce_log", - "particle": "block/iron_block" - }, - "elements": [ - { - "from": [5, 0, 5], - "to": [11, 1, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 8, 15]}, - "faces": { - "north": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 1], "texture": "#0"}, - "south": {"uv": [5, 0, 11, 1], "texture": "#0"}, - "west": {"uv": [9, 15, 15, 16], "texture": "#0"}, - "up": {"uv": [9, 2, 15, 8], "texture": "#0"}, - "down": {"uv": [2, 2, 8, 8], "texture": "#0"} - } - }, - { - "from": [7, 1, 7], - "to": [9, 16, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 9, 15]}, - "faces": { - "north": {"uv": [4, 1, 6, 16], "texture": "#5"}, - "east": {"uv": [0, 1, 2, 16], "texture": "#5"}, - "south": {"uv": [6, 1, 8, 16], "texture": "#5"}, - "west": {"uv": [13, 0, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 16, 7], - "to": [9, 20, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 25, 15]}, - "faces": { - "north": {"uv": [8, 9, 10, 13], "texture": "#5"}, - "east": {"uv": [0, 12, 2, 16], "texture": "#5"}, - "south": {"uv": [5, 7, 7, 11], "texture": "#5"}, - "west": {"uv": [13, 2, 15, 6], "texture": "#5"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#5"} - } - }, - { - "from": [7, 21, 7], - "to": [9, 23, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [16, 29, 15]}, - "faces": { - "north": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "east": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "south": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "west": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "up": {"uv": [7, 7, 9, 9], "texture": "#3"}, - "down": {"uv": [7, 7, 9, 9], "texture": "#3"} - } - }, - { - "from": [7.25, 20, 7.25], - "to": [8.75, 21, 8.75], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "east": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "south": {"uv": [0, 0, 1.5, 1], "texture": "#4"}, - "west": {"uv": [0, 0, 1.5, 1], "texture": "#4"} - } - }, - { - "from": [4.75, 20.25, 7.75], - "to": [7.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [8.75, 20.25, 7.75], - "to": [11.25, 20.75, 8.25], - "rotation": {"angle": 0, "axis": "y", "origin": [18, 28, 15]}, - "faces": { - "north": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "south": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 8.75], - "to": [8.25, 20.75, 11.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, 2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [7.75, 20.25, 4.75], - "to": [8.25, 20.75, 7.25], - "rotation": {"angle": 0, "axis": "y", "origin": [15, 28, -2]}, - "faces": { - "east": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "west": {"uv": [0, 0, 2.5, 0.5], "texture": "#3"}, - "up": {"uv": [0, 0, 2.5, 0.5], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 2.5, 0.5], "rotation": 90, "texture": "#3"} - } - }, - { - "from": [4, 20, 5], - "to": [5, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [11, 20, 5], - "to": [12, 26, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [19, 28, 12]}, - "faces": { - "north": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "texture": "#2"} - } - }, - { - "from": [5, 20, 11], - "to": [11, 26, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, 4]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - }, - { - "from": [5, 20, 4], - "to": [11, 26, 5], - "rotation": {"angle": 0, "axis": "y", "origin": [12, 28, -3]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "east": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#2"}, - "west": {"uv": [0, 0, 1, 6], "texture": "#2"}, - "up": {"uv": [0, 0, 1, 6], "rotation": 270, "texture": "#2"}, - "down": {"uv": [0, 0, 1, 6], "rotation": 90, "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "thirdperson_lefthand": { - "translation": [0, 0, -0.5], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_righthand": { - "translation": [0, 0.75, 0], - "scale": [0.5, 0.5, 0.5] - }, - "firstperson_lefthand": { - "translation": [0, 1.25, 0], - "scale": [0.5, 0.5, 0.5] - }, - "ground": { - "scale": [0.5, 0.5, 0.5] - }, - "gui": { - "rotation": [45, 45, 0], - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - }, - "head": { - "translation": [0, -5.75, 0] - }, - "fixed": { - "translation": [0, -2, 0], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [0, 1, - { - "name": "double_lamp_on_top", - "origin": [8, 8, 8], - "children": [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] + "2": "block/yellow_wool" + } } \ No newline at end of file diff --git a/src/main/resources/assets/decorative/optifine/emissive.properties b/src/main/resources/assets/decorative/optifine/emissive.properties deleted file mode 100755 index 3ce7dca..0000000 --- a/src/main/resources/assets/decorative/optifine/emissive.properties +++ /dev/null @@ -1 +0,0 @@ -suffix.emissive=_e \ No newline at end of file