diff --git a/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_active.json b/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_active.json index 4a031fcd..840c3c22 100644 --- a/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_active.json +++ b/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_active.json @@ -1,48 +1,26 @@ { - "parent": "block/block", - "textures": { - "particle": "toughasnails:block/thermoregulator_side_active", - "front": "toughasnails:block/thermoregulator_front_active", - "side": "toughasnails:block/thermoregulator_side_active", - "back": "toughasnails:block/thermoregulator_back", - "top": "toughasnails:block/thermoregulator_top_active", - "bottom": "minecraft:block/blast_furnace_top" - }, - "elements": [ - { - "from": [8, 16, 0], - "to": [16, 16, 16], - "faces": { - "up": {"uv": [0, 0, 8, 16], "rotation": 180, "texture": "#top", "cullface": "up"} - } - }, - { - "from": [0, 16, 0], - "to": [8, 16, 16], - "faces": { - "up": {"uv": [8, 0, 16, 16], "rotation": 180, "texture": "#top", "cullface": "up"} - } - }, - { - "from": [0, 8, 0], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 16, 8], "texture": "#front", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 8], "texture": "#side", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 8], "texture": "#back", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 8], "texture": "#side", "cullface": "west"} - } - }, - { - "from": [0, 0, 0], - "to": [16, 8, 16], - "faces": { - "north": {"uv": [0, 8, 16, 16], "texture": "#front", "cullface": "north"}, - "east": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "east"}, - "south": {"uv": [0, 8, 16, 16], "texture": "#back", "cullface": "south"}, - "west": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "west"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down"} - } - } - ] -} \ No newline at end of file + "parent": "block/block", + "textures": { + "bottom": "minecraft:block/blast_furnace_top", + "top": "toughasnails:block/thermoregulator_top", + "north": "toughasnails:block/thermoregulator_front_active", + "south": "toughasnails:block/thermoregulator_back", + "west": "toughasnails:block/thermoregulator_side_heating", + "east": "toughasnails:block/thermoregulator_side_cooling", + "particle": "#north" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 16, 16, 0, 0 ], "texture": "#top", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#north", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#south", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#west", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#east", "cullface": "east" } + } + } + ] +} diff --git a/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_cooling_active.json b/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_cooling_active.json index d803c570..d57c3150 100644 --- a/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_cooling_active.json +++ b/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_cooling_active.json @@ -1,50 +1,26 @@ { - "parent": "block/block", - "textures": { - "particle": "toughasnails:block/thermoregulator_side_inactive", - "front": "toughasnails:block/thermoregulator_front_active", - "side": "toughasnails:block/thermoregulator_side_inactive", - "side_active": "toughasnails:block/thermoregulator_side_active", - "back": "toughasnails:block/thermoregulator_back", - "top": "toughasnails:block/thermoregulator_top_inactive", - "top_active": "toughasnails:block/thermoregulator_top_active", - "bottom": "minecraft:block/blast_furnace_top" - }, - "elements": [ - { - "from": [8, 16, 0], - "to": [16, 16, 16], - "faces": { - "up": {"uv": [0, 0, 8, 16], "rotation": 180, "texture": "#top", "cullface": "up"} - } - }, - { - "from": [0, 16, 0], - "to": [8, 16, 16], - "faces": { - "up": {"uv": [8, 0, 16, 16], "rotation": 180, "texture": "#top_active", "cullface": "up"} - } - }, - { - "from": [0, 8, 0], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 16, 8], "texture": "#front", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 8], "texture": "#side", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 8], "texture": "#back", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 8], "texture": "#side", "cullface": "west"} - } - }, - { - "from": [0, 0, 0], - "to": [16, 8, 16], - "faces": { - "north": {"uv": [0, 8, 16, 16], "texture": "#front", "cullface": "north"}, - "east": {"uv": [0, 8, 16, 16], "texture": "#side_active", "cullface": "east"}, - "south": {"uv": [0, 8, 16, 16], "texture": "#back", "cullface": "south"}, - "west": {"uv": [0, 8, 16, 16], "texture": "#side_active", "cullface": "west"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down"} - } - } - ] -} \ No newline at end of file + "parent": "block/block", + "textures": { + "bottom": "minecraft:block/blast_furnace_top", + "top": "toughasnails:block/thermoregulator_top", + "north": "toughasnails:block/thermoregulator_front_active", + "south": "toughasnails:block/thermoregulator_back", + "west": "toughasnails:block/thermoregulator_side", + "east": "toughasnails:block/thermoregulator_side_cooling", + "particle": "#north" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 16, 16, 0, 0 ], "texture": "#top", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#north", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#south", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#west", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#east", "cullface": "east" } + } + } + ] +} diff --git a/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_heating_active.json b/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_heating_active.json index a9633657..fc579f64 100644 --- a/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_heating_active.json +++ b/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_heating_active.json @@ -1,50 +1,26 @@ { - "parent": "block/block", - "textures": { - "particle": "toughasnails:block/thermoregulator_side_inactive", - "front": "toughasnails:block/thermoregulator_front_active", - "side": "toughasnails:block/thermoregulator_side_inactive", - "side_active": "toughasnails:block/thermoregulator_side_active", - "back": "toughasnails:block/thermoregulator_back", - "top": "toughasnails:block/thermoregulator_top_inactive", - "top_active": "toughasnails:block/thermoregulator_top_active", - "bottom": "minecraft:block/blast_furnace_top" - }, - "elements": [ - { - "from": [8, 16, 0], - "to": [16, 16, 16], - "faces": { - "up": {"uv": [0, 0, 8, 16], "rotation": 180, "texture": "#top_active", "cullface": "up"} - } - }, - { - "from": [0, 16, 0], - "to": [8, 16, 16], - "faces": { - "up": {"uv": [8, 0, 16, 16], "rotation": 180, "texture": "#top", "cullface": "up"} - } - }, - { - "from": [0, 8, 0], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 16, 8], "texture": "#front", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 8], "texture": "#side_active", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 8], "texture": "#back", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 8], "texture": "#side_active", "cullface": "west"} - } - }, - { - "from": [0, 0, 0], - "to": [16, 8, 16], - "faces": { - "north": {"uv": [0, 8, 16, 16], "texture": "#front", "cullface": "north"}, - "east": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "east"}, - "south": {"uv": [0, 8, 16, 16], "texture": "#back", "cullface": "south"}, - "west": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "west"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down"} - } - } - ] -} \ No newline at end of file + "parent": "block/block", + "textures": { + "bottom": "minecraft:block/blast_furnace_top", + "top": "toughasnails:block/thermoregulator_top", + "north": "toughasnails:block/thermoregulator_front_active", + "south": "toughasnails:block/thermoregulator_back", + "west": "toughasnails:block/thermoregulator_side_heating", + "east": "toughasnails:block/thermoregulator_side", + "particle": "#north" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 16, 16, 0, 0 ], "texture": "#top", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#north", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#south", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#west", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#east", "cullface": "east" } + } + } + ] +} diff --git a/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_inactive.json b/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_inactive.json index fa386d67..cceffa3c 100644 --- a/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_inactive.json +++ b/common/src/main/resources/assets/toughasnails/models/block/thermoregulator_inactive.json @@ -1,48 +1,26 @@ { - "parent": "block/block", - "textures": { - "particle": "toughasnails:block/thermoregulator_side_inactive", - "front": "toughasnails:block/thermoregulator_front_inactive", - "side": "toughasnails:block/thermoregulator_side_inactive", - "back": "toughasnails:block/thermoregulator_back", - "top": "toughasnails:block/thermoregulator_top_inactive", - "bottom": "minecraft:block/blast_furnace_top" - }, - "elements": [ - { - "from": [8, 16, 0], - "to": [16, 16, 16], - "faces": { - "up": {"uv": [0, 0, 8, 16], "rotation": 180, "texture": "#top", "cullface": "up"} - } - }, - { - "from": [0, 16, 0], - "to": [8, 16, 16], - "faces": { - "up": {"uv": [8, 0, 16, 16], "rotation": 180, "texture": "#top", "cullface": "up"} - } - }, - { - "from": [0, 8, 0], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 16, 8], "texture": "#front", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 8], "texture": "#side", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 8], "texture": "#back", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 8], "texture": "#side", "cullface": "west"} - } - }, - { - "from": [0, 0, 0], - "to": [16, 8, 16], - "faces": { - "north": {"uv": [0, 8, 16, 16], "texture": "#front", "cullface": "north"}, - "east": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "east"}, - "south": {"uv": [0, 8, 16, 16], "texture": "#back", "cullface": "south"}, - "west": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "west"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down"} - } - } - ] -} \ No newline at end of file + "parent": "block/block", + "textures": { + "bottom": "minecraft:block/blast_furnace_top", + "top": "toughasnails:block/thermoregulator_top", + "north": "toughasnails:block/thermoregulator_front", + "south": "toughasnails:block/thermoregulator_back", + "west": "toughasnails:block/thermoregulator_side", + "east": "toughasnails:block/thermoregulator_side", + "particle": "#north" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 16, 16, 0, 0 ], "texture": "#top", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#north", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#south", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#west", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#east", "cullface": "east" } + } + } + ] +} diff --git a/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_front_inactive.png b/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_front.png similarity index 100% rename from common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_front_inactive.png rename to common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_front.png diff --git a/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side.png b/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side.png new file mode 100644 index 00000000..3554a73e Binary files /dev/null and b/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side.png differ diff --git a/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side_active.png b/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side_active.png deleted file mode 100644 index 31fbe7ce..00000000 Binary files a/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side_active.png and /dev/null differ diff --git a/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side_cooling.png b/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side_cooling.png new file mode 100644 index 00000000..41e48531 Binary files /dev/null and b/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side_cooling.png differ diff --git a/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side_active.png.mcmeta b/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side_cooling.png.mcmeta similarity index 100% rename from common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side_active.png.mcmeta rename to common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side_cooling.png.mcmeta diff --git a/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side_heating.png b/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side_heating.png new file mode 100644 index 00000000..effa5f55 Binary files /dev/null and b/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side_heating.png differ diff --git a/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side_heating.png.mcmeta b/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side_heating.png.mcmeta new file mode 100644 index 00000000..1a97ce51 --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side_heating.png.mcmeta @@ -0,0 +1,14 @@ +{ + "animation": { + "frametime": 15, + "interpolate": true, + "frames": [ + 0, + 1, + 2, + 2, + 2, + 1 + ] + } +} diff --git a/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side_inactive.png b/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side_inactive.png deleted file mode 100644 index 8915594b..00000000 Binary files a/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_side_inactive.png and /dev/null differ diff --git a/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_top.png b/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_top.png new file mode 100644 index 00000000..62d98ad6 Binary files /dev/null and b/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_top.png differ diff --git a/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_top_active.png b/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_top_active.png deleted file mode 100644 index ee401b67..00000000 Binary files a/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_top_active.png and /dev/null differ diff --git a/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_top_inactive.png b/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_top_inactive.png deleted file mode 100644 index de5df385..00000000 Binary files a/common/src/main/resources/assets/toughasnails/textures/block/thermoregulator_top_inactive.png and /dev/null differ diff --git a/common/src/main/resources/assets/toughasnails/textures/gui/container/thermoregulator.png b/common/src/main/resources/assets/toughasnails/textures/gui/container/thermoregulator.png index 2fa22103..102cceb7 100644 Binary files a/common/src/main/resources/assets/toughasnails/textures/gui/container/thermoregulator.png and b/common/src/main/resources/assets/toughasnails/textures/gui/container/thermoregulator.png differ