mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-25 22:46:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5707 from homok43/mc1.18/dev

Browse source 
Memory leak in CapManipulationBehaviourBase
This commit is contained in:
Max Mielke 2024-03-16 16:59:32 +01:00 committed by GitHub
commit 4294d74144
Failed to generate hash of commit
2 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/inventory/CapManipulationBehaviourBase.java
View file

@ -7,6 +7,7 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour
import com.simibubi.create.foundation.blockEntity.behaviour.filtering.FilteringBehaviour;
import com.simibubi.create.foundation.item.ItemHelper.ExtractionCountMode;
import com.simibubi.create.foundation.utility.BlockFace;
import com.simibubi.create.foundation.utility.HashableNonNullConsumer;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.Level;
@ -102,7 +103,7 @@ public abstract class CapManipulationBehaviourBase<T, S extends CapManipulationB
amount = filter.getAmount();
return amount;
}
public ExtractionCountMode getModeFromFilter() {
ExtractionCountMode mode = ExtractionCountMode.UPTO;
FilteringBehaviour filter = blockEntity.getBehaviour(FilteringBehaviour.TYPE);
@ -128,7 +129,7 @@ public abstract class CapManipulationBehaviourBase<T, S extends CapManipulationB
targetCapability =
bypassSided ? invBE.getCapability(capability) : invBE.getCapability(capability, targetBlockFace.getFace());
if (targetCapability.isPresent())
targetCapability.addListener(this::onHandlerInvalidated);
targetCapability.addListener(new HashableNonNullConsumer<>(this::onHandlerInvalidated, this));
}
@FunctionalInterface

35
src/main/java/com/simibubi/create/foundation/utility/HashableNonNullConsumer.java Normal file
View file

@ -0,0 +1,35 @@
package com.simibubi.create.foundation.utility;
import java.util.Objects;
import javax.annotation.Nonnull;
import net.minecraftforge.common.util.NonNullConsumer;
public class HashableNonNullConsumer<T, H> implements NonNullConsumer<T> {
private final NonNullConsumer<T> consumer;
private final H hashKey;
public HashableNonNullConsumer(NonNullConsumer<T> consumer, H hashKey) {
this.consumer = consumer;
this.hashKey = hashKey;
}
@Override
public void accept(@Nonnull T t) {
consumer.accept(t);
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
HashableNonNullConsumer<?, ?> that = (HashableNonNullConsumer<?, ?>) o;
return Objects.equals(hashKey, that.hashKey);
}
@Override
public int hashCode() {
return Objects.hash(hashKey);
}
}