From 2afa32ad9eb66ec58d6e74662a42afefb0ab3822 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Wed, 24 Apr 2019 17:36:09 +0300 Subject: [PATCH] Models for some energy storages --- .../blockstates/high_voltage_su.json | 10 +++++ .../blockstates/low_voltage_su.json | 10 +++++ .../machines/energy/high_voltage_su.json | 40 ----------------- .../machines/energy/low_voltage_su.json | 42 ------------------ .../machines/energy/medium_voltage_su.json | 40 ----------------- .../blockstates/medium_voltage_su.json | 10 +++++ .../machines/energy/high_voltage_su.json | 8 ++++ .../block/machines/energy/low_voltage_su.json | 8 ++++ .../machines/energy/medium_voltage_su.json | 8 ++++ .../models/item/high_voltage_su.json | 3 ++ .../models/item/low_voltage_su.json | 3 ++ .../models/item/medium_voltage_su.json | 3 ++ ...ge_front.png => high_voltage_su_front.png} | Bin ...rage_side.png => high_voltage_su_side.png} | Bin ...age_front.png => low_voltage_su_front.png} | Bin ...orage_side.png => low_voltage_su_side.png} | Bin ..._front.png => medium_voltage_su_front.png} | Bin ...ge_side.png => medium_voltage_su_side.png} | Bin 18 files changed, 63 insertions(+), 122 deletions(-) create mode 100644 src/main/resources/assets/techreborn/blockstates/high_voltage_su.json create mode 100644 src/main/resources/assets/techreborn/blockstates/low_voltage_su.json delete mode 100644 src/main/resources/assets/techreborn/blockstates/machines/energy/high_voltage_su.json delete mode 100644 src/main/resources/assets/techreborn/blockstates/machines/energy/low_voltage_su.json delete mode 100644 src/main/resources/assets/techreborn/blockstates/machines/energy/medium_voltage_su.json create mode 100644 src/main/resources/assets/techreborn/blockstates/medium_voltage_su.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/energy/high_voltage_su.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/energy/low_voltage_su.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/energy/medium_voltage_su.json create mode 100644 src/main/resources/assets/techreborn/models/item/high_voltage_su.json create mode 100644 src/main/resources/assets/techreborn/models/item/low_voltage_su.json create mode 100644 src/main/resources/assets/techreborn/models/item/medium_voltage_su.json rename src/main/resources/assets/techreborn/textures/block/machines/energy/{hv_storage_front.png => high_voltage_su_front.png} (100%) rename src/main/resources/assets/techreborn/textures/block/machines/energy/{hv_storage_side.png => high_voltage_su_side.png} (100%) rename src/main/resources/assets/techreborn/textures/block/machines/energy/{lv_storage_front.png => low_voltage_su_front.png} (100%) rename src/main/resources/assets/techreborn/textures/block/machines/energy/{lv_storage_side.png => low_voltage_su_side.png} (100%) rename src/main/resources/assets/techreborn/textures/block/machines/energy/{mv_storage_front.png => medium_voltage_su_front.png} (100%) rename src/main/resources/assets/techreborn/textures/block/machines/energy/{mv_storage_side.png => medium_voltage_su_side.png} (100%) diff --git a/src/main/resources/assets/techreborn/blockstates/high_voltage_su.json b/src/main/resources/assets/techreborn/blockstates/high_voltage_su.json new file mode 100644 index 000000000..93043441b --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/high_voltage_su.json @@ -0,0 +1,10 @@ +{ + "variants": { + "facing=north": { "model": "techreborn:block/machines/energy/high_voltage_su" }, + "facing=south": { "model": "techreborn:block/machines/energy/high_voltage_su", "y": 180 }, + "facing=west": { "model": "techreborn:block/machines/energy/high_voltage_su", "y": 270 }, + "facing=east": { "model": "techreborn:block/machines/energy/high_voltage_su", "y": 90 }, + "facing=up": { "model": "techreborn:block/machines/energy/high_voltage_su", "x": 270 }, + "facing=down": { "model": "techreborn:block/machines/energy/high_voltage_su", "x": 90 } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/low_voltage_su.json b/src/main/resources/assets/techreborn/blockstates/low_voltage_su.json new file mode 100644 index 000000000..f291e3278 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/low_voltage_su.json @@ -0,0 +1,10 @@ +{ + "variants": { + "facing=north": { "model": "techreborn:block/machines/energy/low_voltage_su" }, + "facing=south": { "model": "techreborn:block/machines/energy/low_voltage_su", "y": 180 }, + "facing=west": { "model": "techreborn:block/machines/energy/low_voltage_su", "y": 270 }, + "facing=east": { "model": "techreborn:block/machines/energy/low_voltage_su", "y": 90 }, + "facing=up": { "model": "techreborn:block/machines/energy/low_voltage_su", "x": 270 }, + "facing=down": { "model": "techreborn:block/machines/energy/low_voltage_su", "x": 90 } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/machines/energy/high_voltage_su.json b/src/main/resources/assets/techreborn/blockstates/machines/energy/high_voltage_su.json deleted file mode 100644 index b51c55051..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machines/energy/high_voltage_su.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/energy/hv_storage_side", - "bottom": "techreborn:blocks/machines/energy/hv_storage_side", - "top": "techreborn:blocks/machines/energy/hv_storage_side", - "front": "techreborn:blocks/machines/energy/hv_storage_front", - "side": "techreborn:blocks/machines/energy/hv_storage_side" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "textures": { - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/energy/low_voltage_su.json b/src/main/resources/assets/techreborn/blockstates/machines/energy/low_voltage_su.json deleted file mode 100644 index da9b6e328..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machines/energy/low_voltage_su.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/energy/lv_storage_front", - "down": "techreborn:blocks/machines/energy/lv_storage_side", - "up": "techreborn:blocks/machines/energy/lv_storage_side", - "north": "techreborn:blocks/machines/energy/lv_storage_front", - "east": "techreborn:blocks/machines/energy/lv_storage_side", - "south": "techreborn:blocks/machines/energy/lv_storage_side", - "west": "techreborn:blocks/machines/energy/lv_storage_side" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "textures": { - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/energy/medium_voltage_su.json b/src/main/resources/assets/techreborn/blockstates/machines/energy/medium_voltage_su.json deleted file mode 100644 index fb6eee35c..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machines/energy/medium_voltage_su.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/energy/mv_storage_side", - "bottom": "techreborn:blocks/machines/energy/mv_storage_side", - "top": "techreborn:blocks/machines/energy/mv_storage_side", - "front": "techreborn:blocks/machines/energy/mv_storage_front", - "side": "techreborn:blocks/machines/energy/mv_storage_side" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "textures": { - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - }, - "up": { - "x": 270 - }, - "down": { - "x": 90 - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/medium_voltage_su.json b/src/main/resources/assets/techreborn/blockstates/medium_voltage_su.json new file mode 100644 index 000000000..674c56c5a --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/medium_voltage_su.json @@ -0,0 +1,10 @@ +{ + "variants": { + "facing=north": { "model": "techreborn:block/machines/energy/medium_voltage_su" }, + "facing=south": { "model": "techreborn:block/machines/energy/medium_voltage_su", "y": 180 }, + "facing=west": { "model": "techreborn:block/machines/energy/medium_voltage_su", "y": 270 }, + "facing=east": { "model": "techreborn:block/machines/energy/medium_voltage_su", "y": 90 }, + "facing=up": { "model": "techreborn:block/machines/energy/medium_voltage_su", "x": 270 }, + "facing=down": { "model": "techreborn:block/machines/energy/medium_voltage_su", "x": 90 } + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/energy/high_voltage_su.json b/src/main/resources/assets/techreborn/models/block/machines/energy/high_voltage_su.json new file mode 100644 index 000000000..abc1e67e6 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/energy/high_voltage_su.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "top": "techreborn:block/machines/energy/high_voltage_su_side", + "front": "techreborn:block/machines/energy/high_voltage_su_front", + "side": "techreborn:block/machines/energy/high_voltage_su_side" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/energy/low_voltage_su.json b/src/main/resources/assets/techreborn/models/block/machines/energy/low_voltage_su.json new file mode 100644 index 000000000..35e451a1a --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/energy/low_voltage_su.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "top": "techreborn:block/machines/energy/low_voltage_su_side", + "front": "techreborn:block/machines/energy/low_voltage_su_front", + "side": "techreborn:block/machines/energy/low_voltage_su_side" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/energy/medium_voltage_su.json b/src/main/resources/assets/techreborn/models/block/machines/energy/medium_voltage_su.json new file mode 100644 index 000000000..7d72b3517 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/energy/medium_voltage_su.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "top": "techreborn:block/machines/energy/medium_voltage_su_side", + "front": "techreborn:block/machines/energy/medium_voltage_su_front", + "side": "techreborn:block/machines/energy/medium_voltage_su_side" + } +} diff --git a/src/main/resources/assets/techreborn/models/item/high_voltage_su.json b/src/main/resources/assets/techreborn/models/item/high_voltage_su.json new file mode 100644 index 000000000..cfb6ea314 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/high_voltage_su.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/machines/energy/high_voltage_su" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/low_voltage_su.json b/src/main/resources/assets/techreborn/models/item/low_voltage_su.json new file mode 100644 index 000000000..4c5bc264e --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/low_voltage_su.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/machines/energy/low_voltage_su" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/medium_voltage_su.json b/src/main/resources/assets/techreborn/models/item/medium_voltage_su.json new file mode 100644 index 000000000..f878822d5 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/medium_voltage_su.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/machines/energy/medium_voltage_su" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/block/machines/energy/hv_storage_front.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/high_voltage_su_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/machines/energy/hv_storage_front.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/high_voltage_su_front.png diff --git a/src/main/resources/assets/techreborn/textures/block/machines/energy/hv_storage_side.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/high_voltage_su_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/machines/energy/hv_storage_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/high_voltage_su_side.png diff --git a/src/main/resources/assets/techreborn/textures/block/machines/energy/lv_storage_front.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/low_voltage_su_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/machines/energy/lv_storage_front.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/low_voltage_su_front.png diff --git a/src/main/resources/assets/techreborn/textures/block/machines/energy/lv_storage_side.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/low_voltage_su_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/machines/energy/lv_storage_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/low_voltage_su_side.png diff --git a/src/main/resources/assets/techreborn/textures/block/machines/energy/mv_storage_front.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/medium_voltage_su_front.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/machines/energy/mv_storage_front.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/medium_voltage_su_front.png diff --git a/src/main/resources/assets/techreborn/textures/block/machines/energy/mv_storage_side.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/medium_voltage_su_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/machines/energy/mv_storage_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/medium_voltage_su_side.png