diff --git a/core/src/mindustry/ai/BaseAI.java b/core/src/mindustry/ai/BaseAI.java index 6fa84883e8..768b529759 100644 --- a/core/src/mindustry/ai/BaseAI.java +++ b/core/src/mindustry/ai/BaseAI.java @@ -32,7 +32,6 @@ public class BaseAI{ private static final Seq tmpTiles = new Seq<>(); private static int correct = 0, incorrect = 0; - private static boolean anyDrills; private int lastX, lastY, lastW, lastH; private boolean triedWalls, foundPath; @@ -228,7 +227,7 @@ public class BaseAI{ //make sure at least X% of resource requirements are met correct = incorrect = 0; - anyDrills = false; + boolean anyDrills = false; if(part.required instanceof Item){ for(Stile tile : result.tiles){ diff --git a/core/src/mindustry/logic/LAssembler.java b/core/src/mindustry/logic/LAssembler.java index 662f3ad186..243b2f620f 100644 --- a/core/src/mindustry/logic/LAssembler.java +++ b/core/src/mindustry/logic/LAssembler.java @@ -10,12 +10,8 @@ import mindustry.logic.LExecutor.*; public class LAssembler{ public static ObjectMap> customParsers = new ObjectMap<>(); public static final int maxTokenLength = 36; - private static final int invalidNum = Integer.MIN_VALUE; - private static final StringMap opNameChanges = StringMap.of( - "atan2", "angle", - "dst", "len" - ); + private static final int invalidNum = Integer.MIN_VALUE; private int lastVar; /** Maps names to variable IDs. */ diff --git a/core/src/mindustry/logic/LStatement.java b/core/src/mindustry/logic/LStatement.java index dbcee427ff..638af52074 100644 --- a/core/src/mindustry/logic/LStatement.java +++ b/core/src/mindustry/logic/LStatement.java @@ -51,7 +51,7 @@ public abstract class LStatement{ } protected Cell fields(Table table, String desc, String value, Cons setter){ - table.add(desc).padLeft(10).left().self(this::param);; + table.add(desc).padLeft(10).left().self(this::param); return field(table, value, setter).width(85f).padRight(10).left(); } diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java index 80c7548c87..c93ac23448 100644 --- a/core/src/mindustry/logic/LStatements.java +++ b/core/src/mindustry/logic/LStatements.java @@ -905,7 +905,7 @@ public class LStatements{ void rebuild(Table table){ table.clearChildren(); - table.add(" find ").left().self(this::param);; + table.add(" find ").left().self(this::param); table.button(b -> { b.label(() -> locate.name()); @@ -918,14 +918,14 @@ public class LStatements{ switch(locate){ case building -> { row(table); - table.add(" group ").left().self(this::param);; + table.add(" group ").left().self(this::param); table.button(b -> { b.label(() -> flag.name()); b.clicked(() -> showSelect(b, BlockFlag.allLogic, flag, t -> flag = t, 2, cell -> cell.size(110, 50))); }, Styles.logict, () -> {}).size(110, 40).color(table.color).left().padLeft(2); row(table); - table.add(" enemy ").left().self(this::param);; + table.add(" enemy ").left().self(this::param); fields(table, enemy, str -> enemy = str); diff --git a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java index 504c07dfa3..2459a7b2eb 100644 --- a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java @@ -115,10 +115,6 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ tile.floor = getBlock(position); tile.block = tile.floor.asFloor().wall; - //if(noise.octaveNoise3D(5, 0.6, 8.0, position.x, position.y, position.z) > 0.65){ - //tile.block = Blocks.air; - //} - if(rid.getValue(position.x, position.y, position.z, 22) > 0.32){ tile.block = Blocks.air; }