Skip to content

Make connector cache more robust #1122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrh0 merged 1 commit into from
Mar 8, 2026
Merged

Make connector cache more robust #1122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/main/java/com/mrh0/createaddition/blocks/connector/base/AbstractConnectorBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,6 @@ public InteractionResult onSneakWrenched(BlockState state, UseOnContext c) {
@Override
public void neighborChanged(BlockState state, Level worldIn, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) {
BlockEntity blockEntity = state.hasBlockEntity() ? worldIn.getBlockEntity(pos) : null;
if(blockEntity != null) {
if(blockEntity instanceof AbstractConnectorBlockEntity) {
((AbstractConnectorBlockEntity)blockEntity).updateExternalEnergyStorage();
}
}
if (!state.canSurvive(worldIn, pos)) {
dropResources(state, worldIn, pos, blockEntity);

Expand Down
33 changes: 7 additions & 26 deletions ...main/java/com/mrh0/createaddition/blocks/connector/base/AbstractConnectorBlockEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,10 @@ public void firstTick() {
this.wasContraption = false;
validateNodes();
}

updateExternalEnergyStorage();
}

protected void specialTick() {}

boolean externalStorageInvalid = false;
@Override
public void tick() {
if (this.firstTick) firstTick();
Expand All @@ -274,15 +271,18 @@ public void tick() {
if(awakeNetwork(level)) notifyUpdate();

networkTick(network);

if (externalStorageInvalid) updateExternalEnergyStorage();

}

private void networkTick(EnergyNetwork network) {
ConnectorMode mode = getMode();
if(level == null) return;
if(level.isClientSide()) return;
if(external == null) {
updateExternalEnergyStorage();
if(external == null) {
return;
}
}
IEnergyStorage otherStorage = external.getCapability();
if (otherStorage == null) return;

Expand Down Expand Up @@ -316,7 +316,6 @@ public void remove() {
}

invalidateNodeCache();
// invalidateCaps();

// Invalidate
if (network != null) network.invalidate();
Expand Down Expand Up @@ -369,32 +368,14 @@ public void updateExternalEnergyStorage() {
if (!(level instanceof ServerLevel)) return;
if (!level.isLoaded(getBlockPos())) return;
var side = getBlockState().getValue(AbstractConnectorBlock.FACING);
if (!level.isLoaded(getBlockPos().relative(side))) return;
externalStorageInvalid = false;

//if (!level.isLoaded(worldPosition.relative(side))) {
// external = LazyOptional.empty();
// return;
//}
//BlockEntity te = level.getBlockEntity(worldPosition.relative(side));
//if(te == null) {
// external = LazyOptional.empty();
// return;
//}
//LazyOptional<IEnergyStorage> le = te.getCapability(ForgeCapabilities.ENERGY, side.getOpposite());
//if(ignoreCapSide() && !le.isPresent()) le = te.getCapability(ForgeCapabilities.ENERGY);
// Make sure the side isn't already cached.
//if (le.equals(external)) return;
//external = le;
//le.addListener((es) -> { externalStorageInvalid = true; });

external = BlockCapabilityCache.create(
Capabilities.EnergyStorage.BLOCK, // capability to cache
(ServerLevel) level, // level
getPos().relative(side),
side.getOpposite(),
() -> !this.isRemoved(), // validity check (because the cache might outlive the object it belongs to)
() -> externalStorageInvalid = true // invalidation listener
() -> {} // invalidation listener
);
}

Expand Down