diff --git a/src/main/java/mekanism/common/block/states/BlockStateBasic.java b/src/main/java/mekanism/common/block/states/BlockStateBasic.java index 9782a9f81..adeb23f4b 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateBasic.java +++ b/src/main/java/mekanism/common/block/states/BlockStateBasic.java @@ -97,11 +97,11 @@ public class BlockStateBasic extends ExtendedBlockState DYNAMIC_VALVE(BasicBlock.BASIC_BLOCK_1, 11, "DynamicValve", TileEntityDynamicValve.class, true, Predicates.alwaysFalse(), false, false, false), COPPER_BLOCK(BasicBlock.BASIC_BLOCK_1, 12, "CopperBlock", null, false, Predicates.alwaysFalse(), false, false, true), TIN_BLOCK(BasicBlock.BASIC_BLOCK_1, 13, "TinBlock", null, false, Predicates.alwaysFalse(), false, false, true), - THERMAL_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, "ThermalEvaporationController", TileEntityThermalEvaporationController.class, true, Plane.HORIZONTAL, false, false, false), + THERMAL_EVAPORATION_CONTROLLER(BasicBlock.BASIC_BLOCK_1, 14, "ThermalEvaporationController", TileEntityThermalEvaporationController.class, true, Plane.HORIZONTAL, true, false, false), THERMAL_EVAPORATION_VALVE(BasicBlock.BASIC_BLOCK_1, 15, "ThermalEvaporationValve", TileEntityThermalEvaporationValve.class, true, Predicates.alwaysFalse(), false, false, false), THERMAL_EVAPORATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, "ThermalEvaporationBlock", TileEntityThermalEvaporationBlock.class, true, Predicates.alwaysFalse(), false, false, false), INDUCTION_CASING(BasicBlock.BASIC_BLOCK_2, 1, "InductionCasing", TileEntityInductionCasing.class, true, Predicates.alwaysFalse(), false, false, false), - INDUCTION_PORT(BasicBlock.BASIC_BLOCK_2, 2, "InductionPort", TileEntityInductionPort.class, true, Predicates.alwaysFalse(), false, false, false), + INDUCTION_PORT(BasicBlock.BASIC_BLOCK_2, 2, "InductionPort", TileEntityInductionPort.class, true, Predicates.alwaysFalse(), true, false, false), INDUCTION_CELL(BasicBlock.BASIC_BLOCK_2, 3, "InductionCell", TileEntityInductionCell.class, true, Predicates.alwaysFalse(), false, true, false), INDUCTION_PROVIDER(BasicBlock.BASIC_BLOCK_2, 4, "InductionProvider", TileEntityInductionProvider.class, true, Predicates.alwaysFalse(), false, true, false), SUPERHEATING_ELEMENT(BasicBlock.BASIC_BLOCK_2, 5, "SuperheatingElement", TileEntitySuperheatingElement.class, true, Predicates.alwaysFalse(), false, false, false), diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index 4f642870b..ccbd775ca 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -242,7 +242,7 @@ public abstract class BlockReactor extends Block implements ITileEntityProvider if(this == stateOffset.getBlock()) { int metaOffset = stateOffset.getBlock().getMetaFromState(stateOffset); ReactorBlockType typeOffset = ReactorBlockType.get(getReactorBlock(), metaOffset); - if (typeOffset == ReactorBlockType.REACTOR_GLASS || type == ReactorBlockType.LASER_FOCUS_MATRIX) { + if (typeOffset == ReactorBlockType.REACTOR_GLASS || typeOffset == ReactorBlockType.LASER_FOCUS_MATRIX) { return false; } } diff --git a/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java b/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java index 3f849ef57..064a98d5d 100644 --- a/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java +++ b/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java @@ -86,12 +86,12 @@ public class BlockStateReactor extends ExtendedBlockState public static enum ReactorBlockType implements IStringSerializable { - REACTOR_CONTROLLER(ReactorBlock.REACTOR_BLOCK, 0, "ReactorController", 10, TileEntityReactorController.class, false), + REACTOR_CONTROLLER(ReactorBlock.REACTOR_BLOCK, 0, "ReactorController", 10, TileEntityReactorController.class, true), REACTOR_FRAME(ReactorBlock.REACTOR_BLOCK, 1, "ReactorFrame", -1, TileEntityReactorFrame.class, false), - REACTOR_PORT(ReactorBlock.REACTOR_BLOCK, 2, "ReactorPort", -1, TileEntityReactorPort.class, false), + REACTOR_PORT(ReactorBlock.REACTOR_BLOCK, 2, "ReactorPort", -1, TileEntityReactorPort.class, true), REACTOR_LOGIC_ADAPTER(ReactorBlock.REACTOR_BLOCK, 3, "ReactorLogicAdapter", 15, TileEntityReactorLogicAdapter.class, false), REACTOR_GLASS(ReactorBlock.REACTOR_GLASS, 0, "ReactorGlass", -1, TileEntityReactorGlass.class, false), - LASER_FOCUS_MATRIX(ReactorBlock.REACTOR_GLASS, 1, "ReactorLaserFocusMatrix", -1, TileEntityReactorLaserFocusMatrix.class, true); + LASER_FOCUS_MATRIX(ReactorBlock.REACTOR_GLASS, 1, "ReactorLaserFocusMatrix", -1, TileEntityReactorLaserFocusMatrix.class, false); public ReactorBlock blockType; public int meta; @@ -164,6 +164,11 @@ public class BlockStateReactor extends ExtendedBlockState { return new ItemStack(blockType.getBlock(), amount, meta); } + + public boolean hasActiveTexture() + { + return activable; + } } public static class ReactorBlockStateMapper extends StateMapperBase @@ -176,6 +181,13 @@ public class BlockStateReactor extends ExtendedBlockState StringBuilder builder = new StringBuilder(); String nameOverride = null; + if(type.hasActiveTexture()) + { + builder.append(activeProperty.getName()); + builder.append("="); + builder.append(state.getValue(activeProperty)); + } + if(builder.length() == 0) { builder.append("normal"); diff --git a/src/main/resources/assets/mekanism/blockstates/induction_port.json b/src/main/resources/assets/mekanism/blockstates/induction_port.json index 195be6df4..4fdb1e33a 100644 --- a/src/main/resources/assets/mekanism/blockstates/induction_port.json +++ b/src/main/resources/assets/mekanism/blockstates/induction_port.json @@ -8,7 +8,15 @@ }, "variants": { "normal": [{}], - "inventory": [{}] + "inventory": [{}], + "active": { + "false": {}, + "true": { + "textures": { + "all": "mekanism:blocks/induction_port_output" + } + } + } } } diff --git a/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json b/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json index 5fda98a4a..e0cdf4916 100644 --- a/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json +++ b/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json @@ -15,7 +15,16 @@ "east": {"y": 90}, "west": {"y": -90} }, - "inventory": [{}] + "inventory": [{}], + "active": { + "false": {}, + "true": { + "textures": { + "sides": "mekanism:blocks/thermal_evaporation_block", + "front": "mekanism:blocks/thermal_evaporation_controller_on" + } + } + } } } diff --git a/src/main/resources/assets/mekanismgenerators/blockstates/reactor_controller.json b/src/main/resources/assets/mekanismgenerators/blockstates/reactor_controller.json index aecc08f32..192e12856 100644 --- a/src/main/resources/assets/mekanismgenerators/blockstates/reactor_controller.json +++ b/src/main/resources/assets/mekanismgenerators/blockstates/reactor_controller.json @@ -10,13 +10,17 @@ }, "variants": { "normal": [{}], - "facing": { - "north": {}, - "south": {"y": 180}, - "east": {"y": 90}, - "west": {"y": -90} - }, - "inventory": [{}] + "inventory": [{}], + "active": { + "false": {}, + "true": { + "textures": { + "sides": "mekanismgenerators:blocks/reactor_frame", + "front": "mekanismgenerators:blocks/reactor_frame", + "up": "mekanismgenerators:blocks/reactor_controller_on" + } + } + } } } diff --git a/src/main/resources/assets/mekanismgenerators/blockstates/reactor_port.json b/src/main/resources/assets/mekanismgenerators/blockstates/reactor_port.json index d85bd2c95..8f4e114ba 100644 --- a/src/main/resources/assets/mekanismgenerators/blockstates/reactor_port.json +++ b/src/main/resources/assets/mekanismgenerators/blockstates/reactor_port.json @@ -8,7 +8,15 @@ }, "variants": { "normal": [{}], - "inventory": [{}] + "inventory": [{}], + "active": { + "false": {}, + "true": { + "textures": { + "all": "mekanismgenerators:blocks/reactor_port_output" + } + } + } } }