From 9e43bcad946a73c62c326431d645221fbfedf2b0 Mon Sep 17 00:00:00 2001 From: lordIcocain Date: Thu, 26 Jun 2025 20:14:37 +0300 Subject: [PATCH] rework --- .../common/parts/PartFluidP2PInterface.java | 177 ++++++++++-------- 1 file changed, 95 insertions(+), 82 deletions(-) diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidP2PInterface.java b/src/main/java/com/glodblock/github/common/parts/PartFluidP2PInterface.java index ba384d12..86ca4779 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidP2PInterface.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidP2PInterface.java @@ -1,5 +1,7 @@ package com.glodblock.github.common.parts; +import static appeng.helpers.DualityInterface.NUMBER_OF_STORAGE_SLOTS; + import java.util.ArrayList; import java.util.EnumSet; import java.util.List; @@ -15,6 +17,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.Vec3; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -33,6 +36,7 @@ import com.google.common.collect.ImmutableSet; import appeng.api.config.Actionable; import appeng.api.config.Upgrades; +import appeng.api.implementations.items.IMemoryCard; import appeng.api.implementations.tiles.ITileStorageMonitorable; import appeng.api.networking.IGridNode; import appeng.api.networking.crafting.ICraftingLink; @@ -71,6 +75,9 @@ public class PartFluidP2PInterface extends PartP2PTunnelStatic drops = new ArrayList<>(); for (int i = 0; i < patterns.getSizeInventory(); i++) { if (patterns.getStackInSlot(i) == null) continue; drops.add(patterns.getStackInSlot(i)); } - for (int i = 0; i < DualityInterface.NUMBER_OF_STORAGE_SLOTS; i++) { - if (storageAppEng.getStackInSlot(i) == null) continue; - drops.add(storageAppEng.getStackInSlot(i)); + + if (!duality.sharedInventory) { + for (int i = 0; i < NUMBER_OF_STORAGE_SLOTS; i++) { + if (storageAppEng.getStackInSlot(i) == null) continue; + drops.add(storageAppEng.getStackInSlot(i)); + } } + final IPart tile = this.getHost().getPart(this.getSide()); if (tile instanceof PartFluidP2PInterface dualTile) { DualityInterface newDuality = dualTile.duality; @@ -251,11 +288,15 @@ public class PartFluidP2PInterface extends PartP2PTunnelStatic newDuality.getConfigManager().putSetting(setting, config.getSetting(setting))); @@ -282,22 +323,6 @@ public class PartFluidP2PInterface extends PartP2PTunnelStatic