From 76c2c03a136461b5fac33bfdb53adb2664f9a790 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Mon, 8 Apr 2019 16:59:06 +0300 Subject: [PATCH] More models for tier2 machines --- .../blockstates/industrial_blast_furnace.json | 12 ++++ .../blockstates/industrial_centrifuge.json | 12 ++++ .../blockstates/industrial_electrolyzer.json | 12 ++++ .../industrial_blast_furnace.json | 53 ----------------- .../tier2_machines/industrial_centrifuge.json | 56 ------------------ .../industrial_electrolyzer.json | 47 --------------- .../industrial_blast_furnace.json | 11 ++++ .../industrial_blast_furnace_on.json | 11 ++++ .../tier2_machines/industrial_centrifuge.json | 11 ++++ .../industrial_centrifuge_on.json | 11 ++++ .../industrial_electrolyzer.json | 11 ++++ .../industrial_electrolyzer_on.json | 11 ++++ .../models/item/industrial_blast_furnace.json | 3 + .../models/item/industrial_centrifuge.json | 3 + .../models/item/industrial_electrolyzer.json | 3 + .../industrial_electrolyzer_front_off.png | Bin .../industrial_electrolyzer_front_on.png | Bin ...ndustrial_electrolyzer_front_on.png.mcmeta | 0 18 files changed, 111 insertions(+), 156 deletions(-) create mode 100644 src/main/resources/assets/techreborn/blockstates/industrial_blast_furnace.json create mode 100644 src/main/resources/assets/techreborn/blockstates/industrial_centrifuge.json create mode 100644 src/main/resources/assets/techreborn/blockstates/industrial_electrolyzer.json delete mode 100644 src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_blast_furnace.json delete mode 100644 src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_centrifuge.json delete mode 100644 src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_electrolyzer.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_blast_furnace.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_blast_furnace_on.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_centrifuge.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_centrifuge_on.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_electrolyzer.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_electrolyzer_on.json create mode 100644 src/main/resources/assets/techreborn/models/item/industrial_blast_furnace.json create mode 100644 src/main/resources/assets/techreborn/models/item/industrial_centrifuge.json create mode 100644 src/main/resources/assets/techreborn/models/item/industrial_electrolyzer.json rename src/main/resources/assets/techreborn/textures/block/machines/{tier1_machines => tier2_machines}/industrial_electrolyzer_front_off.png (100%) rename src/main/resources/assets/techreborn/textures/block/machines/{tier1_machines => tier2_machines}/industrial_electrolyzer_front_on.png (100%) rename src/main/resources/assets/techreborn/textures/block/machines/{tier1_machines => tier2_machines}/industrial_electrolyzer_front_on.png.mcmeta (100%) diff --git a/src/main/resources/assets/techreborn/blockstates/industrial_blast_furnace.json b/src/main/resources/assets/techreborn/blockstates/industrial_blast_furnace.json new file mode 100644 index 000000000..bdd8d8539 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/industrial_blast_furnace.json @@ -0,0 +1,12 @@ +{ + "variants": { + "facing=north,active=false": { "model": "techreborn:block/machines/tier2_machines/industrial_blast_furnace" }, + "facing=south,active=false": { "model": "techreborn:block/machines/tier2_machines/industrial_blast_furnace", "y": 180 }, + "facing=west,active=false": { "model": "techreborn:block/machines/tier2_machines/industrial_blast_furnace", "y": 270 }, + "facing=east,active=false": { "model": "techreborn:block/machines/tier2_machines/industrial_blast_furnace", "y": 90 }, + "facing=north,active=true": { "model": "techreborn:block/machines/tier2_machines/industrial_blast_furnace_on" }, + "facing=south,active=true": { "model": "techreborn:block/machines/tier2_machines/industrial_blast_furnace_on", "y": 180 }, + "facing=west,active=true": { "model": "techreborn:block/machines/tier2_machines/industrial_blast_furnace_on", "y": 270 }, + "facing=east,active=true": { "model": "techreborn:block/machines/tier2_machines/industrial_blast_furnace_on", "y": 90 } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/industrial_centrifuge.json b/src/main/resources/assets/techreborn/blockstates/industrial_centrifuge.json new file mode 100644 index 000000000..caf7458f8 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/industrial_centrifuge.json @@ -0,0 +1,12 @@ +{ + "variants": { + "facing=north,active=false": { "model": "techreborn:block/machines/tier2_machines/industrial_centrifuge" }, + "facing=south,active=false": { "model": "techreborn:block/machines/tier2_machines/industrial_centrifuge", "y": 180 }, + "facing=west,active=false": { "model": "techreborn:block/machines/tier2_machines/industrial_centrifuge", "y": 270 }, + "facing=east,active=false": { "model": "techreborn:block/machines/tier2_machines/industrial_centrifuge", "y": 90 }, + "facing=north,active=true": { "model": "techreborn:block/machines/tier2_machines/industrial_centrifuge_on" }, + "facing=south,active=true": { "model": "techreborn:block/machines/tier2_machines/industrial_centrifuge_on", "y": 180 }, + "facing=west,active=true": { "model": "techreborn:block/machines/tier2_machines/industrial_centrifuge_on", "y": 270 }, + "facing=east,active=true": { "model": "techreborn:block/machines/tier2_machines/industrial_centrifuge_on", "y": 90 } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/industrial_electrolyzer.json b/src/main/resources/assets/techreborn/blockstates/industrial_electrolyzer.json new file mode 100644 index 000000000..2ce4538fa --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/industrial_electrolyzer.json @@ -0,0 +1,12 @@ +{ + "variants": { + "facing=north,active=false": { "model": "techreborn:block/machines/tier2_machines/industrial_electrolyzer" }, + "facing=south,active=false": { "model": "techreborn:block/machines/tier2_machines/industrial_electrolyzer", "y": 180 }, + "facing=west,active=false": { "model": "techreborn:block/machines/tier2_machines/industrial_electrolyzer", "y": 270 }, + "facing=east,active=false": { "model": "techreborn:block/machines/tier2_machines/industrial_electrolyzer", "y": 90 }, + "facing=north,active=true": { "model": "techreborn:block/machines/tier2_machines/industrial_electrolyzer_on" }, + "facing=south,active=true": { "model": "techreborn:block/machines/tier2_machines/industrial_electrolyzer_on", "y": 180 }, + "facing=west,active=true": { "model": "techreborn:block/machines/tier2_machines/industrial_electrolyzer_on", "y": 270 }, + "facing=east,active=true": { "model": "techreborn:block/machines/tier2_machines/industrial_electrolyzer_on", "y": 90 } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_blast_furnace.json b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_blast_furnace.json deleted file mode 100644 index 72f6a14b1..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_blast_furnace.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier2_machines/industrial_blast_furnace_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/industrial_blast_furnace_west_off", - "east": "techreborn:blocks/machines/tier2_machines/industrial_blast_furnace_east_off", - "front": "techreborn:blocks/machines/tier2_machines/industrial_blast_furnace_front_off" - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - "west": "techreborn:blocks/machines/tier2_machines/industrial_blast_furnace_west_on", - "east": "techreborn:blocks/machines/tier2_machines/industrial_blast_furnace_east_on", - "front": "techreborn:blocks/machines/tier2_machines/industrial_blast_furnace_front_on" - } - }, - "false": { - "textures": { - "west": "techreborn:blocks/machines/tier2_machines/industrial_blast_furnace_west_off", - "east": "techreborn:blocks/machines/tier2_machines/industrial_blast_furnace_east_off", - "front": "techreborn:blocks/machines/tier2_machines/industrial_blast_furnace_front_off" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_centrifuge.json b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_centrifuge.json deleted file mode 100644 index f2fb8a2a7..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_centrifuge.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_front_off", - "top": "techreborn:blocks/machines/tier2_machines/machine_top", - "west": "techreborn:blocks/machines/tier2_machines/machine_west", - "east": "techreborn:blocks/machines/tier2_machines/machine_east", - "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": { - "particle": "techreborn:blocks/machines/tier2_machines/machine_west", - "down": "techreborn:blocks/machines/tier2_machines/machine_bottom", - "south": "techreborn:blocks/machines/tier2_machines/machine_back", - "top": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_top_off", - "front": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_front_off" - } - }, - "facing": { - "north": { - - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - "top": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_top_on", - "front": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_front_on" - } - }, - "false": { - "textures": { - "top": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_top_off", - "front": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_front_off" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_electrolyzer.json b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_electrolyzer.json deleted file mode 100644 index da9163a5f..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_electrolyzer.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier1_machines/industrial_electrolyzer_front_off", - "top": "techreborn:blocks/machines/tier1_machines/machine_top", - "down": "techreborn:blocks/machines/tier1_machines/machine_bottom", - "side": "techreborn:blocks/machines/tier1_machines/machine_side" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "front": "techreborn:blocks/machines/tier1_machines/industrial_electrolyzer_front_off" - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - "front": "techreborn:blocks/machines/tier1_machines/industrial_electrolyzer_front_on" - } - }, - "false": { - "textures": { - "front": "techreborn:blocks/machines/tier1_machines/industrial_electrolyzer_front_off" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_blast_furnace.json b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_blast_furnace.json new file mode 100644 index 000000000..17fec94c4 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_blast_furnace.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/industrial_blast_furnace_west_off", + "east": "techreborn:block/machines/tier2_machines/industrial_blast_furnace_east_off", + "south": "techreborn:block/machines/tier2_machines/machine_back", + "front": "techreborn:block/machines/tier2_machines/industrial_blast_furnace_front_off" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_blast_furnace_on.json b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_blast_furnace_on.json new file mode 100644 index 000000000..53188eb51 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_blast_furnace_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/industrial_blast_furnace_west_on", + "east": "techreborn:block/machines/tier2_machines/industrial_blast_furnace_east_on", + "south": "techreborn:block/machines/tier2_machines/machine_back", + "front": "techreborn:block/machines/tier2_machines/industrial_blast_furnace_front_on" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_centrifuge.json b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_centrifuge.json new file mode 100644 index 000000000..85253d890 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_centrifuge.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "up": "techreborn:block/machines/tier2_machines/industrial_centrifuge_top_off", + "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/industrial_centrifuge_front_off" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_centrifuge_on.json b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_centrifuge_on.json new file mode 100644 index 000000000..0776d46a8 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_centrifuge_on.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "up": "techreborn:block/machines/tier2_machines/industrial_centrifuge_top_on", + "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/industrial_centrifuge_front_on" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_electrolyzer.json b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_electrolyzer.json new file mode 100644 index 000000000..54b0dfcc1 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_electrolyzer.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/industrial_electrolyzer_front_off" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_electrolyzer_on.json b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_electrolyzer_on.json new file mode 100644 index 000000000..c543a4f22 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/industrial_electrolyzer_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/industrial_electrolyzer_front_on" + } +} diff --git a/src/main/resources/assets/techreborn/models/item/industrial_blast_furnace.json b/src/main/resources/assets/techreborn/models/item/industrial_blast_furnace.json new file mode 100644 index 000000000..2602b576e --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/industrial_blast_furnace.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/machines/tier2_machines/industrial_blast_furnace" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/industrial_centrifuge.json b/src/main/resources/assets/techreborn/models/item/industrial_centrifuge.json new file mode 100644 index 000000000..b127827a4 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/industrial_centrifuge.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/machines/tier2_machines/industrial_centrifuge" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/industrial_electrolyzer.json b/src/main/resources/assets/techreborn/models/item/industrial_electrolyzer.json new file mode 100644 index 000000000..b9067dc5e --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/industrial_electrolyzer.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/machines/tier2_machines/industrial_electrolyzer" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/industrial_electrolyzer_front_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_electrolyzer_front_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/industrial_electrolyzer_front_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_electrolyzer_front_off.png diff --git a/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/industrial_electrolyzer_front_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_electrolyzer_front_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/industrial_electrolyzer_front_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_electrolyzer_front_on.png diff --git a/src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/industrial_electrolyzer_front_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_electrolyzer_front_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/machines/tier1_machines/industrial_electrolyzer_front_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/industrial_electrolyzer_front_on.png.mcmeta