diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index b60e5f4c66..7efb2f9cb5 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -481,7 +481,7 @@ public class Control implements ApplicationListener, Loadable{ @Override public void update(){ - //TODO find out why this happens on Android + //this happens on Android and nobody knows why if(assets == null) return; saves.update(); diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java index ad7806267c..0e51d7f0f9 100644 --- a/core/src/mindustry/core/Renderer.java +++ b/core/src/mindustry/core/Renderer.java @@ -217,8 +217,6 @@ public class Renderer implements ApplicationListener{ pixelator.register(); } - //TODO fx - Draw.draw(Layer.background, this::drawBackground); Draw.draw(Layer.floor, blocks.floor::drawFloor); Draw.draw(Layer.block - 1, blocks::drawShadows); diff --git a/core/src/mindustry/entities/Lightning.java b/core/src/mindustry/entities/Lightning.java index b693239061..738bfa1f1e 100644 --- a/core/src/mindustry/entities/Lightning.java +++ b/core/src/mindustry/entities/Lightning.java @@ -32,8 +32,6 @@ public class Lightning{ createLightningInternal(bullet, lastSeed++, bullet.team, color, damage, x, y, targetAngle, length); } - //TODO remote method - //@Remote(called = Loc.server, unreliable = true) private static void createLightningInternal(Bullet hitter, int seed, Team team, Color color, float damage, float x, float y, float rotation, int length){ random.setSeed(seed); hit.clear(); diff --git a/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java b/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java index e146fd7a54..a862671040 100644 --- a/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java +++ b/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java @@ -58,7 +58,6 @@ public class ContinuousLaserBulletType extends BulletType{ @Override public void update(Bullet b){ - //TODO possible laser absorption from blocks //damage every 5 ticks if(b.timer(1, 5f)){ diff --git a/core/src/mindustry/entities/comp/MinerComp.java b/core/src/mindustry/entities/comp/MinerComp.java index ee2d535160..ae815df3cd 100644 --- a/core/src/mindustry/entities/comp/MinerComp.java +++ b/core/src/mindustry/entities/comp/MinerComp.java @@ -105,7 +105,6 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc, Unitc{ Drawf.laser(team(), Core.atlas.find("minelaser"), Core.atlas.find("minelaser-end"), px, py, ex, ey, 0.75f); - //TODO hack? if(isLocal()){ Lines.stroke(1f, Pal.accent); Lines.poly(mineTile.worldx(), mineTile.worldy(), 4, tilesize / 2f * Mathf.sqrt2, Time.time()); diff --git a/core/src/mindustry/graphics/FloorRenderer.java b/core/src/mindustry/graphics/FloorRenderer.java index 4030125ebb..a3b7ff21c8 100644 --- a/core/src/mindustry/graphics/FloorRenderer.java +++ b/core/src/mindustry/graphics/FloorRenderer.java @@ -17,7 +17,6 @@ import java.util.*; import static mindustry.Vars.*; public class FloorRenderer implements Disposable{ - //TODO find out number with best performance private static final int chunksize = mobile ? 16 : 32; private int[][][] cache; diff --git a/core/src/mindustry/graphics/MenuRenderer.java b/core/src/mindustry/graphics/MenuRenderer.java index 5d036ce4e5..2899efcdba 100644 --- a/core/src/mindustry/graphics/MenuRenderer.java +++ b/core/src/mindustry/graphics/MenuRenderer.java @@ -237,8 +237,6 @@ public class MenuRenderer implements Disposable{ } private void drawFlyers(){ - //TODO fix - if(true) return; Draw.color(0f, 0f, 0f, 0.4f); TextureRegion icon = flyerType.icon(Cicon.full); diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index bf5ce45899..f927bc83d5 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -359,7 +359,6 @@ public class UnitType extends UnlockableContent{ drawPayload((Unit & Payloadc)unit); } - //TODO drawOcclusion(unit); Draw.z(z - outlineSpace); @@ -623,7 +622,6 @@ public class UnitType extends UnlockableContent{ } } - //TODO should be below/above legs if(baseRegion.found()){ Draw.rect(baseRegion, unit.x, unit.y, rotation - 90); } diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index f843156b3e..c16d2f23ec 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -58,7 +58,6 @@ public class HudFragment extends Fragment{ showToast(Icon.warning, "Sector " + e.sector.id + " [scarlet]lost!"); }); - //TODO full implementation Events.on(ResetEvent.class, e -> { coreItems.resetUsed(); coreItems.clear(); diff --git a/core/src/mindustry/ui/fragments/PlayerListFragment.java b/core/src/mindustry/ui/fragments/PlayerListFragment.java index 87ac5d068d..eae9407131 100644 --- a/core/src/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/mindustry/ui/fragments/PlayerListFragment.java @@ -36,7 +36,7 @@ public class PlayerListFragment extends Fragment{ rebuild(); content.pack(); content.act(Core.graphics.getDeltaTime()); - //TODO hack + //hacky Core.scene.act(0f); } }); @@ -115,13 +115,9 @@ public class PlayerListFragment extends Fragment{ t.defaults().size(bs); t.button(Icon.hammer, Styles.clearPartiali, - () -> { - ui.showConfirm("@confirm", Core.bundle.format("confirmban", user.name()), () -> Call.adminRequest(user, AdminAction.ban)); - }); + () -> ui.showConfirm("@confirm", Core.bundle.format("confirmban", user.name()), () -> Call.adminRequest(user, AdminAction.ban))); t.button(Icon.cancel, Styles.clearPartiali, - () -> { - ui.showConfirm("@confirm", Core.bundle.format("confirmkick", user.name()), () -> Call.adminRequest(user, AdminAction.kick)); - }); + () -> ui.showConfirm("@confirm", Core.bundle.format("confirmkick", user.name()), () -> Call.adminRequest(user, AdminAction.kick))); t.row(); diff --git a/core/src/mindustry/world/blocks/Autotiler.java b/core/src/mindustry/world/blocks/Autotiler.java index 4e8748db2a..70f3545088 100644 --- a/core/src/mindustry/world/blocks/Autotiler.java +++ b/core/src/mindustry/world/blocks/Autotiler.java @@ -11,7 +11,6 @@ import mindustry.world.*; import java.util.*; -//TODO documentation public interface Autotiler{ /** @@ -109,7 +108,6 @@ public interface Autotiler{ blendresult[0] = 0; blendresult[1] = blendresult[2] = 1; - // TODO code refactoring maybe? int num = (blends(tile, rotation, directional, 2, world) && blends(tile, rotation, directional, 1, world) && blends(tile, rotation, directional, 3, world)) ? 0 : (blends(tile, rotation, directional, 1, world) && blends(tile, rotation, directional, 3, world)) ? 1 : diff --git a/gradle.properties b/gradle.properties index 34baa3a963..dc34a60b45 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=8278e148026dab6b5f74ded2ed2be76a22418c76 +archash=3cbc03589380d6686354b26ebe6a88541576551d