mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-01-27 09:24:47 +00:00
Code Issues Releases Wiki Activity

Remove synchronized from turtle inventory code

Browse Source 
These should never be called off the server thread, so this doesn't make
much difference.
This commit is contained in:
SquidDev 2019-08-01 14:09:57 +01:00
parent 2f96283286
commit 75e2845c01
4 changed files with 59 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/dan200/computercraft/api/turtle/ITurtleAccess.java
View File

@ -145,7 +145,9 @@ public interface ITurtleAccess
GameProfile getOwningPlayer(); GameProfile getOwningPlayer();
/** /**
* Get the inventory of this turtle * Get the inventory of this turtle.
*
* Note: this inventory should only be accessed and modified on the server thread.
* *
* @return This turtle's inventory * @return This turtle's inventory
* @see #getItemHandler() * @see #getItemHandler()
@ -156,6 +158,8 @@ public interface ITurtleAccess
/** /**
* Get the inventory of this turtle as an {@link IItemHandlerModifiable}. * Get the inventory of this turtle as an {@link IItemHandlerModifiable}.
* *
* Note: this inventory should only be accessed and modified on the server thread.
*
* @return This turtle's inventory * @return This turtle's inventory
* @see #getInventory() * @see #getInventory()
* @see IItemHandlerModifiable * @see IItemHandlerModifiable

2
src/main/java/dan200/computercraft/shared/turtle/FurnaceRefuelHandler.java
View File

@ -33,7 +33,7 @@ public final class FurnaceRefuelHandler implements TurtleRefuelEvent.Handler
int fuelSpaceLeft = turtle.getFuelLimit() - turtle.getFuelLevel(); int fuelSpaceLeft = turtle.getFuelLimit() - turtle.getFuelLevel();
int fuelPerItem = getFuelPerItem( turtle.getItemHandler().getStackInSlot( slot ) ); int fuelPerItem = getFuelPerItem( turtle.getItemHandler().getStackInSlot( slot ) );
int fuelItemLimit = (int) Math.ceil( fuelSpaceLeft / (double) fuelPerItem ); int fuelItemLimit = (int) Math.ceil( fuelSpaceLeft / (double) fuelPerItem );
if ( limit > fuelItemLimit ) limit = fuelItemLimit; if( limit > fuelItemLimit ) limit = fuelItemLimit;
ItemStack stack = turtle.getItemHandler().extractItem( slot, limit, false ); ItemStack stack = turtle.getItemHandler().extractItem( slot, limit, false );
int fuelToGive = fuelPerItem * stack.getCount(); int fuelToGive = fuelPerItem * stack.getCount();

6
src/main/java/dan200/computercraft/shared/turtle/apis/TurtleAPI.java
View File

@ -334,9 +334,11 @@ public class TurtleAPI implements ILuaAPI
return tryCommand( context, new TurtleInspectCommand( InteractDirection.Up ) ); return tryCommand( context, new TurtleInspectCommand( InteractDirection.Up ) );
case 40: // inspectDown case 40: // inspectDown
return tryCommand( context, new TurtleInspectCommand( InteractDirection.Down ) ); return tryCommand( context, new TurtleInspectCommand( InteractDirection.Down ) );
case 41: case 41: // getItemDetail
{ {
// getItemDetail // FIXME: There's a race condition here if the stack is being modified (mutating NBT, etc...)
// on another thread. The obvious solution is to move this into a command, but some programs rely
// on this having a 0-tick delay.
int slot = parseOptionalSlotNumber( args, 0, m_turtle.getSelectedSlot() ); int slot = parseOptionalSlotNumber( args, 0, m_turtle.getSelectedSlot() );
ItemStack stack = m_turtle.getInventory().getStackInSlot( slot ); ItemStack stack = m_turtle.getInventory().getStackInSlot( slot );
if( stack.isEmpty() ) return new Object[] { null }; if( stack.isEmpty() ) return new Object[] { null };

80
src/main/java/dan200/computercraft/shared/turtle/blocks/TileTurtle.java
View File

@ -43,19 +43,16 @@ import net.minecraftforge.items.wrapper.InvWrapper;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Collections;
import static net.minecraftforge.items.CapabilityItemHandler.ITEM_HANDLER_CAPABILITY; import static net.minecraftforge.items.CapabilityItemHandler.ITEM_HANDLER_CAPABILITY;
public class TileTurtle extends TileComputerBase implements ITurtleTile, DefaultInventory public class TileTurtle extends TileComputerBase implements ITurtleTile, DefaultInventory
{ {
// Statics
public static final int INVENTORY_SIZE = 16; public static final int INVENTORY_SIZE = 16;
public static final int INVENTORY_WIDTH = 4; public static final int INVENTORY_WIDTH = 4;
public static final int INVENTORY_HEIGHT = 4; public static final int INVENTORY_HEIGHT = 4;
// Members
enum MoveState enum MoveState
{ {
NOT_MOVED, NOT_MOVED,
@ -63,12 +60,12 @@ public class TileTurtle extends TileComputerBase implements ITurtleTile, Default
MOVED MOVED
} }
private NonNullList<ItemStack> m_inventory; private final NonNullList<ItemStack> m_inventory = NonNullList.withSize( INVENTORY_SIZE, ItemStack.EMPTY );
private NonNullList<ItemStack> m_previousInventory; private final NonNullList<ItemStack> m_previousInventory = NonNullList.withSize( INVENTORY_SIZE, ItemStack.EMPTY );
private final IItemHandlerModifiable m_itemHandler = new InvWrapper( this ); private final IItemHandlerModifiable m_itemHandler = new InvWrapper( this );
private boolean m_inventoryChanged; private boolean m_inventoryChanged = false;
private TurtleBrain m_brain; private TurtleBrain m_brain = new TurtleBrain( this );
private MoveState m_moveState; private MoveState m_moveState = MoveState.NOT_MOVED;
private ComputerFamily m_family; private ComputerFamily m_family;
public TileTurtle() public TileTurtle()
@ -78,15 +75,10 @@ public class TileTurtle extends TileComputerBase implements ITurtleTile, Default
public TileTurtle( ComputerFamily family ) public TileTurtle( ComputerFamily family )
{ {
m_inventory = NonNullList.withSize( INVENTORY_SIZE, ItemStack.EMPTY );
m_previousInventory = NonNullList.withSize( INVENTORY_SIZE, ItemStack.EMPTY );
m_inventoryChanged = false;
m_brain = new TurtleBrain( this );
m_moveState = MoveState.NOT_MOVED;
m_family = family; m_family = family;
} }
public boolean hasMoved() private boolean hasMoved()
{ {
return m_moveState == MoveState.MOVED; return m_moveState == MoveState.MOVED;
} }
@ -224,8 +216,6 @@ public class TileTurtle extends TileComputerBase implements ITurtleTile, Default
{ {
super.update(); super.update();
m_brain.update(); m_brain.update();
synchronized( m_inventory )
{
if( !getWorld().isRemote && m_inventoryChanged ) if( !getWorld().isRemote && m_inventoryChanged )
{ {
ServerComputer computer = getServerComputer(); ServerComputer computer = getServerComputer();
@ -238,7 +228,6 @@ public class TileTurtle extends TileComputerBase implements ITurtleTile, Default
} }
} }
} }
}
@Override @Override
public void onNeighbourChange( @Nonnull BlockPos neighbour ) public void onNeighbourChange( @Nonnull BlockPos neighbour )
@ -270,8 +259,8 @@ public class TileTurtle extends TileComputerBase implements ITurtleTile, Default
// Read inventory // Read inventory
NBTTagList nbttaglist = nbt.getTagList( "Items", Constants.NBT.TAG_COMPOUND ); NBTTagList nbttaglist = nbt.getTagList( "Items", Constants.NBT.TAG_COMPOUND );
m_inventory = NonNullList.withSize( INVENTORY_SIZE, ItemStack.EMPTY ); m_inventory.clear();
m_previousInventory = NonNullList.withSize( INVENTORY_SIZE, ItemStack.EMPTY ); m_previousInventory.clear();
for( int i = 0; i < nbttaglist.tagCount(); i++ ) for( int i = 0; i < nbttaglist.tagCount(); i++ )
{ {
NBTTagCompound tag = nbttaglist.getCompoundTagAt( i ); NBTTagCompound tag = nbttaglist.getCompoundTagAt( i );
@ -382,7 +371,7 @@ public class TileTurtle extends TileComputerBase implements ITurtleTile, Default
return m_family; return m_family;
} }
public void setOwningPlayer( GameProfile player ) void setOwningPlayer( GameProfile player )
{ {
m_brain.setOwningPlayer( player ); m_brain.setOwningPlayer( player );
markDirty(); markDirty();
@ -410,44 +399,26 @@ public class TileTurtle extends TileComputerBase implements ITurtleTile, Default
@Override @Override
public ItemStack getStackInSlot( int slot ) public ItemStack getStackInSlot( int slot )
{ {
if( slot >= 0 && slot < INVENTORY_SIZE ) return slot >= 0 && slot < INVENTORY_SIZE ? m_inventory.get( slot ) : ItemStack.EMPTY;
{
synchronized( m_inventory )
{
return m_inventory.get( slot );
}
}
return ItemStack.EMPTY;
} }
@Nonnull @Nonnull
@Override @Override
public ItemStack removeStackFromSlot( int slot ) public ItemStack removeStackFromSlot( int slot )
{
synchronized( m_inventory )
{ {
ItemStack result = getStackInSlot( slot ); ItemStack result = getStackInSlot( slot );
setInventorySlotContents( slot, ItemStack.EMPTY ); setInventorySlotContents( slot, ItemStack.EMPTY );
return result; return result;
} }
}
@Nonnull @Nonnull
@Override @Override
public ItemStack decrStackSize( int slot, int count ) public ItemStack decrStackSize( int slot, int count )
{ {
if( count == 0 ) if( count == 0 ) return ItemStack.EMPTY;
{
return ItemStack.EMPTY;
}
synchronized( m_inventory )
{
ItemStack stack = getStackInSlot( slot ); ItemStack stack = getStackInSlot( slot );
if( stack.isEmpty() ) if( stack.isEmpty() ) return ItemStack.EMPTY;
{
return ItemStack.EMPTY;
}
if( stack.getCount() <= count ) if( stack.getCount() <= count )
{ {
@ -459,28 +430,19 @@ public class TileTurtle extends TileComputerBase implements ITurtleTile, Default
onInventoryDefinitelyChanged(); onInventoryDefinitelyChanged();
return part; return part;
} }
}
@Override @Override
public void setInventorySlotContents( int i, @Nonnull ItemStack stack ) public void setInventorySlotContents( int i, @Nonnull ItemStack stack )
{ {
if( i >= 0 && i < INVENTORY_SIZE ) if( i >= 0 && i < INVENTORY_SIZE && !InventoryUtil.areItemsEqual( stack, m_inventory.get( i ) ) )
{
synchronized( m_inventory )
{
if( !InventoryUtil.areItemsEqual( stack, m_inventory.get( i ) ) )
{ {
m_inventory.set( i, stack ); m_inventory.set( i, stack );
onInventoryDefinitelyChanged(); onInventoryDefinitelyChanged();
} }
} }
}
}
@Override @Override
public void clear() public void clear()
{
synchronized( m_inventory )
{ {
boolean changed = false; boolean changed = false;
for( int i = 0; i < INVENTORY_SIZE; i++ ) for( int i = 0; i < INVENTORY_SIZE; i++ )
@ -491,19 +453,14 @@ public class TileTurtle extends TileComputerBase implements ITurtleTile, Default
changed = true; changed = true;
} }
} }
if( changed )
{ if( changed ) onInventoryDefinitelyChanged();
onInventoryDefinitelyChanged();
}
}
} }
@Override @Override
public void markDirty() public void markDirty()
{ {
super.markDirty(); super.markDirty();
synchronized( m_inventory )
{
if( !m_inventoryChanged ) if( !m_inventoryChanged )
{ {
for( int n = 0; n < getSizeInventory(); n++ ) for( int n = 0; n < getSizeInventory(); n++ )
@ -516,7 +473,6 @@ public class TileTurtle extends TileComputerBase implements ITurtleTile, Default
} }
} }
} }
}
@Override @Override
public boolean isUsableByPlayer( @Nonnull EntityPlayer player ) public boolean isUsableByPlayer( @Nonnull EntityPlayer player )
@ -574,8 +530,8 @@ public class TileTurtle extends TileComputerBase implements ITurtleTile, Default
public void transferStateFrom( TileTurtle copy ) public void transferStateFrom( TileTurtle copy )
{ {
super.transferStateFrom( copy ); super.transferStateFrom( copy );
m_inventory = copy.m_inventory; Collections.copy( m_inventory, copy.m_inventory );
m_previousInventory = copy.m_previousInventory; Collections.copy( m_previousInventory, copy.m_previousInventory );
m_inventoryChanged = copy.m_inventoryChanged; m_inventoryChanged = copy.m_inventoryChanged;
m_brain = copy.m_brain; m_brain = copy.m_brain;
m_brain.setOwner( this ); m_brain.setOwner( this );