From 84a418707d24a13f21cd9e06b5c3d54431f5dde4 Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Fri, 19 Mar 2021 13:42:58 +0300 Subject: [PATCH] Fix CTM compatibility (#2372). Thanks to YuRaNnNzZZ --- .../techreborn/models/block/cube_ctm_base.json | 17 +++++++++++++++++ .../models/block/cube_ctmh_base.json | 17 +++++++++++++++++ .../structure/advanced_machine_casing.json | 6 +++++- .../structure/basic_machine_casing.json | 6 +++++- .../structure/industrial_machine_casing.json | 6 +++++- .../block/machines/energy/ev_multi_ctm.ctx | 7 ------- .../energy/lapotronic_su_front.png.mcmeta | 16 ++++++++++++++++ ...ont_ctm.png => lapotronic_su_front_ctm.png} | Bin .../energy/lapotronic_su_side.png.mcmeta | 11 +++++++++-- ...side_ctm.png => lapotronic_su_side_ctm.png} | Bin .../machines/structure/tier1_casing_ctm.ctx | 7 ------- .../structure/tier1_casing_ctmh.png.mcmeta | 9 +++++++++ .../structure/tier2_casing_ctmh.png.mcmeta | 9 +++++++++ .../structure/tier3_casing_ctmh.png.mcmeta | 9 +++++++++ .../textures/block/reinforced_glass.png.mcmeta | 9 +++++++++ ...m_reinforced_stone_storage_block.png.mcmeta | 12 ++++++++++++ ...rced_tungstensteel_storage_block.png.mcmeta | 12 ++++++++++++ 17 files changed, 134 insertions(+), 19 deletions(-) create mode 100644 src/main/resources/assets/techreborn/models/block/cube_ctm_base.json create mode 100644 src/main/resources/assets/techreborn/models/block/cube_ctmh_base.json delete mode 100644 src/main/resources/assets/techreborn/textures/block/machines/energy/ev_multi_ctm.ctx create mode 100644 src/main/resources/assets/techreborn/textures/block/machines/energy/lapotronic_su_front.png.mcmeta rename src/main/resources/assets/techreborn/textures/block/machines/energy/{ev_multi_front_ctm.png => lapotronic_su_front_ctm.png} (100%) rename src/main/resources/assets/techreborn/textures/block/machines/energy/{ev_multi_side_ctm.png => lapotronic_su_side_ctm.png} (100%) delete mode 100644 src/main/resources/assets/techreborn/textures/block/machines/structure/tier1_casing_ctm.ctx create mode 100644 src/main/resources/assets/techreborn/textures/block/machines/structure/tier1_casing_ctmh.png.mcmeta create mode 100644 src/main/resources/assets/techreborn/textures/block/machines/structure/tier2_casing_ctmh.png.mcmeta create mode 100644 src/main/resources/assets/techreborn/textures/block/machines/structure/tier3_casing_ctmh.png.mcmeta create mode 100644 src/main/resources/assets/techreborn/textures/block/reinforced_glass.png.mcmeta create mode 100644 src/main/resources/assets/techreborn/textures/block/storage/iridium_reinforced_stone_storage_block.png.mcmeta create mode 100644 src/main/resources/assets/techreborn/textures/block/storage/iridium_reinforced_tungstensteel_storage_block.png.mcmeta diff --git a/src/main/resources/assets/techreborn/models/block/cube_ctm_base.json b/src/main/resources/assets/techreborn/models/block/cube_ctm_base.json new file mode 100644 index 000000000..d5a5caeb9 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/cube_ctm_base.json @@ -0,0 +1,17 @@ +{ + "parent": "minecraft:block/cube_all", + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "texture": "#down", "cullface": "down", "tintindex": 0 }, + "up": { "texture": "#up", "cullface": "up", "tintindex": 0 }, + "north": { "texture": "#north", "cullface": "north", "tintindex": 0 }, + "south": { "texture": "#south", "cullface": "south", "tintindex": 0 }, + "west": { "texture": "#west", "cullface": "west", "tintindex": 0 }, + "east": { "texture": "#east", "cullface": "east", "tintindex": 0 } + } + } + ] +} diff --git a/src/main/resources/assets/techreborn/models/block/cube_ctmh_base.json b/src/main/resources/assets/techreborn/models/block/cube_ctmh_base.json new file mode 100644 index 000000000..6ceef2b71 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/cube_ctmh_base.json @@ -0,0 +1,17 @@ +{ + "parent": "minecraft:block/cube_all", + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "down": { "texture": "#down", "cullface": "down" }, + "up": { "texture": "#up", "cullface": "up" }, + "north": { "texture": "#north", "cullface": "north", "tintindex": 0 }, + "south": { "texture": "#south", "cullface": "south", "tintindex": 0 }, + "west": { "texture": "#west", "cullface": "west", "tintindex": 0 }, + "east": { "texture": "#east", "cullface": "east", "tintindex": 0 } + } + } + ] +} 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 index 3006bdfe8..fded50593 100644 --- 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 @@ -1,6 +1,10 @@ { - "parent": "minecraft:block/cube_all", + "parent": "techreborn:block/cube_ctmh_base", "textures": { "all": "techreborn:block/machines/structure/tier2_casing" + }, + "ctm_version": 1, + "ctm_overrides": { + "0": "techreborn:block/machines/structure/tier2_casing_ctmh" } } 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 index bfaca083f..effec4acc 100644 --- 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 @@ -1,6 +1,10 @@ { - "parent": "minecraft:block/cube_all", + "parent": "techreborn:block/cube_ctmh_base", "textures": { "all": "techreborn:block/machines/structure/tier1_casing" + }, + "ctm_version": 1, + "ctm_overrides": { + "0": "techreborn:block/machines/structure/tier1_casing_ctmh" } } 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 index 4f1664f7f..bf92c41db 100644 --- 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 @@ -1,6 +1,10 @@ { - "parent": "minecraft:block/cube_all", + "parent": "techreborn:block/cube_ctmh_base", "textures": { "all": "techreborn:block/machines/structure/tier3_casing" + }, + "ctm_version": 1, + "ctm_overrides": { + "0": "techreborn:block/machines/structure/tier3_casing_ctmh" } } diff --git a/src/main/resources/assets/techreborn/textures/block/machines/energy/ev_multi_ctm.ctx b/src/main/resources/assets/techreborn/textures/block/machines/energy/ev_multi_ctm.ctx deleted file mode 100644 index 899ceebdf..000000000 --- a/src/main/resources/assets/techreborn/textures/block/machines/energy/ev_multi_ctm.ctx +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type":"CTM", - "textures":[ - "./ev_multi_side", - "./ev_multi_side_ctm" - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/block/machines/energy/lapotronic_su_front.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/energy/lapotronic_su_front.png.mcmeta new file mode 100644 index 000000000..15cec8580 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/machines/energy/lapotronic_su_front.png.mcmeta @@ -0,0 +1,16 @@ +{ + "ctm":{ + "ctm_version": 1, + "type":"CTM", + "textures":[ + "techreborn:block/machines/energy/lapotronic_su_front_ctm" + ], + "extra":{ + "ignore_states":true, + "connect_to":[ + {"block":"techreborn:lsu_storage"}, + {"block":"techreborn:lapotronic_su"} + ] + } + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/machines/energy/ev_multi_front_ctm.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/lapotronic_su_front_ctm.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/machines/energy/ev_multi_front_ctm.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/lapotronic_su_front_ctm.png diff --git a/src/main/resources/assets/techreborn/textures/block/machines/energy/lapotronic_su_side.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/energy/lapotronic_su_side.png.mcmeta index e4c81852d..0d319cd13 100644 --- a/src/main/resources/assets/techreborn/textures/block/machines/energy/lapotronic_su_side.png.mcmeta +++ b/src/main/resources/assets/techreborn/textures/block/machines/energy/lapotronic_su_side.png.mcmeta @@ -3,7 +3,14 @@ "ctm_version": 1, "type":"CTM", "textures":[ - "techreborn:blocks/machines/energy/ev_multi_side_ctm" - ] + "techreborn:block/machines/energy/lapotronic_su_side_ctm" + ], + "extra":{ + "ignore_states":true, + "connect_to":[ + {"block":"techreborn:lsu_storage"}, + {"block":"techreborn:lapotronic_su"} + ] + } } } diff --git a/src/main/resources/assets/techreborn/textures/block/machines/energy/ev_multi_side_ctm.png b/src/main/resources/assets/techreborn/textures/block/machines/energy/lapotronic_su_side_ctm.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/machines/energy/ev_multi_side_ctm.png rename to src/main/resources/assets/techreborn/textures/block/machines/energy/lapotronic_su_side_ctm.png diff --git a/src/main/resources/assets/techreborn/textures/block/machines/structure/tier1_casing_ctm.ctx b/src/main/resources/assets/techreborn/textures/block/machines/structure/tier1_casing_ctm.ctx deleted file mode 100644 index 2701abf91..000000000 --- a/src/main/resources/assets/techreborn/textures/block/machines/structure/tier1_casing_ctm.ctx +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type":"CTMH", - "textures":[ - "./tier1_casing", - "./tier1_casing_ctmh" - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/block/machines/structure/tier1_casing_ctmh.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/structure/tier1_casing_ctmh.png.mcmeta new file mode 100644 index 000000000..ddec0e9b1 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/machines/structure/tier1_casing_ctmh.png.mcmeta @@ -0,0 +1,9 @@ +{ + "ctm": { + "ctm_version": 1, + "type": "ctm_horizontal", + "extra": { + "connect_inside": true + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/block/machines/structure/tier2_casing_ctmh.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/structure/tier2_casing_ctmh.png.mcmeta new file mode 100644 index 000000000..ddec0e9b1 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/machines/structure/tier2_casing_ctmh.png.mcmeta @@ -0,0 +1,9 @@ +{ + "ctm": { + "ctm_version": 1, + "type": "ctm_horizontal", + "extra": { + "connect_inside": true + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/block/machines/structure/tier3_casing_ctmh.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/structure/tier3_casing_ctmh.png.mcmeta new file mode 100644 index 000000000..ddec0e9b1 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/machines/structure/tier3_casing_ctmh.png.mcmeta @@ -0,0 +1,9 @@ +{ + "ctm": { + "ctm_version": 1, + "type": "ctm_horizontal", + "extra": { + "connect_inside": true + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/block/reinforced_glass.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/reinforced_glass.png.mcmeta new file mode 100644 index 000000000..0427a47bf --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/reinforced_glass.png.mcmeta @@ -0,0 +1,9 @@ +{ + "ctm":{ + "ctm_version": 1, + "type":"CTM", + "textures":[ + "techreborn:block/reinforced_glass_ctm" + ] + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/storage/iridium_reinforced_stone_storage_block.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/storage/iridium_reinforced_stone_storage_block.png.mcmeta new file mode 100644 index 000000000..7c3c96e2a --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/storage/iridium_reinforced_stone_storage_block.png.mcmeta @@ -0,0 +1,12 @@ +{ + "ctm":{ + "ctm_version": 1, + "type":"CTM", + "textures":[ + "techreborn:block/storage/iridum_reinforced_stone_storage_block_ctm" + ], + "extra":{ + "ignore_states":true + } + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/storage/iridium_reinforced_tungstensteel_storage_block.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/storage/iridium_reinforced_tungstensteel_storage_block.png.mcmeta new file mode 100644 index 000000000..29f3a942e --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/block/storage/iridium_reinforced_tungstensteel_storage_block.png.mcmeta @@ -0,0 +1,12 @@ +{ + "ctm":{ + "ctm_version": 1, + "type":"CTM", + "textures":[ + "techreborn:block/storage/iridium_reinforced_tungstensteel_storage_block_ctm" + ], + "extra":{ + "ignore_states":true + } + } +}