Altarik/ReFramed
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

further simplify redstone

Browse Source
This commit is contained in:
quat1024 2023-07-03 03:38:35 -04:00
parent 720e98c30b
commit 5a3eb6e520
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/io/github/cottonmc/templates/block/TemplateBlock.java
View File

@ -82,9 +82,9 @@ public abstract class TemplateBlock extends Block implements BlockEntityProvider
if(placementState != null && Block.isShapeFullCube(placementState.getCollisionShape(world, pos)) && !(block instanceof BlockEntityProvider)) { if(placementState != null && Block.isShapeFullCube(placementState.getCollisionShape(world, pos)) && !(block instanceof BlockEntityProvider)) {
if(!world.isClient) be.setRenderedState(placementState); if(!world.isClient) be.setRenderedState(placementState);
//Even if the block does not glow, this'll do a block update when adding a redstoney block world.setBlockState(pos, state
int newLuminance = be.hasSpentGlowstoneDust() ? 15 : placementState.getLuminance(); .with(LIGHT, be.hasSpentGlowstoneDust() ? 15 : placementState.getLuminance())
world.setBlockState(pos, state.with(LIGHT, newLuminance)); .with(REDSTONE, be.hasSpentRedstoneTorch() || placementState.getWeakRedstonePower(world, pos, Direction.NORTH) != 0));
if(!player.isCreative()) held.decrement(1); if(!player.isCreative()) held.decrement(1);
world.playSound(player, pos, state.getSoundGroup().getPlaceSound(), SoundCategory.BLOCKS, 1f, 1f); world.playSound(player, pos, state.getSoundGroup().getPlaceSound(), SoundCategory.BLOCKS, 1f, 1f);
@ -118,16 +118,12 @@ public abstract class TemplateBlock extends Block implements BlockEntityProvider
@Override @Override
public int getWeakRedstonePower(BlockState state, BlockView view, BlockPos pos, Direction dir) { public int getWeakRedstonePower(BlockState state, BlockView view, BlockPos pos, Direction dir) {
if(state.get(REDSTONE)) return 15; return state.get(REDSTONE) ? 15 : 0;
else if(view.getBlockEntity(pos) instanceof TemplateEntity template) return template.getRenderedState().getWeakRedstonePower(view, pos, dir);
else return 0;
} }
@Override @Override
public int getStrongRedstonePower(BlockState state, BlockView view, BlockPos pos, Direction dir) { public int getStrongRedstonePower(BlockState state, BlockView view, BlockPos pos, Direction dir) {
if(state.get(REDSTONE)) return 15; return state.get(REDSTONE) ? 15 : 0;
else if(view.getBlockEntity(pos) instanceof TemplateEntity template) return template.getRenderedState().getStrongRedstonePower(view, pos, dir);
else return 0;
} }
public int luminance(BlockState state) { public int luminance(BlockState state) {