mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Fix active block states.
Allowed Thermal Evaporation Controller and Induction Port to have active states. Allowed Reactor Controller and Reactor Port to have active states. Disallowed Reactor Focus Matrix to have active states. Fix issue with Reactor Glass and Reactor Laser Matrix should side render.
This commit is contained in:
1 parent
d0f0508a26
commit
83f06d6ba2
7 files changed
+57
-16
No files matched your search
@@ -97,11 +97,11 @@ public class BlockStateBasic extends ExtendedBlockState
|
||||
DYNAMIC_VALVE(BasicBlock.BASIC_BLOCK_1, 11, "DynamicValve", TileEntityDynamicValve.class, true, Predicates.<EnumFacing>alwaysFalse(), false, false, false),
|
||||
COPPER_BLOCK(BasicBlock.BASIC_BLOCK_1, 12, "CopperBlock", null, false, Predicates.<EnumFacing>alwaysFalse(), false, false, true),
|
||||
TIN_BLOCK(BasicBlock.BASIC_BLOCK_1, 13, "TinBlock", null, false, Predicates.<EnumFacing>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.<EnumFacing>alwaysFalse(), false, false, false),
|
||||
THERMAL_EVAPORATION_BLOCK(BasicBlock.BASIC_BLOCK_2, 0, "ThermalEvaporationBlock", TileEntityThermalEvaporationBlock.class, true, Predicates.<EnumFacing>alwaysFalse(), false, false, false),
|
||||
INDUCTION_CASING(BasicBlock.BASIC_BLOCK_2, 1, "InductionCasing", TileEntityInductionCasing.class, true, Predicates.<EnumFacing>alwaysFalse(), false, false, false),
|
||||
INDUCTION_PORT(BasicBlock.BASIC_BLOCK_2, 2, "InductionPort", TileEntityInductionPort.class, true, Predicates.<EnumFacing>alwaysFalse(), false, false, false),
|
||||
INDUCTION_PORT(BasicBlock.BASIC_BLOCK_2, 2, "InductionPort", TileEntityInductionPort.class, true, Predicates.<EnumFacing>alwaysFalse(), true, false, false),
|
||||
INDUCTION_CELL(BasicBlock.BASIC_BLOCK_2, 3, "InductionCell", TileEntityInductionCell.class, true, Predicates.<EnumFacing>alwaysFalse(), false, true, false),
|
||||
INDUCTION_PROVIDER(BasicBlock.BASIC_BLOCK_2, 4, "InductionProvider", TileEntityInductionProvider.class, true, Predicates.<EnumFacing>alwaysFalse(), false, true, false),
|
||||
SUPERHEATING_ELEMENT(BasicBlock.BASIC_BLOCK_2, 5, "SuperheatingElement", TileEntitySuperheatingElement.class, true, Predicates.<EnumFacing>alwaysFalse(), false, false, false),
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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");
|
||||
|
||||
Reference in new issue
Block a user