mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-01-15 03:35:42 +00:00
Code Issues Releases Wiki Activity

Preserve on-state of pocket computers

Browse Source 
This is far less robust than block-based computers, but I don't think it
needs to be. Fixes #1097 Or closes? Unclear - I'm counting this as a
bug.
This commit is contained in:
Jonathan Coates 2022-05-27 22:23:04 +01:00
parent 2efad38f53
commit ab22726883
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/dan200/computercraft/shared/pocket/items/ItemPocketComputer.java
View File

@ -50,6 +50,7 @@ public class ItemPocketComputer extends Item implements IComputerItem, IMedia, I
private static final String NBT_UPGRADE = "Upgrade";
private static final String NBT_UPGRADE_INFO = "UpgradeInfo";
public static final String NBT_LIGHT = "Light";
private static final String NBT_ON = "On";
private static final String NBT_INSTANCE = "Instanceid";
private static final String NBT_SESSION = "SessionId";
@ -108,6 +109,13 @@ public class ItemPocketComputer extends Item implements IComputerItem, IMedia, I
setLabel( stack, label );
}
boolean on = computer.isOn();
if( on != isMarkedOn( stack ) )
{
changed = true;
stack.getOrCreateTag().putBoolean( NBT_ON, on );
}
// Update pocket upgrade
if( upgrade != null ) upgrade.update( computer, computer.getPeripheral( ComputerSide.BACK ) );
@ -250,6 +258,10 @@ public class ItemPocketComputer extends Item implements IComputerItem, IMedia, I
computer.updateValues( entity, stack, getUpgrade( stack ) );
computer.addAPI( new PocketAPI( computer ) );
ComputerCraft.serverComputerRegistry.add( instanceID, computer );
// Only turn on when initially creating the computer, rather than each tick.
if( isMarkedOn( stack ) && entity instanceof PlayerEntity ) computer.turnOn();
if( inventory != null ) inventory.setChanged();
}
computer.setWorld( world );
@ -365,6 +377,12 @@ public class ItemPocketComputer extends Item implements IComputerItem, IMedia, I
stack.getOrCreateTag().putInt( NBT_SESSION, sessionID );
}
private static boolean isMarkedOn( @Nonnull ItemStack stack )
{
CompoundNBT nbt = stack.getTag();
return nbt != null && nbt.getBoolean( NBT_ON );
}
public static ComputerState getState( @Nonnull ItemStack stack )
{
ClientComputer computer = getClientComputer( stack );