From a1c77aa47cf5e229b2e4e02fa1a8a064a67cd886 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Tue, 5 Sep 2017 00:15:02 +0300 Subject: [PATCH] Merged inventory keys in blockstate jsons --- .../client/gui/GuiDieselGenerator.java | 3 + .../machines/generators/diesel_generator.json | 8 +- .../generators/dragon_egg_syphon.json | 94 +++++++-------- .../generators/fusion_control_computer.json | 100 ++++++++-------- .../machines/generators/lightning_rod.json | 94 +++++++-------- .../generators/magic_energy_absorber.json | 8 +- .../generators/magic_energy_converter.json | 8 +- .../generators/semi_fluid_generator.json | 103 ++++++++-------- .../generators/solid_fuel_generator.json | 100 ++++++++-------- .../generators/thermal_generator.json | 101 ++++++++-------- .../machines/generators/wind_mill.json | 7 +- .../tier0_machines/iron_alloy_furnace.json | 7 +- .../machines/tier0_machines/iron_furnace.json | 96 +++++++-------- .../tier1_machines/alloy_smelter.json | 7 +- .../tier1_machines/assembly_machine.json | 7 +- .../tier1_machines/chemical_reactor.json | 7 +- .../machines/tier1_machines/compressor.json | 7 +- .../tier1_machines/electric_furnace.json | 7 +- .../machines/tier1_machines/extractor.json | 7 +- .../machines/tier1_machines/grinder.json | 101 ++++++++-------- .../industrial_electrolyzer.json | 7 +- .../machines/tier1_machines/recycler.json | 7 +- .../tier1_machines/rolling_machine.json | 96 +++++++-------- .../tier1_machines/scrapboxinator.json | 7 +- .../machines/tier2_machines/charge_o_mat.json | 9 +- .../tier2_machines/digital_chest.json | 6 +- .../tier2_machines/distillation_tower.json | 7 +- .../tier2_machines/implosion_compressor.json | 110 ++++++++--------- .../industrial_blast_furnace.json | 9 +- .../tier2_machines/industrial_centrifuge.json | 113 +++++++++--------- .../tier2_machines/industrial_grinder.json | 8 +- .../tier2_machines/industrial_sawmill.json | 7 +- .../tier2_machines/vacuum_freezer.json | 8 +- .../machines/tier3_machines/chunk_loader.json | 6 +- .../tier3_machines/matter_fabricator.json | 9 +- .../tier3_machines/quantum_chest.json | 6 +- .../machines/tier3_machines/quantum_tank.json | 6 +- 37 files changed, 559 insertions(+), 734 deletions(-) diff --git a/src/main/java/techreborn/client/gui/GuiDieselGenerator.java b/src/main/java/techreborn/client/gui/GuiDieselGenerator.java index 7f2bd3411..3202a1ff6 100644 --- a/src/main/java/techreborn/client/gui/GuiDieselGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiDieselGenerator.java @@ -25,8 +25,11 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import techreborn.tiles.generator.TileDieselGenerator; +@SideOnly(Side.CLIENT) public class GuiDieselGenerator extends GuiBase { TileDieselGenerator tile; diff --git a/src/main/resources/assets/techreborn/blockstates/machines/generators/diesel_generator.json b/src/main/resources/assets/techreborn/blockstates/machines/generators/diesel_generator.json index ea02597a7..450b985a1 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/generators/diesel_generator.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/generators/diesel_generator.json @@ -11,6 +11,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "cube_bottom_top", "textures": { "side": "techreborn:blocks/machines/generators/diesel_generator_side_off", "top": "techreborn:blocks/machines/generators/diesel_generator_top_off" @@ -42,13 +43,6 @@ "top": "techreborn:blocks/machines/generators/diesel_generator_top_off" } } - }, - "inventory": { - "model": "cube_bottom_top", - "textures": { - "side": "techreborn:blocks/machines/generators/diesel_generator_side_off", - "top": "techreborn:blocks/machines/generators/diesel_generator_top_off" - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/generators/dragon_egg_syphon.json b/src/main/resources/assets/techreborn/blockstates/machines/generators/dragon_egg_syphon.json index 184732c70..24511d8bb 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/generators/dragon_egg_syphon.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/generators/dragon_egg_syphon.json @@ -1,51 +1,47 @@ { - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "cube_bottom_top", - "textures": { - "particle": "techreborn:blocks/machines/generators/dragon_egg_syphon_side_off", - "top": "techreborn:blocks/machines/generators/dragon_egg_syphon_top", - "down": "techreborn:blocks/machines/generators/generator_bottom" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "textures": { - "side": "techreborn:blocks/machines/generators/dragon_egg_syphon_side_off" - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - "side": "techreborn:blocks/machines/generators/dragon_egg_syphon_side_on" - } - }, - "false": { - "textures": { - "side": "techreborn:blocks/machines/generators/dragon_egg_syphon_side_off" - } - } - }, - "inventory": { - "model": "cube_bottom_top", - "textures": { - "side": "techreborn:blocks/machines/generators/dragon_egg_syphon_side_off" - } - } - } + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "cube_bottom_top", + "textures": { + "particle": "techreborn:blocks/machines/generators/dragon_egg_syphon_side_off", + "top": "techreborn:blocks/machines/generators/dragon_egg_syphon_top", + "down": "techreborn:blocks/machines/generators/generator_bottom" + } + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "model": "cube_bottom_top", + "textures": { + "side": "techreborn:blocks/machines/generators/dragon_egg_syphon_side_off" + } + }, + "facing": { + "north": { + + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + } + }, + "active": { + "true": { + "textures": { + "side": "techreborn:blocks/machines/generators/dragon_egg_syphon_side_on" + } + }, + "false": { + "textures": { + "side": "techreborn:blocks/machines/generators/dragon_egg_syphon_side_off" + } + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/generators/fusion_control_computer.json b/src/main/resources/assets/techreborn/blockstates/machines/generators/fusion_control_computer.json index 6997c76af..4616051ce 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/generators/fusion_control_computer.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/generators/fusion_control_computer.json @@ -1,54 +1,50 @@ { - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier3_machines/fusion_reactor_bottom", - "top": "techreborn:blocks/machines/tier3_machines/machine_top", - "down": "techreborn:blocks/machines/tier3_machines/fusion_reactor_bottom", - "west": "techreborn:blocks/machines/generators/fusion_reactor_west", - "east": "techreborn:blocks/machines/generators/fusion_reactor_east", - "south": "techreborn:blocks/machines/tier3_machines/machine_back" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "textures": { - "front": "techreborn:blocks/machines/generators/fusion_reactor_front_off" - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - "front": "techreborn:blocks/machines/generators/fusion_reactor_front_on" - } - }, - "false": { - "textures": { - "front": "techreborn:blocks/machines/generators/fusion_reactor_front_off" - } - } - }, - "inventory": { - "model": "orientable", - "textures": { - "front": "techreborn:blocks/machines/generators/fusion_reactor_front_off" - } - } - } + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "orientable", + "textures": { + "particle": "techreborn:blocks/machines/tier3_machines/fusion_reactor_bottom", + "top": "techreborn:blocks/machines/tier3_machines/machine_top", + "down": "techreborn:blocks/machines/tier3_machines/fusion_reactor_bottom", + "west": "techreborn:blocks/machines/generators/fusion_reactor_west", + "east": "techreborn:blocks/machines/generators/fusion_reactor_east", + "south": "techreborn:blocks/machines/tier3_machines/machine_back" + } + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "model": "orientable", + "textures": { + "front": "techreborn:blocks/machines/generators/fusion_reactor_front_off" + } + }, + "facing": { + "north": { + + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + } + }, + "active": { + "true": { + "textures": { + "front": "techreborn:blocks/machines/generators/fusion_reactor_front_on" + } + }, + "false": { + "textures": { + "front": "techreborn:blocks/machines/generators/fusion_reactor_front_off" + } + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/generators/lightning_rod.json b/src/main/resources/assets/techreborn/blockstates/machines/generators/lightning_rod.json index 6dcf43ac6..acd04c60f 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/generators/lightning_rod.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/generators/lightning_rod.json @@ -1,50 +1,50 @@ { - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/generators/lightning_rod_side", - "top": "techreborn:blocks/machines/generators/lightning_rod_top", - "side": "techreborn:blocks/machines/generators/lightning_rod_side", - "front": "techreborn:blocks/machines/generators/lightning_rod_side", - "down": "techreborn:blocks/machines/generators/generator_bottom" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "textures": { - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - } - }, - "false": { - "textures": { - } - } - }, - "inventory": { - "model": "orientable", - "textures": { - } - } - } + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "orientable", + "textures": { + "particle": "techreborn:blocks/machines/generators/lightning_rod_side", + "top": "techreborn:blocks/machines/generators/lightning_rod_top", + "side": "techreborn:blocks/machines/generators/lightning_rod_side", + "front": "techreborn:blocks/machines/generators/lightning_rod_side", + "down": "techreborn:blocks/machines/generators/generator_bottom" + } + }, + "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": { + + } + } + } + } } diff --git a/src/main/resources/assets/techreborn/blockstates/machines/generators/magic_energy_absorber.json b/src/main/resources/assets/techreborn/blockstates/machines/generators/magic_energy_absorber.json index 9801110bf..850c33373 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/generators/magic_energy_absorber.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/generators/magic_energy_absorber.json @@ -11,6 +11,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "cube_bottom_top", "textures": { "top": "techreborn:blocks/machines/generators/magic_energy_absorber_top_off", "side": "techreborn:blocks/machines/generators/magic_energy_absorber_side_off" @@ -42,13 +43,6 @@ "side": "techreborn:blocks/machines/generators/magic_energy_absorber_side_off" } } - }, - "inventory": { - "model": "cube_bottom_top", - "textures": { - "top": "techreborn:blocks/machines/generators/magic_energy_absorber_top_off", - "side": "techreborn:blocks/machines/generators/magic_energy_absorber_side_off" - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/generators/magic_energy_converter.json b/src/main/resources/assets/techreborn/blockstates/machines/generators/magic_energy_converter.json index 212c6188b..bd1bf85f9 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/generators/magic_energy_converter.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/generators/magic_energy_converter.json @@ -11,6 +11,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "cube_bottom_top", "textures": { "top": "techreborn:blocks/machines/generators/magic_energy_converter_top_off", "side": "techreborn:blocks/machines/generators/magic_energy_converter_side_off" @@ -42,13 +43,6 @@ "side": "techreborn:blocks/machines/generators/magic_energy_converter_side_off" } } - }, - "inventory": { - "model": "cube_bottom_top", - "textures": { - "top": "techreborn:blocks/machines/generators/magic_energy_converter_top_off", - "side": "techreborn:blocks/machines/generators/magic_energy_converter_side_off" - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/generators/semi_fluid_generator.json b/src/main/resources/assets/techreborn/blockstates/machines/generators/semi_fluid_generator.json index 100d72026..b8d20b9bb 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/generators/semi_fluid_generator.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/generators/semi_fluid_generator.json @@ -1,56 +1,51 @@ { - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "cube_bottom_top", - "textures": { - "particle": "techreborn:blocks/machines/generators/semi_fluid_generator_side_off", - "down": "techreborn:blocks/machines/generators/generator_bottom" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "textures": { - "top": "techreborn:blocks/machines/generators/semi_fluid_generator_top_off", - "side": "techreborn:blocks/machines/generators/semi_fluid_generator_side_off" - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - "top": "techreborn:blocks/machines/generators/semi_fluid_generator_top_on", - "side": "techreborn:blocks/machines/generators/semi_fluid_generator_side_on" - } - }, - "false": { - "textures": { - "top": "techreborn:blocks/machines/generators/semi_fluid_generator_top_off", - "side": "techreborn:blocks/machines/generators/semi_fluid_generator_side_off" - } - } - }, - "inventory": { - "model": "cube_bottom_top", - "textures": { - "particle": "techreborn:blocks/machines/generators/semi_fluid_generator_side_off", - "down": "techreborn:blocks/machines/generators/generator_bottom", - "top": "techreborn:blocks/machines/generators/semi_fluid_generator_top_off", - "side": "techreborn:blocks/machines/generators/semi_fluid_generator_side_off" - } - } - } + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "cube_bottom_top", + "textures": { + "particle": "techreborn:blocks/machines/generators/semi_fluid_generator_side_off", + "down": "techreborn:blocks/machines/generators/generator_bottom" + } + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "model": "cube_bottom_top", + "textures": { + "particle": "techreborn:blocks/machines/generators/semi_fluid_generator_side_off", + "down": "techreborn:blocks/machines/generators/generator_bottom", + "top": "techreborn:blocks/machines/generators/semi_fluid_generator_top_off", + "side": "techreborn:blocks/machines/generators/semi_fluid_generator_side_off" + } + }, + "facing": { + "north": { + + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + } + }, + "active": { + "true": { + "textures": { + "top": "techreborn:blocks/machines/generators/semi_fluid_generator_top_on", + "side": "techreborn:blocks/machines/generators/semi_fluid_generator_side_on" + } + }, + "false": { + "textures": { + "top": "techreborn:blocks/machines/generators/semi_fluid_generator_top_off", + "side": "techreborn:blocks/machines/generators/semi_fluid_generator_side_off" + } + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/generators/solid_fuel_generator.json b/src/main/resources/assets/techreborn/blockstates/machines/generators/solid_fuel_generator.json index acce20de0..d91c2de66 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/generators/solid_fuel_generator.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/generators/solid_fuel_generator.json @@ -1,54 +1,50 @@ { - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "cube_bottom_top", - "textures": { - "particle": "techreborn:blocks/machines/generators/generator_side_off", - "top": "techreborn:blocks/machines/generators/generator_top", - "down": "techreborn:blocks/machines/generators/generator_bottom" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "textures": { - "side": "techreborn:blocks/machines/generators/generator_side_off" - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - "side": "techreborn:blocks/machines/generators/generator_side_on" - } - }, - "false": { - "textures": { - "side": "techreborn:blocks/machines/generators/generator_side_off" - } - } - }, - "inventory": { - "model": "cube_bottom_top", - "textures": { - "particle": "techreborn:blocks/machines/generators/generator_side_off", - "down": "techreborn:blocks/machines/generators/generator_bottom", - "top": "techreborn:blocks/machines/generators/generator_top", - "side": "techreborn:blocks/machines/generators/generator_side_off" - } - } - } + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "cube_bottom_top", + "textures": { + "particle": "techreborn:blocks/machines/generators/generator_side_off", + "top": "techreborn:blocks/machines/generators/generator_top", + "down": "techreborn:blocks/machines/generators/generator_bottom" + } + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "model": "cube_bottom_top", + "textures": { + "particle": "techreborn:blocks/machines/generators/generator_side_off", + "down": "techreborn:blocks/machines/generators/generator_bottom", + "top": "techreborn:blocks/machines/generators/generator_top", + "side": "techreborn:blocks/machines/generators/generator_side_off" + } + }, + "facing": { + "north": { + + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + } + }, + "active": { + "true": { + "textures": { + "side": "techreborn:blocks/machines/generators/generator_side_on" + } + }, + "false": { + "textures": { + "side": "techreborn:blocks/machines/generators/generator_side_off" + } + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/generators/thermal_generator.json b/src/main/resources/assets/techreborn/blockstates/machines/generators/thermal_generator.json index e448de0b5..57cd73626 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/generators/thermal_generator.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/generators/thermal_generator.json @@ -1,55 +1,50 @@ { - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "cube_bottom_top", - "textures": { - "particle": "techreborn:blocks/machines/generators/thermal_generator_side_off", - "down": "techreborn:blocks/machines/generators/generator_bottom" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "textures": { - "top": "techreborn:blocks/machines/generators/thermal_generator_top_off", - "side": "techreborn:blocks/machines/generators/thermal_generator_side_off" - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - "top": "techreborn:blocks/machines/generators/thermal_generator_top_on", - "side": "techreborn:blocks/machines/generators/thermal_generator_side_on" - } - }, - "false": { - "textures": { - "top": "techreborn:blocks/machines/generators/thermal_generator_top_off", - "side": "techreborn:blocks/machines/generators/thermal_generator_side_off" - } - } - }, - "inventory": { - "model": "cube_bottom_top", - "textures": { - "particle": "techreborn:blocks/machines/generators/thermal_generator_side_off", - "top": "techreborn:blocks/machines/generators/thermal_generator_top_off", - "side": "techreborn:blocks/machines/generators/thermal_generator_side_off" - } - } - } + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "cube_bottom_top", + "textures": { + "particle": "techreborn:blocks/machines/generators/thermal_generator_side_off", + "down": "techreborn:blocks/machines/generators/generator_bottom" + } + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "model": "cube_bottom_top", + "textures": { + "particle": "techreborn:blocks/machines/generators/thermal_generator_side_off", + "top": "techreborn:blocks/machines/generators/thermal_generator_top_off", + "side": "techreborn:blocks/machines/generators/thermal_generator_side_off" + } + }, + "facing": { + "north": { + + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + } + }, + "active": { + "true": { + "textures": { + "top": "techreborn:blocks/machines/generators/thermal_generator_top_on", + "side": "techreborn:blocks/machines/generators/thermal_generator_side_on" + } + }, + "false": { + "textures": { + "top": "techreborn:blocks/machines/generators/thermal_generator_top_off", + "side": "techreborn:blocks/machines/generators/thermal_generator_side_off" + } + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/generators/wind_mill.json b/src/main/resources/assets/techreborn/blockstates/machines/generators/wind_mill.json index b9db26ce6..469178c8f 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/generators/wind_mill.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/generators/wind_mill.json @@ -15,6 +15,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "orientable", "textures": { "north": "techreborn:blocks/machines/generators/wind_mill_front_off" } @@ -43,12 +44,6 @@ "north": "techreborn:blocks/machines/generators/wind_mill_front_on" } } - }, - "inventory": { - "model": "orientable", - "textures": { - "north": "techreborn:blocks/machines/generators/wind_mill_front_off" - } } } } diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier0_machines/iron_alloy_furnace.json b/src/main/resources/assets/techreborn/blockstates/machines/tier0_machines/iron_alloy_furnace.json index 3a8cff435..69900abf4 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier0_machines/iron_alloy_furnace.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier0_machines/iron_alloy_furnace.json @@ -13,6 +13,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "orientable", "textures": { "front": "techreborn:blocks/machines/tier0_machines/alloy_furnace_front_off" } @@ -41,12 +42,6 @@ "front": "techreborn:blocks/machines/tier0_machines/alloy_furnace_front_off" } } - }, - "inventory": { - "model": "orientable", - "textures": { - "front": "techreborn:blocks/machines/tier0_machines/alloy_furnace_front_off" - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier0_machines/iron_furnace.json b/src/main/resources/assets/techreborn/blockstates/machines/tier0_machines/iron_furnace.json index f795a0e30..ea7c4e119 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier0_machines/iron_furnace.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier0_machines/iron_furnace.json @@ -1,52 +1,48 @@ { - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier0_machines/furnace_front_off", - "top": "techreborn:blocks/machines/tier0_machines/machine_top", - "down": "techreborn:blocks/machines/tier0_machines/machine_bottom", - "side": "techreborn:blocks/machines/tier0_machines/machine_side" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "textures": { - "front": "techreborn:blocks/machines/tier0_machines/furnace_front_off" - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - "front": "techreborn:blocks/machines/tier0_machines/furnace_front_on" - } - }, - "false": { - "textures": { - "front": "techreborn:blocks/machines/tier0_machines/furnace_front_off" - } - } - }, - "inventory": { - "model": "orientable", - "textures": { - "front": "techreborn:blocks/machines/tier0_machines/furnace_front_off" - } - } - } + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "orientable", + "textures": { + "particle": "techreborn:blocks/machines/tier0_machines/furnace_front_off", + "top": "techreborn:blocks/machines/tier0_machines/machine_top", + "down": "techreborn:blocks/machines/tier0_machines/machine_bottom", + "side": "techreborn:blocks/machines/tier0_machines/machine_side" + } + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "model": "orientable", + "textures": { + "front": "techreborn:blocks/machines/tier0_machines/furnace_front_off" + } + }, + "facing": { + "north": { + + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + } + }, + "active": { + "true": { + "textures": { + "front": "techreborn:blocks/machines/tier0_machines/furnace_front_on" + } + }, + "false": { + "textures": { + "front": "techreborn:blocks/machines/tier0_machines/furnace_front_off" + } + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/alloy_smelter.json b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/alloy_smelter.json index 9163b7951..de881e8ac 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/alloy_smelter.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/alloy_smelter.json @@ -13,6 +13,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "orientable", "textures": { "front": "techreborn:blocks/machines/tier1_machines/electric_alloy_smelter_front_off" } @@ -41,12 +42,6 @@ "front": "techreborn:blocks/machines/tier1_machines/electric_alloy_smelter_front_off" } } - }, - "inventory": { - "model": "orientable", - "textures": { - "front": "techreborn:blocks/machines/tier1_machines/electric_alloy_smelter_front_off" - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/assembly_machine.json b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/assembly_machine.json index b8a104377..f3e12ed74 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/assembly_machine.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/assembly_machine.json @@ -13,6 +13,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "orientable", "textures": { "front": "techreborn:blocks/machines/tier1_machines/assembling_machine_front_off" } @@ -41,12 +42,6 @@ "front": "techreborn:blocks/machines/tier1_machines/assembling_machine_front_off" } } - }, - "inventory": { - "model": "orientable", - "textures": { - "front": "techreborn:blocks/machines/tier1_machines/assembling_machine_front_off" - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/chemical_reactor.json b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/chemical_reactor.json index 9c175b478..d9e421671 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/chemical_reactor.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/chemical_reactor.json @@ -13,6 +13,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "orientable", "textures": { "front": "techreborn:blocks/machines/tier1_machines/chemical_reactor_front_off" } @@ -41,12 +42,6 @@ "front": "techreborn:blocks/machines/tier1_machines/chemical_reactor_front_off" } } - }, - "inventory": { - "model": "orientable", - "textures": { - "front": "techreborn:blocks/machines/tier1_machines/chemical_reactor_front_off" - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/compressor.json b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/compressor.json index 66c0c4e71..778bec8ec 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/compressor.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/compressor.json @@ -13,6 +13,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "orientable", "textures": { "front": "techreborn:blocks/machines/tier1_machines/compressor_front_off" } @@ -41,12 +42,6 @@ "front": "techreborn:blocks/machines/tier1_machines/compressor_front_off" } } - }, - "inventory": { - "model": "orientable", - "textures": { - "front": "techreborn:blocks/machines/tier1_machines/compressor_front_off" - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/electric_furnace.json b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/electric_furnace.json index de89dd3f4..6e722818c 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/electric_furnace.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/electric_furnace.json @@ -13,6 +13,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "orientable", "textures": { "front": "techreborn:blocks/machines/tier1_machines/electric_furnace_front_off" } @@ -41,12 +42,6 @@ "front": "techreborn:blocks/machines/tier1_machines/electric_furnace_front_off" } } - }, - "inventory": { - "model": "orientable", - "textures": { - "front": "techreborn:blocks/machines/tier1_machines/electric_furnace_front_off" - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/extractor.json b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/extractor.json index 5cad4b052..a5d279b53 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/extractor.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/extractor.json @@ -13,6 +13,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "orientable", "textures": { "front": "techreborn:blocks/machines/tier1_machines/extractor_front_off" } @@ -41,12 +42,6 @@ "front": "techreborn:blocks/machines/tier1_machines/extractor_front_off" } } - }, - "inventory": { - "model": "orientable", - "textures": { - "front": "techreborn:blocks/machines/tier1_machines/extractor_front_off" - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/grinder.json b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/grinder.json index 6cf237610..773031ad9 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/grinder.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/grinder.json @@ -1,55 +1,50 @@ { - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier1_machines/grinder_front_off", - "down": "techreborn:blocks/machines/tier1_machines/machine_bottom", - "side": "techreborn:blocks/machines/tier1_machines/machine_side" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "textures": { - "top": "techreborn:blocks/machines/tier1_machines/grinder_top_off", - "front": "techreborn:blocks/machines/tier1_machines/grinder_front_off" - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - "top": "techreborn:blocks/machines/tier1_machines/grinder_top_on", - "front": "techreborn:blocks/machines/tier1_machines/grinder_front_on" - } - }, - "false": { - "textures": { - "top": "techreborn:blocks/machines/tier1_machines/grinder_top_off", - "front": "techreborn:blocks/machines/tier1_machines/grinder_front_off" - } - } - }, - "inventory": { - "model": "orientable", - "textures": { - "top": "techreborn:blocks/machines/tier1_machines/grinder_top_off", - "front": "techreborn:blocks/machines/tier1_machines/grinder_front_off" - } - } - } + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "orientable", + "textures": { + "particle": "techreborn:blocks/machines/tier1_machines/grinder_front_off", + "down": "techreborn:blocks/machines/tier1_machines/machine_bottom", + "side": "techreborn:blocks/machines/tier1_machines/machine_side" + } + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "model": "orientable", + "textures": { + "top": "techreborn:blocks/machines/tier1_machines/grinder_top_off", + "front": "techreborn:blocks/machines/tier1_machines/grinder_front_off" + } + }, + "facing": { + "north": { + + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + } + }, + "active": { + "true": { + "textures": { + "top": "techreborn:blocks/machines/tier1_machines/grinder_top_on", + "front": "techreborn:blocks/machines/tier1_machines/grinder_front_on" + } + }, + "false": { + "textures": { + "top": "techreborn:blocks/machines/tier1_machines/grinder_top_off", + "front": "techreborn:blocks/machines/tier1_machines/grinder_front_off" + } + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/industrial_electrolyzer.json b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/industrial_electrolyzer.json index d49008fd8..da9163a5f 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/industrial_electrolyzer.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/industrial_electrolyzer.json @@ -13,6 +13,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "orientable", "textures": { "front": "techreborn:blocks/machines/tier1_machines/industrial_electrolyzer_front_off" } @@ -41,12 +42,6 @@ "front": "techreborn:blocks/machines/tier1_machines/industrial_electrolyzer_front_off" } } - }, - "inventory": { - "model": "orientable", - "textures": { - "front": "techreborn:blocks/machines/tier1_machines/industrial_electrolyzer_front_off" - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/recycler.json b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/recycler.json index 89e735807..77cbb0610 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/recycler.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/recycler.json @@ -13,6 +13,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "orientable", "textures": { "front": "techreborn:blocks/machines/tier1_machines/recycler_front_off" } @@ -41,12 +42,6 @@ "front": "techreborn:blocks/machines/tier1_machines/recycler_front_off" } } - }, - "inventory": { - "model": "orientable", - "textures": { - "front": "techreborn:blocks/machines/tier1_machines/recycler_front_off" - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/rolling_machine.json b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/rolling_machine.json index 0831631c1..d8f7b482c 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/rolling_machine.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/rolling_machine.json @@ -1,52 +1,48 @@ { - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier1_machines/rolling_machine_front_off", - "top": "techreborn:blocks/machines/tier1_machines/machine_top", - "down": "techreborn:blocks/machines/tier1_machines/machine_bottom", - "side": "techreborn:blocks/machines/tier1_machines/machine_side" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "textures": { - "front": "techreborn:blocks/machines/tier1_machines/rolling_machine_front_off" - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - "front": "techreborn:blocks/machines/tier1_machines/rolling_machine_front_on" - } - }, - "false": { - "textures": { - "front": "techreborn:blocks/machines/tier1_machines/rolling_machine_front_off" - } - } - }, - "inventory": { - "model": "orientable", - "textures": { - "front": "techreborn:blocks/machines/tier1_machines/rolling_machine_front_off" - } - } - } + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "orientable", + "textures": { + "particle": "techreborn:blocks/machines/tier1_machines/rolling_machine_front_off", + "top": "techreborn:blocks/machines/tier1_machines/machine_top", + "down": "techreborn:blocks/machines/tier1_machines/machine_bottom", + "side": "techreborn:blocks/machines/tier1_machines/machine_side" + } + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "model": "orientable", + "textures": { + "front": "techreborn:blocks/machines/tier1_machines/rolling_machine_front_off" + } + }, + "facing": { + "north": { + + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + } + }, + "active": { + "true": { + "textures": { + "front": "techreborn:blocks/machines/tier1_machines/rolling_machine_front_on" + } + }, + "false": { + "textures": { + "front": "techreborn:blocks/machines/tier1_machines/rolling_machine_front_off" + } + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/scrapboxinator.json b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/scrapboxinator.json index 6f9aae940..1fdec6871 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/scrapboxinator.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier1_machines/scrapboxinator.json @@ -13,6 +13,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "orientable", "textures": { "front": "techreborn:blocks/machines/tier1_machines/scrapboxinator_front_off" } @@ -41,12 +42,6 @@ "front": "techreborn:blocks/machines/tier1_machines/scrapboxinator_front_off" } } - }, - "inventory": { - "model": "orientable", - "textures": { - "front": "techreborn:blocks/machines/tier1_machines/scrapboxinator_front_off" - } } } } \ No newline at end of file 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 index f419abbbd..efb643f98 100644 --- 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 @@ -11,6 +11,7 @@ "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", @@ -45,14 +46,6 @@ "front": "techreborn:blocks/machines/tier2_machines/charge_bench_side_off" } } - }, - "inventory": { - "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" - } } } } \ 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 index 651598ec0..401bdca51 100644 --- 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 @@ -14,6 +14,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "orientable", "textures": { } }, @@ -39,11 +40,6 @@ "textures": { } } - }, - "inventory": { - "model": "orientable", - "textures": { - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/distillation_tower.json b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/distillation_tower.json index 8feb6b9f5..f85313a5f 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/distillation_tower.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/distillation_tower.json @@ -15,6 +15,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "orientable", "textures": { "front": "techreborn:blocks/machines/tier2_machines/distillation_tower_front_off" } @@ -43,12 +44,6 @@ "front": "techreborn:blocks/machines/tier2_machines/distillation_tower_front_off" } } - }, - "inventory": { - "model": "orientable", - "textures": { - "front": "techreborn:blocks/machines/tier2_machines/distillation_tower_front_off" - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/implosion_compressor.json b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/implosion_compressor.json index a4c1bbe48..f3b5feb5a 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/implosion_compressor.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/implosion_compressor.json @@ -1,60 +1,54 @@ { - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier2_machines/implosion_compressor_front_off", - "top": "techreborn:blocks/machines/tier2_machines/machine_top", - "down": "techreborn:blocks/machines/tier2_machines/machine_bottom", - "south": "techreborn:blocks/machines/tier2_machines/machine_back" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "textures": { - "west": "techreborn:blocks/machines/tier2_machines/implosion_compressor_west_off", - "east": "techreborn:blocks/machines/tier2_machines/implosion_compressor_east_off", - "front": "techreborn:blocks/machines/tier2_machines/implosion_compressor_front_off" - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - "west": "techreborn:blocks/machines/tier2_machines/implosion_compressor_west_on", - "east": "techreborn:blocks/machines/tier2_machines/implosion_compressor_east_on", - "front": "techreborn:blocks/machines/tier2_machines/implosion_compressor_front_on" - } - }, - "false": { - "textures": { - "west": "techreborn:blocks/machines/tier2_machines/implosion_compressor_west_off", - "east": "techreborn:blocks/machines/tier2_machines/implosion_compressor_east_off", - "front": "techreborn:blocks/machines/tier2_machines/implosion_compressor_front_off" - } - } - }, - "inventory": { - "model": "orientable", - "textures": { - "west": "techreborn:blocks/machines/tier2_machines/implosion_compressor_west_off", - "east": "techreborn:blocks/machines/tier2_machines/implosion_compressor_east_off", - "front": "techreborn:blocks/machines/tier2_machines/implosion_compressor_front_off" - } - } - } + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "orientable", + "textures": { + "particle": "techreborn:blocks/machines/tier2_machines/implosion_compressor_front_off", + "top": "techreborn:blocks/machines/tier2_machines/machine_top", + "down": "techreborn:blocks/machines/tier2_machines/machine_bottom", + "south": "techreborn:blocks/machines/tier2_machines/machine_back" + } + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "model": "orientable", + "textures": { + "west": "techreborn:blocks/machines/tier2_machines/implosion_compressor_west_off", + "east": "techreborn:blocks/machines/tier2_machines/implosion_compressor_east_off", + "front": "techreborn:blocks/machines/tier2_machines/implosion_compressor_front_off" + } + }, + "facing": { + "north": { + + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + } + }, + "active": { + "true": { + "textures": { + "west": "techreborn:blocks/machines/tier2_machines/implosion_compressor_west_on", + "east": "techreborn:blocks/machines/tier2_machines/implosion_compressor_east_on", + "front": "techreborn:blocks/machines/tier2_machines/implosion_compressor_front_on" + } + }, + "false": { + "textures": { + "west": "techreborn:blocks/machines/tier2_machines/implosion_compressor_west_off", + "east": "techreborn:blocks/machines/tier2_machines/implosion_compressor_east_off", + "front": "techreborn:blocks/machines/tier2_machines/implosion_compressor_front_off" + } + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_blast_furnace.json b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_blast_furnace.json index 3c383a0e2..72f6a14b1 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_blast_furnace.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_blast_furnace.json @@ -13,6 +13,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "orientable", "textures": { "west": "techreborn:blocks/machines/tier2_machines/industrial_blast_furnace_west_off", "east": "techreborn:blocks/machines/tier2_machines/industrial_blast_furnace_east_off", @@ -47,14 +48,6 @@ "front": "techreborn:blocks/machines/tier2_machines/industrial_blast_furnace_front_off" } } - }, - "inventory": { - "model": "orientable", - "textures": { - "west": "techreborn:blocks/machines/tier2_machines/implosion_compressor_west_off", - "east": "techreborn:blocks/machines/tier2_machines/implosion_compressor_east_off", - "front": "techreborn:blocks/machines/tier2_machines/industrial_blast_furnace_front_off" - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_centrifuge.json b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_centrifuge.json index ebb554dea..f2fb8a2a7 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_centrifuge.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_centrifuge.json @@ -1,61 +1,56 @@ { - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_front_off", - "top": "techreborn:blocks/machines/tier2_machines/machine_top", - "west": "techreborn:blocks/machines/tier2_machines/machine_west", - "east": "techreborn:blocks/machines/tier2_machines/machine_east", - "down": "techreborn:blocks/machines/tier2_machines/machine_bottom", - "south": "techreborn:blocks/machines/tier2_machines/machine_back" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "textures": { - "top": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_top_off", - "front": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_front_off" - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - "top": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_top_on", - "front": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_front_on" - } - }, - "false": { - "textures": { - "top": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_top_off", - "front": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_front_off" - } - } - }, - "inventory": { - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier2_machines/machine_west", - "down": "techreborn:blocks/machines/tier2_machines/machine_bottom", - "south": "techreborn:blocks/machines/tier2_machines/machine_back", - "top": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_top_off", - "front": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_front_off" - } - } - } + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "orientable", + "textures": { + "particle": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_front_off", + "top": "techreborn:blocks/machines/tier2_machines/machine_top", + "west": "techreborn:blocks/machines/tier2_machines/machine_west", + "east": "techreborn:blocks/machines/tier2_machines/machine_east", + "down": "techreborn:blocks/machines/tier2_machines/machine_bottom", + "south": "techreborn:blocks/machines/tier2_machines/machine_back" + } + }, + "variants": { + "inventory": { + "transform": "forge:default-block", + "model": "orientable", + "textures": { + "particle": "techreborn:blocks/machines/tier2_machines/machine_west", + "down": "techreborn:blocks/machines/tier2_machines/machine_bottom", + "south": "techreborn:blocks/machines/tier2_machines/machine_back", + "top": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_top_off", + "front": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_front_off" + } + }, + "facing": { + "north": { + + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + } + }, + "active": { + "true": { + "textures": { + "top": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_top_on", + "front": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_front_on" + } + }, + "false": { + "textures": { + "top": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_top_off", + "front": "techreborn:blocks/machines/tier2_machines/industrial_centrifuge_front_off" + } + } + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_grinder.json b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_grinder.json index b4587a0df..7d1bc9c80 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_grinder.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_grinder.json @@ -14,6 +14,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "orientable", "textures": { "top": "techreborn:blocks/machines/tier2_machines/industrial_grinder_top_off", "front": "techreborn:blocks/machines/tier2_machines/industrial_grinder_front_off" @@ -45,13 +46,6 @@ "front": "techreborn:blocks/machines/tier2_machines/industrial_grinder_front_off" } } - }, - "inventory": { - "model": "orientable", - "textures": { - "top": "techreborn:blocks/machines/tier2_machines/industrial_grinder_top_off", - "front": "techreborn:blocks/machines/tier2_machines/industrial_grinder_front_off" - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_sawmill.json b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_sawmill.json index 544ba84de..d3feee82b 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_sawmill.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/industrial_sawmill.json @@ -15,6 +15,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "orientable", "textures": { "front": "techreborn:blocks/machines/tier2_machines/industrial_sawmill_front_off" } @@ -43,12 +44,6 @@ "front": "techreborn:blocks/machines/tier2_machines/industrial_sawmill_front_off" } } - }, - "inventory": { - "model": "orientable", - "textures": { - "front": "techreborn:blocks/machines/tier2_machines/industrial_sawmill_front_off" - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/vacuum_freezer.json b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/vacuum_freezer.json index 74c25edfa..45be8aaea 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/vacuum_freezer.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier2_machines/vacuum_freezer.json @@ -12,6 +12,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "orientable", "textures": { "top": "techreborn:blocks/machines/tier2_machines/vacuum_freezer_top_off", "front": "techreborn:blocks/machines/tier2_machines/vacuum_freezer_front_off" @@ -43,13 +44,6 @@ "front": "techreborn:blocks/machines/tier2_machines/vacuum_freezer_front_off" } } - }, - "inventory": { - "model": "orientable", - "textures": { - "top": "techreborn:blocks/machines/tier2_machines/vacuum_freezer_top_off", - "front": "techreborn:blocks/machines/tier2_machines/vacuum_freezer_front_off" - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/chunk_loader.json b/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/chunk_loader.json index 72dbba119..48ca3e818 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/chunk_loader.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/chunk_loader.json @@ -14,6 +14,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "orientable", "textures": { } }, @@ -39,11 +40,6 @@ "textures": { } } - }, - "inventory": { - "model": "orientable", - "textures": { - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/matter_fabricator.json b/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/matter_fabricator.json index f9a754627..6c13408ee 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/matter_fabricator.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/matter_fabricator.json @@ -11,6 +11,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "orientable", "textures": { "top": "techreborn:blocks/machines/tier3_machines/mass_fabricator_top_off", "side": "techreborn:blocks/machines/tier3_machines/mass_fabricator_side_off", @@ -45,14 +46,6 @@ "front": "techreborn:blocks/machines/tier3_machines/mass_fabricator_side_off" } } - }, - "inventory": { - "model": "orientable", - "textures": { - "top": "techreborn:blocks/machines/tier3_machines/mass_fabricator_top_off", - "side": "techreborn:blocks/machines/tier3_machines/mass_fabricator_side_off", - "front": "techreborn:blocks/machines/tier3_machines/mass_fabricator_side_off" - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/quantum_chest.json b/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/quantum_chest.json index 7ebc1ca9d..8a555f075 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/quantum_chest.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/quantum_chest.json @@ -14,6 +14,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "orientable", "textures": { } }, @@ -39,11 +40,6 @@ "textures": { } } - }, - "inventory": { - "model": "orientable", - "textures": { - } } } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/quantum_tank.json b/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/quantum_tank.json index 8f92b519e..bcb7bee93 100644 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/quantum_tank.json +++ b/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/quantum_tank.json @@ -14,6 +14,7 @@ "variants": { "inventory": { "transform": "forge:default-block", + "model": "orientable", "textures": { } }, @@ -39,11 +40,6 @@ "textures": { } } - }, - "inventory": { - "model": "orientable", - "textures": { - } } } } \ No newline at end of file