diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java index 25aec37c97..0f52311b88 100644 --- a/core/src/mindustry/ai/BlockIndexer.java +++ b/core/src/mindustry/ai/BlockIndexer.java @@ -220,7 +220,7 @@ public class BlockIndexer{ public void notifyTileDamaged(Building entity){ if(damagedTiles[entity.team.id] == null){ - damagedTiles[entity.team.id] = new ObjectSet(); + damagedTiles[entity.team.id] = new ObjectSet<>(); } damagedTiles[entity.team.id].add(entity); diff --git a/core/src/mindustry/ai/Pathfinder.java b/core/src/mindustry/ai/Pathfinder.java index 21ef56134b..920e28e6ce 100644 --- a/core/src/mindustry/ai/Pathfinder.java +++ b/core/src/mindustry/ai/Pathfinder.java @@ -468,7 +468,7 @@ public class Pathfinder implements Runnable{ /** search frontier, these are Pos objects */ IntQueue frontier = new IntQueue(); /** all target positions; these positions have a cost of 0, and must be synchronized on! */ - IntSeq targets = new IntSeq(); + final IntSeq targets = new IntSeq(); /** current search ID */ int search = 1; /** last updated time */ diff --git a/core/src/mindustry/ai/formations/patterns/ArrowFormation.java b/core/src/mindustry/ai/formations/patterns/ArrowFormation.java deleted file mode 100644 index e3db12d2fe..0000000000 --- a/core/src/mindustry/ai/formations/patterns/ArrowFormation.java +++ /dev/null @@ -1,26 +0,0 @@ -package mindustry.ai.formations.patterns; - -import arc.math.geom.*; -import mindustry.ai.formations.*; - -public class ArrowFormation extends FormationPattern{ - //total triangular numbers - private static final int totalTris = 30; - //triangular number table - private static final int[] triTable = new int[totalTris]; - - //calculat triangular numbers - static{ - int sum = 0; - for(int i = 0; i < totalTris; i++){ - triTable[i] = sum; - sum += (i + 1); - } - } - - @Override - public Vec3 calculateSlotLocation(Vec3 out, int slot){ - //TODO - return out; - } -} diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 971f251820..26366cd5fa 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1701,7 +1701,7 @@ public class Blocks implements ContentList{ trailEffect = Fx.instTrail; despawnEffect = Fx.instBomb; trailSpacing = 20f; - damage = 1300; + damage = 1250; tileDamageMultiplier = 0.5f; speed = brange; hitShake = 6f; diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index 4bb22b7839..64bbd4bc5d 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -191,10 +191,6 @@ public class Control implements ApplicationListener, Loadable{ } - void resetCamera(){ - - } - @Override public void loadAsync(){ Draw.scl = 1f / Core.atlas.find("scale_marker").width; diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java index c4e519a4a5..ae8c7d9a7c 100644 --- a/core/src/mindustry/core/NetClient.java +++ b/core/src/mindustry/core/NetClient.java @@ -105,12 +105,10 @@ public class NetClient implements ApplicationListener{ Time.runTask(3f, ui.loadfrag::hide); if(packet.reason != null){ - if(packet.reason.equals("closed")){ - ui.showSmall("@disconnect", "@disconnect.closed"); - }else if(packet.reason.equals("timeout")){ - ui.showSmall("@disconnect", "@disconnect.timeout"); - }else if(packet.reason.equals("error")){ - ui.showSmall("@disconnect", "@disconnect.error"); + switch(packet.reason){ + case "closed" -> ui.showSmall("@disconnect", "@disconnect.closed"); + case "timeout" -> ui.showSmall("@disconnect", "@disconnect.timeout"); + case "error" -> ui.showSmall("@disconnect", "@disconnect.error"); } }else{ ui.showErrorMessage("@disconnect"); diff --git a/core/src/mindustry/io/JsonIO.java b/core/src/mindustry/io/JsonIO.java index e6ea20cf9e..39c3a1a821 100644 --- a/core/src/mindustry/io/JsonIO.java +++ b/core/src/mindustry/io/JsonIO.java @@ -75,7 +75,7 @@ public class JsonIO{ //TODO this is terrible - json.setSerializer(Sector.class, new Serializer(){ + json.setSerializer(Sector.class, new Serializer<>(){ @Override public void write(Json json, Sector object, Class knownType){ json.writeValue(object.planet.name + "-" + object.id); @@ -88,7 +88,7 @@ public class JsonIO{ } }); - json.setSerializer(SectorPreset.class, new Serializer(){ + json.setSerializer(SectorPreset.class, new Serializer<>(){ @Override public void write(Json json, SectorPreset object, Class knownType){ json.writeValue(object.name); @@ -100,7 +100,7 @@ public class JsonIO{ } }); - json.setSerializer(Liquid.class, new Serializer(){ + json.setSerializer(Liquid.class, new Serializer<>(){ @Override public void write(Json json, Liquid object, Class knownType){ json.writeValue(object.name); @@ -109,12 +109,12 @@ public class JsonIO{ @Override public Liquid read(Json json, JsonValue jsonData, Class type){ if(jsonData.asString() == null) return Liquids.water; - Liquid i = Vars.content.getByName(ContentType.liquid, jsonData.asString()); + Liquid i = Vars.content.getByName(ContentType.liquid, jsonData.asString()); return i == null ? Liquids.water : i; } }); - json.setSerializer(Item.class, new Serializer(){ + json.setSerializer(Item.class, new Serializer<>(){ @Override public void write(Json json, Item object, Class knownType){ json.writeValue(object.name); @@ -123,12 +123,12 @@ public class JsonIO{ @Override public Item read(Json json, JsonValue jsonData, Class type){ if(jsonData.asString() == null) return Items.copper; - Item i = Vars.content.getByName(ContentType.item, jsonData.asString()); + Item i = Vars.content.getByName(ContentType.item, jsonData.asString()); return i == null ? Items.copper : i; } }); - json.setSerializer(Team.class, new Serializer(){ + json.setSerializer(Team.class, new Serializer<>(){ @Override public void write(Json json, Team object, Class knownType){ json.writeValue(object.id); @@ -140,7 +140,7 @@ public class JsonIO{ } }); - json.setSerializer(Block.class, new Serializer(){ + json.setSerializer(Block.class, new Serializer<>(){ @Override public void write(Json json, Block object, Class knownType){ json.writeValue(object.name); @@ -153,7 +153,7 @@ public class JsonIO{ } }); - json.setSerializer(Weather.class, new Serializer(){ + json.setSerializer(Weather.class, new Serializer<>(){ @Override public void write(Json json, Weather object, Class knownType){ json.writeValue(object.name); @@ -165,7 +165,7 @@ public class JsonIO{ } }); - json.setSerializer(ItemStack.class, new Serializer(){ + json.setSerializer(ItemStack.class, new Serializer<>(){ @Override public void write(Json json, ItemStack object, Class knownType){ json.writeObjectStart(); @@ -180,7 +180,7 @@ public class JsonIO{ } }); - json.setSerializer(UnlockableContent.class, new Serializer(){ + json.setSerializer(UnlockableContent.class, new Serializer<>(){ @Override public void write(Json json, UnlockableContent object, Class knownType){ json.writeValue(object.name); diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java index b532151f1c..82bcc02ab3 100644 --- a/core/src/mindustry/logic/LExecutor.java +++ b/core/src/mindustry/logic/LExecutor.java @@ -577,7 +577,7 @@ public class LExecutor{ if(address != -1){ Var va = exec.vars[value]; Var vb = exec.vars[compare]; - boolean cmp = false; + boolean cmp; if(op.objFunction != null && (va.isobj || vb.isobj)){ //use object function if provided, and one of the variables is an object diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java index 6d57f2c079..2ce318f4a7 100644 --- a/core/src/mindustry/logic/LStatements.java +++ b/core/src/mindustry/logic/LStatements.java @@ -155,39 +155,37 @@ public class LStatements{ s.setColor(table.color); switch(type){ - case clear: + case clear -> { fields(s, "r", x, v -> x = v); fields(s, "g", y, v -> y = v); fields(s, "b", p1, v -> p1 = v); - break; - case color: + } + case color -> { fields(s, "r", x, v -> x = v); fields(s, "g", y, v -> y = v); fields(s, "b", p1, v -> p1 = v); row(s); fields(s, "a", p2, v -> p2 = v); - break; - case stroke: + } + case stroke -> { s.add().width(4); fields(s, x, v -> x = v); - break; - case line: + } + case line -> { fields(s, "x", x, v -> x = v); fields(s, "y", y, v -> y = v); row(s); fields(s, "x2", p1, v -> p1 = v); fields(s, "y2", p2, v -> p2 = v); - break; - case rect: - case lineRect: + } + case rect, lineRect -> { fields(s, "x", x, v -> x = v); fields(s, "y", y, v -> y = v); row(s); fields(s, "width", p1, v -> p1 = v); fields(s, "height", p2, v -> p2 = v); - break; - case poly: - case linePoly: + } + case poly, linePoly -> { fields(s, "x", x, v -> x = v); fields(s, "y", y, v -> y = v); row(s); @@ -195,8 +193,8 @@ public class LStatements{ fields(s, "radius", p2, v -> p2 = v); row(s); fields(s, "rotation", p3, v -> p3 = v); - break; - case triangle: + } + case triangle -> { fields(s, "x", x, v -> x = v); fields(s, "y", y, v -> y = v); row(s); @@ -205,7 +203,7 @@ public class LStatements{ row(s); fields(s, "x3", p3, v -> p3 = v); fields(s, "y3", p4, v -> p4 = v); - break; + } } }).expand().left(); } diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index b63a0b17dc..56be89b072 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -37,7 +37,7 @@ public class ContentParser{ private static final boolean ignoreUnknownFields = true; ObjectMap, ContentType> contentTypes = new ObjectMap<>(); - ObjectMap, FieldParser> classParsers = new ObjectMap, FieldParser>(){{ + ObjectMap, FieldParser> classParsers = new ObjectMap<>(){{ put(Effect.class, (type, data) -> field(Fx.class, data)); put(Schematic.class, (type, data) -> { Object result = fieldOpt(Loadouts.class, data); diff --git a/core/src/mindustry/ui/fragments/PlacementFragment.java b/core/src/mindustry/ui/fragments/PlacementFragment.java index c705b34f6b..f854826322 100644 --- a/core/src/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/mindustry/ui/fragments/PlacementFragment.java @@ -124,18 +124,17 @@ public class PlacementFragment extends Fragment{ for(int j = 0; j < blocks.size; j++){ if(blocks.get(j) == currentBlock){ switch(i){ - case 10: //left - j = (j - 1 + blocks.size) % blocks.size; - break; - case 11: //right - j = (j + 1) % blocks.size; - break; - case 12: //up + //left + case 10 -> j = (j - 1 + blocks.size) % blocks.size; + //right + case 11 -> j = (j + 1) % blocks.size; + //up + case 12 -> { j = (j > 3 ? j - 4 : blocks.size - blocks.size % 4 + j); j -= (j < blocks.size ? 0 : 4); - break; - case 13: //down - j = (j < blocks.size - 4 ? j + 4 : j % 4); + } + //down + case 13 -> j = (j < blocks.size - 4 ? j + 4 : j % 4); } input.block = blocks.get(j); selectedBlocks.put(currentCategory, input.block); diff --git a/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java b/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java index 5602ab3052..9adafd1e54 100644 --- a/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java +++ b/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java @@ -7,7 +7,6 @@ import arc.math.geom.*; import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.io.*; -import mindustry.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.entities.*; diff --git a/core/src/mindustry/world/blocks/defense/TractorBeamTurret.java b/core/src/mindustry/world/blocks/defense/TractorBeamTurret.java index 4c500774a4..33dc39d631 100644 --- a/core/src/mindustry/world/blocks/defense/TractorBeamTurret.java +++ b/core/src/mindustry/world/blocks/defense/TractorBeamTurret.java @@ -6,7 +6,6 @@ import arc.math.*; import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.io.*; -import mindustry.*; import mindustry.annotations.Annotations.*; import mindustry.entities.*; import mindustry.gen.*; diff --git a/core/src/mindustry/world/blocks/distribution/MassDriver.java b/core/src/mindustry/world/blocks/distribution/MassDriver.java index fa6529fd72..115d365a88 100644 --- a/core/src/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/mindustry/world/blocks/distribution/MassDriver.java @@ -251,7 +251,7 @@ public class MassDriver extends Block{ data.to = target; int totalUsed = 0; for(int i = 0; i < content.items().size; i++){ - int maxTransfer = Math.min(items.get(content.item(i)), ((MassDriver)tile.block()).itemCapacity - totalUsed); + int maxTransfer = Math.min(items.get(content.item(i)), tile.block().itemCapacity - totalUsed); data.items[i] = maxTransfer; totalUsed += maxTransfer; items.remove(content.item(i), maxTransfer); diff --git a/core/src/mindustry/world/blocks/power/PowerGraph.java b/core/src/mindustry/world/blocks/power/PowerGraph.java index 2d5a4d2918..fdb19dc05c 100644 --- a/core/src/mindustry/world/blocks/power/PowerGraph.java +++ b/core/src/mindustry/world/blocks/power/PowerGraph.java @@ -19,7 +19,7 @@ public class PowerGraph{ private final ObjectSet all = new ObjectSet<>(); private final WindowedMean powerBalance = new WindowedMean(60); - private float lastPowerProduced, lastPowerNeeded, lastUsageFraction, lastPowerStored; + private float lastPowerProduced, lastPowerNeeded, lastPowerStored; private float lastScaledPowerIn, lastScaledPowerOut, lastCapacity; private long lastFrameUpdated = -1; @@ -201,7 +201,7 @@ public class PowerGraph{ tile.power.status = 1f; } - lastPowerNeeded = lastPowerProduced = lastUsageFraction = 1f; + lastPowerNeeded = lastPowerProduced = 1f; return; } @@ -236,12 +236,6 @@ public class PowerGraph{ distributePower(powerNeeded, powerProduced); } - - //overproducing: 10 / 20 = 0.5 - //underproducing: 20 / 10 = 2 -> clamp -> 1.0 - //nothing being produced: 20 / 0 -> 1.0 - //nothing being consumed: 0 / 20 -> 0.0 - lastUsageFraction = Mathf.zero(rawProduced) ? 1f : Mathf.clamp(powerNeeded / rawProduced); } public void addGraph(PowerGraph graph){ diff --git a/core/src/mindustry/world/blocks/units/CommandCenter.java b/core/src/mindustry/world/blocks/units/CommandCenter.java index cbad080647..a8ffa3c3e9 100644 --- a/core/src/mindustry/world/blocks/units/CommandCenter.java +++ b/core/src/mindustry/world/blocks/units/CommandCenter.java @@ -13,7 +13,6 @@ import mindustry.content.*; import mindustry.entities.*; import mindustry.entities.units.*; import mindustry.gen.*; -import mindustry.graphics.*; import mindustry.ui.*; import mindustry.world.*; import mindustry.world.meta.*; diff --git a/core/src/mindustry/world/blocks/units/RepairPoint.java b/core/src/mindustry/world/blocks/units/RepairPoint.java index 6100e5c61f..13cc7b848b 100644 --- a/core/src/mindustry/world/blocks/units/RepairPoint.java +++ b/core/src/mindustry/world/blocks/units/RepairPoint.java @@ -6,7 +6,6 @@ import arc.math.*; import arc.math.geom.*; import arc.struct.*; import arc.util.*; -import mindustry.*; import mindustry.annotations.Annotations.*; import mindustry.entities.*; import mindustry.gen.*;