diff --git a/src/main/resources/assets/cyclic/models/block/my_water_candle.json b/src/main/resources/assets/cyclic/models/block/my_water_candle.json new file mode 100644 index 000000000..4f0bbe3c0 --- /dev/null +++ b/src/main/resources/assets/cyclic/models/block/my_water_candle.json @@ -0,0 +1,91 @@ + { + "credit": "Made with Blockbench @INooBTooMuch https://github.com/Lothrazar/Cyclic/issues/2182", + "parent": "block/block", + "textures": { + "holder": "cyclic:blocks/machine/water_candle_holder", + "2": "cyclic:blocks/machine/water_candle", + "sides": "cyclic:blocks/machine/water_candle_sides" + }, + "elements": [ + { + "name": "pillar", + "from": [7, 0.25, 7], + "to": [9, 8, 9], + "rotation": {"angle": 0, "axis": "z", "origin": [1, 0, 0]}, + "faces": { + "north": {"uv": [0, 0, 3, 12], "texture": "#sides"}, + "east": {"uv": [6, 0, 9, 12], "texture": "#sides"}, + "south": {"uv": [3, 0, 6, 12], "texture": "#sides"}, + "west": {"uv": [9, 0, 12, 12], "texture": "#sides"}, + "up": {"uv": [15, 2, 12, 0], "texture": "#sides"}, + "down": {"uv": [15, 2, 12, 4], "texture": "#sides"} + } + }, + { + "name": "center", + "from": [4, 0, 4], + "to": [12, 0.25, 12], + "faces": { + "north": {"uv": [10, 0, 9, 6], "texture": "#holder"}, + "east": {"uv": [10, 0, 9, 6], "texture": "#holder"}, + "south": {"uv": [10, 0, 9, 6], "texture": "#holder"}, + "west": {"uv": [10, 0, 9, 6], "texture": "#holder"}, + "up": {"uv": [9, 9, 0, 0], "texture": "#holder"}, + "down": {"uv": [9, 0, 0, 9], "texture": "#holder"} + } + }, + { + "name": "sh", + "from": [4, 0, 3], + "to": [12, 0.75, 4], + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#2"}, + "east": {"uv": [0, 4, 1, 5], "texture": "#2"}, + "south": {"uv": [0, 1, 8, 2], "texture": "#2"}, + "west": {"uv": [1, 4, 2, 5], "texture": "#2"}, + "up": {"uv": [8, 3, 0, 2], "texture": "#2"}, + "down": {"uv": [8, 3, 0, 4], "texture": "#2"} + } + }, + { + "name": "sh", + "from": [3, 0, 4], + "to": [4, 0.75, 12], + "faces": { + "north": {"uv": [0, 4, 1, 5], "texture": "#2"}, + "east": {"uv": [0, 15, 8, 16], "texture": "#2"}, + "south": {"uv": [1, 4, 2, 5], "texture": "#2"}, + "west": {"uv": [0, 14, 8, 15], "texture": "#2"}, + "up": {"uv": [14, 8, 15, 16], "texture": "#2"}, + "down": {"uv": [15, 8, 16, 16], "texture": "#2"} + } + }, + { + "name": "sh", + "from": [12, 0, 4], + "to": [13, 0.75, 12], + "faces": { + "north": {"uv": [0, 4, 1, 5], "texture": "#2"}, + "east": {"uv": [0, 12, 8, 13], "texture": "#2"}, + "south": {"uv": [1, 4, 2, 5], "texture": "#2"}, + "west": {"uv": [0, 13, 8, 14], "texture": "#2"}, + "up": {"uv": [14, 0, 15, 8], "texture": "#2"}, + "down": {"uv": [15, 0, 16, 8], "texture": "#2"} + } + }, + { + "name": "sh", + "from": [4, 0, 12], + "to": [12, 0.75, 13], + "faces": { + "north": {"uv": [0, 11, 8, 12], "texture": "#2"}, + "east": {"uv": [0, 4, 1, 5], "texture": "#2"}, + "south": {"uv": [0, 8, 8, 9], "texture": "#2"}, + "west": {"uv": [1, 4, 2, 5], "texture": "#2"}, + "up": {"uv": [0, 9, 8, 10], "texture": "#2"}, + "down": {"uv": [0, 7, 8, 8], "texture": "#2"} + } + } + ], + "display": {} +} \ No newline at end of file diff --git a/src/main/resources/assets/cyclic/models/block/my_water_candle_lit.json b/src/main/resources/assets/cyclic/models/block/my_water_candle_lit.json new file mode 100644 index 000000000..731f877b0 --- /dev/null +++ b/src/main/resources/assets/cyclic/models/block/my_water_candle_lit.json @@ -0,0 +1,132 @@ + { + "credit": "Made with Blockbench @INooBTooMuch https://github.com/Lothrazar/Cyclic/issues/2182", + "parent": "block/block", + "textures": { + "holder": "cyclic:blocks/machine/water_candle_holder", + "2": "cyclic:blocks/machine/water_candle", + "centerwater": "cyclic:blocks/water_fake", + "sides": "cyclic:blocks/machine/water_candle_sides", + "flame": "cyclic:blocks/machine/gold" + }, + "elements": [ + { + "name": "centerwater", + "from": [4, 0.4, 4], + "to": [12, 0.6, 12], + "faces": { + "north": {"uv": [0, 0, 9, 0.25], "texture": "#centerwater"}, + "east": {"uv": [0, 0, 8, 0.25], "texture": "#centerwater"}, + "south": {"uv": [0, 0, 9, 0.25], "texture": "#centerwater"}, + "west": {"uv": [0, 0, 8, 0.25], "texture": "#centerwater"}, + "up": {"uv": [0, 0, 9, 8], "texture": "#centerwater"}, + "down": {"uv": [0, 0, 9, 8], "texture": "#centerwater"} + } + }, + { + "name": "flame", + "from": [7, 8, 8], + "to": [9, 10, 8], + "faces": { + "north": {"uv": [0, 0, 2, 2], "texture": "#flame"}, + "east": {"uv": [0, 0, 0, 2], "texture": "#flame"}, + "south": {"uv": [0, 0, 2, 2], "texture": "#flame"}, + "west": {"uv": [0, 0, 0, 2], "texture": "#flame"}, + "up": {"uv": [0, 0, 2, 0], "texture": "#flame"}, + "down": {"uv": [0, 0, 2, 0], "texture": "#flame"} + } + }, + { + "name": "flame", + "from": [8, 8, 7], + "to": [8, 10, 9], + "faces": { + "north": {"uv": [0, 0, 0, 2], "texture": "#flame"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#flame"}, + "south": {"uv": [0, 0, 0, 2], "texture": "#flame"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#flame"}, + "up": {"uv": [0, 0, 0, 2], "texture": "#flame"}, + "down": {"uv": [0, 0, 0, 2], "texture": "#flame"} + } + }, + { + "name": "pillar", + "from": [7, 0.25, 7], + "to": [9, 8, 9], + "rotation": {"angle": 0, "axis": "z", "origin": [1, 0, 0]}, + "faces": { + "north": {"uv": [0, 0, 3, 12], "texture": "#sides"}, + "east": {"uv": [6, 0, 9, 12], "texture": "#sides"}, + "south": {"uv": [3, 0, 6, 12], "texture": "#sides"}, + "west": {"uv": [9, 0, 12, 12], "texture": "#sides"}, + "up": {"uv": [15, 2, 12, 0], "texture": "#sides"}, + "down": {"uv": [15, 2, 12, 4], "texture": "#sides"} + } + }, + { + "name": "center", + "from": [4, 0, 4], + "to": [12, 0.25, 12], + "faces": { + "north": {"uv": [10, 0, 9, 6], "texture": "#holder"}, + "east": {"uv": [10, 0, 9, 6], "texture": "#holder"}, + "south": {"uv": [10, 0, 9, 6], "texture": "#holder"}, + "west": {"uv": [10, 0, 9, 6], "texture": "#holder"}, + "up": {"uv": [9, 9, 0, 0], "texture": "#holder"}, + "down": {"uv": [9, 0, 0, 9], "texture": "#holder"} + } + }, + { + "name": "sh", + "from": [4, 0, 3], + "to": [12, 0.75, 4], + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#2"}, + "east": {"uv": [0, 4, 1, 5], "texture": "#2"}, + "south": {"uv": [0, 1, 8, 2], "texture": "#2"}, + "west": {"uv": [1, 4, 2, 5], "texture": "#2"}, + "up": {"uv": [8, 3, 0, 2], "texture": "#2"}, + "down": {"uv": [8, 3, 0, 4], "texture": "#2"} + } + }, + { + "name": "sh", + "from": [3, 0, 4], + "to": [4, 0.75, 12], + "faces": { + "north": {"uv": [0, 4, 1, 5], "texture": "#2"}, + "east": {"uv": [0, 15, 8, 16], "texture": "#2"}, + "south": {"uv": [1, 4, 2, 5], "texture": "#2"}, + "west": {"uv": [0, 14, 8, 15], "texture": "#2"}, + "up": {"uv": [14, 8, 15, 16], "texture": "#2"}, + "down": {"uv": [15, 8, 16, 16], "texture": "#2"} + } + }, + { + "name": "sh", + "from": [12, 0, 4], + "to": [13, 0.75, 12], + "faces": { + "north": {"uv": [0, 4, 1, 5], "texture": "#2"}, + "east": {"uv": [0, 12, 8, 13], "texture": "#2"}, + "south": {"uv": [1, 4, 2, 5], "texture": "#2"}, + "west": {"uv": [0, 13, 8, 14], "texture": "#2"}, + "up": {"uv": [14, 0, 15, 8], "texture": "#2"}, + "down": {"uv": [15, 0, 16, 8], "texture": "#2"} + } + }, + { + "name": "sh", + "from": [4, 0, 12], + "to": [12, 0.75, 13], + "faces": { + "north": {"uv": [0, 11, 8, 12], "texture": "#2"}, + "east": {"uv": [0, 4, 1, 5], "texture": "#2"}, + "south": {"uv": [0, 8, 8, 9], "texture": "#2"}, + "west": {"uv": [1, 4, 2, 5], "texture": "#2"}, + "up": {"uv": [0, 9, 8, 10], "texture": "#2"}, + "down": {"uv": [0, 7, 8, 8], "texture": "#2"} + } + } + ], + "display": {} +} \ No newline at end of file diff --git a/src/main/resources/assets/cyclic/models/block/water_candle.json b/src/main/resources/assets/cyclic/models/block/water_candle.json index 4a3d6f72d..4bc1f137d 100644 --- a/src/main/resources/assets/cyclic/models/block/water_candle.json +++ b/src/main/resources/assets/cyclic/models/block/water_candle.json @@ -1,90 +1,3 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", - "parent": "block/block", - "textures": { - "pillar": "cyclic:blocks/machine/lapis", - "center": "cyclic:blocks/machine/gold", - "base": "cyclic:blocks/machine/stone", - "particle": "cyclic:blocks/machine/gold" - }, - "elements": [ - { - "name": "pillar", - "from": [7, 0.25, 7], - "to": [9, 12, 9], - "faces": { - "north": {"uv": [0, 0, 2, 11.75], "texture": "#pillar"}, - "east": {"uv": [0, 0, 2, 11.75], "texture": "#pillar"}, - "south": {"uv": [0, 0, 2, 11.75], "texture": "#pillar"}, - "west": {"uv": [0, 0, 2, 11.75], "texture": "#pillar"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#pillar"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#pillar"} - } - }, - { - "name": "center", - "from": [3, 0, 4], - "to": [12, 0.25, 12], - "faces": { - "north": {"uv": [0, 0, 9, 0.25], "texture": "#center"}, - "east": {"uv": [0, 0, 8, 0.25], "texture": "#center"}, - "south": {"uv": [0, 0, 9, 0.25], "texture": "#center"}, - "west": {"uv": [0, 0, 8, 0.25], "texture": "#center"}, - "up": {"uv": [0, 0, 9, 8], "texture": "#center"}, - "down": {"uv": [1, 2, 10, 10], "texture": "#center"} - } - }, - { - "name": "sh", - "from": [3, 0, 2], - "to": [12, 0.75, 4], - "faces": { - "north": {"uv": [0, 0, 9, 0.75], "texture": "#base"}, - "east": {"uv": [0, 0, 2, 0.75], "texture": "#base"}, - "south": {"uv": [0, 0, 9, 0.75], "texture": "#base"}, - "west": {"uv": [0, 0, 2, 0.75], "texture": "#base"}, - "up": {"uv": [2, 0, 11, 2], "texture": "#base"}, - "down": {"uv": [0, 0, 9, 2], "texture": "#base"} - } - }, - { - "name": "sh", - "from": [1, 0, 4], - "to": [3, 0.75, 12], - "faces": { - "north": {"uv": [0, 0, 2, 0.75], "texture": "#base"}, - "east": {"uv": [0, 0, 8, 0.75], "texture": "#base"}, - "south": {"uv": [0, 0, 2, 0.75], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 0.75], "texture": "#base"}, - "up": {"uv": [0, 1, 2, 9], "texture": "#base"}, - "down": {"uv": [0, 0, 2, 8], "texture": "#base"} - } - }, - { - "name": "sh", - "from": [12, 0, 4], - "to": [14, 0.75, 12], - "faces": { - "north": {"uv": [0, 0, 2, 0.75], "texture": "#base"}, - "east": {"uv": [0, 0, 8, 0.75], "texture": "#base"}, - "south": {"uv": [0, 0, 2, 0.75], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 0.75], "texture": "#base"}, - "up": {"uv": [14, 3, 16, 11], "texture": "#base"}, - "down": {"uv": [0, 0, 2, 8], "texture": "#base"} - } - }, - { - "name": "sh", - "from": [3, 0, 12], - "to": [12, 0.75, 14], - "faces": { - "north": {"uv": [0, 0, 9, 0.75], "texture": "#base"}, - "east": {"uv": [0, 0, 2, 0.75], "texture": "#base"}, - "south": {"uv": [0, 0, 9, 0.75], "texture": "#base"}, - "west": {"uv": [0, 0, 2, 0.75], "texture": "#base"}, - "up": {"uv": [4, 14, 13, 16], "texture": "#base"}, - "down": {"uv": [0, 0, 9, 2], "texture": "#base"} - } - } - ] + "parent": "cyclic:block/my_water_candle" } \ No newline at end of file diff --git a/src/main/resources/assets/cyclic/models/block/water_candle_lit.json b/src/main/resources/assets/cyclic/models/block/water_candle_lit.json index 8513accf1..48bbee606 100644 --- a/src/main/resources/assets/cyclic/models/block/water_candle_lit.json +++ b/src/main/resources/assets/cyclic/models/block/water_candle_lit.json @@ -1,130 +1,3 @@ { - "credit": "Made with Blockbench, a free, modern block model editor by JannisX11", - "textures": { - "pillar": "cyclic:blocks/machine/lapis", - "center": "cyclic:blocks/machine/gold", - "base": "cyclic:blocks/machine/stone", - "particle": "cyclic:blocks/machine/gold", - "centerwater": "cyclic:blocks/water_fake", - "flame": "cyclic:blocks/machine/gold" - }, - "elements": [ - { - "name": "pillar", - "from": [7, 0.25, 7], - "to": [9, 12, 9], - "faces": { - "north": {"uv": [0, 0, 2, 11.75], "texture": "#pillar"}, - "east": {"uv": [0, 0, 2, 11.75], "texture": "#pillar"}, - "south": {"uv": [0, 0, 2, 11.75], "texture": "#pillar"}, - "west": {"uv": [0, 0, 2, 11.75], "texture": "#pillar"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#pillar"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#pillar"} - } - }, - { - "name": "center", - "from": [3, 0, 4], - "to": [12, 0.25, 12], - "faces": { - "north": {"uv": [0, 0, 9, 0.25], "texture": "#center"}, - "east": {"uv": [0, 0, 8, 0.25], "texture": "#center"}, - "south": {"uv": [0, 0, 9, 0.25], "texture": "#center"}, - "west": {"uv": [0, 0, 8, 0.25], "texture": "#center"}, - "up": {"uv": [0, 0, 9, 8], "texture": "#center"}, - "down": {"uv": [3, 5, 12, 13], "texture": "#center"} - } - }, - { - "name": "centerwater", - "from": [3, 0.5, 4], - "to": [12, 0.75, 12], - "faces": { - "north": {"uv": [0, 0, 9, 0.25], "texture": "#centerwater"}, - "east": {"uv": [0, 0, 8, 0.25], "texture": "#centerwater"}, - "south": {"uv": [0, 0, 9, 0.25], "texture": "#centerwater"}, - "west": {"uv": [0, 0, 8, 0.25], "texture": "#centerwater"}, - "up": {"uv": [0, 0, 9, 8], "texture": "#centerwater"}, - "down": {"uv": [0, 0, 9, 8], "texture": "#centerwater"} - } - }, - { - "name": "sh", - "from": [3, 0, 2], - "to": [12, 0.75, 4], - "faces": { - "north": {"uv": [0, 0, 9, 0.75], "texture": "#base"}, - "east": {"uv": [0, 0, 2, 0.75], "texture": "#base"}, - "south": {"uv": [0, 0, 9, 0.75], "texture": "#base"}, - "west": {"uv": [0, 0, 2, 0.75], "texture": "#base"}, - "up": {"uv": [2, 0, 11, 2], "texture": "#base"}, - "down": {"uv": [0, 0, 9, 2], "texture": "#base"} - } - }, - { - "name": "sh", - "from": [1, 0, 4], - "to": [3, 0.75, 12], - "faces": { - "north": {"uv": [0, 0, 2, 0.75], "texture": "#base"}, - "east": {"uv": [0, 0, 8, 0.75], "texture": "#base"}, - "south": {"uv": [0, 0, 2, 0.75], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 0.75], "texture": "#base"}, - "up": {"uv": [0, 1, 2, 9], "texture": "#base"}, - "down": {"uv": [0, 0, 2, 8], "texture": "#base"} - } - }, - { - "name": "sh", - "from": [12, 0, 4], - "to": [14, 0.75, 12], - "faces": { - "north": {"uv": [0, 0, 2, 0.75], "texture": "#base"}, - "east": {"uv": [0, 0, 8, 0.75], "texture": "#base"}, - "south": {"uv": [0, 0, 2, 0.75], "texture": "#base"}, - "west": {"uv": [0, 0, 8, 0.75], "texture": "#base"}, - "up": {"uv": [14, 3, 16, 11], "texture": "#base"}, - "down": {"uv": [0, 0, 2, 8], "texture": "#base"} - } - }, - { - "name": "sh", - "from": [3, 0, 12], - "to": [12, 0.75, 14], - "faces": { - "north": {"uv": [0, 0, 9, 0.75], "texture": "#base"}, - "east": {"uv": [0, 0, 2, 0.75], "texture": "#base"}, - "south": {"uv": [0, 0, 9, 0.75], "texture": "#base"}, - "west": {"uv": [0, 0, 2, 0.75], "texture": "#base"}, - "up": {"uv": [4, 14, 13, 16], "texture": "#base"}, - "down": {"uv": [0, 0, 9, 2], "texture": "#base"} - } - }, - { - "name": "flame", - "from": [7, 12, 8], - "to": [9, 14, 8], - "faces": { - "north": {"uv": [0, 0, 2, 2], "texture": "#flame"}, - "east": {"uv": [0, 0, 0, 2], "texture": "#flame"}, - "south": {"uv": [0, 0, 2, 2], "texture": "#flame"}, - "west": {"uv": [0, 0, 0, 2], "texture": "#flame"}, - "up": {"uv": [0, 0, 2, 0], "texture": "#flame"}, - "down": {"uv": [0, 0, 2, 0], "texture": "#flame"} - } - }, - { - "name": "flame", - "from": [8, 12, 7], - "to": [8, 14, 9], - "faces": { - "north": {"uv": [0, 0, 0, 2], "texture": "#flame"}, - "east": {"uv": [0, 0, 2, 2], "texture": "#flame"}, - "south": {"uv": [0, 0, 0, 2], "texture": "#flame"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#flame"}, - "up": {"uv": [0, 0, 0, 2], "texture": "#flame"}, - "down": {"uv": [0, 0, 0, 2], "texture": "#flame"} - } - } - ] + "parent": "cyclic:block/my_water_candle_lit" } \ No newline at end of file diff --git a/src/main/resources/assets/cyclic/textures/blocks/machine/water_candle.png b/src/main/resources/assets/cyclic/textures/blocks/machine/water_candle.png new file mode 100644 index 000000000..6b0601149 Binary files /dev/null and b/src/main/resources/assets/cyclic/textures/blocks/machine/water_candle.png differ diff --git a/src/main/resources/assets/cyclic/textures/blocks/machine/water_candle_holder.png b/src/main/resources/assets/cyclic/textures/blocks/machine/water_candle_holder.png new file mode 100644 index 000000000..3fb116295 Binary files /dev/null and b/src/main/resources/assets/cyclic/textures/blocks/machine/water_candle_holder.png differ diff --git a/src/main/resources/assets/cyclic/textures/blocks/machine/water_candle_sides.png b/src/main/resources/assets/cyclic/textures/blocks/machine/water_candle_sides.png new file mode 100644 index 000000000..d2baad2c4 Binary files /dev/null and b/src/main/resources/assets/cyclic/textures/blocks/machine/water_candle_sides.png differ diff --git a/update.json b/update.json index aaf9faa75..af83baa95 100644 --- a/update.json +++ b/update.json @@ -79,5 +79,6 @@ ,"1.5.20":"#2102 wooden and golden hopper deposit logic fixed, now matches 1.18.2+ versions. #2085 Hopper reach area & pickup logic now uses vanilla-hopper area size. JEED compatibility added for some potion effects. Port Fishing Net and Mending Fishingrods compatibility from 1.12.2 #2067. Ender Apple now sends a message if nothing is found (void/flatworlds/etc). Growth enchant now skips IGrowable blocks that return false for 'canGrow();'. Many new config options added for: growth enchant, beheading enchant, battery, sprinkler, experience_pylon, fisher, scythes, and others in cyclic.toml" ,"1.5.21":"#1933 Sack of Holding chest placement override added, with new config to revert back to legacy behavior if desired (overrideChestSingle). #2168 fix bug where ender shelf sometimes would not save contents when mined after exiting reloading world when client data desyncs. Added a percentage config and ignorelist config for cyclic:disarm enchantment (disarmPercentPerLevel, disarmIngoredMobs), resolves it dropping your copied weapon from alexsmobs:mimicube #2249. Fix #1878 layered and/or logic for multiple wireless transmitters on the same node " ,"1.5.22":"Fix #2351 advanced crafting stick not opening. " + ,"1.5.23":"Backport #2182 candle model assets. New config under [cyclic.blocks] wireless_transfer_dimensional = true allowing transfer nodes to connect across dimensions if possible. " } }