diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index c24c40f17..6ca602dce 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -148,6 +148,22 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus BlockStateBasic.BasicBlockType type = state.getValue(getProperty()); return type.meta; } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) + { + TileEntity tile = worldIn.getTileEntity(pos); + if(tile instanceof TileEntityBasicBlock && ((TileEntityBasicBlock)tile).facing != null) + { + state = state.withProperty(BlockStateBasic.facingProperty, ((TileEntityBasicBlock)tile).facing); + } + if(tile instanceof IActiveState) + { + state = state.withProperty(BlockStateBasic.activeProperty, ((IActiveState)tile).getActive()); + } + return state; + } + /* @Override public IIcon getIcon(ItemStack stack, int side) @@ -809,7 +825,7 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus } else if(getBasicBlock() == BasicBlock.BASIC_BLOCK_2) { - if(metadata == 5) + if(metadata == 5 && tileEntity instanceof TileEntitySuperheatingElement) { TileEntitySuperheatingElement element = (TileEntitySuperheatingElement)tileEntity; diff --git a/src/main/java/mekanism/common/block/states/BlockStateBasic.java b/src/main/java/mekanism/common/block/states/BlockStateBasic.java index 57edb1520..700f6d86b 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateBasic.java +++ b/src/main/java/mekanism/common/block/states/BlockStateBasic.java @@ -92,7 +92,7 @@ public class BlockStateBasic extends BlockStateFacing DYNAMIC_VALVE(BasicBlock.BASIC_BLOCK_1, 11, "DynamicValve", TileEntityDynamicValve.class, false, Predicates.alwaysFalse(), false), COPPER_BLOCK(BasicBlock.BASIC_BLOCK_1, 12, "CopperBlock", null, false, Predicates.alwaysFalse(), false), TIN_BLOCK(BasicBlock.BASIC_BLOCK_1, 13, "TinBlock", null, false, Predicates.alwaysFalse(), false), - THERMAL_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, "ThermalEvaporationController", TileEntityThermalEvaporationController.class, false, Plane.HORIZONTAL, false), + THERMAL_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, "ThermalEvaporationController", TileEntityThermalEvaporationController.class, false, Plane.HORIZONTAL, true), THERMAL_EVAPORATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, "ThermalEvaporationValve", TileEntityThermalEvaporationValve.class, false, Predicates.alwaysFalse(), false), THERMAL_EVAPORATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, "ThermalEvaporationBlock", TileEntityThermalEvaporationBlock.class, false, Predicates.alwaysFalse(), false), INDUCTION_CASING(BasicBlock.BASIC_BLOCK_2, 1, "InductionCasing", TileEntityInductionCasing.class, false, Predicates.alwaysFalse(), false), diff --git a/src/main/resources/assets/mekanism/blockstates/OreBlock.json b/src/main/resources/assets/mekanism/blockstates/OreBlock.json new file mode 100644 index 000000000..8589863b0 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/OreBlock.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all" + }, + "variants": { + "type": { + "osmium": {"textures": {"all": "mekanism:blocks/OsmiumOre"}}, + "copper": {"textures": {"all": "mekanism:blocks/CopperOre"}}, + "tin": {"textures": {"all": "mekanism:blocks/TinOre"}} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/solar_evaporation_block.json b/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_block.json similarity index 74% rename from src/main/resources/assets/mekanism/blockstates/solar_evaporation_block.json rename to src/main/resources/assets/mekanism/blockstates/thermal_evaporation_block.json index 6891a251a..4c7d9dccc 100644 --- a/src/main/resources/assets/mekanism/blockstates/solar_evaporation_block.json +++ b/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_block.json @@ -3,7 +3,7 @@ "defaults": { "model": "cube_all", "textures": { - "all": "mekanism:blocks/SolarEvaporationBlock" + "all": "mekanism:blocks/SalinationBlock" } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json b/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json new file mode 100644 index 000000000..313dda6a1 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json @@ -0,0 +1,24 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "sides": "mekanism:blocks/SalinationBlock", + "front": "mekanism:blocks/SalinationController" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": {"textures": {"front": "mekanism:blocks/SalinationControllerOn"}}, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/solar_evaporation_valve.json b/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_valve.json similarity index 74% rename from src/main/resources/assets/mekanism/blockstates/solar_evaporation_valve.json rename to src/main/resources/assets/mekanism/blockstates/thermal_evaporation_valve.json index f2f085609..20a2da7d0 100644 --- a/src/main/resources/assets/mekanism/blockstates/solar_evaporation_valve.json +++ b/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_valve.json @@ -3,7 +3,7 @@ "defaults": { "model": "cube_all", "textures": { - "all": "mekanism:blocks/SolarEvaporationValve" + "all": "mekanism:blocks/SalinationValve" } }, "variants": {