mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2024-06-25 06:33:23 +00:00
![SquidDev](/assets/img/avatar_default.png)
Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
154 lines
5.3 KiB
Java
154 lines
5.3 KiB
Java
/*
|
|
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
* Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
|
|
* Send enquiries to dratcliffe@gmail.com
|
|
*/
|
|
|
|
package dan200.computercraft.shared.peripheral.modem.wired;
|
|
|
|
import dan200.computercraft.ComputerCraft;
|
|
import net.minecraft.block.SoundType;
|
|
import net.minecraft.block.state.IBlockState;
|
|
import net.minecraft.entity.player.EntityPlayer;
|
|
import net.minecraft.item.BlockItemUseContext;
|
|
import net.minecraft.item.ItemBlock;
|
|
import net.minecraft.item.ItemGroup;
|
|
import net.minecraft.item.ItemStack;
|
|
import net.minecraft.tileentity.TileEntity;
|
|
import net.minecraft.util.*;
|
|
import net.minecraft.util.math.BlockPos;
|
|
import net.minecraft.world.World;
|
|
import net.minecraftforge.registries.ForgeRegistries;
|
|
|
|
import javax.annotation.Nonnull;
|
|
|
|
import static dan200.computercraft.shared.peripheral.modem.wired.BlockCable.*;
|
|
|
|
public abstract class ItemBlockCable extends ItemBlock
|
|
{
|
|
private String translationKey;
|
|
|
|
public ItemBlockCable( BlockCable block, Properties settings )
|
|
{
|
|
super( block, settings );
|
|
}
|
|
|
|
boolean placeAt( World world, BlockPos pos, IBlockState state, EntityPlayer player )
|
|
{
|
|
// TODO: Check entity collision.
|
|
if( !state.isValidPosition( world, pos ) ) return false;
|
|
|
|
world.setBlockState( pos, state, 3 );
|
|
SoundType soundType = state.getBlock().getSoundType( state, world, pos, player );
|
|
world.playSound( null, pos, soundType.getPlaceSound(), SoundCategory.BLOCKS, (soundType.getVolume() + 1.0F) / 2.0F, soundType.getPitch() * 0.8F );
|
|
|
|
TileEntity tile = world.getTileEntity( pos );
|
|
if( tile instanceof TileCable )
|
|
{
|
|
TileCable cable = (TileCable) tile;
|
|
cable.modemChanged();
|
|
cable.connectionsChanged();
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
boolean placeAtCorrected( World world, BlockPos pos, IBlockState state )
|
|
{
|
|
return placeAt( world, pos, correctConnections( world, pos, state ), null );
|
|
}
|
|
|
|
@Override
|
|
public void fillItemGroup( @Nonnull ItemGroup group, @Nonnull NonNullList<ItemStack> list )
|
|
{
|
|
if( isInGroup( group ) ) list.add( new ItemStack( this ) );
|
|
}
|
|
|
|
@Nonnull
|
|
@Override
|
|
public String getTranslationKey()
|
|
{
|
|
if( translationKey == null )
|
|
{
|
|
translationKey = Util.makeTranslationKey( "block", ForgeRegistries.ITEMS.getKey( this ) );
|
|
}
|
|
return translationKey;
|
|
}
|
|
|
|
public static class WiredModem extends ItemBlockCable
|
|
{
|
|
public WiredModem( BlockCable block, Properties settings )
|
|
{
|
|
super( block, settings );
|
|
}
|
|
|
|
@Nonnull
|
|
@Override
|
|
public EnumActionResult tryPlace( BlockItemUseContext context )
|
|
{
|
|
ItemStack stack = context.getItem();
|
|
if( stack.isEmpty() ) return EnumActionResult.FAIL;
|
|
|
|
World world = context.getWorld();
|
|
BlockPos pos = context.getPos();
|
|
IBlockState existingState = world.getBlockState( pos );
|
|
|
|
// Try to add a modem to a cable
|
|
if( existingState.getBlock() == ComputerCraft.Blocks.cable && existingState.get( MODEM ) == CableModemVariant.None )
|
|
{
|
|
EnumFacing side = context.getFace().getOpposite();
|
|
IBlockState newState = existingState
|
|
.with( MODEM, CableModemVariant.from( side ) )
|
|
.with( CONNECTIONS.get( side ), existingState.get( CABLE ) );
|
|
if( placeAt( world, pos, newState, context.getPlayer() ) )
|
|
{
|
|
stack.shrink( 1 );
|
|
return EnumActionResult.SUCCESS;
|
|
}
|
|
}
|
|
|
|
return super.tryPlace( context );
|
|
}
|
|
}
|
|
|
|
public static class Cable extends ItemBlockCable
|
|
{
|
|
public Cable( BlockCable block, Properties settings )
|
|
{
|
|
super( block, settings );
|
|
}
|
|
|
|
@Nonnull
|
|
@Override
|
|
public EnumActionResult tryPlace( BlockItemUseContext context )
|
|
{
|
|
ItemStack stack = context.getItem();
|
|
if( stack.isEmpty() ) return EnumActionResult.FAIL;
|
|
|
|
World world = context.getWorld();
|
|
BlockPos pos = context.getPos();
|
|
|
|
// Try to add a cable to a modem inside the block we're clicking on.
|
|
BlockPos insidePos = pos.offset( context.getFace().getOpposite() );
|
|
IBlockState insideState = world.getBlockState( insidePos );
|
|
if( insideState.getBlock() == ComputerCraft.Blocks.cable && !insideState.get( BlockCable.CABLE )
|
|
&& placeAtCorrected( world, insidePos, insideState.with( BlockCable.CABLE, true ) ) )
|
|
{
|
|
stack.shrink( 1 );
|
|
return EnumActionResult.SUCCESS;
|
|
}
|
|
|
|
// Try to add a cable to a modem adjacent to this block
|
|
IBlockState existingState = world.getBlockState( pos );
|
|
if( existingState.getBlock() == ComputerCraft.Blocks.cable && !existingState.get( BlockCable.CABLE )
|
|
&& placeAtCorrected( world, pos, existingState.with( BlockCable.CABLE, true ) ) )
|
|
{
|
|
stack.shrink( 1 );
|
|
return EnumActionResult.SUCCESS;
|
|
}
|
|
|
|
return super.tryPlace( context );
|
|
}
|
|
}
|
|
}
|