Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't call suspend when removing, only call unmount.

Browse Source
This commit is contained in:
Florian Nücke
2022-01-15 15:01:25 +01:00
parent ac4521a72c
commit e435262ab9
6 changed files with 71 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/li/cil/oc2/common/blockentity/BusCableBlockEntity.java
View File

@@ -163,16 +163,6 @@ public final class BusCableBlockEntity extends ModBlockEntity {
}
}
@Override
public void setRemoved() {
super.setRemoved();
// Bus element will usually be discovered via bus scan, not via capability request, so
// automatic invalidation via capability will *not* necessarily schedule a scan on the
// controller of our current bus. So we need to trigger that manually.
busElement.scheduleScan();
}
@Override
public CompoundTag getUpdateTag() {
final CompoundTag tag = super.getUpdateTag();
@@ -222,6 +212,20 @@ public final class BusCableBlockEntity extends ModBlockEntity {
busElement.initialize();
}
@Override
protected void unloadServer(final boolean isRemove) {
super.unloadServer(isRemove);
if (isRemove) {
// Bus element will usually be discovered via bus scan, not via capability request, so
// automatic invalidation via capability will *not* necessarily schedule a scan on the
// controller of our current bus. So we need to trigger that manually.
// The controller already listens to chunk unloads, so we don't want to call this when
// the containing chunk gets unloaded, only when we're being removed.
busElement.scheduleScan();
}
}
///////////////////////////////////////////////////////////////////
private ListTag serializeInterfaceNames() {

19
src/main/java/li/cil/oc2/common/blockentity/ComputerBlockEntity.java
View File

@@ -195,13 +195,6 @@ public final class ComputerBlockEntity extends ModBlockEntity implements Termina
virtualMachine.tick();
}
@Override
public void setRemoved() {
super.setRemoved();
virtualMachine.stop();
}
@Override
public CompoundTag getUpdateTag() {
final CompoundTag tag = super.getUpdateTag();
@@ -282,10 +275,16 @@ public final class ComputerBlockEntity extends ModBlockEntity implements Termina
}
@Override
protected void unloadServer() {
super.unloadServer();
protected void unloadServer(final boolean isRemove) {
super.unloadServer(isRemove);
virtualMachine.suspend();
if (isRemove) {
virtualMachine.stop();
} else {
virtualMachine.suspend();
}
virtualMachine.dispose();
// This is necessary in case some other controller found us before our controller
// did its scan, which can happen because the scan can happen with a delay. In

12
src/main/java/li/cil/oc2/common/blockentity/ModBlockEntity.java
View File

@@ -94,18 +94,18 @@ public abstract class ModBlockEntity extends BlockEntity {
@Override
public void onChunkUnloaded() {
super.onChunkUnloaded(); // -> invalidateCaps()
onUnload();
onUnload(false);
}
public void onWorldUnloaded() {
invalidateCaps();
onUnload();
onUnload(false);
}
@Override
public void setRemoved() {
super.setRemoved(); // -> invalidateCaps()
onUnload();
onUnload(true);
}
///////////////////////////////////////////////////////////////////
@@ -128,9 +128,9 @@ public abstract class ModBlockEntity extends BlockEntity {
}
}
protected void onUnload() {
protected void onUnload(final boolean isRemove) {
if (level != null && !level.isClientSide()) {
unloadServer();
unloadServer(isRemove);
ServerScheduler.cancelOnUnload(level, onWorldUnloaded);
}
}
@@ -148,7 +148,7 @@ public abstract class ModBlockEntity extends BlockEntity {
protected void loadServer() {
}
protected void unloadServer() {
protected void unloadServer(final boolean isRemove) {
}
///////////////////////////////////////////////////////////////////

69
src/main/java/li/cil/oc2/common/blockentity/NetworkConnectorBlockEntity.java
View File

@@ -260,42 +260,6 @@ public final class NetworkConnectorBlockEntity extends ModBlockEntity {
}
}
@Override
protected void loadClient() {
super.loadClient();
NetworkCableRenderer.addNetworkConnector(this);
}
@Override
public void setRemoved() {
super.setRemoved();
// When we're being removed we want to break the actual link to any connected
// connectors. This will also cause cables to be dropped.
final ArrayList<NetworkConnectorBlockEntity> list = new ArrayList<>(connectors.values());
connectors.clear();
for (final NetworkConnectorBlockEntity connector : list) {
disconnectFrom(connector.getBlockPos());
connector.disconnectFrom(getBlockPos());
}
}
@Override
protected void unloadServer() {
super.unloadServer();
// When unloading, we just want to remove the reference to this block entity
// from connected connectors; we don't want to actually break the link.
final BlockPos pos = getBlockPos();
for (final NetworkConnectorBlockEntity connector : connectors.values()) {
connector.connectors.remove(pos);
if (connector.connectorPositions.contains(pos)) {
connector.dirtyConnectors.add(pos);
}
}
}
@Override
public AABB getRenderBoundingBox() {
if (Minecraft.useShaderTransparency()) {
@@ -317,6 +281,39 @@ public final class NetworkConnectorBlockEntity extends ModBlockEntity {
}
}
@Override
protected void loadClient() {
super.loadClient();
NetworkCableRenderer.addNetworkConnector(this);
}
@Override
protected void unloadServer(final boolean isRemove) {
super.unloadServer(isRemove);
if (isRemove) {
// When we're being removed we want to break the actual link to any connected
// connectors. This will also cause cables to be dropped.
final ArrayList<NetworkConnectorBlockEntity> list = new ArrayList<>(connectors.values());
connectors.clear();
for (final NetworkConnectorBlockEntity connector : list) {
disconnectFrom(connector.getBlockPos());
connector.disconnectFrom(getBlockPos());
}
} else {
// When unloading, we just want to remove the reference to this block entity
// from connected connectors; we don't want to actually break the link.
final BlockPos pos = getBlockPos();
for (final NetworkConnectorBlockEntity connector : connectors.values()) {
connector.connectors.remove(pos);
if (connector.connectorPositions.contains(pos)) {
connector.dirtyConnectors.add(pos);
}
}
}
}
///////////////////////////////////////////////////////////////////
private void resolveLocalInterface() {

5
src/main/java/li/cil/oc2/common/entity/Robot.java
View File

@@ -345,10 +345,9 @@ public final class Robot extends Entity implements li.cil.oc2.api.capabilities.R
public void setRemoved(final RemovalReason reason) {
super.setRemoved(reason);
virtualMachine.suspend();
// Full unload to release out-of-nbt persisted runtime-only data such as ram.
virtualMachine.stop();
virtualMachine.dispose();
}
@Override
@@ -473,6 +472,7 @@ public final class Robot extends Entity implements li.cil.oc2.api.capabilities.R
unregisterListeners();
virtualMachine.suspend();
virtualMachine.dispose();
}
private void handleWorldUnload(final WorldEvent.Unload event) {
@@ -482,6 +482,7 @@ public final class Robot extends Entity implements li.cil.oc2.api.capabilities.R
unregisterListeners();
virtualMachine.suspend();
virtualMachine.dispose();
}
private Cursor3D getBlockPosIterator() {

8
src/main/java/li/cil/oc2/common/vm/AbstractVirtualMachine.java
View File

@@ -82,12 +82,16 @@ public abstract class AbstractVirtualMachine implements VirtualMachine {
///////////////////////////////////////////////////////////////////
public void dispose() {
joinWorkerThread();
state.context.invalidate();
busController.dispose();
}
public void suspend() {
joinWorkerThread();
state.vmAdapter.suspend();
state.rpcAdapter.suspend();
state.context.invalidate();
busController.dispose();
}
@Override