diff --git a/src/main/java/mekanism/common/block/states/BlockStateBasic.java b/src/main/java/mekanism/common/block/states/BlockStateBasic.java index 700f6d86b..63f91f4ea 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateBasic.java +++ b/src/main/java/mekanism/common/block/states/BlockStateBasic.java @@ -20,7 +20,6 @@ import mekanism.common.tile.TileEntityThermalEvaporationBlock; import mekanism.common.tile.TileEntityThermalEvaporationController; import mekanism.common.tile.TileEntityThermalEvaporationValve; import mekanism.common.util.LangUtils; - import net.minecraft.block.Block; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; @@ -103,7 +102,7 @@ public class BlockStateBasic extends BlockStateFacing PRESSURE_DISPERSER(BasicBlock.BASIC_BLOCK_2, 6, "PressureDisperser",TileEntityPressureDisperser.class, true, Predicates.alwaysFalse(), false), BOILER_CASING(BasicBlock.BASIC_BLOCK_2, 7, "BoilerCasing", TileEntityBoilerCasing.class, true, Predicates.alwaysFalse(), false), BOILER_VALVE(BasicBlock.BASIC_BLOCK_2, 8, "BoilerValve", TileEntityBoilerValve.class, true, Predicates.alwaysFalse(), false), - SECURITY_DESK(BasicBlock.BASIC_BLOCK_2, 9, "SecurityDesk", TileEntitySecurityDesk.class, true, Predicates.alwaysFalse(), false); + SECURITY_DESK(BasicBlock.BASIC_BLOCK_2, 9, "SecurityDesk", TileEntitySecurityDesk.class, true, Plane.HORIZONTAL, false); public BasicBlock blockType; diff --git a/src/main/resources/assets/mekanism/blockstates/energized_smelter.json b/src/main/resources/assets/mekanism/blockstates/energized_smelter.json index f45e8deea..78e75e261 100644 --- a/src/main/resources/assets/mekanism/blockstates/energized_smelter.json +++ b/src/main/resources/assets/mekanism/blockstates/energized_smelter.json @@ -8,7 +8,8 @@ "west": "mekanism:blocks/energized_smelter/EnergizedSmelterRight", "east": "mekanism:blocks/energized_smelter/EnergizedSmelterLeft", "south": "mekanism:blocks/energized_smelter/EnergizedSmelterBack", - "up": "mekanism:blocks/energized_smelter/EnergizedSmelterTop" + "up": "mekanism:blocks/energized_smelter/EnergizedSmelterTop", + "down": "mekanism:blocks/energized_smelter/EnergizedSmelterBottom" } }, "variants": { @@ -19,7 +20,16 @@ "west": {"y": -90} }, "active": { - "true": {"textures": {"front": "mekanism:blocks/energized_smelter/EnergizedSmelterFrontOn"}}, + "true": { + "textures": { + "front": "mekanism:blocks/energized_smelter/EnergizedSmelterFrontOn", + "west": "mekanism:blocks/energized_smelter/EnergizedSmelterRightOn", + "east": "mekanism:blocks/energized_smelter/EnergizedSmelterLeftOn", + "south": "mekanism:blocks/energized_smelter/EnergizedSmelterBackOn", + "up": "mekanism:blocks/energized_smelter/EnergizedSmelterTopOn", + "down": "mekanism:blocks/energized_smelter/EnergizedSmelterBottomOn" + } + }, "false": {} }, "inventory": [{}] diff --git a/src/main/resources/assets/mekanism/blockstates/formulaic_assemblicator.json b/src/main/resources/assets/mekanism/blockstates/formulaic_assemblicator.json index 00c1bd913..f13a151a4 100644 --- a/src/main/resources/assets/mekanism/blockstates/formulaic_assemblicator.json +++ b/src/main/resources/assets/mekanism/blockstates/formulaic_assemblicator.json @@ -19,7 +19,7 @@ "west": {"y": -90} }, "active": { - "true": {"textures": {"front": "mekanism:blocks/formulaic_assemblicator/FormulaicAssemblicatorFrontOn"}}, + "true": {}, "false": {} }, "inventory": [{}] diff --git a/src/main/resources/assets/mekanism/blockstates/oredictionificator.json b/src/main/resources/assets/mekanism/blockstates/oredictionificator.json index 2269cf91a..e39404ff8 100644 --- a/src/main/resources/assets/mekanism/blockstates/oredictionificator.json +++ b/src/main/resources/assets/mekanism/blockstates/oredictionificator.json @@ -19,7 +19,7 @@ "west": {"y": -90} }, "active": { - "true": {"textures": {"front": "mekanism:blocks/oredictionificator/OredictionificatorFrontOn"}}, + "true": {}, "false": {} }, "inventory": [{}] diff --git a/src/main/resources/assets/mekanism/blockstates/osmium_compressor.json b/src/main/resources/assets/mekanism/blockstates/osmium_compressor.json index 524629634..d392e4859 100644 --- a/src/main/resources/assets/mekanism/blockstates/osmium_compressor.json +++ b/src/main/resources/assets/mekanism/blockstates/osmium_compressor.json @@ -5,10 +5,11 @@ "textures": { "sides": "mekanism:blocks/SteelCasing", "front": "mekanism:blocks/osmium_compressor/OsmiumCompressorFront", - "west": "mekanism:blocks/osmium_compressor/OsmiumCompressorRight", - "east": "mekanism:blocks/osmium_compressor/OsmiumCompressorLeft", + "west": "mekanism:blocks/osmium_compressor/OsmiumCompressorLeft", + "east": "mekanism:blocks/osmium_compressor/OsmiumCompressorRight", "south": "mekanism:blocks/osmium_compressor/OsmiumCompressorBack", - "up": "mekanism:blocks/osmium_compressor/OsmiumCompressorTop" + "up": "mekanism:blocks/osmium_compressor/OsmiumCompressorTop", + "down": "mekanism:blocks/osmium_compressor/OsmiumCompressorBottom" } }, "variants": { @@ -19,7 +20,15 @@ "west": {"y": -90} }, "active": { - "true": {"textures": {"front": "mekanism:blocks/osmium_compressor/OsmiumCompressorFrontOn"}}, + "true": { + "textures": { + "front": "mekanism:blocks/osmium_compressor/OsmiumCompressorFrontOn", + "west": "mekanism:blocks/osmium_compressor/OsmiumCompressorLeftOn", + "east": "mekanism:blocks/osmium_compressor/OsmiumCompressorRightOn", + "south": "mekanism:blocks/osmium_compressor/OsmiumCompressorBackOn", + "up": "mekanism:blocks/osmium_compressor/OsmiumCompressorTopOn" + } + }, "false": {} }, "inventory": [{}] diff --git a/src/main/resources/assets/mekanism/blockstates/precision_sawmill.json b/src/main/resources/assets/mekanism/blockstates/precision_sawmill.json index f6750867b..0f722299a 100644 --- a/src/main/resources/assets/mekanism/blockstates/precision_sawmill.json +++ b/src/main/resources/assets/mekanism/blockstates/precision_sawmill.json @@ -8,7 +8,8 @@ "west": "mekanism:blocks/precision_sawmill/PrecisionSawmillRight", "east": "mekanism:blocks/precision_sawmill/PrecisionSawmillLeft", "south": "mekanism:blocks/precision_sawmill/PrecisionSawmillBack", - "up": "mekanism:blocks/precision_sawmill/PrecisionSawmillTop" + "up": "mekanism:blocks/precision_sawmill/PrecisionSawmillTop", + "down": "mekanism:blocks/precision_sawmill/PrecisionSawmillBottom" } }, "variants": { @@ -19,7 +20,15 @@ "west": {"y": -90} }, "active": { - "true": {"textures": {"front": "mekanism:blocks/precision_sawmill/PrecisionSawmillFrontOn"}}, + "true": { + "textures": { + "front": "mekanism:blocks/precision_sawmill/PrecisionSawmillFrontOn", + "west": "mekanism:blocks/precision_sawmill/PrecisionSawmillRightOn", + "east": "mekanism:blocks/precision_sawmill/PrecisionSawmillLeftOn", + "south": "mekanism:blocks/precision_sawmill/PrecisionSawmillBackOn", + "up": "mekanism:blocks/precision_sawmill/PrecisionSawmillTopOn" + } + }, "false": {} }, "inventory": [{}] diff --git a/src/main/resources/assets/mekanism/blockstates/purification_chamber.json b/src/main/resources/assets/mekanism/blockstates/purification_chamber.json index 650ec38b4..35508f9a1 100644 --- a/src/main/resources/assets/mekanism/blockstates/purification_chamber.json +++ b/src/main/resources/assets/mekanism/blockstates/purification_chamber.json @@ -8,7 +8,8 @@ "west": "mekanism:blocks/purification_chamber/PurificationChamberRight", "east": "mekanism:blocks/purification_chamber/PurificationChamberLeft", "south": "mekanism:blocks/purification_chamber/PurificationChamberBack", - "up": "mekanism:blocks/purification_chamber/PurificationChamberTop" + "up": "mekanism:blocks/purification_chamber/PurificationChamberTop", + "down": "mekanism:blocks/purification_chamber/PurificationChamberBottom" } }, "variants": { @@ -18,8 +19,16 @@ "east": {"y": 90}, "west": {"y": -90} }, - "active": { - "true": {"textures": {"front": "mekanism:blocks/purification_chamber/PurificationChamberFrontOn"}}, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/purification_chamber/PurificationChamberFrontOn", + "west": "mekanism:blocks/purification_chamber/PurificationChamberRightOn", + "east": "mekanism:blocks/purification_chamber/PurificationChamberLeftOn", + "south": "mekanism:blocks/purification_chamber/PurificationChamberBackOn", + "up": "mekanism:blocks/purification_chamber/PurificationChamberTopOn" + } + }, "false": {} }, "inventory": [{}] diff --git a/src/main/resources/assets/mekanism/blockstates/security_desk.json b/src/main/resources/assets/mekanism/blockstates/security_desk.json new file mode 100644 index 000000000..d4be63785 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/security_desk.json @@ -0,0 +1,21 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:security_desk" + }, + "variants": { + "normal": [{}], + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": {}, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/models/block/enrichment_chamber.json b/src/main/resources/assets/mekanism/models/block/enrichment_chamber.json deleted file mode 100644 index 4c7566f70..000000000 --- a/src/main/resources/assets/mekanism/models/block/enrichment_chamber.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "front": "mekanism:blocks/enrichment_chamber/EnrichmentChamberFront" - } -} - diff --git a/src/main/resources/assets/mekanism/models/entity/robit.json b/src/main/resources/assets/mekanism/models/entity/robit.json index 654ea7a00..e70014ec8 100644 --- a/src/main/resources/assets/mekanism/models/entity/robit.json +++ b/src/main/resources/assets/mekanism/models/entity/robit.json @@ -197,7 +197,7 @@ } ], "textures": { - "all": "...", + "all": "mekanism:entities/Robit", "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube.png b/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube.png new file mode 100755 index 000000000..558ed0bc1 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFrontOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFrontOn.png.mcmeta deleted file mode 100644 index 24f9c2fae..000000000 --- a/src/main/resources/assets/mekanism/textures/blocks/osmium_compressor/OsmiumCompressorFrontOn.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 1 - } -} diff --git a/src/main/resources/assets/mekanism/textures/entities/Robit.png b/src/main/resources/assets/mekanism/textures/entities/Robit.png new file mode 100644 index 000000000..bc416458c Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/entities/Robit.png differ