From 3892b15685fb76acdcf04121d0d47c6de6e074ab Mon Sep 17 00:00:00 2001 From: drcrazy Date: Fri, 5 Apr 2019 16:19:39 +0300 Subject: [PATCH] More models for tier2 machines --- .../blockstates/distillation_tower.json | 12 +++++ .../blockstates/implosion_compressor.json | 12 +++++ .../generators/creative_solar_panel.json | 46 ---------------- .../tier2_machines/computer_cube.json | 49 ----------------- .../tier2_machines/distillation_tower.json | 49 ----------------- .../tier2_machines/implosion_compressor.json | 54 ------------------- .../tier2_machines/distillation_tower.json | 11 ++++ .../tier2_machines/distillation_tower_on.json | 11 ++++ .../tier2_machines/implosion_compressor.json | 11 ++++ .../implosion_compressor_on.json | 11 ++++ .../models/item/distillation_tower.json | 3 ++ .../models/item/implosion_compressor.json | 3 ++ 12 files changed, 74 insertions(+), 198 deletions(-) create mode 100644 src/main/resources/assets/techreborn/blockstates/distillation_tower.json create mode 100644 src/main/resources/assets/techreborn/blockstates/implosion_compressor.json delete mode 100644 src/main/resources/assets/techreborn/blockstates/machines/generators/creative_solar_panel.json delete mode 100644 src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/computer_cube.json delete mode 100644 src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/distillation_tower.json delete mode 100644 src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/implosion_compressor.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/tier2_machines/distillation_tower.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/tier2_machines/distillation_tower_on.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/tier2_machines/implosion_compressor.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/tier2_machines/implosion_compressor_on.json create mode 100644 src/main/resources/assets/techreborn/models/item/distillation_tower.json create mode 100644 src/main/resources/assets/techreborn/models/item/implosion_compressor.json diff --git a/src/main/resources/assets/techreborn/blockstates/distillation_tower.json b/src/main/resources/assets/techreborn/blockstates/distillation_tower.json new file mode 100644 index 000000000..ecf141a77 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/distillation_tower.json @@ -0,0 +1,12 @@ +{ + "variants": { + "facing=north,active=false": { "model": "techreborn:block/machines/tier2_machines/distillation_tower" }, + "facing=south,active=false": { "model": "techreborn:block/machines/tier2_machines/distillation_tower", "y": 180 }, + "facing=west,active=false": { "model": "techreborn:block/machines/tier2_machines/distillation_tower", "y": 270 }, + "facing=east,active=false": { "model": "techreborn:block/machines/tier2_machines/distillation_tower", "y": 90 }, + "facing=north,active=true": { "model": "techreborn:block/machines/tier2_machines/distillation_tower_on" }, + "facing=south,active=true": { "model": "techreborn:block/machines/tier2_machines/distillation_tower_on", "y": 180 }, + "facing=west,active=true": { "model": "techreborn:block/machines/tier2_machines/distillation_tower_on", "y": 270 }, + "facing=east,active=true": { "model": "techreborn:block/machines/tier2_machines/distillation_tower_on", "y": 90 } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/implosion_compressor.json b/src/main/resources/assets/techreborn/blockstates/implosion_compressor.json new file mode 100644 index 000000000..2c91be5a3 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/implosion_compressor.json @@ -0,0 +1,12 @@ +{ + "variants": { + "facing=north,active=false": { "model": "techreborn:block/machines/tier2_machines/implosion_compressor" }, + "facing=south,active=false": { "model": "techreborn:block/machines/tier2_machines/implosion_compressor", "y": 180 }, + "facing=west,active=false": { "model": "techreborn:block/machines/tier2_machines/implosion_compressor", "y": 270 }, + "facing=east,active=false": { "model": "techreborn:block/machines/tier2_machines/implosion_compressor", "y": 90 }, + "facing=north,active=true": { "model": "techreborn:block/machines/tier2_machines/implosion_compressor_on" }, + "facing=south,active=true": { "model": "techreborn:block/machines/tier2_machines/implosion_compressor_on", "y": 180 }, + "facing=west,active=true": { "model": "techreborn:block/machines/tier2_machines/implosion_compressor_on", "y": 270 }, + "facing=east,active=true": { "model": "techreborn:block/machines/tier2_machines/implosion_compressor_on", "y": 90 } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/machines/generators/creative_solar_panel.json b/src/main/resources/assets/techreborn/blockstates/machines/generators/creative_solar_panel.json deleted file mode 100644 index 1e07a4ca7..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machines/generators/creative_solar_panel.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "top": "techreborn:blocks/machines/generators/panels/creative_panel_top", - "bottom": "techreborn:blocks/machines/generators/generator_bottom", - "side": "techreborn:blocks/machines/generators/panels/creative_panel_side" - }, - "transform": "forge:default-block", - "model": "minecraft:cube_bottom_top" - }, - "variants": { - "inventory": { - "model": "minecraft:cube_bottom_top", - "textures": { - - } - }, - "facing": { - "north": { - - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - "side": "techreborn:blocks/machines/generators/panels/creative_panel_side" - } - }, - "false": { - "textures": { - "side": "techreborn:blocks/machines/generators/panels/creative_panel_side" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/computer_cube.json b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/computer_cube.json deleted file mode 100644 index 0e8251f23..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/computer_cube.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier2_machines/computer_cube_front", - "top": "techreborn:blocks/machines/tier2_machines/machine_top", - "down": "techreborn:blocks/machines/tier2_machines/machine_bottom", - "side": "techreborn:blocks/machines/tier2_machines/computer_cube_side" - } - }, - "variants": { - "normal": [{}], - "inventory": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "front": "techreborn:blocks/machines/tier2_machines/computer_cube_front" - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - "front": "techreborn:blocks/machines/tier2_machines/computer_cube_front" - } - }, - "false": { - "textures": { - "front": "techreborn:blocks/machines/tier2_machines/computer_cube_front" - } - } - } - } -} - diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/distillation_tower.json b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/distillation_tower.json deleted file mode 100644 index f85313a5f..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/distillation_tower.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier2_machines/distillation_tower_front_off", - "top": "techreborn:blocks/machines/tier2_machines/machine_top", - "down": "techreborn:blocks/machines/tier2_machines/machine_bottom", - "west": "techreborn:blocks/machines/tier2_machines/machine_west", - "east": "techreborn:blocks/machines/tier2_machines/machine_east", - "south": "techreborn:blocks/machines/tier2_machines/machine_back" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "front": "techreborn:blocks/machines/tier2_machines/distillation_tower_front_off" - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - "front": "techreborn:blocks/machines/tier2_machines/distillation_tower_front_on" - } - }, - "false": { - "textures": { - "front": "techreborn:blocks/machines/tier2_machines/distillation_tower_front_off" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/implosion_compressor.json b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/implosion_compressor.json deleted file mode 100644 index f3b5feb5a..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/implosion_compressor.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier2_machines/implosion_compressor_front_off", - "top": "techreborn:blocks/machines/tier2_machines/machine_top", - "down": "techreborn:blocks/machines/tier2_machines/machine_bottom", - "south": "techreborn:blocks/machines/tier2_machines/machine_back" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "west": "techreborn:blocks/machines/tier2_machines/implosion_compressor_west_off", - "east": "techreborn:blocks/machines/tier2_machines/implosion_compressor_east_off", - "front": "techreborn:blocks/machines/tier2_machines/implosion_compressor_front_off" - } - }, - "facing": { - "north": { - - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - "west": "techreborn:blocks/machines/tier2_machines/implosion_compressor_west_on", - "east": "techreborn:blocks/machines/tier2_machines/implosion_compressor_east_on", - "front": "techreborn:blocks/machines/tier2_machines/implosion_compressor_front_on" - } - }, - "false": { - "textures": { - "west": "techreborn:blocks/machines/tier2_machines/implosion_compressor_west_off", - "east": "techreborn:blocks/machines/tier2_machines/implosion_compressor_east_off", - "front": "techreborn:blocks/machines/tier2_machines/implosion_compressor_front_off" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/distillation_tower.json b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/distillation_tower.json new file mode 100644 index 000000000..842a1f608 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/distillation_tower.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "up": "techreborn:block/machines/tier2_machines/machine_top", + "down": "techreborn:block/machines/tier2_machines/machine_bottom", + "west": "techreborn:block/machines/tier2_machines/machine_west", + "east": "techreborn:block/machines/tier2_machines/machine_east", + "south": "techreborn:block/machines/tier2_machines/machine_back", + "front": "techreborn:block/machines/tier2_machines/distillation_tower_front_off" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/distillation_tower_on.json b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/distillation_tower_on.json new file mode 100644 index 000000000..d2539fbbe --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/distillation_tower_on.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "up": "techreborn:block/machines/tier2_machines/machine_top", + "down": "techreborn:block/machines/tier2_machines/machine_bottom", + "west": "techreborn:block/machines/tier2_machines/machine_west", + "east": "techreborn:block/machines/tier2_machines/machine_east", + "south": "techreborn:block/machines/tier2_machines/machine_back", + "front": "techreborn:block/machines/tier2_machines/distillation_tower_front_on" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/implosion_compressor.json b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/implosion_compressor.json new file mode 100644 index 000000000..52a64a5ee --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/implosion_compressor.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "up": "techreborn:block/machines/tier2_machines/machine_top", + "down": "techreborn:block/machines/tier2_machines/machine_bottom", + "west": "techreborn:block/machines/tier2_machines/implosion_compressor_west_off", + "east": "techreborn:block/machines/tier2_machines/implosion_compressor_east_off", + "south": "techreborn:block/machines/tier2_machines/machine_back", + "front": "techreborn:block/machines/tier2_machines/implosion_compressor_front_off" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/implosion_compressor_on.json b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/implosion_compressor_on.json new file mode 100644 index 000000000..71cabfad2 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/implosion_compressor_on.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "up": "techreborn:block/machines/tier2_machines/machine_top", + "down": "techreborn:block/machines/tier2_machines/machine_bottom", + "west": "techreborn:block/machines/tier2_machines/implosion_compressor_west_on", + "east": "techreborn:block/machines/tier2_machines/implosion_compressor_east_on", + "south": "techreborn:block/machines/tier2_machines/machine_back", + "front": "techreborn:block/machines/tier2_machines/implosion_compressor_front_on" + } +} diff --git a/src/main/resources/assets/techreborn/models/item/distillation_tower.json b/src/main/resources/assets/techreborn/models/item/distillation_tower.json new file mode 100644 index 000000000..280752b1c --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/distillation_tower.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/machines/tier2_machines/distillation_tower" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/implosion_compressor.json b/src/main/resources/assets/techreborn/models/item/implosion_compressor.json new file mode 100644 index 000000000..8a10757fd --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/implosion_compressor.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/machines/tier2_machines/implosion_compressor" +} \ No newline at end of file