From d010fc97373eeb58d23506b788b27c3d14757b32 Mon Sep 17 00:00:00 2001 From: dpeter99 Date: Mon, 22 Aug 2016 09:28:45 +0200 Subject: [PATCH] Fixed modells - fixes #78 - fixed cell workbench --- .../{cell_work_bench.json => cell_workbench.json} | 0 .../appliedenergistics2/models/block/cell_work_bench.json | 8 -------- .../appliedenergistics2/models/block/cell_workbench.json | 8 ++++++++ .../assets/appliedenergistics2/models/block/charger.json | 1 + .../models/block/cube/cube_AE_bottom_top.json | 2 +- .../assets/appliedenergistics2/models/block/grinder.json | 1 - .../appliedenergistics2/models/block/inscriber.json | 1 + .../assets/appliedenergistics2/models/block/ioport.json | 2 +- .../models/block/quartz_torch_standing.json | 1 + .../models/block/quartz_torch_standing_odd.json | 1 + .../models/block/quartz_torch_wall.json | 1 + .../models/block/quartz_torch_wall_odd.json | 1 + .../assets/appliedenergistics2/models/block/tiny_tnt.json | 1 + .../assets/appliedenergistics2/models/block/wireless.json | 1 + 14 files changed, 18 insertions(+), 11 deletions(-) rename src/main/resources/assets/appliedenergistics2/blockstates/{cell_work_bench.json => cell_workbench.json} (100%) delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/cell_work_bench.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/cell_workbench.json diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/cell_work_bench.json b/src/main/resources/assets/appliedenergistics2/blockstates/cell_workbench.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/blockstates/cell_work_bench.json rename to src/main/resources/assets/appliedenergistics2/blockstates/cell_workbench.json diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cell_work_bench.json b/src/main/resources/assets/appliedenergistics2/models/block/cell_work_bench.json deleted file mode 100644 index 4e7b2609e..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/block/cell_work_bench.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "block/cube_bottom_top", - "textures": { - "bottom": "appliedenergistics2:blocks/cell_work_bench_bottom", - "side": "appliedenergistics2:blocks/cell_work_bench_side", - "top": "appliedenergistics2:blocks/cell_work_bench" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cell_workbench.json b/src/main/resources/assets/appliedenergistics2/models/block/cell_workbench.json new file mode 100644 index 000000000..5f60ab019 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/models/block/cell_workbench.json @@ -0,0 +1,8 @@ +{ + "parent": "appliedenergistics2:block/cube/cube_ae_bottom_top", + "textures": { + "bottom": "appliedenergistics2:blocks/cell_workbench_bottom", + "side": "appliedenergistics2:blocks/cell_workbench_side", + "top": "appliedenergistics2:blocks/cell_workbench" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/charger.json b/src/main/resources/assets/appliedenergistics2/models/block/charger.json index e60a5b116..9cb336268 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/charger.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/charger.json @@ -349,6 +349,7 @@ ], "parent": "block/orientable", "textures": { + "particle": "appliedenergistics2:blocks/charger", "0": "appliedenergistics2:blocks/charger_side", "1": "appliedenergistics2:blocks/charger", "2": "appliedenergistics2:blocks/charger_inside" diff --git a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_bottom_top.json b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_bottom_top.json index d1fb3f5b7..81009b8b0 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_bottom_top.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_AE_bottom_top.json @@ -1,5 +1,5 @@ { - "parent": "appliedenergistics2:block/cube_ae", + "parent": "appliedenergistics2:block/cube/cube_ae", "textures": { "down": "#bottom", "east": "#side", diff --git a/src/main/resources/assets/appliedenergistics2/models/block/grinder.json b/src/main/resources/assets/appliedenergistics2/models/block/grinder.json index 356926713..14ae1eecd 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/grinder.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/grinder.json @@ -1,5 +1,4 @@ { - "ambientocclusion": false, "parent": "appliedenergistics2:block/cube/cube_ae_machine", "textures": { "bottom": "appliedenergistics2:blocks/grinder_bottom", diff --git a/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json b/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json index 6777853b1..4fbb91697 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json @@ -487,6 +487,7 @@ ], "parent": "block/orientable", "textures": { + "particle": "appliedenergistics2:blocks/inscriber", "0": "appliedenergistics2:blocks/inscriber" } } \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/ioport.json b/src/main/resources/assets/appliedenergistics2/models/block/ioport.json index 3f919fb76..8b6892db7 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/ioport.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/ioport.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_bottom_top", + "parent": "appliedenergistics2:block/cube/cube_ae_bottom_top", "textures": { "bottom": "appliedenergistics2:blocks/ioport_bottom", "side": "appliedenergistics2:blocks/ioport_side", diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_standing.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_standing.json index 137c92ef4..ca9d34ac0 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_standing.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_standing.json @@ -299,6 +299,7 @@ } ], "textures": { + "particle": "appliedenergistics2:blocks/quartz_torch", "metal": "appliedenergistics2:blocks/quartz_torch_metal", "quartz": "appliedenergistics2:blocks/quartz_torch" } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_standing_odd.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_standing_odd.json index c37d8bcfb..06933c2cf 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_standing_odd.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_standing_odd.json @@ -299,6 +299,7 @@ } ], "textures": { + "particle": "appliedenergistics2:blocks/quartz_torch", "metal": "appliedenergistics2:blocks/quartz_torch_metal", "quartz": "appliedenergistics2:blocks/quartz_torch" } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_wall.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_wall.json index c17543a6b..d16fe7f3b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_wall.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_wall.json @@ -201,6 +201,7 @@ } ], "textures": { + "particle": "appliedenergistics2:blocks/quartz_torch", "metal": "appliedenergistics2:blocks/quartz_torch_metal", "quartz": "appliedenergistics2:blocks/quartz_torch" } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_wall_odd.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_wall_odd.json index f19c5713b..b7e93d552 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_wall_odd.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/quartz_torch_wall_odd.json @@ -201,6 +201,7 @@ } ], "textures": { + "particle": "appliedenergistics2:blocks/quartz_torch", "metal": "appliedenergistics2:blocks/quartz_torch_metal", "quartz": "appliedenergistics2:blocks/quartz_torch" } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/tiny_tnt.json b/src/main/resources/assets/appliedenergistics2/models/block/tiny_tnt.json index 0049a5419..84dd29eb2 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/tiny_tnt.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/tiny_tnt.json @@ -73,6 +73,7 @@ ], "parent": "block/block", "textures": { + "particle": "blocks/tnt_bottom", "0": "blocks/tnt_side", "1": "blocks/tnt_top", "2": "blocks/tnt_bottom" diff --git a/src/main/resources/assets/appliedenergistics2/models/block/wireless.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless.json index e6c03365c..28f96470a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/wireless.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/wireless.json @@ -762,6 +762,7 @@ } ], "textures": { + "particle": "appliedenergistics2:blocks/wireless_inside", "0": "appliedenergistics2:blocks/wireless_inside", "1": "appliedenergistics2:blocks/wireless" }