From 4df9d62a90dd9c1d4dfebd1d5764936563591257 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Thu, 4 Apr 2019 17:29:03 +0300 Subject: [PATCH] More models --- src/main/java/techreborn/init/TRContent.java | 1 - .../techreborn/blockstates/charge_o_mat.json | 12 +++++ .../techreborn/blockstates/computer_cube.json | 8 +++ .../techreborn/blockstates/digital_chest.json | 5 ++ .../machines/tier2_machines/charge_o_mat.json | 51 ------------------ .../tier2_machines/digital_chest.json | 45 ---------------- .../machines/tier2_machines/charge_o_mat.json | 8 +++ .../tier2_machines/charge_o_mat_on.json | 8 +++ .../tier2_machines/computer_cube.json | 8 +++ .../tier2_machines/digital_chest.json | 8 +++ .../models/item/advanced_chainsaw.json | 2 +- .../models/item/basic_chainsaw.json | 2 +- .../techreborn/models/item/charge_o_mat.json | 3 ++ .../techreborn/models/item/computer_cube.json | 3 ++ .../techreborn/models/item/digital_chest.json | 3 ++ .../models/item/energy_crystal.json | 2 +- .../models/item/frequency_transmitter.json | 2 +- .../models/item/industrial_chainsaw.json | 2 +- .../models/item/lapotron_crystal.json | 2 +- .../models/item/lapotronic_orb.json | 2 +- .../models/item/lithium_ion_battery.json | 2 +- .../models/item/misc/missing_recipe.json | 6 --- .../techreborn/models/item/nanosaber.json | 4 +- .../override/advanced_chainsaw_animated.json | 0 .../override/basic_chainsaw_animated.json | 0 .../override/energy_crystal_empty.json | 0 .../frequency_transmitter_coords.json | 0 .../industrial_chainsaw_animated.json | 0 .../override/lapotron_crystal_empty.json | 0 .../override/lapotronic_orb_empty.json | 0 .../override/lithium_battery_empty.json | 0 .../{tool => }/override/nanosaber_active.json | 0 .../override/nanosaber_active_low.json | 0 .../red_cell_battery_empty.json} | 2 +- .../models/item/red_cell_battery.json | 4 +- .../tier2_machines/charge_bench_bottom.png | Bin 561 -> 0 bytes ...side_off.png => charge_o_mat_side_off.png} | Bin ...h_side_on.png => charge_o_mat_side_on.png} | Bin ...h_top_off.png => charge_o_mat_top_off.png} | Bin ...nch_top_on.png => charge_o_mat_top_on.png} | Bin .../{re_battery.png => red_cell_battery.png} | Bin ...y_empty.png => red_cell_battery_empty.png} | Bin 42 files changed, 79 insertions(+), 116 deletions(-) create mode 100644 src/main/resources/assets/techreborn/blockstates/charge_o_mat.json create mode 100644 src/main/resources/assets/techreborn/blockstates/computer_cube.json create mode 100644 src/main/resources/assets/techreborn/blockstates/digital_chest.json delete mode 100644 src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/charge_o_mat.json delete mode 100644 src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/digital_chest.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/tier2_machines/charge_o_mat.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/tier2_machines/charge_o_mat_on.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/tier2_machines/computer_cube.json create mode 100644 src/main/resources/assets/techreborn/models/block/machines/tier2_machines/digital_chest.json create mode 100644 src/main/resources/assets/techreborn/models/item/charge_o_mat.json create mode 100644 src/main/resources/assets/techreborn/models/item/computer_cube.json create mode 100644 src/main/resources/assets/techreborn/models/item/digital_chest.json delete mode 100644 src/main/resources/assets/techreborn/models/item/misc/missing_recipe.json rename src/main/resources/assets/techreborn/models/item/{tool => }/override/advanced_chainsaw_animated.json (100%) rename src/main/resources/assets/techreborn/models/item/{tool => }/override/basic_chainsaw_animated.json (100%) rename src/main/resources/assets/techreborn/models/item/{battery => }/override/energy_crystal_empty.json (100%) rename src/main/resources/assets/techreborn/models/item/{misc => override}/frequency_transmitter_coords.json (100%) rename src/main/resources/assets/techreborn/models/item/{tool => }/override/industrial_chainsaw_animated.json (100%) rename src/main/resources/assets/techreborn/models/item/{battery => }/override/lapotron_crystal_empty.json (100%) rename src/main/resources/assets/techreborn/models/item/{battery => }/override/lapotronic_orb_empty.json (100%) rename src/main/resources/assets/techreborn/models/item/{battery => }/override/lithium_battery_empty.json (100%) rename src/main/resources/assets/techreborn/models/item/{tool => }/override/nanosaber_active.json (100%) rename src/main/resources/assets/techreborn/models/item/{tool => }/override/nanosaber_active_low.json (100%) rename src/main/resources/assets/techreborn/models/item/{battery/override/re_battery_empty.json => override/red_cell_battery_empty.json} (50%) delete mode 100644 src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/charge_bench_bottom.png rename src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/{charge_bench_side_off.png => charge_o_mat_side_off.png} (100%) rename src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/{charge_bench_side_on.png => charge_o_mat_side_on.png} (100%) rename src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/{charge_bench_top_off.png => charge_o_mat_top_off.png} (100%) rename src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/{charge_bench_top_on.png => charge_o_mat_top_on.png} (100%) rename src/main/resources/assets/techreborn/textures/item/battery/{re_battery.png => red_cell_battery.png} (100%) rename src/main/resources/assets/techreborn/textures/item/battery/{re_battery_empty.png => red_cell_battery_empty.png} (100%) diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index e41af2e82..ab9fe8563 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -61,7 +61,6 @@ public class TRContent { // Misc Blocks public static Block COMPUTER_CUBE; - public static Block FLARE; public static Block NUKE; public static Block REFINED_IRON_FENCE; public static Block REINFORCED_GLASS; diff --git a/src/main/resources/assets/techreborn/blockstates/charge_o_mat.json b/src/main/resources/assets/techreborn/blockstates/charge_o_mat.json new file mode 100644 index 000000000..b95b4bdcb --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/charge_o_mat.json @@ -0,0 +1,12 @@ +{ + "variants": { + "facing=north,active=false": { "model": "techreborn:block/machines/tier2_machines/charge_o_mat" }, + "facing=south,active=false": { "model": "techreborn:block/machines/tier2_machines/charge_o_mat", "y": 180 }, + "facing=west,active=false": { "model": "techreborn:block/machines/tier2_machines/charge_o_mat", "y": 270 }, + "facing=east,active=false": { "model": "techreborn:block/machines/tier2_machines/charge_o_mat", "y": 90 }, + "facing=north,active=true": { "model": "techreborn:block/machines/tier2_machines/charge_o_mat_on" }, + "facing=south,active=true": { "model": "techreborn:block/machines/tier2_machines/charge_o_mat_on", "y": 180 }, + "facing=west,active=true": { "model": "techreborn:block/machines/tier2_machines/charge_o_mat_on", "y": 270 }, + "facing=east,active=true": { "model": "techreborn:block/machines/tier2_machines/charge_o_mat_on", "y": 90 } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/computer_cube.json b/src/main/resources/assets/techreborn/blockstates/computer_cube.json new file mode 100644 index 000000000..9a606b46d --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/computer_cube.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "techreborn:block/machines/tier2_machines/computer_cube" }, + "facing=south": { "model": "techreborn:block/machines/tier2_machines/computer_cube", "y": 180 }, + "facing=west": { "model": "techreborn:block/machines/tier2_machines/computer_cube", "y": 270 }, + "facing=east": { "model": "techreborn:block/machines/tier2_machines/computer_cube", "y": 90 } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/digital_chest.json b/src/main/resources/assets/techreborn/blockstates/digital_chest.json new file mode 100644 index 000000000..5cf2fded9 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/digital_chest.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/machines/tier2_machines/digital_chest" } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/charge_o_mat.json b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/charge_o_mat.json deleted file mode 100644 index efb643f98..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/charge_o_mat.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier2_machines/charge_bench_side_off", - "down": "techreborn:blocks/machines/tier2_machines/charge_bench_bottom" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "top": "techreborn:blocks/machines/tier2_machines/charge_bench_top_off", - "side": "techreborn:blocks/machines/tier2_machines/charge_bench_side_off", - "front": "techreborn:blocks/machines/tier2_machines/charge_bench_side_off" - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - "top": "techreborn:blocks/machines/tier2_machines/charge_bench_top_on", - "side": "techreborn:blocks/machines/tier2_machines/charge_bench_side_on", - "front": "techreborn:blocks/machines/tier2_machines/charge_bench_side_on" - } - }, - "false": { - "textures": { - "top": "techreborn:blocks/machines/tier2_machines/charge_bench_top_off", - "side": "techreborn:blocks/machines/tier2_machines/charge_bench_side_off", - "front": "techreborn:blocks/machines/tier2_machines/charge_bench_side_off" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/digital_chest.json b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/digital_chest.json deleted file mode 100644 index 401bdca51..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/digital_chest.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier2_machines/digital_chest_side", - "down": "techreborn:blocks/machines/tier2_machines/digital_chest_bottom", - "top": "techreborn:blocks/machines/tier2_machines/digital_chest_top", - "side": "techreborn:blocks/machines/tier2_machines/digital_chest_side", - "front": "techreborn:blocks/machines/tier2_machines/digital_chest_side" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - } - }, - "false": { - "textures": { - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/charge_o_mat.json b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/charge_o_mat.json new file mode 100644 index 000000000..220dbf815 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/charge_o_mat.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "techreborn:block/machines/tier2_machines/charge_o_mat_top_off", + "bottom": "techreborn:block/machines/tier2_machines/machine_bottom", + "side": "techreborn:block/machines/tier2_machines/charge_o_mat_side_off" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/charge_o_mat_on.json b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/charge_o_mat_on.json new file mode 100644 index 000000000..e8bd1fd33 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/charge_o_mat_on.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "techreborn:block/machines/tier2_machines/charge_o_mat_top_on", + "bottom": "techreborn:block/machines/tier2_machines/machine_bottom", + "side": "techreborn:block/machines/tier2_machines/charge_o_mat_side_on" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/computer_cube.json b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/computer_cube.json new file mode 100644 index 000000000..de46721df --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/computer_cube.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "top": "techreborn:block/machines/tier2_machines/machine_top", + "front": "techreborn:block/machines/tier2_machines/computer_cube_front", + "side": "techreborn:block/machines/tier2_machines/computer_cube_side" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/digital_chest.json b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/digital_chest.json new file mode 100644 index 000000000..4f43250b5 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier2_machines/digital_chest.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "techreborn:block/machines/tier2_machines/digital_chest_top", + "bottom": "techreborn:block/machines/tier2_machines/digital_chest_bottom", + "side": "techreborn:block/machines/tier2_machines/digital_chest_side" + } +} diff --git a/src/main/resources/assets/techreborn/models/item/advanced_chainsaw.json b/src/main/resources/assets/techreborn/models/item/advanced_chainsaw.json index c769e416a..85c862fa2 100644 --- a/src/main/resources/assets/techreborn/models/item/advanced_chainsaw.json +++ b/src/main/resources/assets/techreborn/models/item/advanced_chainsaw.json @@ -8,7 +8,7 @@ "predicate": { "techreborn:animated": 1 }, - "model": "techreborn:item/tool/override/advanced_chainsaw_animated" + "model": "techreborn:item/override/advanced_chainsaw_animated" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/basic_chainsaw.json b/src/main/resources/assets/techreborn/models/item/basic_chainsaw.json index 3eab333ee..23a1fd838 100644 --- a/src/main/resources/assets/techreborn/models/item/basic_chainsaw.json +++ b/src/main/resources/assets/techreborn/models/item/basic_chainsaw.json @@ -8,7 +8,7 @@ "predicate": { "techreborn:animated": 1 }, - "model": "techreborn:item/tool/override/basic_chainsaw_animated" + "model": "techreborn:item/override/basic_chainsaw_animated" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/charge_o_mat.json b/src/main/resources/assets/techreborn/models/item/charge_o_mat.json new file mode 100644 index 000000000..948f46bbe --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/charge_o_mat.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/machines/tier2_machines/charge_o_mat" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/computer_cube.json b/src/main/resources/assets/techreborn/models/item/computer_cube.json new file mode 100644 index 000000000..cb3990c5c --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/computer_cube.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/machines/tier2_machines/computer_cube" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/digital_chest.json b/src/main/resources/assets/techreborn/models/item/digital_chest.json new file mode 100644 index 000000000..6616afee1 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/digital_chest.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/machines/tier2_machines/digital_chest" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/energy_crystal.json b/src/main/resources/assets/techreborn/models/item/energy_crystal.json index 8377c4129..03a438fec 100644 --- a/src/main/resources/assets/techreborn/models/item/energy_crystal.json +++ b/src/main/resources/assets/techreborn/models/item/energy_crystal.json @@ -8,7 +8,7 @@ "predicate": { "techreborn:empty": 1 }, - "model": "techreborn:item/battery/override/energy_crystal_empty" + "model": "techreborn:item/override/energy_crystal_empty" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/frequency_transmitter.json b/src/main/resources/assets/techreborn/models/item/frequency_transmitter.json index 9ab537011..367f7a9a9 100644 --- a/src/main/resources/assets/techreborn/models/item/frequency_transmitter.json +++ b/src/main/resources/assets/techreborn/models/item/frequency_transmitter.json @@ -8,7 +8,7 @@ "predicate": { "techreborn:coords": 1 }, - "model": "techreborn:item/misc/frequency_transmitter_coords" + "model": "techreborn:item/override/frequency_transmitter_coords" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/industrial_chainsaw.json b/src/main/resources/assets/techreborn/models/item/industrial_chainsaw.json index 74f003cf8..f331c5d84 100644 --- a/src/main/resources/assets/techreborn/models/item/industrial_chainsaw.json +++ b/src/main/resources/assets/techreborn/models/item/industrial_chainsaw.json @@ -8,7 +8,7 @@ "predicate": { "techreborn:animated": 1 }, - "model": "techreborn:item/tool/override/industrial_chainsaw_animated" + "model": "techreborn:item/override/industrial_chainsaw_animated" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/lapotron_crystal.json b/src/main/resources/assets/techreborn/models/item/lapotron_crystal.json index 3d8bdbbce..f333d1bb9 100644 --- a/src/main/resources/assets/techreborn/models/item/lapotron_crystal.json +++ b/src/main/resources/assets/techreborn/models/item/lapotron_crystal.json @@ -8,7 +8,7 @@ "predicate": { "techreborn:empty": 1 }, - "model": "techreborn:item/battery/override/lapotron_crystal_empty" + "model": "techreborn:item/override/lapotron_crystal_empty" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/lapotronic_orb.json b/src/main/resources/assets/techreborn/models/item/lapotronic_orb.json index 1f5d3a97a..bcaefc856 100644 --- a/src/main/resources/assets/techreborn/models/item/lapotronic_orb.json +++ b/src/main/resources/assets/techreborn/models/item/lapotronic_orb.json @@ -8,7 +8,7 @@ "predicate": { "techreborn:empty": 1 }, - "model": "techreborn:item/battery/override/lapotronic_orb_empty" + "model": "techreborn:item/override/lapotronic_orb_empty" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/lithium_ion_battery.json b/src/main/resources/assets/techreborn/models/item/lithium_ion_battery.json index 47a5a2c7e..c9acabe46 100644 --- a/src/main/resources/assets/techreborn/models/item/lithium_ion_battery.json +++ b/src/main/resources/assets/techreborn/models/item/lithium_ion_battery.json @@ -8,7 +8,7 @@ "predicate": { "techreborn:empty": 1 }, - "model": "techreborn:item/battery/override/lithium_battery_empty" + "model": "techreborn:item/override/lithium_battery_empty" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/misc/missing_recipe.json b/src/main/resources/assets/techreborn/models/item/misc/missing_recipe.json deleted file mode 100644 index a5f061ce7..000000000 --- a/src/main/resources/assets/techreborn/models/item/misc/missing_recipe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "techreborn:item/techrebornItem", - "textures": { - "layer0": "techreborn:items/misc/missing_recipe" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/nanosaber.json b/src/main/resources/assets/techreborn/models/item/nanosaber.json index 38dc07bca..c7e713adf 100644 --- a/src/main/resources/assets/techreborn/models/item/nanosaber.json +++ b/src/main/resources/assets/techreborn/models/item/nanosaber.json @@ -8,13 +8,13 @@ "predicate": { "techreborn:active": 0.5 }, - "model": "techreborn:item/tool/override/nanosaber_active_low" + "model": "techreborn:item/override/nanosaber_active_low" }, { "predicate": { "techreborn:active": 1 }, - "model": "techreborn:item/tool/override/nanosaber_active" + "model": "techreborn:item/override/nanosaber_active" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/override/advanced_chainsaw_animated.json b/src/main/resources/assets/techreborn/models/item/override/advanced_chainsaw_animated.json similarity index 100% rename from src/main/resources/assets/techreborn/models/item/tool/override/advanced_chainsaw_animated.json rename to src/main/resources/assets/techreborn/models/item/override/advanced_chainsaw_animated.json diff --git a/src/main/resources/assets/techreborn/models/item/tool/override/basic_chainsaw_animated.json b/src/main/resources/assets/techreborn/models/item/override/basic_chainsaw_animated.json similarity index 100% rename from src/main/resources/assets/techreborn/models/item/tool/override/basic_chainsaw_animated.json rename to src/main/resources/assets/techreborn/models/item/override/basic_chainsaw_animated.json diff --git a/src/main/resources/assets/techreborn/models/item/battery/override/energy_crystal_empty.json b/src/main/resources/assets/techreborn/models/item/override/energy_crystal_empty.json similarity index 100% rename from src/main/resources/assets/techreborn/models/item/battery/override/energy_crystal_empty.json rename to src/main/resources/assets/techreborn/models/item/override/energy_crystal_empty.json diff --git a/src/main/resources/assets/techreborn/models/item/misc/frequency_transmitter_coords.json b/src/main/resources/assets/techreborn/models/item/override/frequency_transmitter_coords.json similarity index 100% rename from src/main/resources/assets/techreborn/models/item/misc/frequency_transmitter_coords.json rename to src/main/resources/assets/techreborn/models/item/override/frequency_transmitter_coords.json diff --git a/src/main/resources/assets/techreborn/models/item/tool/override/industrial_chainsaw_animated.json b/src/main/resources/assets/techreborn/models/item/override/industrial_chainsaw_animated.json similarity index 100% rename from src/main/resources/assets/techreborn/models/item/tool/override/industrial_chainsaw_animated.json rename to src/main/resources/assets/techreborn/models/item/override/industrial_chainsaw_animated.json diff --git a/src/main/resources/assets/techreborn/models/item/battery/override/lapotron_crystal_empty.json b/src/main/resources/assets/techreborn/models/item/override/lapotron_crystal_empty.json similarity index 100% rename from src/main/resources/assets/techreborn/models/item/battery/override/lapotron_crystal_empty.json rename to src/main/resources/assets/techreborn/models/item/override/lapotron_crystal_empty.json diff --git a/src/main/resources/assets/techreborn/models/item/battery/override/lapotronic_orb_empty.json b/src/main/resources/assets/techreborn/models/item/override/lapotronic_orb_empty.json similarity index 100% rename from src/main/resources/assets/techreborn/models/item/battery/override/lapotronic_orb_empty.json rename to src/main/resources/assets/techreborn/models/item/override/lapotronic_orb_empty.json diff --git a/src/main/resources/assets/techreborn/models/item/battery/override/lithium_battery_empty.json b/src/main/resources/assets/techreborn/models/item/override/lithium_battery_empty.json similarity index 100% rename from src/main/resources/assets/techreborn/models/item/battery/override/lithium_battery_empty.json rename to src/main/resources/assets/techreborn/models/item/override/lithium_battery_empty.json diff --git a/src/main/resources/assets/techreborn/models/item/tool/override/nanosaber_active.json b/src/main/resources/assets/techreborn/models/item/override/nanosaber_active.json similarity index 100% rename from src/main/resources/assets/techreborn/models/item/tool/override/nanosaber_active.json rename to src/main/resources/assets/techreborn/models/item/override/nanosaber_active.json diff --git a/src/main/resources/assets/techreborn/models/item/tool/override/nanosaber_active_low.json b/src/main/resources/assets/techreborn/models/item/override/nanosaber_active_low.json similarity index 100% rename from src/main/resources/assets/techreborn/models/item/tool/override/nanosaber_active_low.json rename to src/main/resources/assets/techreborn/models/item/override/nanosaber_active_low.json diff --git a/src/main/resources/assets/techreborn/models/item/battery/override/re_battery_empty.json b/src/main/resources/assets/techreborn/models/item/override/red_cell_battery_empty.json similarity index 50% rename from src/main/resources/assets/techreborn/models/item/battery/override/re_battery_empty.json rename to src/main/resources/assets/techreborn/models/item/override/red_cell_battery_empty.json index 2af2e4953..613de26b1 100644 --- a/src/main/resources/assets/techreborn/models/item/battery/override/re_battery_empty.json +++ b/src/main/resources/assets/techreborn/models/item/override/red_cell_battery_empty.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "techreborn:item/battery/re_battery_empty" + "layer0": "techreborn:item/battery/red_cell_battery_empty" } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/red_cell_battery.json b/src/main/resources/assets/techreborn/models/item/red_cell_battery.json index a4f5f6e63..2ab595148 100644 --- a/src/main/resources/assets/techreborn/models/item/red_cell_battery.json +++ b/src/main/resources/assets/techreborn/models/item/red_cell_battery.json @@ -1,14 +1,14 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "techreborn:item/battery/re_battery" + "layer0": "techreborn:item/battery/red_cell_battery" }, "overrides": [ { "predicate": { "techreborn:empty": 1 }, - "model": "techreborn:item/battery/override/re_battery_empty" + "model": "techreborn:item/override/red_cell_battery_empty" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/charge_bench_bottom.png b/src/main/resources/assets/techreborn/textures/block/machines/tier2_machines/charge_bench_bottom.png deleted file mode 100644 index c752a0c91e62e6f0feb249c545fd86f6e336042b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 561 zcmV-10?z%3P)Il$6~62sD5YNN@o@b|$e+k<5q{q#DKJynnWQ zc>gXV6BPl#BQO;rK}Ap%A`*{4L{QHWF|!gQAI?E2vijSTX*h`nIS5C z`Sz1yI*~tq{?3y}jbet`Y?8(5IGIUA@ay-++t)8CW|T-MraZnj+NIJi^=vF=OG1#D zh$wsSWKKqVA814{JZPgK+-OiS_@-1B2ZM7TI{5FsRa?4hAsU7 z?NS*Y6TlP%RF$$UKt(9Fj4b6&do?3+%1~8ImEOnvS41$?MOlFWAXaRd$!$45#sFZ9 z!L>Cal2S`SS41M9YA4ch&M3|3!^s4X>48Qj?Rve_TuiBE|3vBTsLWy8_dbC#6EeuZ zXp0El{cMZ~+