diff --git a/src/main/resources/assets/create/models/block/redstone_contact/block.json b/src/main/resources/assets/create/models/block/redstone_contact/block.json index 29e376ae3..274c963cd 100644 --- a/src/main/resources/assets/create/models/block/redstone_contact/block.json +++ b/src/main/resources/assets/create/models/block/redstone_contact/block.json @@ -1,82 +1,82 @@ { - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "credit": "Made with Blockbench", "parent": "block/block", - "textures": { - "particle": "create:block/contact_side", - "0": "create:block/brass_casing", - "1": "create:block/contact_side", - "2": "create:block/contact_front" - }, - "elements": [ - { - "name": "Center", - "from": [ 2.0, 1.0, 2.0 ], - "to": [ 14.0, 15.0, 14.0 ], - "faces": { - "up": { "texture": "#0", "uv": [ 2.0, 2.0, 14.0, 14.0 ] }, - "down": { "texture": "#0", "uv": [ 2.0, 2.0, 14.0, 14.0 ] } - } - }, - { - "name": "Side", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 2.0, 16.0, 16.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 14.0, 0.0, 16.0, 16.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 16.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 16.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 16.0 ] } - } - }, - { - "name": "Side", - "from": [ 14.0, 0.0, 0.0 ], - "to": [ 16.0, 16.0, 16.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 16.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "south": { "texture": "#1", "uv": [ 14.0, 0.0, 16.0, 16.0 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "up": { "texture": "#1", "uv": [ 14.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#1", "uv": [ 14.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "Short Side", - "from": [ 2.0, 0.0, 0.0 ], - "to": [ 14.0, 16.0, 2.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 16.0 ] }, - "south": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 16.0 ] }, - "up": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 2.0 ] }, - "down": { "texture": "#1", "uv": [ 2.0, 14.0, 14.0, 16.0 ] } - } - }, - { - "name": "Short Side", - "from": [ 2.0, 0.0, 14.0 ], - "to": [ 14.0, 16.0, 16.0 ], - "faces": { - "north": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 16.0 ] }, - "south": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 16.0 ] }, - "up": { "texture": "#1", "uv": [ 2.0, 14.0, 14.0, 16.0 ] }, - "down": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 2.0 ] } - } - }, - { - "name": "Contact", - "from": [ 6.0, 15.0, 6.0 ], - "to": [ 10.0, 16.0, 10.0 ], - "shade": false, - "faces": { - "north": { "texture": "#2", "uv": [ 6.0, 10.0, 10.0, 11.0 ] }, - "east": { "texture": "#2", "uv": [ 10.0, 6.0, 11.0, 10.0 ], "rotation": 90 }, - "south": { "texture": "#2", "uv": [ 5.0, 6.0, 6.0, 10.0 ], "rotation": 90 }, - "west": { "texture": "#2", "uv": [ 6.0, 5.0, 10.0, 6.0 ] }, - "up": { "texture": "#2", "uv": [ 6.0, 6.0, 10.0, 10.0 ] } - } - } - ] + "textures": { + "0": "create:block/contact_front", + "1": "create:block/contact_side", + "3": "create:block/contact_back", + "particle": "create:block/contact_side" + }, + "elements": [ + { + "name": "Center", + "from": [2, 1, 2], + "to": [14, 15, 14], + "faces": { + "up": {"uv": [2, 2, 14, 14], "texture": "#0"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + } + }, + { + "name": "Side", + "from": [0, 0, 0], + "to": [2, 16, 16], + "faces": { + "north": {"uv": [14, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 2, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 16], "texture": "#0"} + } + }, + { + "name": "Side", + "from": [14, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 2, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [14, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [14, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [14, 0, 16, 16], "texture": "#3"} + } + }, + { + "name": "Short Side", + "from": [2, 0, 0], + "to": [14, 16, 2], + "faces": { + "north": {"uv": [2, 0, 14, 16], "texture": "#1"}, + "south": {"uv": [2, 0, 14, 16], "texture": "#1"}, + "up": {"uv": [2, 0, 14, 2], "texture": "#0"}, + "down": {"uv": [2, 14, 14, 16], "texture": "#3"} + } + }, + { + "name": "Short Side", + "from": [2, 0, 14], + "to": [14, 16, 16], + "faces": { + "north": {"uv": [2, 0, 14, 16], "texture": "#1"}, + "south": {"uv": [2, 0, 14, 16], "texture": "#1"}, + "up": {"uv": [2, 14, 14, 16], "texture": "#0"}, + "down": {"uv": [2, 0, 14, 2], "texture": "#3"} + } + }, + { + "name": "Contact", + "from": [6, 15, 6], + "to": [10, 16, 10], + "shade": false, + "faces": { + "north": {"uv": [6, 6, 10, 7], "rotation": 180, "texture": "#0"}, + "east": {"uv": [9, 6, 10, 10], "rotation": 90, "texture": "#0"}, + "south": {"uv": [9, 6, 10, 10], "rotation": 270, "texture": "#0"}, + "west": {"uv": [6, 6, 10, 7], "texture": "#0"}, + "up": {"uv": [6, 6, 10, 10], "texture": "#0"} + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/redstone_contact/block_powered.json b/src/main/resources/assets/create/models/block/redstone_contact/block_powered.json index eedc44be7..6ffaa77a0 100644 --- a/src/main/resources/assets/create/models/block/redstone_contact/block_powered.json +++ b/src/main/resources/assets/create/models/block/redstone_contact/block_powered.json @@ -1,7 +1,82 @@ { - "parent": "create:block/redstone_contact/block", - "textures": { - "particle": "create:block/contact_side_powered", - "1": "create:block/contact_side_powered" - } + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "create:block/contact_front", + "1": "create:block/contact_side_powered", + "3": "create:block/contact_back", + "particle": "create:block/contact_side_powered" + }, + "elements": [ + { + "name": "Center", + "from": [2, 1, 2], + "to": [14, 15, 14], + "faces": { + "up": {"uv": [2, 2, 14, 14], "texture": "#0"}, + "down": {"uv": [2, 2, 14, 14], "texture": "#3"} + } + }, + { + "name": "Side", + "from": [0, 0, 0], + "to": [2, 16, 16], + "faces": { + "north": {"uv": [14, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 2, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 2, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 16], "texture": "#0"} + } + }, + { + "name": "Side", + "from": [14, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 2, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [14, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [14, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [14, 0, 16, 16], "texture": "#3"} + } + }, + { + "name": "Short Side", + "from": [2, 0, 0], + "to": [14, 16, 2], + "faces": { + "north": {"uv": [2, 0, 14, 16], "texture": "#1"}, + "south": {"uv": [2, 0, 14, 16], "texture": "#1"}, + "up": {"uv": [2, 0, 14, 2], "texture": "#0"}, + "down": {"uv": [2, 14, 14, 16], "texture": "#3"} + } + }, + { + "name": "Short Side", + "from": [2, 0, 14], + "to": [14, 16, 16], + "faces": { + "north": {"uv": [2, 0, 14, 16], "texture": "#1"}, + "south": {"uv": [2, 0, 14, 16], "texture": "#1"}, + "up": {"uv": [2, 14, 14, 16], "texture": "#0"}, + "down": {"uv": [2, 0, 14, 2], "texture": "#3"} + } + }, + { + "name": "Contact", + "from": [6, 15, 6], + "to": [10, 16, 10], + "shade": false, + "faces": { + "north": {"uv": [6, 6, 10, 7], "rotation": 180, "texture": "#0"}, + "east": {"uv": [9, 6, 10, 10], "rotation": 90, "texture": "#0"}, + "south": {"uv": [9, 6, 10, 10], "rotation": 270, "texture": "#0"}, + "west": {"uv": [6, 6, 10, 7], "texture": "#0"}, + "up": {"uv": [6, 6, 10, 10], "texture": "#0"} + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/contact_back.png b/src/main/resources/assets/create/textures/block/contact_back.png new file mode 100644 index 000000000..7f872f17f Binary files /dev/null and b/src/main/resources/assets/create/textures/block/contact_back.png differ diff --git a/src/main/resources/assets/create/textures/block/contact_front.png b/src/main/resources/assets/create/textures/block/contact_front.png index 38f90a6ed..5634e9a0f 100644 Binary files a/src/main/resources/assets/create/textures/block/contact_front.png and b/src/main/resources/assets/create/textures/block/contact_front.png differ diff --git a/src/main/resources/assets/create/textures/block/contact_side.png b/src/main/resources/assets/create/textures/block/contact_side.png index 84bf79386..d8bb701c2 100644 Binary files a/src/main/resources/assets/create/textures/block/contact_side.png and b/src/main/resources/assets/create/textures/block/contact_side.png differ diff --git a/src/main/resources/assets/create/textures/block/contact_side_powered.png b/src/main/resources/assets/create/textures/block/contact_side_powered.png index a69505c23..716fb98ca 100644 Binary files a/src/main/resources/assets/create/textures/block/contact_side_powered.png and b/src/main/resources/assets/create/textures/block/contact_side_powered.png differ