From 653d9880282fd04f2b572c62298d3e6fb96a7c64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Z=C3=BCnd?= Date: Sun, 29 Dec 2024 18:04:27 +0100 Subject: [PATCH] Remove EnableP2pBackboneTransfer and EnableQuantumBridgeBackboneTransfer config options --- src/main/java/appeng/core/AEConfig.java | 7 ------- src/main/java/appeng/parts/p2p/PartP2PTunnelME.java | 5 +---- src/main/java/appeng/tile/qnb/TileQuantumBridge.java | 4 +--- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/main/java/appeng/core/AEConfig.java b/src/main/java/appeng/core/AEConfig.java index 1d76f30d3ce..44450d78bd0 100644 --- a/src/main/java/appeng/core/AEConfig.java +++ b/src/main/java/appeng/core/AEConfig.java @@ -90,8 +90,6 @@ public final class AEConfig extends Configuration implements IConfigurableObject public boolean debugLogTiming = false; public boolean debugPathFinding = false; - public boolean p2pBackboneTransfer = false; - public boolean quantumBridgeBackboneTransfer = false; public int wirelessTerminalBattery = 1600000; public int entropyManipulatorBattery = 200000; public int matterCannonBattery = 200000; @@ -232,11 +230,6 @@ public AEConfig(final File configFile) { this.debugLogTiming = this.get("debug", "LogTiming", this.debugLogTiming).getBoolean(this.debugLogTiming); this.debugPathFinding = this.get("debug", "LogPathFinding", this.debugPathFinding) .getBoolean(this.debugPathFinding); - this.p2pBackboneTransfer = this.get("debug", "EnableP2pBackboneTransfer", this.p2pBackboneTransfer) - .getBoolean(this.p2pBackboneTransfer); - this.quantumBridgeBackboneTransfer = this - .get("debug", "EnableQuantumBridgeBackboneTransfer", this.quantumBridgeBackboneTransfer) - .getBoolean(this.quantumBridgeBackboneTransfer); this.craftingCalculatorVersion = this.get("debug", "CraftingCalculatorVersion", this.craftingCalculatorVersion) .getInt(this.craftingCalculatorVersion); this.craftingCalculatorVersion = Math.max(1, Math.min(this.craftingCalculatorVersion, 2)); diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java index 1444e7d6411..b88f4ae070e 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java @@ -29,7 +29,6 @@ import appeng.api.networking.ticking.TickingRequest; import appeng.api.parts.IPartHost; import appeng.api.util.AECableType; -import appeng.core.AEConfig; import appeng.core.AELog; import appeng.core.settings.TickRates; import appeng.hooks.TickHandler; @@ -46,9 +45,7 @@ public class PartP2PTunnelME extends PartP2PTunnelNormal implem public PartP2PTunnelME(final ItemStack is) { super(is); this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL, GridFlags.COMPRESSED_CHANNEL); - if (AEConfig.instance.p2pBackboneTransfer) this.outerProxy - .setFlags(GridFlags.DENSE_CAPACITY, GridFlags.ULTRA_DENSE_CAPACITY, GridFlags.CANNOT_CARRY_COMPRESSED); - else this.outerProxy.setFlags(GridFlags.DENSE_CAPACITY, GridFlags.CANNOT_CARRY_COMPRESSED); + this.outerProxy.setFlags(GridFlags.DENSE_CAPACITY, GridFlags.CANNOT_CARRY_COMPRESSED); } @Override diff --git a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java index 93cbbcae57e..dff49650aea 100644 --- a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java +++ b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java @@ -59,9 +59,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock public TileQuantumBridge() { this.getProxy().setValidSides(EnumSet.noneOf(ForgeDirection.class)); - if (AEConfig.instance.quantumBridgeBackboneTransfer) - this.getProxy().setFlags(GridFlags.DENSE_CAPACITY, GridFlags.ULTRA_DENSE_CAPACITY); - else this.getProxy().setFlags(GridFlags.DENSE_CAPACITY); + this.getProxy().setFlags(GridFlags.DENSE_CAPACITY); this.getProxy().setIdlePowerUsage(22); this.internalInventory.setMaxStackSize(1); }