mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-11-18 06:05:12 +00:00
Code Issues Releases Wiki Activity

Different fix for shadow turtles

Browse Source
This commit is contained in:
Bartek Bok
2017-05-03 16:03:47 +02:00
parent 5284b145f8
commit 4eb4bb933f
2 changed files with 93 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,12 +46,19 @@ public class TileTurtle extends TileComputerBase
public static final int INVENTORY_HEIGHT = 4;
// Members
enum MoveState
{
NOT_MOVED,
IN_PROGRESS,
MOVED
}
private ItemStack[] m_inventory;
private ItemStack[] m_previousInventory;
private boolean m_inventoryChanged;
private TurtleBrain m_brain;
private boolean m_moved;
private MoveState m_moveState;
public TileTurtle()
{
@@ -59,12 +66,12 @@ public class TileTurtle extends TileComputerBase
m_previousInventory = new ItemStack[ getSizeInventory() ];
m_inventoryChanged = false;
m_brain = createBrain();
m_moved = false;
m_moveState = MoveState.NOT_MOVED;
}
public boolean hasMoved()
{
return m_moved;
return m_moveState == MoveState.MOVED;
}
protected TurtleBrain createBrain()
@@ -276,6 +283,41 @@ public class TileTurtle extends TileComputerBase
}
}
@Override
public void onNeighbourChange()
{
if ( m_moveState == MoveState.NOT_MOVED )
{
super.onNeighbourChange();
}
}
@Override
public void onNeighbourTileEntityChange(BlockPos neighbour)
{
if ( m_moveState == MoveState.NOT_MOVED )
{
super.onNeighbourTileEntityChange( neighbour );
}
}
public void notifyMoveStart()
{
if (m_moveState == MoveState.NOT_MOVED)
{
m_moveState = MoveState.IN_PROGRESS;
}
}
public void notifyMoveEnd()
{
// MoveState.MOVED is final
if (m_moveState == MoveState.IN_PROGRESS)
{
m_moveState = MoveState.NOT_MOVED;
}
}
@Override
public void readFromNBT( NBTTagCompound nbttagcompound )
{
@@ -401,7 +443,7 @@ public class TileTurtle extends TileComputerBase
}
// IInventory
@Override
public int getSizeInventory()
{
@@ -431,7 +473,7 @@ public class TileTurtle extends TileComputerBase
return result;
}
}
@Override
public ItemStack decrStackSize( int slot, int count )
{
@@ -447,13 +489,13 @@ public class TileTurtle extends TileComputerBase
{
return null;
}
if( stack.stackSize <= count )
{
setInventorySlotContents( slot, null );
return stack;
}
ItemStack part = stack.splitStack( count );
onInventoryDefinitelyChanged();
return part;
@@ -496,7 +538,7 @@ public class TileTurtle extends TileComputerBase
}
}
}
@Override
public String getName()
{
@@ -550,7 +592,7 @@ public class TileTurtle extends TileComputerBase
public void openInventory( EntityPlayer player )
{
}
@Override
public void closeInventory( EntityPlayer player )
{
@@ -561,7 +603,7 @@ public class TileTurtle extends TileComputerBase
{
return true;
}
@Override
public void markDirty()
{
@@ -664,6 +706,6 @@ public class TileTurtle extends TileComputerBase
m_inventoryChanged = copy.m_inventoryChanged;
m_brain = copy.m_brain;
m_brain.setOwner( this );
copy.m_moved = true;
copy.m_moveState = MoveState.MOVED;
}
}