Skip to content

Commit

Permalink
Fix #559
Browse files Browse the repository at this point in the history
  • Loading branch information
bl4ckscor3 committed Feb 17, 2025
1 parent 36e6ebc commit cf1876c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 24 deletions.
1 change: 1 addition & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
- Fix: Reinforced buttons and levers can be triggered by wind charges
- Fix: Reinforced grass blocks and water cauldrons are still tinted even if the reinforced tint is turned off
- Fix: Fake water does not flow the same way as regular water
- Fix: Laser and inventory scanner fields don't show up properly in the overlay of Jade/TOP/etc.
- Removed: Configuration "ableToBreakMines"

[1] Note: Frame blocks that already existed in the world prior to this update will lose their owner. These frames can be broken by anyone so they can be placed down with the proper owner again.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import net.geforcemods.securitycraft.SCContent;
import net.geforcemods.securitycraft.api.OwnableBlockEntity;
import net.geforcemods.securitycraft.blockentities.InventoryScannerBlockEntity;
import net.geforcemods.securitycraft.compat.IOverlayDisplay;
import net.geforcemods.securitycraft.misc.ModuleType;
import net.geforcemods.securitycraft.util.BlockUtils;
import net.minecraft.core.BlockPos;
Expand Down Expand Up @@ -43,7 +42,7 @@
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape;

public class InventoryScannerFieldBlock extends OwnableBlock implements IOverlayDisplay, SimpleWaterloggedBlock {
public class InventoryScannerFieldBlock extends OwnableBlock implements SimpleWaterloggedBlock {
public static final EnumProperty<Direction> FACING = BlockStateProperties.HORIZONTAL_FACING;
public static final BooleanProperty HORIZONTAL = InventoryScannerBlock.HORIZONTAL;
public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
Expand Down Expand Up @@ -348,14 +347,4 @@ public boolean skipRendering(BlockState state, BlockState adjacentBlockState, Di
public BlockState mirror(BlockState state, Mirror mirror) {
return state.rotate(mirror.getRotation(state.getValue(FACING)));
}

@Override
public ItemStack getDisplayStack(Level level, BlockState state, BlockPos pos) {
return ItemStack.EMPTY;
}

@Override
public boolean shouldShowSCInfo(Level level, BlockState state, BlockPos pos) {
return false;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import net.geforcemods.securitycraft.api.ILinkedAction;
import net.geforcemods.securitycraft.api.OwnableBlockEntity;
import net.geforcemods.securitycraft.blockentities.LaserBlockBlockEntity;
import net.geforcemods.securitycraft.compat.IOverlayDisplay;
import net.geforcemods.securitycraft.misc.CustomDamageSources;
import net.geforcemods.securitycraft.misc.ModuleType;
import net.geforcemods.securitycraft.util.BlockUtils;
Expand Down Expand Up @@ -40,7 +39,7 @@
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape;

public class LaserFieldBlock extends OwnableBlock implements IOverlayDisplay, SimpleWaterloggedBlock {
public class LaserFieldBlock extends OwnableBlock implements SimpleWaterloggedBlock {
public static final IntegerProperty BOUNDTYPE = IntegerProperty.create("boundtype", 1, 3);
public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
private static final VoxelShape SHAPE_X = Block.box(0, 6.75, 6.75, 16, 9.25, 9.25);
Expand Down Expand Up @@ -188,14 +187,4 @@ public BlockState rotate(BlockState state, Rotation rot) {
default -> 1;
});
}

@Override
public ItemStack getDisplayStack(Level level, BlockState state, BlockPos pos) {
return ItemStack.EMPTY;
}

@Override
public boolean shouldShowSCInfo(Level level, BlockState state, BlockPos pos) {
return false;
}
}

0 comments on commit cf1876c

Please sign in to comment.