From 56cdadce75d4f074eeee7d90c67b1244d24f56ba Mon Sep 17 00:00:00 2001 From: Kogepan229 Date: Mon, 10 Nov 2025 21:58:28 +0900 Subject: [PATCH] Revert "Merge branch 'master' into gui-reaper" This reverts commit f29844f2f8209fce75eadcfb6eb9d5b805e9b26e, reversing changes made to f35d6856d5704c577f41db057bda4e88cfaf0181. --- dependencies.gradle | 2 +- .../common/parts/PartFluidP2PInterface.java | 107 ------------------ 2 files changed, 1 insertion(+), 108 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 3553b86e..503b3711 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,7 +35,7 @@ */ dependencies { api('com.github.GTNewHorizons:NotEnoughItems:2.8.33-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-739-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-732-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.9.7:dev') api("com.github.GTNewHorizons:GTNHLib:0.8.0:dev") 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 6e501513..d237c860 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidP2PInterface.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidP2PInterface.java @@ -58,7 +58,6 @@ public class PartFluidP2PInterface extends PartP2PInterface implements IDualHost @Override public PartP2PTunnel applyMemoryCard(EntityPlayer player, IMemoryCard memoryCard, ItemStack is) { PartP2PTunnel newTunnel = super.applyMemoryCard(player, memoryCard, is); - if (Platform.isClient()) return newTunnel; NBTTagCompound data = memoryCard.getData(is); if (newTunnel instanceof PartFluidP2PInterface p2PInterface) { p2PInterface.duality.getConfigManager().readFromNBT(data); @@ -66,112 +65,6 @@ public class PartFluidP2PInterface extends PartP2PInterface implements IDualHost return newTunnel; } - @Override - public void addToWorld() { - super.addToWorld(); - this.duality.initialize(); - } - - @Override - public void getDrops(final List drops, final boolean wrenched) { - this.duality.addDrops(drops); - } - - @Override - public int cableConnectionRenderTo() { - return 4; - } - - @Override - public IConfigManager getConfigManager() { - return this.duality.getConfigManager(); - } - - @Override - public IInventory getInventoryByName(final String name) { - return this.duality.getInventoryByName(name); - } - - @Override - public void onNeighborChanged() { - this.duality.updateRedstoneState(); - } - - @Override - public boolean onPartActivate(final EntityPlayer p, final Vec3 pos) { - if (super.onPartActivate(p, pos)) { - return true; - } - - if (p.isSneaking()) { - return false; - } - - if (Platform.isServer()) { - InventoryHandler.openGui( - p, - this.getHost().getTile().getWorldObj(), - new BlockPos(this.getHost().getTile()), - Objects.requireNonNull(this.getSide()), - GuiType.DUAL_INTERFACE); - } - - return true; - } - - private void dropPatterns(final PartFluidP2PInterface p2p) { - final AppEngInternalInventory patterns = p2p.duality.getPatterns(); - final List drops = new ArrayList<>(); - for (int i = 0; i < patterns.getSizeInventory(); i++) { - if (patterns.getStackInSlot(i) == null) continue; - drops.add(patterns.getStackInSlot(i)); - } - if (!drops.isEmpty()) { - final TileEntity te = p2p.getTileEntity(); - Platform.spawnDrops(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord, drops); - } - } - - @Override - protected void copyContents(final PartP2PTunnel from) { - if (from instanceof PartFluidP2PInterface fromInterface) { - DualityInterface newDuality = this.duality; - // Copy interface storage, upgrades, and settings over - UpgradeInventory upgrades = (UpgradeInventory) fromInterface.duality.getInventoryByName("upgrades"); - UpgradeInventory newUpgrade = (UpgradeInventory) newDuality.getInventoryByName("upgrades"); - for (int i = 0; i < upgrades.getSizeInventory(); ++i) { - newUpgrade.setInventorySlotContents(i, upgrades.getStackInSlot(i)); - } - - if (!fromInterface.duality.sharedInventory) { - IInventory storage = fromInterface.duality.getStorage(); - IInventory newStorage = newDuality.getStorage(); - for (int i = 0; i < storage.getSizeInventory(); ++i) { - newStorage.setInventorySlotContents(i, storage.getStackInSlot(i)); - } - - IInventory config = fromInterface.duality.getInventoryByName("config"); - IInventory newConfig = newDuality.getInventoryByName("config"); - for (int i = 0; i < config.getSizeInventory(); ++i) { - newConfig.setInventorySlotContents(i, config.getStackInSlot(i)); - } - } - - AppEngInternalInventory patterns = fromInterface.duality.getPatterns(); - boolean drop = true; - if (!from.isOutput() && !this.isOutput()) { // input to input - for (int i = 0; i < patterns.getSizeInventory(); i++) { - newDuality.getPatterns().setInventorySlotContents(i, patterns.getStackInSlot(i)); - } - drop = false; - } - - if (drop) { - this.dropPatterns(fromInterface); - } - } - } - @Override protected void copySettings(final PartP2PTunnel from) { if (from instanceof PartFluidP2PInterface fromInterface) {