From 84a380f51ef05f1765f628cdb86e2ffca1fc06df Mon Sep 17 00:00:00 2001 From: drcrazy Date: Wed, 27 Mar 2019 14:49:09 +0300 Subject: [PATCH] Frames&Casings --- .../blockstates/advanced_machine_casing.json | 5 ++ .../blockstates/advanced_machine_frame.json | 5 ++ .../blockstates/basic_machine_casing.json | 5 ++ .../blockstates/basic_machine_frame.json | 5 ++ .../techreborn/blockstates/grinder.json | 16 +++--- .../industrial_machine_casing.json | 5 ++ .../blockstates/industrial_machine_frame.json | 5 ++ .../techreborn/blockstates/machine_block.json | 45 ----------------- .../structure/ctm/machine_casing_ctm.json | 26 ---------- .../machines/tier1_machines/grinder.json | 50 ------------------- .../models/block/machine_casing_standard.json | 11 ---- .../structure/advanced_machine_casing.json | 6 +++ .../structure/advanced_machine_frame.json | 6 +++ .../structure/basic_machine_casing.json | 6 +++ .../structure/basic_machine_frame.json | 6 +++ .../structure/industrial_machine_casing.json | 6 +++ .../structure/industrial_machine_frame.json | 6 +++ .../tier1_machines}/grinder.json | 0 .../tier1_machines}/grinder_on.json | 0 .../models/item/advanced_machine_casing.json | 3 ++ .../models/item/advanced_machine_frame.json | 3 ++ .../models/item/basic_machine_casing.json | 3 ++ .../models/item/basic_machine_frame.json | 3 ++ .../item/industrial_machine_casing.json | 3 ++ .../models/item/industrial_machine_frame.json | 3 ++ 25 files changed, 92 insertions(+), 140 deletions(-) create mode 100644 src/main/resources/assets/techreborn/blockstates/advanced_machine_casing.json create mode 100644 src/main/resources/assets/techreborn/blockstates/advanced_machine_frame.json create mode 100644 src/main/resources/assets/techreborn/blockstates/basic_machine_casing.json create mode 100644 src/main/resources/assets/techreborn/blockstates/basic_machine_frame.json create mode 100644 src/main/resources/assets/techreborn/blockstates/industrial_machine_casing.json create mode 100644 src/main/resources/assets/techreborn/blockstates/industrial_machine_frame.json delete mode 100644 src/main/resources/assets/techreborn/blockstates/machine_block.json delete mode 100644 src/main/resources/assets/techreborn/blockstates/machines/structure/ctm/machine_casing_ctm.json delete mode 100644 src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/grinder.json delete mode 100644 src/main/resources/assets/techreborn/models/block/machine_casing_standard.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/structure/advanced_machine_casing.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/structure/advanced_machine_frame.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/structure/basic_machine_casing.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/structure/basic_machine_frame.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/structure/industrial_machine_casing.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/structure/industrial_machine_frame.json rename src/main/resources/assets/techreborn/models/block/{ => machines/tier1_machines}/grinder.json (100%) rename src/main/resources/assets/techreborn/models/block/{ => machines/tier1_machines}/grinder_on.json (100%) create mode 100644 src/main/resources/assets/techreborn/models/item/advanced_machine_casing.json create mode 100644 src/main/resources/assets/techreborn/models/item/advanced_machine_frame.json create mode 100644 src/main/resources/assets/techreborn/models/item/basic_machine_casing.json create mode 100644 src/main/resources/assets/techreborn/models/item/basic_machine_frame.json create mode 100644 src/main/resources/assets/techreborn/models/item/industrial_machine_casing.json create mode 100644 src/main/resources/assets/techreborn/models/item/industrial_machine_frame.json diff --git a/src/main/resources/assets/techreborn/blockstates/advanced_machine_casing.json b/src/main/resources/assets/techreborn/blockstates/advanced_machine_casing.json new file mode 100644 index 000000000..8b7c616b4 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/advanced_machine_casing.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/machines/structure/advanced_machine_casing" } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/advanced_machine_frame.json b/src/main/resources/assets/techreborn/blockstates/advanced_machine_frame.json new file mode 100644 index 000000000..e7898112e --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/advanced_machine_frame.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/machines/structure/advanced_machine_frame" } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/basic_machine_casing.json b/src/main/resources/assets/techreborn/blockstates/basic_machine_casing.json new file mode 100644 index 000000000..ff36417f0 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/basic_machine_casing.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/machines/structure/basic_machine_casing" } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/basic_machine_frame.json b/src/main/resources/assets/techreborn/blockstates/basic_machine_frame.json new file mode 100644 index 000000000..2a97116fc --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/basic_machine_frame.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/machines/structure/basic_machine_frame" } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/grinder.json b/src/main/resources/assets/techreborn/blockstates/grinder.json index ada1248ad..4cbc5afa9 100644 --- a/src/main/resources/assets/techreborn/blockstates/grinder.json +++ b/src/main/resources/assets/techreborn/blockstates/grinder.json @@ -1,12 +1,12 @@ { "variants": { - "facing=north,active=false": { "model": "techreborn:block/grinder" }, - "facing=south,active=false": { "model": "techreborn:block/grinder", "y": 180 }, - "facing=west,active=false": { "model": "techreborn:block/grinder", "y": 270 }, - "facing=east,active=false": { "model": "techreborn:block/grinder", "y": 90 }, - "facing=north,active=true": { "model": "techreborn:block/grinder_on" }, - "facing=south,active=true": { "model": "techreborn:block/grinder_on", "y": 180 }, - "facing=west,active=true": { "model": "techreborn:block/grinder_on", "y": 270 }, - "facing=east,active=true": { "model": "techreborn:block/grinder_on", "y": 90 } + "facing=north,active=false": { "model": "techreborn:block/machines/tier1_machines/grinder" }, + "facing=south,active=false": { "model": "techreborn:block/machines/tier1_machines/grinder", "y": 180 }, + "facing=west,active=false": { "model": "techreborn:block/machines/tier1_machines/grinder", "y": 270 }, + "facing=east,active=false": { "model": "techreborn:block/machines/tier1_machines/grinder", "y": 90 }, + "facing=north,active=true": { "model": "techreborn:block/machines/tier1_machines/grinder_on" }, + "facing=south,active=true": { "model": "techreborn:block/machines/tier1_machines/grinder_on", "y": 180 }, + "facing=west,active=true": { "model": "techreborn:block/machines/tier1_machines/grinder_on", "y": 270 }, + "facing=east,active=true": { "model": "techreborn:block/machines/tier1_machines/grinder_on", "y": 90 } } } diff --git a/src/main/resources/assets/techreborn/blockstates/industrial_machine_casing.json b/src/main/resources/assets/techreborn/blockstates/industrial_machine_casing.json new file mode 100644 index 000000000..9cf73a69e --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/industrial_machine_casing.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/machines/structure/industrial_machine_casing" } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/industrial_machine_frame.json b/src/main/resources/assets/techreborn/blockstates/industrial_machine_frame.json new file mode 100644 index 000000000..19ec34799 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/industrial_machine_frame.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/machines/structure/industrial_machine_frame" } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/machine_block.json b/src/main/resources/assets/techreborn/blockstates/machine_block.json deleted file mode 100644 index 570372016..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machine_block.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": {}, - "transform": "forge:default-block", - "model": "cube_all" - }, - "variants": { - "inventory": [ - {} - ], - "type": { - "basic_machine_frame": { - "textures": { - "all": "techreborn:blocks/machines/structure/tier1_machine_block" - } - }, - "advanced_machine_frame": { - "textures": { - "all": "techreborn:blocks/machines/structure/tier2_machine_block" - } - }, - "industrial_machine_frame": { - "textures": { - "all": "techreborn:blocks/machines/structure/tier3_machine_block" - } - }, - "basic_machine_casing": { - "textures": { - "all": "techreborn:blocks/machines/structure/tier1_casing" - } - }, - "advanced_machine_casing": { - "textures": { - "all": "techreborn:blocks/machines/structure/tier2_casing" - } - }, - "industrial_machine_casing": { - "textures": { - "all": "techreborn:blocks/machines/structure/tier3_casing" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/structure/ctm/machine_casing_ctm.json b/src/main/resources/assets/techreborn/blockstates/machines/structure/ctm/machine_casing_ctm.json deleted file mode 100644 index e7c991035..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machines/structure/ctm/machine_casing_ctm.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": {}, - "transform": "forge:default-block", - "model": "techreborn:machine_casing_standard" - }, - "variants": { - "type": { - "standard": - { - "model": "techreborn:machine_casing_standard" - }, - "reinforced": [ - { - "model": "techreborn:machine_casing_standard" - } - ], - "advanced": [ - { - "model": "techreborn:machine_casing_standard" - } - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/grinder.json b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/grinder.json deleted file mode 100644 index 773031ad9..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/grinder.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier1_machines/grinder_front_off", - "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": { - "top": "techreborn:blocks/machines/tier1_machines/grinder_top_off", - "front": "techreborn:blocks/machines/tier1_machines/grinder_front_off" - } - }, - "facing": { - "north": { - - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - "top": "techreborn:blocks/machines/tier1_machines/grinder_top_on", - "front": "techreborn:blocks/machines/tier1_machines/grinder_front_on" - } - }, - "false": { - "textures": { - "top": "techreborn:blocks/machines/tier1_machines/grinder_top_off", - "front": "techreborn:blocks/machines/tier1_machines/grinder_front_off" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/machine_casing_standard.json b/src/main/resources/assets/techreborn/models/block/machine_casing_standard.json deleted file mode 100644 index 5edd2d22a..000000000 --- a/src/main/resources/assets/techreborn/models/block/machine_casing_standard.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "techreborn:machines/structure/tier1_casing_ctm" - }, - - "ctm" : { - "model": { "model": "cube" }, - "face": "techreborn:machines/structure/tier1_casing_ctm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/machines/structure/advanced_machine_casing.json b/src/main/resources/assets/techreborn/models/block/machines/structure/advanced_machine_casing.json new file mode 100644 index 000000000..3006bdfe8 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/structure/advanced_machine_casing.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "techreborn:block/machines/structure/tier2_casing" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/structure/advanced_machine_frame.json b/src/main/resources/assets/techreborn/models/block/machines/structure/advanced_machine_frame.json new file mode 100644 index 000000000..64639b0d4 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/structure/advanced_machine_frame.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "techreborn:block/machines/structure/tier2_machine_block" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/structure/basic_machine_casing.json b/src/main/resources/assets/techreborn/models/block/machines/structure/basic_machine_casing.json new file mode 100644 index 000000000..bfaca083f --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/structure/basic_machine_casing.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "techreborn:block/machines/structure/tier1_casing" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/structure/basic_machine_frame.json b/src/main/resources/assets/techreborn/models/block/machines/structure/basic_machine_frame.json new file mode 100644 index 000000000..2cd90c4a0 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/structure/basic_machine_frame.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "techreborn:block/machines/structure/tier1_machine_block" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/structure/industrial_machine_casing.json b/src/main/resources/assets/techreborn/models/block/machines/structure/industrial_machine_casing.json new file mode 100644 index 000000000..4f1664f7f --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/structure/industrial_machine_casing.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "techreborn:block/machines/structure/tier3_casing" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/structure/industrial_machine_frame.json b/src/main/resources/assets/techreborn/models/block/machines/structure/industrial_machine_frame.json new file mode 100644 index 000000000..7039c9ae6 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/structure/industrial_machine_frame.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "techreborn:block/machines/structure/tier3_machine_block" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/grinder.json b/src/main/resources/assets/techreborn/models/block/machines/tier1_machines/grinder.json similarity index 100% rename from src/main/resources/assets/techreborn/models/block/grinder.json rename to src/main/resources/assets/techreborn/models/block/machines/tier1_machines/grinder.json diff --git a/src/main/resources/assets/techreborn/models/block/grinder_on.json b/src/main/resources/assets/techreborn/models/block/machines/tier1_machines/grinder_on.json similarity index 100% rename from src/main/resources/assets/techreborn/models/block/grinder_on.json rename to src/main/resources/assets/techreborn/models/block/machines/tier1_machines/grinder_on.json diff --git a/src/main/resources/assets/techreborn/models/item/advanced_machine_casing.json b/src/main/resources/assets/techreborn/models/item/advanced_machine_casing.json new file mode 100644 index 000000000..e0f58a414 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/advanced_machine_casing.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/machines/structure/advanced_machine_casing" +} diff --git a/src/main/resources/assets/techreborn/models/item/advanced_machine_frame.json b/src/main/resources/assets/techreborn/models/item/advanced_machine_frame.json new file mode 100644 index 000000000..8f4aed6da --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/advanced_machine_frame.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/machines/structure/advanced_machine_frame" +} diff --git a/src/main/resources/assets/techreborn/models/item/basic_machine_casing.json b/src/main/resources/assets/techreborn/models/item/basic_machine_casing.json new file mode 100644 index 000000000..ee33b1ae4 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/basic_machine_casing.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/machines/structure/basic_machine_casing" +} diff --git a/src/main/resources/assets/techreborn/models/item/basic_machine_frame.json b/src/main/resources/assets/techreborn/models/item/basic_machine_frame.json new file mode 100644 index 000000000..cff5b6307 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/basic_machine_frame.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/machines/structure/basic_machine_frame" +} diff --git a/src/main/resources/assets/techreborn/models/item/industrial_machine_casing.json b/src/main/resources/assets/techreborn/models/item/industrial_machine_casing.json new file mode 100644 index 000000000..67997022f --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/industrial_machine_casing.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/machines/structure/industrial_machine_casing" +} diff --git a/src/main/resources/assets/techreborn/models/item/industrial_machine_frame.json b/src/main/resources/assets/techreborn/models/item/industrial_machine_frame.json new file mode 100644 index 000000000..4e5f74319 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/industrial_machine_frame.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/machines/structure/industrial_machine_frame" +}