diff --git a/gradle.properties b/gradle.properties index 19fe95814..af9b06e35 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ aechannel=stable aebuild=7 aegroup=appeng aebasename=appliedenergistics2 -trousers=omni-fixes-v21b +trousers=omni-fixes-v43 ######################################################### # Versions # diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 289723fe7..7b4ad4b6d 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -621,6 +621,8 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn BlockPos blockPos = this.getLocation().getPos(); Platform.spawnDrops( world, blockPos, dropList ); } + + this.gridProxy.setIdlePowerUsage( Math.pow( 4, ( this.getInstalledUpgrades( Upgrades.PATTERN_EXPANSION ) ) ) ); } @Override diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index 27186f808..0ee2fef79 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -680,11 +680,6 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU } } - if (m instanceof DualityInterface ) - { - sum *= ( Math.pow( 4, ( (DualityInterface) m ).getInstalledUpgrades( Upgrades.PATTERN_EXPANSION ) ) ); - } - // power... if( eg.extractAEPower( sum, Actionable.MODULATE, PowerMultiplier.CONFIG ) < sum - 0.01 ) { diff --git a/src/main/java/appeng/tile/misc/TileInterface.java b/src/main/java/appeng/tile/misc/TileInterface.java index 6a945c307..fcf587082 100644 --- a/src/main/java/appeng/tile/misc/TileInterface.java +++ b/src/main/java/appeng/tile/misc/TileInterface.java @@ -164,6 +164,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II super.onReady(); this.duality.initialize(); + this.getProxy().setIdlePowerUsage( Math.pow( 4, ( this.getInstalledUpgrades( Upgrades.PATTERN_EXPANSION ) ) ) ); } @Override diff --git a/src/main/resources/assets/appliedenergistics2/textures/guis/interface.png b/src/main/resources/assets/appliedenergistics2/textures/guis/interface.png index d9fa10581..b3beba9c4 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/guis/interface.png and b/src/main/resources/assets/appliedenergistics2/textures/guis/interface.png differ