Skip to content

Commit 69ec077

Browse files
committed
Fix reactor glass side being visible through the laser focus matrix
1 parent bf64ca7 commit 69ec077

File tree

3 files changed

+25
-4
lines changed

3 files changed

+25
-4
lines changed
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package mekanism.generators.common.block;
2+
3+
import mekanism.common.block.basic.BlockStructuralGlass;
4+
import mekanism.common.content.blocktype.BlockTypeTile;
5+
import mekanism.common.tile.prefab.TileEntityStructuralMultiblock;
6+
import mekanism.generators.common.block.fusion.BlockLaserFocusMatrix;
7+
import net.minecraft.core.Direction;
8+
import net.minecraft.world.level.block.state.BlockState;
9+
import org.jetbrains.annotations.NotNull;
10+
11+
public class BlockReactorGlass<TILE extends TileEntityStructuralMultiblock> extends BlockStructuralGlass<TILE> {
12+
13+
public BlockReactorGlass(BlockTypeTile<TILE> type) {
14+
super(type);
15+
}
16+
17+
@Override
18+
protected boolean skipRendering(@NotNull BlockState state, @NotNull BlockState adjacentBlockState, @NotNull Direction side) {
19+
return super.skipRendering(state, adjacentBlockState, side) || adjacentBlockState.getBlock() instanceof BlockLaserFocusMatrix;
20+
}
21+
}

src/generators/java/mekanism/generators/common/block/fusion/BlockLaserFocusMatrix.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package mekanism.generators.common.block.fusion;
22

3-
import mekanism.common.block.basic.BlockStructuralGlass;
43
import mekanism.common.block.prefab.BlockBasicMultiblock;
54
import mekanism.common.block.states.BlockStateHelper;
5+
import mekanism.generators.common.block.BlockReactorGlass;
66
import mekanism.generators.common.registries.GeneratorsBlockTypes;
77
import mekanism.generators.common.tile.fusion.TileEntityLaserFocusMatrix;
88
import net.minecraft.core.BlockPos;
@@ -36,7 +36,7 @@ public boolean shouldDisplayFluidOverlay(@NotNull BlockState state, @NotNull Blo
3636
@Override
3737
protected boolean skipRendering(@NotNull BlockState state, @NotNull BlockState adjacentBlockState, @NotNull Direction side) {
3838
Block blockOffset = adjacentBlockState.getBlock();
39-
if (blockOffset instanceof BlockStructuralGlass || blockOffset instanceof BlockLaserFocusMatrix) {
39+
if (blockOffset instanceof BlockReactorGlass || blockOffset instanceof BlockLaserFocusMatrix) {
4040
return true;
4141
}
4242
return super.skipRendering(state, adjacentBlockState, side);

src/generators/java/mekanism/generators/common/registries/GeneratorsBlocks.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import mekanism.common.attachments.containers.fluid.FluidTanksBuilder;
88
import mekanism.common.attachments.containers.heat.HeatCapacitorsBuilder;
99
import mekanism.common.attachments.containers.item.ItemSlotsBuilder;
10-
import mekanism.common.block.basic.BlockStructuralGlass;
1110
import mekanism.common.block.interfaces.IHasDescription;
1211
import mekanism.common.block.prefab.BlockBasicMultiblock;
1312
import mekanism.common.block.prefab.BlockTile;
@@ -20,6 +19,7 @@
2019
import mekanism.common.tags.MekanismTags;
2120
import mekanism.generators.common.GeneratorTags;
2221
import mekanism.generators.common.MekanismGenerators;
22+
import mekanism.generators.common.block.BlockReactorGlass;
2323
import mekanism.generators.common.block.fusion.BlockLaserFocusMatrix;
2424
import mekanism.generators.common.block.turbine.BlockTurbineRotor;
2525
import mekanism.generators.common.config.MekanismGeneratorsConfig;
@@ -115,7 +115,7 @@ private GeneratorsBlocks() {
115115
public static final BlockRegistryObject<BlockBasicMultiblock<TileEntityTurbineVent>, ItemBlockTooltip<BlockBasicMultiblock<TileEntityTurbineVent>>> TURBINE_VENT = registerTooltipBlock("turbine_vent", () -> new BlockBasicMultiblock<>(GeneratorsBlockTypes.TURBINE_VENT, properties -> properties.mapColor(MapColor.COLOR_GRAY)));
116116
public static final BlockRegistryObject<BlockTile<TileEntitySaturatingCondenser, BlockTypeTile<TileEntitySaturatingCondenser>>, ItemBlockTooltip<BlockTile<TileEntitySaturatingCondenser, BlockTypeTile<TileEntitySaturatingCondenser>>>> SATURATING_CONDENSER = registerTooltipBlock("saturating_condenser", () -> new BlockTile<>(GeneratorsBlockTypes.SATURATING_CONDENSER, properties -> properties.mapColor(MapColor.COLOR_GRAY)));
117117

118-
public static final BlockRegistryObject<BlockStructuralGlass<TileEntityReactorGlass>, ItemBlockTooltip<BlockStructuralGlass<TileEntityReactorGlass>>> REACTOR_GLASS = registerTooltipBlock("reactor_glass", () -> new BlockStructuralGlass<>(GeneratorsBlockTypes.REACTOR_GLASS));
118+
public static final BlockRegistryObject<BlockReactorGlass<TileEntityReactorGlass>, ItemBlockTooltip<BlockReactorGlass<TileEntityReactorGlass>>> REACTOR_GLASS = registerTooltipBlock("reactor_glass", () -> new BlockReactorGlass<>(GeneratorsBlockTypes.REACTOR_GLASS));
119119

120120
public static final BlockRegistryObject<BlockBasicMultiblock<TileEntityFissionReactorCasing>, ItemBlockTooltip<BlockBasicMultiblock<TileEntityFissionReactorCasing>>> FISSION_REACTOR_CASING = registerTooltipBlock("fission_reactor_casing", () -> new BlockBasicMultiblock<>(GeneratorsBlockTypes.FISSION_REACTOR_CASING, properties -> properties.mapColor(MapColor.COLOR_LIGHT_GRAY)));
121121
public static final BlockRegistryObject<BlockBasicMultiblock<TileEntityFissionReactorPort>, ItemBlockTooltip<BlockBasicMultiblock<TileEntityFissionReactorPort>>> FISSION_REACTOR_PORT = registerTooltipBlock("fission_reactor_port", () -> new BlockBasicMultiblock<>(GeneratorsBlockTypes.FISSION_REACTOR_PORT, properties -> properties.mapColor(MapColor.COLOR_LIGHT_GRAY)));

0 commit comments

Comments
 (0)