Leisuretimedock/webdisplays
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more dedup

Browse Source
This commit is contained in:
GiantLuigi4 2023-06-07 15:58:42 -04:00
parent 727808adbc
commit c2c7df3b16
3 changed files with 14 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/net/montoyo/wd/block/BlockKeyboardLeft.java
View File

@ -14,14 +14,12 @@ import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.RenderShape;
import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.DirectionProperty; import net.minecraft.world.level.block.state.properties.DirectionProperty;
import net.minecraft.world.level.block.state.properties.EnumProperty; import net.minecraft.world.level.block.state.properties.EnumProperty;
import net.minecraft.world.level.block.state.properties.Property; import net.minecraft.world.level.block.state.properties.Property;
import net.minecraft.world.level.material.PushReaction;
import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.Shapes;
@ -64,7 +62,7 @@ public class BlockKeyboardLeft extends BlockPeripheral {
BlockPos relative = pos.relative(BlockKeyboardLeft.mapDirection(state.getValue(FACING).getOpposite())); BlockPos relative = pos.relative(BlockKeyboardLeft.mapDirection(state.getValue(FACING).getOpposite()));
BlockState ns = world.getBlockState(relative); BlockState ns = world.getBlockState(relative);
if(ns.getBlock() instanceof BlockPeripheral) { if (ns.getBlock() instanceof BlockPeripheral) {
BlockEntity te = world.getBlockEntity(relative); // TODO: check? BlockEntity te = world.getBlockEntity(relative); // TODO: check?
if (te instanceof TileEntityKeyboard) if (te instanceof TileEntityKeyboard)
return (TileEntityKeyboard) te; return (TileEntityKeyboard) te;
@ -88,11 +86,6 @@ public class BlockKeyboardLeft extends BlockPeripheral {
builder.add(properties); builder.add(properties);
} }
@Override
public RenderShape getRenderShape(BlockState state) {
return RenderShape.MODEL;
}
@Override @Override
public void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) { public void entityInside(BlockState state, Level world, BlockPos pos, Entity entity) {
double rpos = (entity.getY() - ((double) pos.getY())) * 16.0; double rpos = (entity.getY() - ((double) pos.getY())) * 16.0;
@ -106,11 +99,11 @@ public class BlockKeyboardLeft extends BlockPeripheral {
@Override @Override
public @NotNull InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { public @NotNull InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
if(player.getItemInHand(hand).getItem() instanceof ItemLinker) if (player.getItemInHand(hand).getItem() instanceof ItemLinker)
return InteractionResult.PASS; return InteractionResult.PASS;
TileEntityKeyboard tek = BlockKeyboardLeft.getTileEntity(state, level, pos); TileEntityKeyboard tek = BlockKeyboardLeft.getTileEntity(state, level, pos);
if(tek != null) if (tek != null)
return tek.onRightClick(player, hand); return tek.onRightClick(player, hand);
return InteractionResult.PASS; return InteractionResult.PASS;
@ -122,37 +115,29 @@ public class BlockKeyboardLeft extends BlockPeripheral {
} }
@Override @Override
public PushReaction getPistonPushReaction(BlockState state) { public VoxelShape getOcclusionShape(BlockState arg, BlockGetter arg2, BlockPos arg3) {
return PushReaction.IGNORE; return Shapes.empty();
} }
private static void removeRightPiece(BlockState state, Level world, BlockPos pos) { private static void removeRightPiece(BlockState state, Level world, BlockPos pos) {
BlockPos relative = pos.relative(BlockKeyboardLeft.mapDirection(state.getValue(FACING))); BlockPos relative = pos.relative(BlockKeyboardLeft.mapDirection(state.getValue(FACING)));
BlockState ns = world.getBlockState(relative); BlockState ns = world.getBlockState(relative);
if(ns.getBlock() instanceof BlockKeyboardRight) { if (ns.getBlock() instanceof BlockKeyboardRight)
world.setBlock(relative, Blocks.AIR.defaultBlockState(), 3); world.setBlock(relative, Blocks.AIR.defaultBlockState(), 3);
}
} }
public static void remove(BlockState state, Level world, BlockPos pos, boolean setState, boolean drop) { public static void remove(BlockState state, Level world, BlockPos pos, boolean setState, boolean drop) {
removeRightPiece(state, world, pos); removeRightPiece(state, world, pos);
if (setState) { if (setState)
world.setBlock(pos, Blocks.AIR.defaultBlockState(), 3); world.setBlock(pos, Blocks.AIR.defaultBlockState(), 3);
}
WDNetworkRegistry.INSTANCE.send(PacketDistributor.NEAR.with(() -> point(world, pos)), new S2CMessageCloseGui(pos)); WDNetworkRegistry.INSTANCE.send(PacketDistributor.NEAR.with(() -> point(world, pos)), new S2CMessageCloseGui(pos));
} }
@Override @Override
public void onRemove(BlockState arg, Level arg2, BlockPos arg3, BlockState arg4, boolean bl) { public void onRemove(BlockState arg, Level arg2, BlockPos arg3, BlockState arg4, boolean bl) {
if(!arg2.isClientSide) { if (!arg2.isClientSide)
remove(arg, arg2, arg3, false, false); remove(arg, arg2, arg3, false, false);
}
super.onRemove(arg, arg2, arg3, arg4, bl); super.onRemove(arg, arg2, arg3, arg4, bl);
} }
@Override
public VoxelShape getOcclusionShape(BlockState arg, BlockGetter arg2, BlockPos arg3) {
return Shapes.empty();
}
} }

13
src/main/java/net/montoyo/wd/block/BlockKeyboardRight.java
View File

@ -49,24 +49,21 @@ public class BlockKeyboardRight extends Block implements IPeripheral {
BlockPos relative = pos.relative(BlockKeyboardLeft.mapDirection(state.getValue(FACING).getOpposite())); BlockPos relative = pos.relative(BlockKeyboardLeft.mapDirection(state.getValue(FACING).getOpposite()));
BlockState ns = world.getBlockState(relative); BlockState ns = world.getBlockState(relative);
if(ns.getBlock() instanceof BlockKeyboardLeft) { if (ns.getBlock() instanceof BlockKeyboardLeft)
world.setBlock(relative, Blocks.AIR.defaultBlockState(), 3); world.setBlock(relative, Blocks.AIR.defaultBlockState(), 3);
}
} }
public static void remove(BlockState state, Level world, BlockPos pos, boolean setState, boolean drop) { public static void remove(BlockState state, Level world, BlockPos pos, boolean setState, boolean drop) {
removeLeftPiece(state, world, pos); removeLeftPiece(state, world, pos);
if (setState) { if (setState)
world.setBlock(pos, Blocks.AIR.defaultBlockState(), 3); world.setBlock(pos, Blocks.AIR.defaultBlockState(), 3);
}
WDNetworkRegistry.INSTANCE.send(PacketDistributor.NEAR.with(() -> point(world, pos)), new S2CMessageCloseGui(pos)); WDNetworkRegistry.INSTANCE.send(PacketDistributor.NEAR.with(() -> point(world, pos)), new S2CMessageCloseGui(pos));
} }
@Override @Override
public void onRemove(BlockState arg, Level arg2, BlockPos arg3, BlockState arg4, boolean bl) { public void onRemove(BlockState arg, Level arg2, BlockPos arg3, BlockState arg4, boolean bl) {
if(!arg2.isClientSide) { if (!arg2.isClientSide)
remove(arg, arg2, arg3, false, false); remove(arg, arg2, arg3, false, false);
}
super.onRemove(arg, arg2, arg3, arg4, bl); super.onRemove(arg, arg2, arg3, arg4, bl);
} }
@ -104,11 +101,11 @@ public class BlockKeyboardRight extends Block implements IPeripheral {
@Override @Override
public @NotNull InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { public @NotNull InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
if(player.getItemInHand(hand).getItem() instanceof ItemLinker) if (player.getItemInHand(hand).getItem() instanceof ItemLinker)
return InteractionResult.PASS; return InteractionResult.PASS;
TileEntityKeyboard tek = BlockKeyboardLeft.getTileEntity(state, level, pos); TileEntityKeyboard tek = BlockKeyboardLeft.getTileEntity(state, level, pos);
if(tek != null) if (tek != null)
return tek.onRightClick(player, hand); return tek.onRightClick(player, hand);
return InteractionResult.PASS; return InteractionResult.PASS;

27
src/main/java/net/montoyo/wd/client/StaticStateMapper.java
View File

@ -1,27 +0,0 @@
/*
* Copyright (C) 2018 BARBOTIN Nicolas
*/
/*
package net.montoyo.wd.client;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.world.level.block.state.BlockState;
import javax.annotation.Nonnull;
public class StaticStateMapper {
private final ModelResourceLocation resLoc;
public StaticStateMapper(ModelResourceLocation rl) {
resLoc = rl;
}
@Override
@Nonnull
protected ModelResourceLocation getModelResourceLocation(@Nonnull BlockState state) {
return resLoc;
}
} */