Skip to content

Commit d354023

Browse files
committed
Fix crafting deadlock on result lock
1 parent 7339be1 commit d354023

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

src/main/java/com/glodblock/github/common/part/PartDualInterface.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import appeng.api.networking.ticking.TickingRequest;
1515
import appeng.api.parts.IPartCollisionHelper;
1616
import appeng.api.parts.IPartModel;
17+
import appeng.api.storage.data.IAEFluidStack;
1718
import appeng.api.storage.data.IAEItemStack;
1819
import appeng.api.util.AECableType;
1920
import appeng.api.util.IConfigManager;
@@ -32,6 +33,7 @@
3233
import appeng.util.inv.InvOperation;
3334
import com.glodblock.github.FluidCraft;
3435
import com.glodblock.github.common.component.DualityDualInterface;
36+
import com.glodblock.github.common.item.fake.FakeFluids;
3537
import com.glodblock.github.interfaces.FCPriorityHost;
3638
import com.glodblock.github.inventory.GuiType;
3739
import com.glodblock.github.inventory.InventoryHandler;
@@ -172,6 +174,16 @@ public void onChangeInventory(final IItemHandler inv, final int slot, final InvO
172174
duality.onItemInventoryChange(inv, slot, mc, removedStack, newStack);
173175
}
174176

177+
@Override
178+
public void onStackReturnNetwork(IAEFluidStack stack) {
179+
this.duality.getItemInterface().onStackReturnedToNetwork(FakeFluids.packFluid2AEDrops(stack));
180+
}
181+
182+
@Override
183+
public void onStackReturnNetwork(IAEItemStack stack) {
184+
this.duality.getItemInterface().onStackReturnedToNetwork(stack);
185+
}
186+
175187
@Override
176188
public DualityInterface getInterfaceDuality() {
177189
return duality.getItemInterface();

src/main/java/com/glodblock/github/common/tile/TileDualInterface.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import appeng.api.networking.ticking.IGridTickable;
1313
import appeng.api.networking.ticking.TickRateModulation;
1414
import appeng.api.networking.ticking.TickingRequest;
15+
import appeng.api.storage.data.IAEFluidStack;
1516
import appeng.api.storage.data.IAEItemStack;
1617
import appeng.api.util.AECableType;
1718
import appeng.api.util.AEPartLocation;
@@ -27,6 +28,7 @@
2728
import appeng.util.inv.IInventoryDestination;
2829
import appeng.util.inv.InvOperation;
2930
import com.glodblock.github.common.component.DualityDualInterface;
31+
import com.glodblock.github.common.item.fake.FakeFluids;
3032
import com.glodblock.github.interfaces.FCPriorityHost;
3133
import com.glodblock.github.inventory.GuiType;
3234
import com.glodblock.github.loader.FCBlocks;
@@ -205,6 +207,16 @@ public void onChangeInventory(final IItemHandler inv, final int slot, final InvO
205207
duality.onItemInventoryChange(inv, slot, mc, removed, added);
206208
}
207209

210+
@Override
211+
public void onStackReturnNetwork(IAEFluidStack stack) {
212+
duality.getItemInterface().onStackReturnedToNetwork(FakeFluids.packFluid2AEDrops(stack));
213+
}
214+
215+
@Override
216+
public void onStackReturnNetwork(IAEItemStack stack) {
217+
duality.getItemInterface().onStackReturnedToNetwork(stack);
218+
}
219+
208220
@Override
209221
public DualityInterface getInterfaceDuality() {
210222
return duality.getItemInterface();

0 commit comments

Comments
 (0)