From 55d7ac82e5a872408deb066f4e81d084a3d871fc Mon Sep 17 00:00:00 2001 From: yueh Date: Sun, 28 Jun 2020 19:19:05 +0200 Subject: [PATCH] Removed no channels pathing. Also use default values for features without a config option --- src/main/java/appeng/core/AEConfig.java | 2 +- src/main/java/appeng/me/cache/PathGridCache.java | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/main/java/appeng/core/AEConfig.java b/src/main/java/appeng/core/AEConfig.java index 09837c5ae..0922e7032 100644 --- a/src/main/java/appeng/core/AEConfig.java +++ b/src/main/java/appeng/core/AEConfig.java @@ -203,7 +203,7 @@ public final class AEConfig { } public boolean isFeatureEnabled(final AEFeature f) { - return this.featureFlags.contains(f); + return (!f.isConfig() && f.isEnabled()) || this.featureFlags.contains(f); } public boolean areFeaturesEnabled(Collection features) { diff --git a/src/main/java/appeng/me/cache/PathGridCache.java b/src/main/java/appeng/me/cache/PathGridCache.java index 10f3840c1..14183479b 100644 --- a/src/main/java/appeng/me/cache/PathGridCache.java +++ b/src/main/java/appeng/me/cache/PathGridCache.java @@ -95,16 +95,7 @@ public class PathGridCache implements IPathingGrid { this.updateNetwork = false; this.setChannelsInUse(0); - if (!AEConfig.instance().isFeatureEnabled(AEFeature.CHANNELS)) { - final int used = this.calculateRequiredChannels(); - - final int nodes = this.myGrid.getNodes().size(); - this.ticksUntilReady = 20 + Math.max(0, nodes / 100 - 20); - this.setChannelsByBlocks(nodes * used); - this.setChannelPowerUsage(this.getChannelsByBlocks() / 128.0); - - this.myGrid.getPivot().beginVisit(new AdHocChannelUpdater(used)); - } else if (this.controllerState == ControllerState.NO_CONTROLLER) { + if (this.controllerState == ControllerState.NO_CONTROLLER) { final int requiredChannels = this.calculateRequiredChannels(); int used = requiredChannels; if (requiredChannels > 8) {