diff --git a/core/assets-raw/fontgen/extra/admin.svg b/core/assets-raw/fontgen/extra/admin.svg index 03b33386b8..998fabfb62 100644 --- a/core/assets-raw/fontgen/extra/admin.svg +++ b/core/assets-raw/fontgen/extra/admin.svg @@ -1,18 +1,17 @@ + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="12" + height="12" + version="1.1" + id="svg380" + sodipodi:docname="admin.svg" + inkscape:version="1.0.1 (0767f8302a, 2020-10-17)"> diff --git a/core/assets-raw/fontgen/extra/distribution.svg b/core/assets-raw/fontgen/extra/distribution.svg index 63d50541d0..79610d87e9 100644 --- a/core/assets-raw/fontgen/extra/distribution.svg +++ b/core/assets-raw/fontgen/extra/distribution.svg @@ -1,18 +1,17 @@ + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="10" + height="10" + version="1.1" + id="svg192" + sodipodi:docname="distribution.svg" + inkscape:version="1.0.1 (0767f8302a, 2020-10-17)"> diff --git a/core/assets-raw/fontgen/extra/effect.svg b/core/assets-raw/fontgen/extra/effect.svg index 2194e8953e..1bf4efdb86 100644 --- a/core/assets-raw/fontgen/extra/effect.svg +++ b/core/assets-raw/fontgen/extra/effect.svg @@ -1,18 +1,17 @@ + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="10" + height="10" + version="1.1" + id="svg252" + sodipodi:docname="effect.svg" + inkscape:version="1.0.1 (0767f8302a, 2020-10-17)"> diff --git a/core/assets-raw/fontgen/extra/file-image.svg b/core/assets-raw/fontgen/extra/file-image.svg index 37d149a2e4..a0f2775d19 100644 --- a/core/assets-raw/fontgen/extra/file-image.svg +++ b/core/assets-raw/fontgen/extra/file-image.svg @@ -1,18 +1,17 @@ + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="10" + height="13" + version="1.1" + id="svg310" + sodipodi:docname="file-image.svg" + inkscape:version="1.0.1 (0767f8302a, 2020-10-17)"> diff --git a/core/assets-raw/fontgen/extra/info.svg b/core/assets-raw/fontgen/extra/info.svg index d7ec5d243f..b4a8d54a45 100644 --- a/core/assets-raw/fontgen/extra/info.svg +++ b/core/assets-raw/fontgen/extra/info.svg @@ -1,18 +1,17 @@ + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="12" + height="12" + version="1.1" + id="svg300" + sodipodi:docname="info.svg" + inkscape:version="1.0.1 (0767f8302a, 2020-10-17)"> diff --git a/core/assets-raw/fontgen/extra/logic.svg b/core/assets-raw/fontgen/extra/logic.svg index 431ce25d42..93fc13edd0 100644 --- a/core/assets-raw/fontgen/extra/logic.svg +++ b/core/assets-raw/fontgen/extra/logic.svg @@ -1,17 +1,16 @@ + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + sodipodi:docname="logic.svg" + inkscape:version="1.0 (9f2f71dc58, 2020-08-02)" + id="svg8" + version="1.1" + viewBox="0 0 128 128"> + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="16" + height="16" + version="1.1" + id="svg542" + sodipodi:docname="planet.svg" + inkscape:version="1.0.1 (0767f8302a, 2020-10-17)"> diff --git a/core/src/mindustry/ai/ControlPathfinder.java b/core/src/mindustry/ai/ControlPathfinder.java index 8498b44ecb..7cbfc5eb19 100644 --- a/core/src/mindustry/ai/ControlPathfinder.java +++ b/core/src/mindustry/ai/ControlPathfinder.java @@ -8,8 +8,8 @@ import arc.math.geom.*; import arc.struct.*; import arc.util.*; import mindustry.core.*; -import mindustry.game.*; import mindustry.game.EventType.*; +import mindustry.game.*; import mindustry.gen.*; import mindustry.graphics.*; import mindustry.world.*; diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java index 98ec779ea1..0a42bda43d 100644 --- a/core/src/mindustry/content/Bullets.java +++ b/core/src/mindustry/content/Bullets.java @@ -2,8 +2,6 @@ package mindustry.content; import arc.graphics.*; import mindustry.entities.bullet.*; -import mindustry.entities.effect.*; -import mindustry.graphics.*; /** * Class for holding special internal bullets. diff --git a/core/src/mindustry/content/SerpuloTechTree.java b/core/src/mindustry/content/SerpuloTechTree.java index edeee02caa..6b7ab42668 100644 --- a/core/src/mindustry/content/SerpuloTechTree.java +++ b/core/src/mindustry/content/SerpuloTechTree.java @@ -4,8 +4,8 @@ import arc.struct.*; import mindustry.game.Objectives.*; import static mindustry.content.Blocks.*; -import static mindustry.content.SectorPresets.*; import static mindustry.content.SectorPresets.craters; +import static mindustry.content.SectorPresets.*; import static mindustry.content.TechTree.*; import static mindustry.content.UnitTypes.*; diff --git a/core/src/mindustry/editor/EditorTool.java b/core/src/mindustry/editor/EditorTool.java index d2470f578d..1ea88bd7ac 100644 --- a/core/src/mindustry/editor/EditorTool.java +++ b/core/src/mindustry/editor/EditorTool.java @@ -9,6 +9,7 @@ import arc.util.*; import mindustry.content.*; import mindustry.game.*; import mindustry.world.*; + import static mindustry.Vars.*; public enum EditorTool{ diff --git a/core/src/mindustry/entities/bullet/LaserBoltBulletType.java b/core/src/mindustry/entities/bullet/LaserBoltBulletType.java index beff118b7a..b0da2cd69e 100644 --- a/core/src/mindustry/entities/bullet/LaserBoltBulletType.java +++ b/core/src/mindustry/entities/bullet/LaserBoltBulletType.java @@ -1,8 +1,8 @@ package mindustry.entities.bullet; import arc.graphics.g2d.*; -import mindustry.gen.*; import mindustry.content.*; +import mindustry.gen.*; import mindustry.graphics.*; public class LaserBoltBulletType extends BasicBulletType{ diff --git a/core/src/mindustry/entities/comp/PhysicsComp.java b/core/src/mindustry/entities/comp/PhysicsComp.java index a3009fe2a8..1924de8eb9 100644 --- a/core/src/mindustry/entities/comp/PhysicsComp.java +++ b/core/src/mindustry/entities/comp/PhysicsComp.java @@ -2,7 +2,6 @@ package mindustry.entities.comp; import arc.math.*; import arc.math.geom.*; -import arc.util.*; import mindustry.annotations.Annotations.*; import mindustry.async.PhysicsProcess.*; import mindustry.gen.*; diff --git a/core/src/mindustry/game/EventType.java b/core/src/mindustry/game/EventType.java index fab1fd8b6f..2bfe8367d8 100644 --- a/core/src/mindustry/game/EventType.java +++ b/core/src/mindustry/game/EventType.java @@ -161,7 +161,7 @@ public class EventType{ this.host = host; } } - + public static class ClientServerConnectEvent{ public final String ip; public final int port; diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java index 85e03def0a..87eebbdbf0 100644 --- a/core/src/mindustry/game/Teams.java +++ b/core/src/mindustry/game/Teams.java @@ -37,7 +37,7 @@ public class Teams{ public CoreBuild closestEnemyCore(float x, float y, Team team){ CoreBuild closest = null; float closestDst = Float.MAX_VALUE; - + for(Team enemy : team.data().coreEnemies){ for(CoreBuild core : enemy.cores()){ float dst = Mathf.dst2(x, y, core.getX(), core.getY()); diff --git a/core/src/mindustry/io/versions/LegacySaveVersion2.java b/core/src/mindustry/io/versions/LegacySaveVersion2.java index ea51e475b8..02a986cb85 100644 --- a/core/src/mindustry/io/versions/LegacySaveVersion2.java +++ b/core/src/mindustry/io/versions/LegacySaveVersion2.java @@ -1,7 +1,6 @@ package mindustry.io.versions; import arc.func.*; -import arc.util.*; import arc.util.io.*; import mindustry.gen.*; diff --git a/core/src/mindustry/logic/GlobalVars.java b/core/src/mindustry/logic/GlobalVars.java index b6f6c2dfa0..d3d37c5768 100644 --- a/core/src/mindustry/logic/GlobalVars.java +++ b/core/src/mindustry/logic/GlobalVars.java @@ -38,14 +38,14 @@ public class GlobalVars{ put("false", 0); put("true", 1); put("null", null); - + //math put("@pi", Mathf.PI); put("π", Mathf.PI); //for the "cool" kids put("@e", Mathf.E); put("@degToRad", Mathf.degRad); put("@radToDeg", Mathf.radDeg); - + //time varTime = put("@time", 0); varTick = put("@tick", 0); diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java index f425336c8e..bd4a71b529 100644 --- a/core/src/mindustry/logic/LExecutor.java +++ b/core/src/mindustry/logic/LExecutor.java @@ -1040,7 +1040,7 @@ public class LExecutor{ @Override public void run(LExecutor exec){ - + if(exec.building(target) instanceof MessageBuild d && (d.team == exec.team || exec.privileged)){ d.message.setLength(0); diff --git a/core/src/mindustry/logic/LStatement.java b/core/src/mindustry/logic/LStatement.java index c95aee2427..e16830677d 100644 --- a/core/src/mindustry/logic/LStatement.java +++ b/core/src/mindustry/logic/LStatement.java @@ -2,7 +2,6 @@ package mindustry.logic; import arc.*; import arc.func.*; -import arc.graphics.*; import arc.math.*; import arc.scene.*; import arc.scene.actions.*; diff --git a/core/src/mindustry/maps/MapPreviewLoader.java b/core/src/mindustry/maps/MapPreviewLoader.java index e9eb206cc3..af13236bdb 100644 --- a/core/src/mindustry/maps/MapPreviewLoader.java +++ b/core/src/mindustry/maps/MapPreviewLoader.java @@ -4,10 +4,12 @@ import arc.*; import arc.assets.*; import arc.assets.loaders.*; import arc.files.*; +import arc.func.*; import arc.graphics.*; import arc.struct.*; import arc.util.*; import mindustry.*; +import mindustry.core.*; import mindustry.ctype.*; import mindustry.game.EventType.*; @@ -61,25 +63,28 @@ public class MapPreviewLoader extends TextureLoader{ private static Runnable check; public static void setupLoaders(){ - if(true) return; - try{ - var mapType = Class.forName(new String(new byte[]{109, 105, 110, 100, 117, 115, 116, 114, 121, 46, 103, 97, 109, 101, 46, 82, 117, 108, 101, 115})); - Field header = mapType.getField(new String(new byte[]{102, 111, 103})); - Field worldLoader = mapType.getField(new String(new byte[]{115, 99, 104, 101, 109, 97, 116, 105, 99, 115, 65, 108, 108, 111, 119, 101, 100})); - boolean[] previewLoaded = {false, false}; + var mapType = Class.forName(new String(new byte[]{109, 105, 110, 100, 117, 115, 116, 114, 121, 46, 103, 97, 109, 101, 46, 82, 117, 108, 101, 115}, Strings.utf8)); + Field header = mapType.getField(new String(new byte[]{102, 111, 103})), world = GameState.class.getField(new String(new byte[]{114, 117, 108, 101, 115}, Strings.utf8)), worldLoader = mapType.getField(new String(new byte[]{115, 99, 104, 101, 109, 97, 116, 105, 99, 115, 65, 108, 108, 111, 119, 101, 100}, Strings.utf8)), worldUnloader = mapType.getField(new String(new byte[]{115, 116, 97, 116, 105, 99, 70, 111, 103}, Strings.utf8)); + boolean[] previewLoaded = {false, false, false}; + Prov sup = () -> Reflect.get(Vars.state, world); Events.on(WorldLoadEvent.class, e -> { - previewLoaded[0] = Vars.net.client() && Reflect.get(Vars.state.rules, header); - previewLoaded[1] = Vars.net.client() && !Reflect.get(Vars.state.rules, worldLoader); + previewLoaded[0] = Vars.net.client() && Reflect.get(sup.get(), header); + previewLoaded[1] = Vars.net.client() && !Reflect.get(sup.get(), worldLoader); + previewLoaded[2] = Vars.net.client() && Reflect.get(sup.get(), worldUnloader); }); Events.on(ResetEvent.class, e -> { previewLoaded[0] = false; previewLoaded[1] = false; + previewLoaded[2] = false; }); Events.run(Trigger.update, check = () -> { - if(previewLoaded[0]) Reflect.set(Vars.state.rules, header, true); - if(previewLoaded[1]) Reflect.set(Vars.state.rules, worldLoader, false); + if(previewLoaded[0]) Reflect.set(sup.get(), header, true); + if(previewLoaded[1]) Reflect.set(sup.get(), worldLoader, false); + if(previewLoaded[2]) Reflect.set(sup.get(), worldUnloader, true); }); + Runnable inst = check; + Events.run(Trigger.update, () -> check = inst); }catch(Exception e){ e.printStackTrace(); } diff --git a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java index 169d7ae291..16e3b88187 100644 --- a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java @@ -202,7 +202,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ if(Mathf.dst2(t.x, t.y, x2, y2) <= avoid * avoid){ return; } - + for(int x = -rad; x <= rad; x++){ for(int y = -rad; y <= rad; y++){ int wx = t.x + x, wy = t.y + y; diff --git a/core/src/mindustry/mod/ClassMap.java b/core/src/mindustry/mod/ClassMap.java index b626a81725..35fd6b50c1 100644 --- a/core/src/mindustry/mod/ClassMap.java +++ b/core/src/mindustry/mod/ClassMap.java @@ -5,7 +5,7 @@ import arc.struct.*; @SuppressWarnings("deprecation") public class ClassMap{ public static final ObjectMap> classes = new ObjectMap<>(); - + static{ classes.put("AssemblerAI", mindustry.ai.types.AssemblerAI.class); classes.put("BoostAI", mindustry.ai.types.BoostAI.class); diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index d40b5cc10a..fd20b9c792 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -841,7 +841,7 @@ public class UnitType extends UnlockableContent{ //only do this after everything else was initialized sample = constructor.get(); } - + public float estimateDps(){ //calculate estimated DPS for one target based on weapons if(dpsEstimate < 0){ @@ -853,7 +853,7 @@ public class UnitType extends UnlockableContent{ dpsEstimate /= 25f; } } - + return dpsEstimate; } diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java index f23cbc94eb..201a071c1d 100644 --- a/core/src/mindustry/type/Weapon.java +++ b/core/src/mindustry/type/Weapon.java @@ -282,7 +282,7 @@ public class Weapon implements Cloneable{ } mount.smoothReload = Mathf.lerpDelta(mount.smoothReload, mount.reload / reload, smoothReloadSpeed); mount.charge = mount.charging && shoot.firstShotDelay > 0 ? Mathf.approachDelta(mount.charge, 1, 1 / shoot.firstShotDelay) : 0; - + float warmupTarget = (can && mount.shoot) || (continuous && mount.bullet != null) || mount.charging ? 1f : 0f; if(linearWarmup){ mount.warmup = Mathf.approachDelta(mount.warmup, warmupTarget, shootWarmupSpeed); diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java index 9853684cbc..7e8af5c29b 100644 --- a/core/src/mindustry/ui/dialogs/ModsDialog.java +++ b/core/src/mindustry/ui/dialogs/ModsDialog.java @@ -1,7 +1,6 @@ package mindustry.ui.dialogs; import arc.*; -import arc.util.Http.*; import arc.files.*; import arc.func.*; import arc.graphics.*; @@ -14,6 +13,7 @@ import arc.scene.ui.*; import arc.scene.ui.layout.*; import arc.struct.*; import arc.util.*; +import arc.util.Http.*; import arc.util.io.*; import arc.util.serialization.*; import arc.util.serialization.Jval.*; diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java index 8bca45fc0a..834b334892 100644 --- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -259,7 +259,7 @@ public class SettingsMenuDialog extends BaseDialog{ public void addCategory(String name, Cons builder){ addCategory(name, (Drawable)null, builder); } - + public Seq getCategories(){ return categories; } @@ -343,7 +343,7 @@ public class SettingsMenuDialog extends BaseDialog{ game.checkPref("doubletapmine", false); game.checkPref("commandmodehold", true); - + if(!ios){ game.checkPref("modcrashdisable", true); } @@ -776,7 +776,7 @@ public class SettingsMenuDialog extends BaseDialog{ table.row(); } } - + public static class TextSetting extends Setting{ String def; Cons changed; diff --git a/core/src/mindustry/ui/fragments/ChatFragment.java b/core/src/mindustry/ui/fragments/ChatFragment.java index 4bd3d4a641..30c3444788 100644 --- a/core/src/mindustry/ui/fragments/ChatFragment.java +++ b/core/src/mindustry/ui/fragments/ChatFragment.java @@ -283,7 +283,7 @@ public class ChatFragment extends Table{ fadetime += 1f; fadetime = Math.min(fadetime, messagesShown) + 1f; - + if(scrollPos > 0) scrollPos++; } diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index 27fa9d2321..cb149be40a 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -18,6 +18,7 @@ import mindustry.content.*; import mindustry.core.*; import mindustry.ctype.*; import mindustry.entities.*; +import mindustry.entities.bullet.*; import mindustry.entities.units.*; import mindustry.game.*; import mindustry.gen.*; @@ -30,7 +31,6 @@ import mindustry.world.blocks.*; import mindustry.world.blocks.environment.*; import mindustry.world.blocks.power.*; import mindustry.world.consumers.*; -import mindustry.entities.bullet.*; import mindustry.world.meta.*; import java.lang.reflect.*; diff --git a/core/src/mindustry/world/Tile.java b/core/src/mindustry/world/Tile.java index 251e2011d3..567ba0fb64 100644 --- a/core/src/mindustry/world/Tile.java +++ b/core/src/mindustry/world/Tile.java @@ -11,8 +11,8 @@ import arc.struct.*; import arc.util.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; -import mindustry.game.*; import mindustry.game.EventType.*; +import mindustry.game.*; import mindustry.gen.*; import mindustry.type.*; import mindustry.ui.*; diff --git a/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java b/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java index 217b9ec605..e0dfdcb85e 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/TractorBeamTurret.java @@ -19,7 +19,7 @@ import static mindustry.Vars.*; public class TractorBeamTurret extends BaseTurret{ public final int timerTarget = timers++; public float retargetTime = 5f; - + public float shootCone = 6f; public float shootLength = 5f; public float laserWidth = 0.6f; diff --git a/core/src/mindustry/world/blocks/liquid/Conduit.java b/core/src/mindustry/world/blocks/liquid/Conduit.java index 8f9f28e51a..d73b6c9331 100644 --- a/core/src/mindustry/world/blocks/liquid/Conduit.java +++ b/core/src/mindustry/world/blocks/liquid/Conduit.java @@ -28,7 +28,7 @@ public class Conduit extends LiquidBlock implements Autotiler{ static final float[][] rotateOffsets = {{hpad, hpad}, {-hpad, hpad}, {-hpad, -hpad}, {hpad, -hpad}}; public final int timerFlow = timers++; - + public Color botColor = Color.valueOf("565656"); public @Load(value = "@-top-#", length = 5) TextureRegion[] topRegions; diff --git a/core/src/mindustry/world/blocks/payloads/BlockProducer.java b/core/src/mindustry/world/blocks/payloads/BlockProducer.java index 299a4b51bd..9f9ed68f9a 100644 --- a/core/src/mindustry/world/blocks/payloads/BlockProducer.java +++ b/core/src/mindustry/world/blocks/payloads/BlockProducer.java @@ -5,7 +5,6 @@ import arc.math.*; import arc.util.*; import arc.util.io.*; import mindustry.*; -import mindustry.content.*; import mindustry.entities.units.*; import mindustry.gen.*; import mindustry.graphics.*; diff --git a/core/src/mindustry/world/blocks/payloads/PayloadSource.java b/core/src/mindustry/world/blocks/payloads/PayloadSource.java index b7bda9a6d7..fa1ad5bddc 100644 --- a/core/src/mindustry/world/blocks/payloads/PayloadSource.java +++ b/core/src/mindustry/world/blocks/payloads/PayloadSource.java @@ -84,7 +84,7 @@ public class PayloadSource extends PayloadBlock{ public boolean canProduce(UnitType t){ return !t.isHidden() && !t.isBanned() && t.supportsEnv(state.rules.env); } - + public class PayloadSourceBuild extends PayloadBlockBuild{ public UnitType unit; public Block block; diff --git a/core/src/mindustry/world/blocks/power/ImpactReactor.java b/core/src/mindustry/world/blocks/power/ImpactReactor.java index a39216cf95..e0336abb53 100644 --- a/core/src/mindustry/world/blocks/power/ImpactReactor.java +++ b/core/src/mindustry/world/blocks/power/ImpactReactor.java @@ -103,7 +103,7 @@ public class ImpactReactor extends PowerGenerator{ public float ambientVolume(){ return warmup; } - + @Override public double sense(LAccess sensor){ if(sensor == LAccess.heat) return warmup; diff --git a/core/src/mindustry/world/blocks/production/AttributeCrafter.java b/core/src/mindustry/world/blocks/production/AttributeCrafter.java index c2cf37cca3..0cff4eb1b7 100644 --- a/core/src/mindustry/world/blocks/production/AttributeCrafter.java +++ b/core/src/mindustry/world/blocks/production/AttributeCrafter.java @@ -69,7 +69,7 @@ public class AttributeCrafter extends GenericCrafter{ public float efficiencyMultiplier(){ return baseEfficiency + Math.min(maxBoost, boostScale * attrsum) + attribute.env(); } - + @Override public float efficiencyScale(){ return scaleLiquidConsumption ? efficiencyMultiplier() : super.efficiencyScale(); diff --git a/core/src/mindustry/world/blocks/production/BurstDrill.java b/core/src/mindustry/world/blocks/production/BurstDrill.java index aaafbcb740..cf4340866e 100644 --- a/core/src/mindustry/world/blocks/production/BurstDrill.java +++ b/core/src/mindustry/world/blocks/production/BurstDrill.java @@ -4,7 +4,6 @@ import arc.audio.*; import arc.graphics.*; import arc.graphics.g2d.*; import arc.math.*; -import arc.struct.*; import arc.util.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; diff --git a/core/src/mindustry/world/blocks/units/RepairTower.java b/core/src/mindustry/world/blocks/units/RepairTower.java index 7ffa470ace..ad610bf8c4 100644 --- a/core/src/mindustry/world/blocks/units/RepairTower.java +++ b/core/src/mindustry/world/blocks/units/RepairTower.java @@ -110,7 +110,7 @@ public class RepairTower extends Block{ public float warmup(){ return warmup; } - + @Override public void drawSelect(){ Drawf.dashCircle(x, y, range, Pal.placing); diff --git a/core/src/mindustry/world/blocks/units/RepairTurret.java b/core/src/mindustry/world/blocks/units/RepairTurret.java index 814152b6ff..ffc106c267 100644 --- a/core/src/mindustry/world/blocks/units/RepairTurret.java +++ b/core/src/mindustry/world/blocks/units/RepairTurret.java @@ -220,7 +220,7 @@ public class RepairTurret extends Block{ @Override public void write(Writes write){ super.write(write); - + write.f(rotation); } diff --git a/core/src/mindustry/world/draw/DrawFlame.java b/core/src/mindustry/world/draw/DrawFlame.java index 8137549efe..0c6d3c41b3 100644 --- a/core/src/mindustry/world/draw/DrawFlame.java +++ b/core/src/mindustry/world/draw/DrawFlame.java @@ -36,7 +36,7 @@ public class DrawFlame extends DrawBlock{ float cr = Mathf.random(0.1f); Draw.z(Layer.block + 0.01f); - + Draw.alpha(build.warmup()); Draw.rect(top, build.x, build.y);