Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Enable(P2p|QuantumBridge)BackboneTransfer config options #637

Merged
merged 1 commit into from
Dec 29, 2024
Merged

Remove Enable(P2p|QuantumBridge)BackboneTransfer config options #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions src/main/java/appeng/core/AEConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/appeng/parts/p2p/PartP2PTunnelME.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -46,9 +45,7 @@ public class PartP2PTunnelME extends PartP2PTunnelNormal<PartP2PTunnelME> 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
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/appeng/tile/qnb/TileQuantumBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down