mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-10-31 13:42:59 +00:00
Code Issues Releases Wiki Activity

fix: creative picking sided modem/cable

Browse Source
This commit is contained in:
Nikita Savyolov
2021-10-28 01:10:47 +03:00
parent 702e4fc787
commit 272572dbf2
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockCable.java
View File

@@ -11,6 +11,7 @@ import dan200.computercraft.api.ComputerCraftAPI;
import dan200.computercraft.shared.ComputerCraftRegistry; import dan200.computercraft.shared.ComputerCraftRegistry;
import dan200.computercraft.shared.common.BlockGeneric; import dan200.computercraft.shared.common.BlockGeneric;
import dan200.computercraft.shared.util.WorldUtil; import dan200.computercraft.shared.util.WorldUtil;
import net.fabricmc.fabric.api.block.BlockPickInteractionAware;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.ShapeContext; import net.minecraft.block.ShapeContext;
@@ -37,7 +38,7 @@ import java.util.EnumMap;
import static dan200.computercraft.shared.util.WaterloggableHelpers.*; import static dan200.computercraft.shared.util.WaterloggableHelpers.*;
public class BlockCable extends BlockGeneric implements Waterloggable public class BlockCable extends BlockGeneric implements Waterloggable, BlockPickInteractionAware
{ {
public static final EnumProperty<CableModemVariant> MODEM = EnumProperty.of( "modem", CableModemVariant.class ); public static final EnumProperty<CableModemVariant> MODEM = EnumProperty.of( "modem", CableModemVariant.class );
public static final BooleanProperty CABLE = BooleanProperty.of( "cable" ); public static final BooleanProperty CABLE = BooleanProperty.of( "cable" );
@@ -168,21 +169,21 @@ public class BlockCable extends BlockGeneric implements Waterloggable
return true; return true;
} }
// TODO Re-implement, likely will need mixin @Override
// @Override public ItemStack getPickedStack( BlockState state, BlockView world, BlockPos pos, @Nullable PlayerEntity player, HitResult hit )
// public ItemStack getPickStack(BlockView world, BlockPos pos, BlockState state) { {
// Direction modem = state.get( MODEM ).getFacing(); Direction modem = state.get( MODEM ).getFacing();
// boolean cable = state.get( CABLE ); boolean cable = state.get( CABLE );
//
// // If we've only got one, just use that. // If we've only got one, just use that.
// if( !cable ) return new ItemStack( ComputerCraftRegistry.ModItems.WIRED_MODEM.get() ); if( !cable ) return new ItemStack( ComputerCraftRegistry.ModItems.WIRED_MODEM );
// if( modem == null ) return new ItemStack( ComputerCraftRegistry.ModItems.CABLE.get() ); if( modem == null ) return new ItemStack( ComputerCraftRegistry.ModItems.CABLE );
//
// // We've a modem and cable, so try to work out which one we're interacting with // We've a modem and cable, so try to work out which one we're interacting with
// return hit != null && WorldUtil.isVecInside( CableShapes.getModemShape( state ), hit.getPos().subtract( pos.getX(), pos.getY(), pos.getZ() ) ) return hit != null && WorldUtil.isVecInside( CableShapes.getModemShape( state ), hit.getPos().subtract( pos.getX(), pos.getY(), pos.getZ() ) )
// ? new ItemStack( ComputerCraftRegistry.ModItems.WIRED_MODEM.get() ) ? new ItemStack( ComputerCraftRegistry.ModItems.WIRED_MODEM )
// : new ItemStack( ComputerCraftRegistry.ModItems.CABLE.get() ); : new ItemStack( ComputerCraftRegistry.ModItems.CABLE );
// } }
@Override @Override
@Deprecated @Deprecated