From 02ef633529f93785bc3ee9f49d620a816680c0a8 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 15 Jan 2021 17:10:38 -0500 Subject: [PATCH] Removed redundant parens --- core/src/mindustry/world/blocks/distribution/Conveyor.java | 2 +- core/src/mindustry/world/blocks/power/ImpactReactor.java | 6 +++--- core/src/mindustry/world/blocks/power/NuclearReactor.java | 2 +- core/src/mindustry/world/blocks/production/Drill.java | 2 +- core/src/mindustry/world/blocks/storage/Unloader.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index f21f4fbad2..7fb01d9be0 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -114,7 +114,7 @@ public class Conveyor extends Block implements Autotiler{ @Override public void draw(){ - int frame = enabled && clogHeat <= 0.5f ? (int)(((Time.time * speed * 8f * timeScale())) % 4) : 0; + int frame = enabled && clogHeat <= 0.5f ? (int)(((Time.time * speed * 8f * timeScale)) % 4) : 0; //draw extra conveyors facing this one for non-square tiling purposes Draw.z(Layer.blockUnder); diff --git a/core/src/mindustry/world/blocks/power/ImpactReactor.java b/core/src/mindustry/world/blocks/power/ImpactReactor.java index da7bcdabc7..22c95a9089 100644 --- a/core/src/mindustry/world/blocks/power/ImpactReactor.java +++ b/core/src/mindustry/world/blocks/power/ImpactReactor.java @@ -45,7 +45,7 @@ public class ImpactReactor extends PowerGenerator{ bars.add("poweroutput", (GeneratorBuild entity) -> new Bar(() -> Core.bundle.format("bar.poweroutput", - Strings.fixed(Math.max(entity.getPowerProduction() - consumes.getPower().usage, 0) * 60 * entity.timeScale(), 1)), + Strings.fixed(Math.max(entity.getPowerProduction() - consumes.getPower().usage, 0) * 60 * entity.timeScale, 1)), () -> Pal.powerBar, () -> entity.productionEfficiency)); } @@ -72,7 +72,7 @@ public class ImpactReactor extends PowerGenerator{ if(consValid() && power.status >= 0.99f){ boolean prevOut = getPowerProduction() <= consumes.getPower().requestedPower(this); - warmup = Mathf.lerpDelta(warmup, 1f, warmupSpeed * timeScale()); + warmup = Mathf.lerpDelta(warmup, 1f, warmupSpeed * timeScale); if(Mathf.equal(warmup, 1f, 0.001f)){ warmup = 1f; } @@ -81,7 +81,7 @@ public class ImpactReactor extends PowerGenerator{ Events.fire(Trigger.impactPower); } - if(timer(timerUse, itemDuration / timeScale())){ + if(timer(timerUse, itemDuration / timeScale)){ consume(); } }else{ diff --git a/core/src/mindustry/world/blocks/power/NuclearReactor.java b/core/src/mindustry/world/blocks/power/NuclearReactor.java index bbde62b3e7..7dd8be9f07 100644 --- a/core/src/mindustry/world/blocks/power/NuclearReactor.java +++ b/core/src/mindustry/world/blocks/power/NuclearReactor.java @@ -81,7 +81,7 @@ public class NuclearReactor extends PowerGenerator{ if(fuel > 0 && enabled){ heat += fullness * heating * Math.min(delta(), 4f); - if(timer(timerFuel, itemDuration / timeScale())){ + if(timer(timerFuel, itemDuration / timeScale)){ consume(); } }else{ diff --git a/core/src/mindustry/world/blocks/production/Drill.java b/core/src/mindustry/world/blocks/production/Drill.java index 6d4e0c8708..373d5bb9de 100644 --- a/core/src/mindustry/world/blocks/production/Drill.java +++ b/core/src/mindustry/world/blocks/production/Drill.java @@ -90,7 +90,7 @@ public class Drill extends Block{ super.setBars(); bars.add("drillspeed", (DrillBuild e) -> - new Bar(() -> Core.bundle.format("bar.drillspeed", Strings.fixed(e.lastDrillSpeed * 60 * e.timeScale(), 2)), () -> Pal.ammo, () -> e.warmup)); + new Bar(() -> Core.bundle.format("bar.drillspeed", Strings.fixed(e.lastDrillSpeed * 60 * e.timeScale, 2)), () -> Pal.ammo, () -> e.warmup)); } public Item getDrop(Tile tile){ diff --git a/core/src/mindustry/world/blocks/storage/Unloader.java b/core/src/mindustry/world/blocks/storage/Unloader.java index e040153828..a2fa940da9 100644 --- a/core/src/mindustry/world/blocks/storage/Unloader.java +++ b/core/src/mindustry/world/blocks/storage/Unloader.java @@ -52,7 +52,7 @@ public class Unloader extends Block{ @Override public void updateTile(){ - if(timer(timerUnload, speed / timeScale())){ + if(timer(timerUnload, speed / timeScale)){ if(rotations == null || rotations.length != proximity.size){ rotations = new int[proximity.size]; }