diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json b/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json index 244f95763..4bfc0c167 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json @@ -1,9 +1,9 @@ { "variants": { "": [ - { "model": "appliedenergistics2:block/charged_quartz_ore0", "weight": 1 }, - { "model": "appliedenergistics2:block/charged_quartz_ore1", "weight": 1 }, - { "model": "appliedenergistics2:block/charged_quartz_ore2", "weight": 1 } + { "model": "appliedenergistics2:block/charged_quartz_ore_0", "weight": 1 }, + { "model": "appliedenergistics2:block/charged_quartz_ore_1", "weight": 1 }, + { "model": "appliedenergistics2:block/charged_quartz_ore_2", "weight": 1 } ] } } diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json b/src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json index 5897d5818..d13e91424 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json @@ -1,19 +1,19 @@ { "variants": { "fullness=0": { - "model": "appliedenergistics2:block/energy_cell/dense_energy_cell0" + "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_0" }, "fullness=1": { - "model": "appliedenergistics2:block/energy_cell/dense_energy_cell1" + "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_1" }, "fullness=2": { - "model": "appliedenergistics2:block/energy_cell/dense_energy_cell2" + "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_2" }, "fullness=3": { - "model": "appliedenergistics2:block/energy_cell/dense_energy_cell3" + "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_3" }, "fullness=4": { - "model": "appliedenergistics2:block/energy_cell/dense_energy_cell4" + "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_4" } } } diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json b/src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json index c91c21d11..2ad1590c0 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json @@ -1,19 +1,19 @@ { "variants": { "fullness=0": { - "model": "appliedenergistics2:block/energy_cell/energy_cell0" + "model": "appliedenergistics2:block/energy_cell/energy_cell_0" }, "fullness=1": { - "model": "appliedenergistics2:block/energy_cell/energy_cell1" + "model": "appliedenergistics2:block/energy_cell/energy_cell_1" }, "fullness=2": { - "model": "appliedenergistics2:block/energy_cell/energy_cell2" + "model": "appliedenergistics2:block/energy_cell/energy_cell_2" }, "fullness=3": { - "model": "appliedenergistics2:block/energy_cell/energy_cell3" + "model": "appliedenergistics2:block/energy_cell/energy_cell_3" }, "fullness=4": { - "model": "appliedenergistics2:block/energy_cell/energy_cell4" + "model": "appliedenergistics2:block/energy_cell/energy_cell_4" } } } diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json index 65cf5bcae..386b2fd98 100644 --- a/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json +++ b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json @@ -1,10 +1,10 @@ { "variants": { "": [ - { "model": "appliedenergistics2:block/quartz_ore0", "weight": 1 }, - { "model": "appliedenergistics2:block/quartz_ore1", "weight": 1 }, - { "model": "appliedenergistics2:block/quartz_ore2", "weight": 1 }, - { "model": "appliedenergistics2:block/quartz_ore3", "weight": 1 } + { "model": "appliedenergistics2:block/quartz_ore_0", "weight": 1 }, + { "model": "appliedenergistics2:block/quartz_ore_1", "weight": 1 }, + { "model": "appliedenergistics2:block/quartz_ore_2", "weight": 1 }, + { "model": "appliedenergistics2:block/quartz_ore_3", "weight": 1 } ] } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore0.json b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_0.json similarity index 99% rename from src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore0.json rename to src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_0.json index e4b0601ad..8ec1c3234 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore0.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_0.json @@ -2,7 +2,7 @@ "parent": "block/block", "textures": { "block": "block/stone", - "quartz": "appliedenergistics2:block/charged_quartz_ore_light0", + "quartz": "appliedenergistics2:block/charged_quartz_ore_light_0", "particle": "appliedenergistics2:block/charged_quartz_ore" }, "elements": [ diff --git a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore1.json b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_1.json similarity index 99% rename from src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore1.json rename to src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_1.json index 60ce29668..0406512c9 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore1.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_1.json @@ -2,7 +2,7 @@ "parent": "block/block", "textures": { "block": "block/stone", - "quartz": "appliedenergistics2:block/charged_quartz_ore_light1", + "quartz": "appliedenergistics2:block/charged_quartz_ore_light_1", "particle": "appliedenergistics2:block/charged_quartz_ore" }, "elements": [ diff --git a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore2.json b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_2.json similarity index 99% rename from src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore2.json rename to src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_2.json index 2a92411b7..5bbbc7864 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore2.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore_2.json @@ -2,7 +2,7 @@ "parent": "block/block", "textures": { "block": "block/stone", - "quartz": "appliedenergistics2:block/charged_quartz_ore_light2", + "quartz": "appliedenergistics2:block/charged_quartz_ore_light_2", "particle": "appliedenergistics2:block/charged_quartz_ore" }, "elements": [ diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell0.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell0.json deleted file mode 100644 index 154d12786..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:block/dense_energy_cell0" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell1.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell1.json deleted file mode 100644 index 1bd02c19d..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:block/dense_energy_cell1" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell2.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell2.json deleted file mode 100644 index f31ac6758..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:block/dense_energy_cell2" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell3.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell3.json deleted file mode 100644 index 14a91bcdd..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:block/dense_energy_cell3" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell4.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell4.json deleted file mode 100644 index ed1d7e1e2..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:block/dense_energy_cell4" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell5.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell5.json deleted file mode 100644 index a55d2a509..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:block/dense_energy_cell5" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell6.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell6.json deleted file mode 100644 index 93dba33cf..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:block/dense_energy_cell6" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell7.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell7.json deleted file mode 100644 index 66432b1fa..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:block/dense_energy_cell7" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_0.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_0.json new file mode 100644 index 000000000..69dc1bf5e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_0.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:block/dense_energy_cell_0" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_1.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_1.json new file mode 100644 index 000000000..fed8e5554 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:block/dense_energy_cell_1" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_2.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_2.json new file mode 100644 index 000000000..20871fccb --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:block/dense_energy_cell_2" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_3.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_3.json new file mode 100644 index 000000000..b4120788b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:block/dense_energy_cell_3" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_4.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_4.json new file mode 100644 index 000000000..3360d5fa1 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:block/dense_energy_cell_4" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_5.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_5.json new file mode 100644 index 000000000..f632def96 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell_5.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:block/dense_energy_cell_5" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell4.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell4.json deleted file mode 100644 index 5fe9da98e..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:block/energy_cell4" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell5.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell5.json deleted file mode 100644 index 5fd33371d..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:block/energy_cell5" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell6.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell6.json deleted file mode 100644 index d82de6b8d..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:block/energy_cell6" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell7.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell7.json deleted file mode 100644 index 866eaa353..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:block/energy_cell7" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_0.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_0.json new file mode 100644 index 000000000..301a6b84e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_0.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:block/energy_cell_0" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_1.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_1.json new file mode 100644 index 000000000..f06576224 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:block/energy_cell_1" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_2.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_2.json new file mode 100644 index 000000000..2e05357bf --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:block/energy_cell_2" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_3.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_3.json new file mode 100644 index 000000000..50201ceb5 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:block/energy_cell_3" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_4.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_4.json new file mode 100644 index 000000000..eca95d56b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:block/energy_cell_4" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_5.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_5.json new file mode 100644 index 000000000..548d037c5 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell_5.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:block/energy_cell_5" + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore0.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore0.json deleted file mode 100644 index 53bceb7f2..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:block/quartz_ore0" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore1.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore1.json deleted file mode 100644 index 8cd28906d..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:block/quartz_ore1" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore2.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore2.json deleted file mode 100644 index 709f31a35..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:block/quartz_ore2" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore3.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore3.json deleted file mode 100644 index c309b13a4..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "appliedenergistics2:block/quartz_ore3" - } -} diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell0.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_0.json similarity index 50% rename from src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell0.json rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_0.json index 60faa2ac4..cc1fc85a5 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell0.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_0.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:block/energy_cell0" + "all": "appliedenergistics2:block/quartz_ore_0" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell1.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_1.json similarity index 50% rename from src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell1.json rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_1.json index a695e5fb4..fc3c1492e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell1.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_1.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:block/energy_cell1" + "all": "appliedenergistics2:block/quartz_ore_1" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell2.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_2.json similarity index 50% rename from src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell2.json rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_2.json index 52911e1d2..1c37dd665 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell2.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_2.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:block/energy_cell2" + "all": "appliedenergistics2:block/quartz_ore_2" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell3.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_3.json similarity index 50% rename from src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell3.json rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_3.json index c46c209b8..f00e64ef8 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell3.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore_3.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "appliedenergistics2:block/energy_cell3" + "all": "appliedenergistics2:block/quartz_ore_3" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/dense_energy_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/dense_energy_cell.json index 709f85b90..bb4435d42 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/dense_energy_cell.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/dense_energy_cell.json @@ -1,47 +1,29 @@ { - "parent": "appliedenergistics2:block/energy_cell/dense_energy_cell0", + "parent": "appliedenergistics2:block/energy_cell/dense_energy_cell_0", "overrides": [ { "predicate": { - "appliedenergistics2:fill_level": 0.125 + "appliedenergistics2:fill_level": 0 }, - "model": "appliedenergistics2:block/energy_cell/dense_energy_cell1" + "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_1" }, { "predicate": { "appliedenergistics2:fill_level": 0.25 }, - "model": "appliedenergistics2:block/energy_cell/dense_energy_cell2" - }, - { - "predicate": { - "appliedenergistics2:fill_level": 0.375 - }, - "model": "appliedenergistics2:block/energy_cell/dense_energy_cell3" + "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_2" }, { "predicate": { "appliedenergistics2:fill_level": 0.5 }, - "model": "appliedenergistics2:block/energy_cell/dense_energy_cell4" - }, - { - "predicate": { - "appliedenergistics2:fill_level": 0.625 - }, - "model": "appliedenergistics2:block/energy_cell/dense_energy_cell5" + "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_3" }, { "predicate": { "appliedenergistics2:fill_level": 0.75 }, - "model": "appliedenergistics2:block/energy_cell/dense_energy_cell6" - }, - { - "predicate": { - "appliedenergistics2:fill_level": 0.875 - }, - "model": "appliedenergistics2:block/energy_cell/dense_energy_cell7" + "model": "appliedenergistics2:block/energy_cell/dense_energy_cell_4" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/energy_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/energy_cell.json index e8ea4e909..bcbb789ca 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/energy_cell.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/energy_cell.json @@ -1,47 +1,29 @@ { - "parent": "appliedenergistics2:block/energy_cell/energy_cell0", + "parent": "appliedenergistics2:block/energy_cell/energy_cell_0", "overrides": [ { "predicate": { - "appliedenergistics2:fill_level": 0.125 + "appliedenergistics2:fill_level": 0 }, - "model": "appliedenergistics2:block/energy_cell/energy_cell1" + "model": "appliedenergistics2:block/energy_cell/energy_cell_1" }, { "predicate": { "appliedenergistics2:fill_level": 0.25 }, - "model": "appliedenergistics2:block/energy_cell/energy_cell2" - }, - { - "predicate": { - "appliedenergistics2:fill_level": 0.375 - }, - "model": "appliedenergistics2:block/energy_cell/energy_cell3" + "model": "appliedenergistics2:block/energy_cell/energy_cell_2" }, { "predicate": { "appliedenergistics2:fill_level": 0.5 }, - "model": "appliedenergistics2:block/energy_cell/energy_cell4" - }, - { - "predicate": { - "appliedenergistics2:fill_level": 0.625 - }, - "model": "appliedenergistics2:block/energy_cell/energy_cell5" + "model": "appliedenergistics2:block/energy_cell/energy_cell_3" }, { "predicate": { "appliedenergistics2:fill_level": 0.75 }, - "model": "appliedenergistics2:block/energy_cell/energy_cell6" - }, - { - "predicate": { - "appliedenergistics2:fill_level": 0.875 - }, - "model": "appliedenergistics2:block/energy_cell/energy_cell7" + "model": "appliedenergistics2:block/energy_cell/energy_cell_4" } ] } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/quartz_ore.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_ore.json index 6369af854..cc1fc85a5 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/quartz_ore.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/quartz_ore.json @@ -1,3 +1,6 @@ { - "parent": "appliedenergistics2:block/quartz_ore" + "parent": "block/cube_all", + "textures": { + "all": "appliedenergistics2:block/quartz_ore_0" + } } diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light0.png b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_0.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light0.png rename to src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_0.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light0.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_0.png.mcmeta similarity index 91% rename from src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light0.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_0.png.mcmeta index b0bb0570f..57fa4d474 100644 --- a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light0.png.mcmeta +++ b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_0.png.mcmeta @@ -1,49 +1,49 @@ - { - "animation": { - "interpolate": true, - "frames": [ - { - "index": 0, - "time": 25 - }, - { - "index": 1, - "time": 2 - }, - { - "index": 2, - "time": 2 - }, - { - "index": 3, - "time": 2 - } - , - { - "index": 4, - "time": 2 - }, - { - "index": 5, - "time": 2 - }, - { - "index": 6, - "time": 2 - }, - { - "index": 7, - "time": 2 - } - , - { - "index": 8, - "time": 2 - }, - { - "index": 9, - "time": 2 - } - ] - } + { + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 25 + }, + { + "index": 1, + "time": 2 + }, + { + "index": 2, + "time": 2 + }, + { + "index": 3, + "time": 2 + } + , + { + "index": 4, + "time": 2 + }, + { + "index": 5, + "time": 2 + }, + { + "index": 6, + "time": 2 + }, + { + "index": 7, + "time": 2 + } + , + { + "index": 8, + "time": 2 + }, + { + "index": 9, + "time": 2 + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light1.png b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_1.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light1.png rename to src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_1.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light1.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_1.png.mcmeta similarity index 91% rename from src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light1.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_1.png.mcmeta index 59678f563..92deaa673 100644 --- a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light1.png.mcmeta +++ b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_1.png.mcmeta @@ -1,49 +1,49 @@ - { - "animation": { - "interpolate": true, - "frames": [ - { - "index": 0, - "time": 2 - }, - { - "index": 1, - "time": 2 - }, - { - "index": 2, - "time": 2 - }, - { - "index": 3, - "time": 2 - } - , - { - "index": 4, - "time": 2 - }, - { - "index": 5, - "time": 2 - }, - { - "index": 6, - "time": 2 - }, - { - "index": 7, - "time": 2 - } - , - { - "index": 8, - "time": 25 - }, - { - "index": 9, - "time": 2 - } - ] - } + { + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 2 + }, + { + "index": 1, + "time": 2 + }, + { + "index": 2, + "time": 2 + }, + { + "index": 3, + "time": 2 + } + , + { + "index": 4, + "time": 2 + }, + { + "index": 5, + "time": 2 + }, + { + "index": 6, + "time": 2 + }, + { + "index": 7, + "time": 2 + } + , + { + "index": 8, + "time": 25 + }, + { + "index": 9, + "time": 2 + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light2.png b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_2.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light2.png rename to src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_2.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light2.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_2.png.mcmeta similarity index 91% rename from src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light2.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_2.png.mcmeta index 3a459b8c2..3d61c70bd 100644 --- a/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light2.png.mcmeta +++ b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light_2.png.mcmeta @@ -1,49 +1,49 @@ - { - "animation": { - "interpolate": true, - "frames": [ - { - "index": 0, - "time": 2 - }, - { - "index": 1, - "time": 2 - }, - { - "index": 2, - "time": 25 - }, - { - "index": 3, - "time": 2 - } - , - { - "index": 4, - "time": 2 - }, - { - "index": 5, - "time": 2 - }, - { - "index": 6, - "time": 2 - }, - { - "index": 7, - "time": 2 - } - , - { - "index": 8, - "time": 2 - }, - { - "index": 9, - "time": 2 - } - ] - } + { + "animation": { + "interpolate": true, + "frames": [ + { + "index": 0, + "time": 2 + }, + { + "index": 1, + "time": 2 + }, + { + "index": 2, + "time": 25 + }, + { + "index": 3, + "time": 2 + } + , + { + "index": 4, + "time": 2 + }, + { + "index": 5, + "time": 2 + }, + { + "index": 6, + "time": 2 + }, + { + "index": 7, + "time": 2 + } + , + { + "index": 8, + "time": 2 + }, + { + "index": 9, + "time": 2 + } + ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell5.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell5.png deleted file mode 100644 index 4c0d1e8e8..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell5.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell6.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell6.png deleted file mode 100644 index 57e04a329..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell6.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell7.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell7.png deleted file mode 100644 index e07df5d7f..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell7.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell0.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell_0.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell0.png rename to src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell_0.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell1.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell_1.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell1.png rename to src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell_1.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell2.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell_2.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell2.png rename to src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell_2.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell3.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell_3.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell3.png rename to src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell_3.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell4.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell_4.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell4.png rename to src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell_4.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell5.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell5.png deleted file mode 100644 index d7ccdf575..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell5.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell6.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell6.png deleted file mode 100644 index d2c80dfea..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell6.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell7.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell7.png deleted file mode 100644 index 9c18613e9..000000000 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell7.png and /dev/null differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell0.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell_0.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/block/energy_cell0.png rename to src/main/resources/assets/appliedenergistics2/textures/block/energy_cell_0.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell1.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell_1.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/block/energy_cell1.png rename to src/main/resources/assets/appliedenergistics2/textures/block/energy_cell_1.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell2.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell_2.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/block/energy_cell2.png rename to src/main/resources/assets/appliedenergistics2/textures/block/energy_cell_2.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell3.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell_3.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/block/energy_cell3.png rename to src/main/resources/assets/appliedenergistics2/textures/block/energy_cell_3.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell4.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell_4.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/block/energy_cell4.png rename to src/main/resources/assets/appliedenergistics2/textures/block/energy_cell_4.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore0.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore_0.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore0.png rename to src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore_0.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore1.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore_1.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore1.png rename to src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore_1.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore2.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore_2.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore2.png rename to src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore_2.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore3.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore_3.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore3.png rename to src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore_3.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/desktop.ini b/src/main/resources/assets/appliedenergistics2/textures/desktop.ini new file mode 100644 index 000000000..17c2f566e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/desktop.ini @@ -0,0 +1,4 @@ +[ViewState] +Mode= +Vid= +FolderType=Pictures diff --git a/src/main/resources/assets/appliedenergistics2/textures/guis/desktop.ini b/src/main/resources/assets/appliedenergistics2/textures/guis/desktop.ini new file mode 100644 index 000000000..17c2f566e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/guis/desktop.ini @@ -0,0 +1,4 @@ +[ViewState] +Mode= +Vid= +FolderType=Pictures