From 8ac0949ddf3ae076c5549de90c2f10908cef274c Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 25 Dec 2019 14:38:43 -0500 Subject: [PATCH 01/78] Added default liquid turret liquid display --- core/src/mindustry/content/Blocks.java | 9 --------- .../blocks/defense/turrets/LiquidTurret.java | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 600220abc9..8fe9cdb52f 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1388,15 +1388,6 @@ public class Blocks implements ContentList{ range = 110f; health = 250 * size * size; shootSound = Sounds.splash; - - drawer = (tile, entity) -> { - Draw.rect(region, tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); - - Draw.color(entity.liquids.current().color); - Draw.alpha(entity.liquids.total() / liquidCapacity); - Draw.rect(name + "-liquid", tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); - Draw.color(); - }; }}; lancer = new ChargeTurret("lancer"){{ diff --git a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java index caafd51d2f..42336ea1d9 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java @@ -1,5 +1,7 @@ package mindustry.world.blocks.defense.turrets; +import arc.*; +import arc.graphics.g2d.*; import arc.struct.*; import mindustry.entities.*; import mindustry.entities.bullet.*; @@ -16,11 +18,13 @@ import static mindustry.Vars.*; public class LiquidTurret extends Turret{ public ObjectMap ammo = new ObjectMap<>(); + public int liquidRegion; public LiquidTurret(String name){ super(name); hasLiquids = true; activeSound = Sounds.spray; + liquidRegion = reg("-liquid"); } /** Initializes accepted ammo map. Format: [liquid1, bullet1, liquid2, bullet2...] */ @@ -28,6 +32,19 @@ public class LiquidTurret extends Turret{ ammo = OrderedMap.of(objects); } + @Override + public void drawLayer(Tile tile){ + super.drawLayer(tile); + TurretEntity entity = tile.ent(); + + if(Core.atlas.isFound(reg(liquidRegion))){ + Draw.color(entity.liquids.current().color); + Draw.alpha(entity.liquids.total() / liquidCapacity); + Draw.rect(reg(liquidRegion), tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); + Draw.color(); + } + } + @Override public void setStats(){ super.setStats(); From 9016c12d16f1820d00fe0c4182057feea3bdf534 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 25 Dec 2019 19:07:04 -0500 Subject: [PATCH 02/78] Made team a separate class --- core/src/mindustry/Vars.java | 2 +- core/src/mindustry/ai/BlockIndexer.java | 24 ++++++------- core/src/mindustry/ai/Pathfinder.java | 14 ++++---- core/src/mindustry/core/GameState.java | 4 +-- core/src/mindustry/core/Logic.java | 2 +- core/src/mindustry/core/Renderer.java | 8 ++--- core/src/mindustry/editor/EditorTile.java | 2 +- core/src/mindustry/editor/EditorTool.java | 2 +- .../mindustry/editor/MapGenerateDialog.java | 2 +- core/src/mindustry/entities/Damage.java | 2 +- core/src/mindustry/entities/Units.java | 10 +++--- .../src/mindustry/entities/type/BaseUnit.java | 2 +- core/src/mindustry/entities/type/Unit.java | 4 +-- .../entities/type/base/BuilderDrone.java | 2 +- core/src/mindustry/game/Gamemode.java | 2 +- core/src/mindustry/game/Team.java | 34 ++++++++++++------- core/src/mindustry/game/Teams.java | 25 +++++--------- core/src/mindustry/io/MapIO.java | 2 +- core/src/mindustry/io/SaveVersion.java | 2 +- core/src/mindustry/io/TypeIO.java | 4 +-- .../mindustry/ui/fragments/HudFragment.java | 2 +- core/src/mindustry/world/Tile.java | 4 +-- .../world/blocks/units/CommandCenter.java | 4 +-- .../src/mindustry/desktop/steam/SStats.java | 6 ++-- .../src/mindustry/server/ServerControl.java | 2 +- tests/src/test/java/ApplicationTests.java | 4 +-- 26 files changed, 86 insertions(+), 85 deletions(-) diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index 3d034b1d6f..502c78887d 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -242,7 +242,7 @@ public class Vars implements Loadable{ unitGroups = new EntityGroup[Team.all.length]; for(Team team : Team.all){ - unitGroups[team.ordinal()] = entities.add(BaseUnit.class).enableMapping(); + unitGroups[(int) team.id] = entities.add(BaseUnit.class).enableMapping(); } for(EntityGroup group : entities.all()){ diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java index e64ad48064..311e7887a7 100644 --- a/core/src/mindustry/ai/BlockIndexer.java +++ b/core/src/mindustry/ai/BlockIndexer.java @@ -103,7 +103,7 @@ public class BlockIndexer{ } private ObjectSet[] getFlagged(Team team){ - return flagMap[team.ordinal()]; + return flagMap[(int) team.id]; } /** @return whether this item is present on this map.*/ @@ -115,11 +115,11 @@ public class BlockIndexer{ public ObjectSet getDamaged(Team team){ returnArray.clear(); - if(damagedTiles[team.ordinal()] == null){ - damagedTiles[team.ordinal()] = new ObjectSet<>(); + if(damagedTiles[(int) team.id] == null){ + damagedTiles[(int) team.id] = new ObjectSet<>(); } - ObjectSet set = damagedTiles[team.ordinal()]; + ObjectSet set = damagedTiles[(int) team.id]; for(Tile tile : set){ if((tile.entity == null || tile.entity.getTeam() != team || !tile.entity.damaged()) || tile.block() instanceof BuildBlock){ returnArray.add(tile); @@ -135,7 +135,7 @@ public class BlockIndexer{ /** Get all allied blocks with a flag. */ public ObjectSet getAllied(Team team, BlockFlag type){ - return flagMap[team.ordinal()][type.ordinal()]; + return flagMap[(int) team.id][type.ordinal()]; } /** Get all enemy blocks with a flag. */ @@ -155,11 +155,11 @@ public class BlockIndexer{ } public void notifyTileDamaged(TileEntity entity){ - if(damagedTiles[entity.getTeam().ordinal()] == null){ - damagedTiles[entity.getTeam().ordinal()] = new ObjectSet<>(); + if(damagedTiles[(int) entity.getTeam().id] == null){ + damagedTiles[(int) entity.getTeam().id] = new ObjectSet<>(); } - ObjectSet set = damagedTiles[entity.getTeam().ordinal()]; + ObjectSet set = damagedTiles[(int) entity.getTeam().id]; set.add(entity.tile); } @@ -287,11 +287,11 @@ public class BlockIndexer{ //fast-set this quadrant to 'occupied' if the tile just placed is already of this team if(tile.getTeam() == data.team && tile.entity != null && tile.block().targetable){ - structQuadrants[data.team.ordinal()].set(quadrantX, quadrantY); + structQuadrants[(int) data.team.id].set(quadrantX, quadrantY); continue; //no need to process futher } - structQuadrants[data.team.ordinal()].set(quadrantX, quadrantY, false); + structQuadrants[(int) data.team.id].set(quadrantX, quadrantY, false); outer: for(int x = quadrantX * quadrantSize; x < world.width() && x < (quadrantX + 1) * quadrantSize; x++){ @@ -299,7 +299,7 @@ public class BlockIndexer{ Tile result = world.ltile(x, y); //when a targetable block is found, mark this quadrant as occupied and stop searching if(result.entity != null && result.getTeam() == data.team){ - structQuadrants[data.team.ordinal()].set(quadrantX, quadrantY); + structQuadrants[(int) data.team.id].set(quadrantX, quadrantY); break outer; } } @@ -308,7 +308,7 @@ public class BlockIndexer{ } private boolean getQuad(Team team, int quadrantX, int quadrantY){ - return structQuadrants[team.ordinal()].get(quadrantX, quadrantY); + return structQuadrants[(int) team.id].get(quadrantX, quadrantY); } private int quadWidth(){ diff --git a/core/src/mindustry/ai/Pathfinder.java b/core/src/mindustry/ai/Pathfinder.java index 4e1212ea6a..9464111cab 100644 --- a/core/src/mindustry/ai/Pathfinder.java +++ b/core/src/mindustry/ai/Pathfinder.java @@ -84,8 +84,8 @@ public class Pathfinder implements Runnable{ } public int debugValue(Team team, int x, int y){ - if(pathMap[team.ordinal()][PathTarget.enemyCores.ordinal()] == null) return 0; - return pathMap[team.ordinal()][PathTarget.enemyCores.ordinal()].weights[x][y]; + if(pathMap[(int) team.id][PathTarget.enemyCores.ordinal()] == null) return 0; + return pathMap[(int) team.id][PathTarget.enemyCores.ordinal()].weights[x][y]; } /** Update a tile in the internal pathfinding grid. Causes a complete pathfinding reclaculation. */ @@ -149,12 +149,12 @@ public class Pathfinder implements Runnable{ public Tile getTargetTile(Tile tile, Team team, PathTarget target){ if(tile == null) return null; - PathData data = pathMap[team.ordinal()][target.ordinal()]; + PathData data = pathMap[(int) team.id][target.ordinal()]; if(data == null){ //if this combination is not found, create it on request - if(!created.get(team.ordinal(), target.ordinal())){ - created.set(team.ordinal(), target.ordinal()); + if(!created.get((int) team.id, target.ordinal())){ + created.set((int) team.id, target.ordinal()); //grab targets since this is run on main thread IntArray targets = target.getTargets(team, new IntArray()); queue.post(() -> createPath(team, target, targets)); @@ -188,7 +188,7 @@ public class Pathfinder implements Runnable{ /** @return whether a tile can be passed through by this team. Pathfinding thread only.*/ private boolean passable(int x, int y, Team team){ int tile = tiles[x][y]; - return PathTile.passable(tile) || (PathTile.team(tile) != team.ordinal() && PathTile.team(tile) != Team.derelict.ordinal()); + return PathTile.passable(tile) || (PathTile.team(tile) != (int) team.id && PathTile.team(tile) != (int) Team.derelict.id); } /** @@ -238,7 +238,7 @@ public class Pathfinder implements Runnable{ PathData path = new PathData(team, target, world.width(), world.height()); list.add(path); - pathMap[team.ordinal()][target.ordinal()] = path; + pathMap[(int) team.id][target.ordinal()] = path; //grab targets from passed array synchronized(path.targets){ diff --git a/core/src/mindustry/core/GameState.java b/core/src/mindustry/core/GameState.java index 73e3db8259..c2be18cfe4 100644 --- a/core/src/mindustry/core/GameState.java +++ b/core/src/mindustry/core/GameState.java @@ -27,11 +27,11 @@ public class GameState{ private State state = State.menu; public int enemies(){ - return net.client() ? enemies : unitGroups[waveTeam.ordinal()].count(b -> !(b instanceof BaseDrone)); + return net.client() ? enemies : unitGroups[(int) waveTeam.id].count(b -> !(b instanceof BaseDrone)); } public BaseUnit boss(){ - return unitGroups[waveTeam.ordinal()].find(BaseUnit::isBoss); + return unitGroups[(int) waveTeam.id].find(BaseUnit::isBoss); } public void set(State astate){ diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index 434058ee72..752017e7ce 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -217,7 +217,7 @@ public class Logic implements ApplicationListener{ Time.update(); if(state.rules.waves && state.rules.waveTimer && !state.gameOver){ - if(!state.rules.waitForWaveToEnd || unitGroups[waveTeam.ordinal()].size() == 0){ + if(!state.rules.waitForWaveToEnd || unitGroups[(int) waveTeam.id].size() == 0){ state.wavetime = Math.max(state.wavetime - Time.delta(), 0); } } diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java index 4dbb2ef4a1..2a7cd16922 100644 --- a/core/src/mindustry/core/Renderer.java +++ b/core/src/mindustry/core/Renderer.java @@ -376,17 +376,17 @@ public class Renderer implements ApplicationListener{ private void drawAllTeams(boolean flying){ for(Team team : Team.all){ - EntityGroup group = unitGroups[team.ordinal()]; + EntityGroup group = unitGroups[(int) team.id]; if(group.count(p -> p.isFlying() == flying) + playerGroup.count(p -> p.isFlying() == flying && p.getTeam() == team) == 0 && flying) continue; - unitGroups[team.ordinal()].draw(u -> u.isFlying() == flying && !u.isDead(), Unit::drawUnder); + unitGroups[(int) team.id].draw(u -> u.isFlying() == flying && !u.isDead(), Unit::drawUnder); playerGroup.draw(p -> p.isFlying() == flying && p.getTeam() == team && !p.isDead(), Unit::drawUnder); - unitGroups[team.ordinal()].draw(u -> u.isFlying() == flying && !u.isDead(), Unit::drawAll); + unitGroups[(int) team.id].draw(u -> u.isFlying() == flying && !u.isDead(), Unit::drawAll); playerGroup.draw(p -> p.isFlying() == flying && p.getTeam() == team, Unit::drawAll); - unitGroups[team.ordinal()].draw(u -> u.isFlying() == flying && !u.isDead(), Unit::drawOver); + unitGroups[(int) team.id].draw(u -> u.isFlying() == flying && !u.isDead(), Unit::drawOver); playerGroup.draw(p -> p.isFlying() == flying && p.getTeam() == team, Unit::drawOver); } } diff --git a/core/src/mindustry/editor/EditorTile.java b/core/src/mindustry/editor/EditorTile.java index f03c376630..f9d00b8903 100644 --- a/core/src/mindustry/editor/EditorTile.java +++ b/core/src/mindustry/editor/EditorTile.java @@ -74,7 +74,7 @@ public class EditorTile extends Tile{ return; } - if(getTeamID() == team.ordinal()) return; + if(getTeamID() == (int) team.id) return; op(OpType.team, getTeamID()); super.setTeam(team); } diff --git a/core/src/mindustry/editor/EditorTool.java b/core/src/mindustry/editor/EditorTool.java index 3e9fcd47dc..a2a6927398 100644 --- a/core/src/mindustry/editor/EditorTool.java +++ b/core/src/mindustry/editor/EditorTool.java @@ -141,7 +141,7 @@ public enum EditorTool{ if(tile.link().synthetic()){ Team dest = tile.getTeam(); if(dest == editor.drawTeam) return; - fill(editor, x, y, false, t -> t.getTeamID() == dest.ordinal() && t.link().synthetic(), t -> t.setTeam(editor.drawTeam)); + fill(editor, x, y, false, t -> t.getTeamID() == (int) dest.id && t.link().synthetic(), t -> t.setTeam(editor.drawTeam)); } } } diff --git a/core/src/mindustry/editor/MapGenerateDialog.java b/core/src/mindustry/editor/MapGenerateDialog.java index 6a18ebc089..976d7fc3b2 100644 --- a/core/src/mindustry/editor/MapGenerateDialog.java +++ b/core/src/mindustry/editor/MapGenerateDialog.java @@ -415,7 +415,7 @@ public class MapGenerateDialog extends FloatingDialog{ this.floor = floor.id; this.block = wall.id; this.ore = ore.id; - this.team = (byte)team.ordinal(); + this.team = (byte) (int) team.id; this.rotation = (byte)rotation; } diff --git a/core/src/mindustry/entities/Damage.java b/core/src/mindustry/entities/Damage.java index a5bc63bc52..a9bdd04f3f 100644 --- a/core/src/mindustry/entities/Damage.java +++ b/core/src/mindustry/entities/Damage.java @@ -88,7 +88,7 @@ public class Damage{ tr.trns(angle, length); Intc2 collider = (cx, cy) -> { Tile tile = world.ltile(cx, cy); - if(tile != null && !collidedBlocks.contains(tile.pos()) && tile.entity != null && tile.getTeamID() != team.ordinal() && tile.entity.collide(hitter)){ + if(tile != null && !collidedBlocks.contains(tile.pos()) && tile.entity != null && tile.getTeamID() != (int) team.id && tile.entity.collide(hitter)){ tile.entity.collision(hitter); collidedBlocks.add(tile.pos()); hitter.getBulletType().hit(hitter, tile.worldx(), tile.worldy()); diff --git a/core/src/mindustry/entities/Units.java b/core/src/mindustry/entities/Units.java index 94a0cfbd12..ad228556b8 100644 --- a/core/src/mindustry/entities/Units.java +++ b/core/src/mindustry/entities/Units.java @@ -157,7 +157,7 @@ public class Units{ /** Iterates over all units in a rectangle. */ public static void nearby(Team team, float x, float y, float width, float height, Cons cons){ - unitGroups[team.ordinal()].intersect(x, y, width, height, cons); + unitGroups[(int) team.id].intersect(x, y, width, height, cons); playerGroup.intersect(x, y, width, height, player -> { if(player.getTeam() == team){ cons.get(player); @@ -167,7 +167,7 @@ public class Units{ /** Iterates over all units in a circle around this position. */ public static void nearby(Team team, float x, float y, float radius, Cons cons){ - unitGroups[team.ordinal()].intersect(x - radius, y - radius, radius*2f, radius*2f, unit -> { + unitGroups[(int) team.id].intersect(x - radius, y - radius, radius*2f, radius*2f, unit -> { if(unit.withinDst(x, y, radius)){ cons.get(unit); } @@ -183,7 +183,7 @@ public class Units{ /** Iterates over all units in a rectangle. */ public static void nearby(float x, float y, float width, float height, Cons cons){ for(Team team : Team.all){ - unitGroups[team.ordinal()].intersect(x, y, width, height, cons); + unitGroups[(int) team.id].intersect(x, y, width, height, cons); } playerGroup.intersect(x, y, width, height, cons); @@ -199,7 +199,7 @@ public class Units{ EnumSet targets = state.teams.enemiesOf(team); for(Team other : targets){ - unitGroups[other.ordinal()].intersect(x, y, width, height, cons); + unitGroups[(int) other.id].intersect(x, y, width, height, cons); } playerGroup.intersect(x, y, width, height, player -> { @@ -217,7 +217,7 @@ public class Units{ /** Iterates over all units. */ public static void all(Cons cons){ for(Team team : Team.all){ - unitGroups[team.ordinal()].all().each(cons); + unitGroups[(int) team.id].all().each(cons); } playerGroup.all().each(cons); diff --git a/core/src/mindustry/entities/type/BaseUnit.java b/core/src/mindustry/entities/type/BaseUnit.java index 46e2f8f63b..dcf3b369a0 100644 --- a/core/src/mindustry/entities/type/BaseUnit.java +++ b/core/src/mindustry/entities/type/BaseUnit.java @@ -365,7 +365,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ @Override public EntityGroup targetGroup(){ - return unitGroups[team.ordinal()]; + return unitGroups[(int) team.id]; } @Override diff --git a/core/src/mindustry/entities/type/Unit.java b/core/src/mindustry/entities/type/Unit.java index 1bec11c029..81ec1de7cb 100644 --- a/core/src/mindustry/entities/type/Unit.java +++ b/core/src/mindustry/entities/type/Unit.java @@ -169,7 +169,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ public void writeSave(DataOutput stream, boolean net) throws IOException{ if(item.item == null) item.item = Items.copper; - stream.writeByte(team.ordinal()); + stream.writeByte((int) team.id); stream.writeBoolean(isDead()); stream.writeFloat(net ? interpolator.target.x : x); stream.writeFloat(net ? interpolator.target.y : y); @@ -220,7 +220,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ for(Team team : Team.all){ if(team != getTeam() || !(this instanceof Player)){ - avoid(unitGroups[team.ordinal()].intersect(cx, cy, fsize, fsize)); + avoid(unitGroups[(int) team.id].intersect(cx, cy, fsize, fsize)); } } diff --git a/core/src/mindustry/entities/type/base/BuilderDrone.java b/core/src/mindustry/entities/type/base/BuilderDrone.java index f84bdecbca..aad348b9ce 100644 --- a/core/src/mindustry/entities/type/base/BuilderDrone.java +++ b/core/src/mindustry/entities/type/base/BuilderDrone.java @@ -114,7 +114,7 @@ public class BuilderDrone extends BaseDrone implements BuilderTrait{ public BuilderDrone(){ if(reset.check()){ Events.on(BuildSelectEvent.class, event -> { - EntityGroup group = unitGroups[event.team.ordinal()]; + EntityGroup group = unitGroups[(int) event.team.id]; if(!(event.tile.entity instanceof BuildEntity)) return; diff --git a/core/src/mindustry/game/Gamemode.java b/core/src/mindustry/game/Gamemode.java index 3cb2605c24..aca4d3340e 100644 --- a/core/src/mindustry/game/Gamemode.java +++ b/core/src/mindustry/game/Gamemode.java @@ -22,7 +22,7 @@ public enum Gamemode{ attack(rules -> { rules.unitDrops = true; rules.attackMode = true; - }, map -> map.teams.contains(waveTeam.ordinal())), + }, map -> map.teams.contains((int) waveTeam.id)), pvp(rules -> { rules.pvp = true; rules.enemyCoreBuildRadius = 600f; diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java index 8e6d66ae1b..a64e5fd127 100644 --- a/core/src/mindustry/game/Team.java +++ b/core/src/mindustry/game/Team.java @@ -1,27 +1,35 @@ package mindustry.game; -import arc.Core; -import arc.graphics.Color; +import arc.*; +import arc.graphics.*; +import arc.struct.*; import mindustry.graphics.*; -public enum Team{ - derelict(Color.valueOf("4d4e58")), - sharded(Pal.accent), - crux(Color.valueOf("e82d2d")), - green(Color.valueOf("4dd98b")), - purple(Color.valueOf("9a4bdf")), - blue(Color.royal.cpy()); +public class Team{ + /** All registered teams. */ + public final static Array all = new Array<>(); + public final static Team + derelict = new Team("derelict", Color.valueOf("4d4e58")), + sharded = new Team("sharded", Pal.accent.cpy()), + crux = new Team("crux", Color.valueOf("e82d2d")), + green = new Team("green", Color.valueOf("4dd98b")), + purple = new Team("purple", Color.valueOf("9a4bdf")), + blue = new Team("blue", Color.royal.cpy()); - public final static Team[] all = values(); public final Color color; public final int intColor; + public final String name; + public final int id; - Team(Color color){ + public Team(String name, Color color){ + this.name = name; this.color = color; - intColor = Color.rgba8888(color); + this.intColor = Color.rgba8888(color); + this.id = all.size; + all.add(this); } public String localized(){ - return Core.bundle.get("team." + name() + ".name"); + return Core.bundle.get("team." + name + ".name"); } } diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java index 2b03bbfaee..020bfb4b88 100644 --- a/core/src/mindustry/game/Teams.java +++ b/core/src/mindustry/game/Teams.java @@ -6,23 +6,22 @@ import mindustry.world.*; /** Class for various team-based utilities. */ public class Teams{ - private TeamData[] map = new TeamData[Team.all.length]; + private TeamData[] map = new TeamData[256]; /** * Register a team. * @param team The team type enum. - * @param enemies The array of enemies of this team. Any team not in this array is considered neutral. */ - public void add(Team team, Team... enemies){ - map[team.ordinal()] = new TeamData(team, EnumSet.of(enemies)); + public void add(Team team){ + map[team.id] = new TeamData(team); } /** Returns team data by type. */ public TeamData get(Team team){ - if(map[team.ordinal()] == null){ - add(team, Array.with(Team.all).select(t -> t != team).toArray(Team.class)); + if(map[team.id] == null){ + add(team); } - return map[team.ordinal()]; + return map[team.id]; } /** Returns whether a team is active, e.g. whether it has any cores remaining. */ @@ -31,14 +30,10 @@ public class Teams{ return team == Vars.waveTeam || get(team).cores.size > 0; } - /** Returns a set of all teams that are enemies of this team. */ - public EnumSet enemiesOf(Team team){ - return get(team).enemies; - } - /** Returns whether {@param other} is an enemy of {@param #team}. */ public boolean areEnemies(Team team, Team other){ - return enemiesOf(team).contains(other); + //todo what about derelict? + return team != other; } /** Allocates a new array with the active teams. @@ -49,13 +44,11 @@ public class Teams{ public static class TeamData{ public final ObjectSet cores = new ObjectSet<>(); - public final EnumSet enemies; public final Team team; public Queue brokenBlocks = new Queue<>(); - public TeamData(Team team, EnumSet enemies){ + public TeamData(Team team){ this.team = team; - this.enemies = enemies; } } diff --git a/core/src/mindustry/io/MapIO.java b/core/src/mindustry/io/MapIO.java index 88c011442b..07e9823569 100644 --- a/core/src/mindustry/io/MapIO.java +++ b/core/src/mindustry/io/MapIO.java @@ -91,7 +91,7 @@ public class MapIO{ public void setTeam(Team team){ super.setTeam(team); if(block instanceof CoreBlock){ - map.teams.add(team.ordinal()); + map.teams.add((int) team.id); } } }; diff --git a/core/src/mindustry/io/SaveVersion.java b/core/src/mindustry/io/SaveVersion.java index ba9a991e05..f3fdc0c20e 100644 --- a/core/src/mindustry/io/SaveVersion.java +++ b/core/src/mindustry/io/SaveVersion.java @@ -217,7 +217,7 @@ public abstract class SaveVersion extends SaveFileReader{ Array data = state.teams.getActive(); stream.writeInt(data.size); for(TeamData team : data){ - stream.writeInt(team.team.ordinal()); + stream.writeInt((int) team.team.id); stream.writeInt(team.brokenBlocks.size); for(BrokenBlock block : team.brokenBlocks){ stream.writeShort(block.x); diff --git a/core/src/mindustry/io/TypeIO.java b/core/src/mindustry/io/TypeIO.java index 4e9c4b5024..de0faaa372 100644 --- a/core/src/mindustry/io/TypeIO.java +++ b/core/src/mindustry/io/TypeIO.java @@ -87,7 +87,7 @@ public class TypeIO{ @WriteClass(BaseUnit.class) public static void writeBaseUnit(ByteBuffer buffer, BaseUnit unit){ - buffer.put((byte)unit.getTeam().ordinal()); + buffer.put((byte) (int) unit.getTeam().id); buffer.putInt(unit.getID()); } @@ -194,7 +194,7 @@ public class TypeIO{ @WriteClass(Team.class) public static void writeTeam(ByteBuffer buffer, Team reason){ - buffer.put((byte)reason.ordinal()); + buffer.put((byte) (int) reason.id); } @ReadClass(Team.class) diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index 80e5dc0185..58e1ff9e52 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -628,7 +628,7 @@ public class HudFragment extends Fragment{ } if(state.rules.waveTimer){ - builder.append((state.rules.waitForWaveToEnd && unitGroups[waveTeam.ordinal()].size() > 0) ? Core.bundle.get("wave.waveInProgress") : ( waitingf.get((int)(state.wavetime/60)))); + builder.append((state.rules.waitForWaveToEnd && unitGroups[(int) waveTeam.id].size() > 0) ? Core.bundle.get("wave.waveInProgress") : ( waitingf.get((int)(state.wavetime/60)))); }else if(state.enemies() == 0){ builder.append(Core.bundle.get("waiting")); } diff --git a/core/src/mindustry/world/Tile.java b/core/src/mindustry/world/Tile.java index 1ac2871bab..a1fb5fa9ff 100644 --- a/core/src/mindustry/world/Tile.java +++ b/core/src/mindustry/world/Tile.java @@ -146,7 +146,7 @@ public class Tile implements Position, TargetTrait{ } public void setTeam(Team team){ - this.team = (byte)team.ordinal(); + this.team = (byte) (int) team.id; } public byte getTeamID(){ @@ -156,7 +156,7 @@ public class Tile implements Position, TargetTrait{ public void setBlock(@NonNull Block type, Team team, int rotation){ preChanged(); this.block = type; - this.team = (byte)team.ordinal(); + this.team = (byte) (int) team.id; this.rotation = (byte)Mathf.mod(rotation, 4); changed(); } diff --git a/core/src/mindustry/world/blocks/units/CommandCenter.java b/core/src/mindustry/world/blocks/units/CommandCenter.java index 9e9312af75..9dae2923d3 100644 --- a/core/src/mindustry/world/blocks/units/CommandCenter.java +++ b/core/src/mindustry/world/blocks/units/CommandCenter.java @@ -58,7 +58,7 @@ public class CommandCenter extends Block{ ObjectSet set = indexer.getAllied(tile.getTeam(), BlockFlag.comandCenter); if(set.size == 1){ - for(BaseUnit unit : unitGroups[tile.getTeam().ordinal()].all()){ + for(BaseUnit unit : unitGroups[(int) tile.getTeam().id].all()){ unit.onCommand(UnitCommand.all[0]); } } @@ -116,7 +116,7 @@ public class CommandCenter extends Block{ Team team = (player == null ? tile.getTeam() : player.getTeam()); - for(BaseUnit unit : unitGroups[team.ordinal()].all()){ + for(BaseUnit unit : unitGroups[(int) team.id].all()){ unit.onCommand(command); } diff --git a/desktop/src/mindustry/desktop/steam/SStats.java b/desktop/src/mindustry/desktop/steam/SStats.java index ee1ab916bc..984fa9e985 100644 --- a/desktop/src/mindustry/desktop/steam/SStats.java +++ b/desktop/src/mindustry/desktop/steam/SStats.java @@ -55,13 +55,13 @@ public class SStats implements SteamUserStatsCallback{ private void checkUpdate(){ if(campaign()){ - SStat.maxUnitActive.max(unitGroups[player.getTeam().ordinal()].size()); + SStat.maxUnitActive.max(unitGroups[(int) player.getTeam().id].size()); - if(unitGroups[player.getTeam().ordinal()].count(u -> u.getType() == UnitTypes.phantom) >= 10){ + if(unitGroups[(int) player.getTeam().id].count(u -> u.getType() == UnitTypes.phantom) >= 10){ active10Phantoms.complete(); } - if(unitGroups[player.getTeam().ordinal()].count(u -> u.getType() == UnitTypes.crawler) >= 50){ + if(unitGroups[(int) player.getTeam().id].count(u -> u.getType() == UnitTypes.crawler) >= 50){ active50Crawlers.complete(); } diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index b821d5dcd5..8ff1874407 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -292,7 +292,7 @@ public class ServerControl implements ApplicationListener{ info(" &lyPlaying on map &fi{0}&fb &lb/&ly Wave {1}", Strings.capitalize(world.getMap().name()), state.wave); if(state.rules.waves){ - info("&ly {0} enemies.", unitGroups[Team.crux.ordinal()].size()); + info("&ly {0} enemies.", unitGroups[(int) Team.crux.id].size()); }else{ info("&ly {0} seconds until next wave.", (int)(state.wavetime / 60)); } diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java index dfda5822c9..43c819bdfd 100644 --- a/tests/src/test/java/ApplicationTests.java +++ b/tests/src/test/java/ApplicationTests.java @@ -106,8 +106,8 @@ public class ApplicationTests{ Time.update(); Time.update(); Time.setDeltaProvider(() -> 1f); - unitGroups[waveTeam.ordinal()].updateEvents(); - assertFalse(unitGroups[waveTeam.ordinal()].isEmpty(), "No enemies spawned."); + unitGroups[(int) waveTeam.id].updateEvents(); + assertFalse(unitGroups[(int) waveTeam.id].isEmpty(), "No enemies spawned."); } @Test From 2b22b7e7e4d524d3687a6c40aeacd1291463d628 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 25 Dec 2019 22:26:51 -0500 Subject: [PATCH 03/78] Condensed unit group array --- core/src/mindustry/Vars.java | 8 ++---- core/src/mindustry/core/GameState.java | 7 +---- core/src/mindustry/core/Logic.java | 26 +++++++------------ core/src/mindustry/core/NetServer.java | 2 +- .../src/mindustry/entities/type/BaseUnit.java | 5 ++++ .../entities/type/base/BaseDrone.java | 4 +++ core/src/mindustry/game/MusicControl.java | 2 +- core/src/mindustry/game/Tutorial.java | 2 +- .../mindustry/ui/fragments/HudFragment.java | 16 ++++++------ 9 files changed, 33 insertions(+), 39 deletions(-) diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index 502c78887d..1a55d6e23f 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -184,7 +184,7 @@ public class Vars implements Loadable{ public static EntityGroup shieldGroup; public static EntityGroup puddleGroup; public static EntityGroup fireGroup; - public static EntityGroup[] unitGroups; + public static EntityGroup unitGroup; public static Player player; @@ -239,11 +239,7 @@ public class Vars implements Loadable{ puddleGroup = entities.add(Puddle.class).enableMapping(); shieldGroup = entities.add(ShieldEntity.class, false); fireGroup = entities.add(Fire.class).enableMapping(); - unitGroups = new EntityGroup[Team.all.length]; - - for(Team team : Team.all){ - unitGroups[(int) team.id] = entities.add(BaseUnit.class).enableMapping(); - } + unitGroup = entities.add(BaseUnit.class).enableMapping(); for(EntityGroup group : entities.all()){ group.setRemoveListener(entity -> { diff --git a/core/src/mindustry/core/GameState.java b/core/src/mindustry/core/GameState.java index c2be18cfe4..eb7d419a10 100644 --- a/core/src/mindustry/core/GameState.java +++ b/core/src/mindustry/core/GameState.java @@ -2,7 +2,6 @@ package mindustry.core; import arc.*; import mindustry.entities.type.*; -import mindustry.entities.type.base.*; import mindustry.game.EventType.*; import mindustry.game.*; @@ -26,12 +25,8 @@ public class GameState{ /** Current game state. */ private State state = State.menu; - public int enemies(){ - return net.client() ? enemies : unitGroups[(int) waveTeam.id].count(b -> !(b instanceof BaseDrone)); - } - public BaseUnit boss(){ - return unitGroups[(int) waveTeam.id].find(BaseUnit::isBoss); + return unitGroup.find(u -> u.isBoss() && u.getTeam() == waveTeam); } public void set(State astate){ diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index 752017e7ce..86061bc6c6 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -1,8 +1,8 @@ package mindustry.core; import arc.*; -import mindustry.annotations.Annotations.*; import arc.util.*; +import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.core.GameState.*; import mindustry.ctype.*; @@ -212,12 +212,15 @@ public class Logic implements ApplicationListener{ public void update(){ if(!state.is(State.menu)){ + if(!net.client()){ + state.enemies = unitGroup.count(b -> b.getTeam() == waveTeam && b.countsAsEnemy()); + } if(!state.isPaused()){ Time.update(); if(state.rules.waves && state.rules.waveTimer && !state.gameOver){ - if(!state.rules.waitForWaveToEnd || unitGroups[(int) waveTeam.id].size() == 0){ + if(!state.rules.waitForWaveToEnd || state.enemies == 0){ state.wavetime = Math.max(state.wavetime - Time.delta(), 0); } } @@ -232,20 +235,15 @@ public class Logic implements ApplicationListener{ } if(!state.isEditor()){ - for(EntityGroup group : unitGroups){ - group.update(); - } - + unitGroup.update(); puddleGroup.update(); shieldGroup.update(); bulletGroup.update(); tileGroup.update(); fireGroup.update(); }else{ - for(EntityGroup group : unitGroups){ - group.updateEvents(); - collisions.updatePhysics(group); - } + unitGroup.updateEvents(); + collisions.updatePhysics(unitGroup); } @@ -257,12 +255,8 @@ public class Logic implements ApplicationListener{ } if(!state.isEditor()){ - - for(EntityGroup group : unitGroups){ - if(group.isEmpty()) continue; - collisions.collideGroups(bulletGroup, group); - } - + //bulletGroup + collisions.collideGroups(bulletGroup, unitGroup); collisions.collideGroups(bulletGroup, playerGroup); } } diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index d00fc5a839..4c86ecb9d0 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -660,7 +660,7 @@ public class NetServer implements ApplicationListener{ byte[] stateBytes = syncStream.toByteArray(); //write basic state data. - Call.onStateSnapshot(player.con, state.wavetime, state.wave, state.enemies(), (short)stateBytes.length, net.compressSnapshot(stateBytes)); + Call.onStateSnapshot(player.con, state.wavetime, state.wave, state.enemies, (short)stateBytes.length, net.compressSnapshot(stateBytes)); viewport.setSize(player.con.viewWidth, player.con.viewHeight).setCenter(player.con.viewX, player.con.viewY); diff --git a/core/src/mindustry/entities/type/BaseUnit.java b/core/src/mindustry/entities/type/BaseUnit.java index dcf3b369a0..28a6eea861 100644 --- a/core/src/mindustry/entities/type/BaseUnit.java +++ b/core/src/mindustry/entities/type/BaseUnit.java @@ -126,6 +126,11 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ this.team = team; } + /** @return whether this unit counts toward the enemy amount in the wave UI. */ + public boolean countsAsEnemy(){ + return true; + } + public UnitType getType(){ return type; } diff --git a/core/src/mindustry/entities/type/base/BaseDrone.java b/core/src/mindustry/entities/type/base/BaseDrone.java index a1b5b1c321..02a8fd9d32 100644 --- a/core/src/mindustry/entities/type/base/BaseDrone.java +++ b/core/src/mindustry/entities/type/base/BaseDrone.java @@ -32,6 +32,10 @@ public abstract class BaseDrone extends FlyingUnit{ } }; + public boolean countsAsEnemy(){ + return false; + } + @Override public void onCommand(UnitCommand command){ //do nothing, normal commands are not applicable here diff --git a/core/src/mindustry/game/MusicControl.java b/core/src/mindustry/game/MusicControl.java index f258b6a520..f4352f28be 100644 --- a/core/src/mindustry/game/MusicControl.java +++ b/core/src/mindustry/game/MusicControl.java @@ -94,7 +94,7 @@ public class MusicControl{ } //dark based on enemies - return Mathf.chance(state.enemies() / 70f + 0.1f); + return Mathf.chance(state.enemies / 70f + 0.1f); } /** Plays and fades in a music track. This must be called every frame. diff --git a/core/src/mindustry/game/Tutorial.java b/core/src/mindustry/game/Tutorial.java index 924e68f63c..569fbd380c 100644 --- a/core/src/mindustry/game/Tutorial.java +++ b/core/src/mindustry/game/Tutorial.java @@ -165,7 +165,7 @@ public class Tutorial{ } }, deposit(() -> event("deposit")), - waves(() -> state.wave > 2 && state.enemies() <= 0 && !spawner.isSpawning()){ + waves(() -> state.wave > 2 && state.enemies <= 0 && !spawner.isSpawning()){ void begin(){ state.rules.waveTimer = true; logic.runWave(); diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index 58e1ff9e52..c2ca5b25e5 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -557,7 +557,7 @@ public class HudFragment extends Fragment{ } private boolean canLaunch(){ - return inLaunchWave() && state.enemies() <= 0; + return inLaunchWave() && state.enemies <= 0; } private void toggleMenus(){ @@ -604,7 +604,7 @@ public class HudFragment extends Fragment{ if(inLaunchWave()){ builder.append("[#"); - Tmp.c1.set(Color.white).lerp(state.enemies() > 0 ? Color.white : Color.scarlet, Mathf.absin(Time.time(), 2f, 1f)).toString(builder); + Tmp.c1.set(Color.white).lerp(state.enemies > 0 ? Color.white : Color.scarlet, Mathf.absin(Time.time(), 2f, 1f)).toString(builder); builder.append("]"); if(!canLaunch()){ @@ -618,18 +618,18 @@ public class HudFragment extends Fragment{ builder.append("[]\n"); } - if(state.enemies() > 0){ - if(state.enemies() == 1){ - builder.append(enemyf.get(state.enemies())); + if(state.enemies > 0){ + if(state.enemies == 1){ + builder.append(enemyf.get(state.enemies)); }else{ - builder.append(enemiesf.get(state.enemies())); + builder.append(enemiesf.get(state.enemies)); } builder.append("\n"); } if(state.rules.waveTimer){ builder.append((state.rules.waitForWaveToEnd && unitGroups[(int) waveTeam.id].size() > 0) ? Core.bundle.get("wave.waveInProgress") : ( waitingf.get((int)(state.wavetime/60)))); - }else if(state.enemies() == 0){ + }else if(state.enemies == 0){ builder.append(Core.bundle.get("waiting")); } @@ -646,7 +646,7 @@ public class HudFragment extends Fragment{ } private boolean canSkipWave(){ - return state.rules.waves && ((net.server() || player.isAdmin) || !net.active()) && state.enemies() == 0 && !spawner.isSpawning() && !state.rules.tutorial; + return state.rules.waves && ((net.server() || player.isAdmin) || !net.active()) && state.enemies == 0 && !spawner.isSpawning() && !state.rules.tutorial; } private void addPlayButton(Table table){ From 1d6f769e3d1aca7d8f446ac79f36d643d24fb528 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 26 Dec 2019 08:01:24 -0500 Subject: [PATCH 04/78] Debug fixes --- core/src/mindustry/world/blocks/BuildBlock.java | 1 + desktop/build.gradle | 2 +- gradle.properties | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/world/blocks/BuildBlock.java b/core/src/mindustry/world/blocks/BuildBlock.java index 69d9ba61e8..82add253a9 100644 --- a/core/src/mindustry/world/blocks/BuildBlock.java +++ b/core/src/mindustry/world/blocks/BuildBlock.java @@ -337,6 +337,7 @@ public class BuildBlock extends Block{ } public void setDeconstruct(Block previous){ + if(previous == null) return; this.previous = previous; this.progress = 1f; if(previous.buildCost >= 0.01f){ diff --git a/desktop/build.gradle b/desktop/build.gradle index efedf8c57b..d03320d394 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -33,7 +33,7 @@ task run(dependsOn: classes, type: JavaExec){ } if(args.contains("debug")){ - main = "io.anuke.mindustry.DebugLauncher" + main = "mindustry.debug.DebugLauncher" } } diff --git a/gradle.properties b/gradle.properties index 29c1e50fad..5404911090 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=88c1a9afe2f5be4dd06e47ac8afe070247b3da29 +archash=6e94de8eaa000725ad8f959009358cf010d6db01 From a5978b61632e3a3e28dee23b13d154ff38fc4ef2 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 26 Dec 2019 08:08:16 -0500 Subject: [PATCH 05/78] Updated Arc --- core/src/mindustry/world/blocks/StaticWall.java | 8 ++++---- gradle.properties | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/world/blocks/StaticWall.java b/core/src/mindustry/world/blocks/StaticWall.java index d81e0521db..531fb010a2 100644 --- a/core/src/mindustry/world/blocks/StaticWall.java +++ b/core/src/mindustry/world/blocks/StaticWall.java @@ -43,9 +43,9 @@ public class StaticWall extends Rock{ boolean eq(int rx, int ry){ return rx < world.width() - 1 && ry < world.height() - 1 - && world.tile(rx + 1, ry).block() == this - && world.tile(rx, ry + 1).block() == this - && world.tile(rx, ry).block() == this - && world.tile(rx + 1, ry + 1).block() == this; + && world.tile(rx + 1, ry).block() == this + && world.tile(rx, ry + 1).block() == this + && world.tile(rx, ry).block() == this + && world.tile(rx + 1, ry + 1).block() == this; } } diff --git a/gradle.properties b/gradle.properties index 5404911090..de2663914f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=6e94de8eaa000725ad8f959009358cf010d6db01 +archash=6024918f94e31c8efbdfa1587177ccc225931b5b From 36ec88e2e26ee88794aa9d87e2e24bc5a9d1b51f Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 26 Dec 2019 14:20:36 -0500 Subject: [PATCH 06/78] Team cleanup --- core/src/mindustry/Vars.java | 4 ++-- core/src/mindustry/game/Teams.java | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index 1a55d6e23f..fafb869c39 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -128,9 +128,9 @@ public class Vars implements Loadable{ public static Fi dataDirectory; /** data subdirectory used for screenshots */ public static Fi screenshotDirectory; - /** data subdirectory used for custom mmaps */ + /** data subdirectory used for custom maps */ public static Fi customMapDirectory; - /** data subdirectory used for custom mmaps */ + /** data subdirectory used for custom map previews */ public static Fi mapPreviewDirectory; /** tmp subdirectory for map conversion */ public static Fi tmpDirectory; diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java index 020bfb4b88..d77b7902ae 100644 --- a/core/src/mindustry/game/Teams.java +++ b/core/src/mindustry/game/Teams.java @@ -1,12 +1,23 @@ package mindustry.game; +import arc.func.*; import arc.struct.*; import mindustry.*; +import mindustry.entities.type.*; import mindustry.world.*; /** Class for various team-based utilities. */ public class Teams{ - private TeamData[] map = new TeamData[256]; + /** Maps team IDs to team data. */ + private Array map = new Array<>(); + /** Active teams. */ + private Array active = new Array<>(); + + public T eachEnemyCore(Team team, Func ret){ + T out = null; + //todo each enemy, each enemy core... + return out; + } /** * Register a team. From de5979f4ee1c4a6f85edd72117d629668a00d67b Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 26 Dec 2019 17:46:01 -0500 Subject: [PATCH 07/78] Many various internal changes --- core/src/mindustry/Vars.java | 4 - core/src/mindustry/ai/BlockIndexer.java | 24 +- core/src/mindustry/ai/Pathfinder.java | 18 +- core/src/mindustry/ai/WaveSpawner.java | 16 +- core/src/mindustry/content/StatusEffects.java | 5 +- core/src/mindustry/core/Control.java | 22 +- core/src/mindustry/core/GameState.java | 2 +- core/src/mindustry/core/Logic.java | 33 ++- core/src/mindustry/core/NetServer.java | 30 +-- core/src/mindustry/core/Renderer.java | 38 +--- core/src/mindustry/core/World.java | 55 +---- core/src/mindustry/editor/DrawOperation.java | 2 +- core/src/mindustry/editor/EditorTile.java | 2 +- core/src/mindustry/editor/EditorTool.java | 19 +- core/src/mindustry/editor/MapEditor.java | 9 +- .../src/mindustry/editor/MapEditorDialog.java | 2 +- .../mindustry/editor/MapGenerateDialog.java | 8 +- core/src/mindustry/entities/Damage.java | 2 +- core/src/mindustry/entities/Units.java | 13 +- .../src/mindustry/entities/type/BaseUnit.java | 17 +- .../mindustry/entities/type/TileEntity.java | 13 +- core/src/mindustry/entities/type/Unit.java | 27 +-- .../entities/type/base/BuilderDrone.java | 2 +- .../mindustry/entities/units/UnitDrops.java | 3 +- core/src/mindustry/game/Gamemode.java | 4 +- core/src/mindustry/game/MusicControl.java | 2 +- core/src/mindustry/game/Rules.java | 4 + core/src/mindustry/game/Schematics.java | 2 +- core/src/mindustry/game/Team.java | 66 ++++-- core/src/mindustry/game/Teams.java | 127 +++++++++-- core/src/mindustry/game/Tutorial.java | 15 +- .../mindustry/graphics/OverlayRenderer.java | 27 +-- core/src/mindustry/input/DesktopInput.java | 2 +- core/src/mindustry/io/LegacyMapIO.java | 214 ------------------ core/src/mindustry/io/MapIO.java | 25 +- core/src/mindustry/io/SaveVersion.java | 4 +- core/src/mindustry/io/TypeIO.java | 8 +- .../maps/generators/MapGenerator.java | 2 +- core/src/mindustry/ui/ItemsDisplay.java | 4 +- .../mindustry/ui/fragments/HudFragment.java | 6 +- .../ui/fragments/PlayerListFragment.java | 3 +- core/src/mindustry/world/Build.java | 15 +- core/src/mindustry/world/CachedTile.java | 2 +- core/src/mindustry/world/Tile.java | 39 +++- .../mindustry/world/blocks/BuildBlock.java | 2 +- .../world/blocks/storage/CoreBlock.java | 33 +-- .../world/blocks/units/CommandCenter.java | 4 +- .../src/mindustry/desktop/steam/SStats.java | 6 +- gradle.properties | 2 +- .../src/mindustry/server/ServerControl.java | 6 +- tests/src/test/java/ApplicationTests.java | 14 +- tests/src/test/java/ZoneTests.java | 4 +- tools/build.gradle | 2 +- 53 files changed, 435 insertions(+), 575 deletions(-) delete mode 100644 core/src/mindustry/io/LegacyMapIO.java diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index fafb869c39..dfefeb2a68 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -61,10 +61,6 @@ public class Vars implements Loadable{ public static final Array defaultServers = Array.with(); /** maximum distance between mine and core that supports automatic transferring */ public static final float mineTransferRange = 220f; - /** team of the player by default */ - public static final Team defaultTeam = Team.sharded; - /** team of the enemy in waves/sectors */ - public static final Team waveTeam = Team.crux; /** whether to enable editing of units in the editor */ public static final boolean enableUnitEditing = false; /** max chat message length */ diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java index 311e7887a7..bb90b37301 100644 --- a/core/src/mindustry/ai/BlockIndexer.java +++ b/core/src/mindustry/ai/BlockIndexer.java @@ -103,7 +103,7 @@ public class BlockIndexer{ } private ObjectSet[] getFlagged(Team team){ - return flagMap[(int) team.id]; + return flagMap[(int)team.id]; } /** @return whether this item is present on this map.*/ @@ -115,11 +115,11 @@ public class BlockIndexer{ public ObjectSet getDamaged(Team team){ returnArray.clear(); - if(damagedTiles[(int) team.id] == null){ - damagedTiles[(int) team.id] = new ObjectSet<>(); + if(damagedTiles[(int)team.id] == null){ + damagedTiles[(int)team.id] = new ObjectSet<>(); } - ObjectSet set = damagedTiles[(int) team.id]; + ObjectSet set = damagedTiles[(int)team.id]; for(Tile tile : set){ if((tile.entity == null || tile.entity.getTeam() != team || !tile.entity.damaged()) || tile.block() instanceof BuildBlock){ returnArray.add(tile); @@ -135,7 +135,7 @@ public class BlockIndexer{ /** Get all allied blocks with a flag. */ public ObjectSet getAllied(Team team, BlockFlag type){ - return flagMap[(int) team.id][type.ordinal()]; + return flagMap[(int)team.id][type.ordinal()]; } /** Get all enemy blocks with a flag. */ @@ -155,11 +155,11 @@ public class BlockIndexer{ } public void notifyTileDamaged(TileEntity entity){ - if(damagedTiles[(int) entity.getTeam().id] == null){ - damagedTiles[(int) entity.getTeam().id] = new ObjectSet<>(); + if(damagedTiles[(int)entity.getTeam().id] == null){ + damagedTiles[(int)entity.getTeam().id] = new ObjectSet<>(); } - ObjectSet set = damagedTiles[(int) entity.getTeam().id]; + ObjectSet set = damagedTiles[(int)entity.getTeam().id]; set.add(entity.tile); } @@ -287,11 +287,11 @@ public class BlockIndexer{ //fast-set this quadrant to 'occupied' if the tile just placed is already of this team if(tile.getTeam() == data.team && tile.entity != null && tile.block().targetable){ - structQuadrants[(int) data.team.id].set(quadrantX, quadrantY); + structQuadrants[(int)data.team.id].set(quadrantX, quadrantY); continue; //no need to process futher } - structQuadrants[(int) data.team.id].set(quadrantX, quadrantY, false); + structQuadrants[(int)data.team.id].set(quadrantX, quadrantY, false); outer: for(int x = quadrantX * quadrantSize; x < world.width() && x < (quadrantX + 1) * quadrantSize; x++){ @@ -299,7 +299,7 @@ public class BlockIndexer{ Tile result = world.ltile(x, y); //when a targetable block is found, mark this quadrant as occupied and stop searching if(result.entity != null && result.getTeam() == data.team){ - structQuadrants[(int) data.team.id].set(quadrantX, quadrantY); + structQuadrants[(int)data.team.id].set(quadrantX, quadrantY); break outer; } } @@ -308,7 +308,7 @@ public class BlockIndexer{ } private boolean getQuad(Team team, int quadrantX, int quadrantY){ - return structQuadrants[(int) team.id].get(quadrantX, quadrantY); + return structQuadrants[(int)team.id].get(quadrantX, quadrantY); } private int quadWidth(){ diff --git a/core/src/mindustry/ai/Pathfinder.java b/core/src/mindustry/ai/Pathfinder.java index 9464111cab..319c85ef2e 100644 --- a/core/src/mindustry/ai/Pathfinder.java +++ b/core/src/mindustry/ai/Pathfinder.java @@ -53,7 +53,7 @@ public class Pathfinder implements Runnable{ } //special preset which may help speed things up; this is optional - preloadPath(waveTeam, PathTarget.enemyCores); + preloadPath(state.rules.waveTeam, PathTarget.enemyCores); start(); }); @@ -84,8 +84,8 @@ public class Pathfinder implements Runnable{ } public int debugValue(Team team, int x, int y){ - if(pathMap[(int) team.id][PathTarget.enemyCores.ordinal()] == null) return 0; - return pathMap[(int) team.id][PathTarget.enemyCores.ordinal()].weights[x][y]; + if(pathMap[(int)team.id][PathTarget.enemyCores.ordinal()] == null) return 0; + return pathMap[(int)team.id][PathTarget.enemyCores.ordinal()].weights[x][y]; } /** Update a tile in the internal pathfinding grid. Causes a complete pathfinding reclaculation. */ @@ -149,12 +149,12 @@ public class Pathfinder implements Runnable{ public Tile getTargetTile(Tile tile, Team team, PathTarget target){ if(tile == null) return null; - PathData data = pathMap[(int) team.id][target.ordinal()]; + PathData data = pathMap[(int)team.id][target.ordinal()]; if(data == null){ //if this combination is not found, create it on request - if(!created.get((int) team.id, target.ordinal())){ - created.set((int) team.id, target.ordinal()); + if(!created.get((int)team.id, target.ordinal())){ + created.set((int)team.id, target.ordinal()); //grab targets since this is run on main thread IntArray targets = target.getTargets(team, new IntArray()); queue.post(() -> createPath(team, target, targets)); @@ -188,7 +188,7 @@ public class Pathfinder implements Runnable{ /** @return whether a tile can be passed through by this team. Pathfinding thread only.*/ private boolean passable(int x, int y, Team team){ int tile = tiles[x][y]; - return PathTile.passable(tile) || (PathTile.team(tile) != (int) team.id && PathTile.team(tile) != (int) Team.derelict.id); + return PathTile.passable(tile) || (PathTile.team(tile) != (int)team.id && PathTile.team(tile) != (int)Team.derelict.id); } /** @@ -238,7 +238,7 @@ public class Pathfinder implements Runnable{ PathData path = new PathData(team, target, world.width(), world.height()); list.add(path); - pathMap[(int) team.id][target.ordinal()] = path; + pathMap[(int)team.id][target.ordinal()] = path; //grab targets from passed array synchronized(path.targets){ @@ -303,7 +303,7 @@ public class Pathfinder implements Runnable{ } //spawn points are also enemies. - if(state.rules.waves && team == defaultTeam){ + if(state.rules.waves && team == state.rules.defaultTeam){ for(Tile other : spawner.getGroundSpawns()){ out.add(other.pos()); } diff --git a/core/src/mindustry/ai/WaveSpawner.java b/core/src/mindustry/ai/WaveSpawner.java index ac4914a90b..25b9983db0 100644 --- a/core/src/mindustry/ai/WaveSpawner.java +++ b/core/src/mindustry/ai/WaveSpawner.java @@ -53,7 +53,7 @@ public class WaveSpawner{ eachFlyerSpawn((spawnX, spawnY) -> { for(int i = 0; i < spawned; i++){ - BaseUnit unit = group.createUnit(waveTeam); + BaseUnit unit = group.createUnit(state.rules.waveTeam); unit.set(spawnX + Mathf.range(spread), spawnY + Mathf.range(spread)); unit.add(); } @@ -66,7 +66,7 @@ public class WaveSpawner{ for(int i = 0; i < spawned; i++){ Tmp.v1.rnd(spread); - BaseUnit unit = group.createUnit(waveTeam); + BaseUnit unit = group.createUnit(state.rules.waveTeam); unit.set(spawnX + Tmp.v1.x, spawnY + Tmp.v1.y); Time.run(Math.min(i * 5, 60 * 2), () -> spawnEffect(unit)); @@ -78,7 +78,7 @@ public class WaveSpawner{ eachGroundSpawn((spawnX, spawnY, doShockwave) -> { if(doShockwave){ Time.run(20f, () -> Effects.effect(Fx.spawnShockwave, spawnX, spawnY, state.rules.dropZoneRadius)); - Time.run(40f, () -> Damage.damage(waveTeam, spawnX, spawnY, state.rules.dropZoneRadius, 99999999f, true)); + Time.run(40f, () -> Damage.damage(state.rules.waveTeam, spawnX, spawnY, state.rules.dropZoneRadius, 99999999f, true)); } }); @@ -90,9 +90,9 @@ public class WaveSpawner{ cons.accept(spawn.worldx(), spawn.worldy(), true); } - if(state.rules.attackMode && state.teams.isActive(waveTeam) && !state.teams.get(defaultTeam).cores.isEmpty()){ - Tile firstCore = state.teams.get(defaultTeam).cores.first(); - for(Tile core : state.teams.get(waveTeam).cores){ + if(state.rules.attackMode && state.teams.isActive(state.rules.waveTeam) && !state.teams.playerCores().isEmpty()){ + Tile firstCore = state.teams.playerCores().first(); + for(Tile core : state.teams.get(state.rules.waveTeam).cores){ Tmp.v1.set(firstCore).sub(core.worldx(), core.worldy()).limit(coreMargin + core.block().size*tilesize); cons.accept(core.worldx() + Tmp.v1.x, core.worldy() + Tmp.v1.y, false); } @@ -107,8 +107,8 @@ public class WaveSpawner{ cons.get(spawnX, spawnY); } - if(state.rules.attackMode && state.teams.isActive(waveTeam)){ - for(Tile core : state.teams.get(waveTeam).cores){ + if(state.rules.attackMode && state.teams.isActive(state.rules.waveTeam)){ + for(Tile core : state.teams.get(state.rules.waveTeam).cores){ cons.get(core.worldx(), core.worldy()); } } diff --git a/core/src/mindustry/content/StatusEffects.java b/core/src/mindustry/content/StatusEffects.java index 525a14199c..6672727847 100644 --- a/core/src/mindustry/content/StatusEffects.java +++ b/core/src/mindustry/content/StatusEffects.java @@ -6,8 +6,7 @@ import mindustry.entities.Effects; import mindustry.ctype.ContentList; import mindustry.game.EventType.*; import mindustry.type.StatusEffect; - -import static mindustry.Vars.waveTeam; +import static mindustry.Vars.*; public class StatusEffects implements ContentList{ public static StatusEffect none, burning, freezing, wet, melting, tarred, overdrive, shielded, shocked, corroded, boss; @@ -48,7 +47,7 @@ public class StatusEffects implements ContentList{ init(() -> { trans(shocked, ((unit, time, newTime, result) -> { unit.damage(20f); - if(unit.getTeam() == waveTeam){ + if(unit.getTeam() == state.rules.waveTeam){ Events.fire(Trigger.shock); } result.set(this, time); diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index f525494963..ef31948c82 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -63,7 +63,7 @@ public class Control implements ApplicationListener, Loadable{ }); Events.on(PlayEvent.class, event -> { - player.setTeam(state.rules.pvp ? netServer.assignTeam(player, playerGroup.all()) : defaultTeam); + player.setTeam(state.rules.pvp ? netServer.assignTeam(player, playerGroup.all()) : state.rules.defaultTeam); player.setDead(true); player.add(); @@ -256,9 +256,9 @@ public class Control implements ApplicationListener, Loadable{ world.loadGenerator(zone.generator); zone.rules.get(state.rules); state.rules.zone = zone; - for(Tile core : state.teams.get(defaultTeam).cores){ + for(TileEntity core : state.teams.playerCores()){ for(ItemStack stack : zone.getStartingItems()){ - core.entity.items.add(stack.item, stack.amount); + core.items.add(stack.item, stack.amount); } } state.set(State.playing); @@ -294,8 +294,8 @@ public class Control implements ApplicationListener, Loadable{ Geometry.circle(coreb.x, coreb.y, 10, (cx, cy) -> { Tile tile = world.ltile(cx, cy); - if(tile != null && tile.getTeam() == defaultTeam && !(tile.block() instanceof CoreBlock)){ - world.removeBlock(tile); + if(tile != null && tile.getTeam() == state.rules.defaultTeam && !(tile.block() instanceof CoreBlock)){ + tile.remove(); } }); @@ -305,13 +305,13 @@ public class Control implements ApplicationListener, Loadable{ zone.rules.get(state.rules); state.rules.zone = zone; - for(Tile core : state.teams.get(defaultTeam).cores){ + for(TileEntity core : state.teams.playerCores()){ for(ItemStack stack : zone.getStartingItems()){ - core.entity.items.add(stack.item, stack.amount); + core.items.add(stack.item, stack.amount); } } - Tile core = state.teams.get(defaultTeam).cores.first(); - core.entity.items.clear(); + TileEntity core = state.teams.playerCores().first(); + core.items.clear(); logic.play(); state.rules.waveTimer = false; @@ -434,9 +434,9 @@ public class Control implements ApplicationListener, Loadable{ input.update(); if(world.isZone()){ - for(Tile tile : state.teams.get(player.getTeam()).cores){ + for(TileEntity tile : state.teams.cores(player.getTeam())){ for(Item item : content.items()){ - if(tile.entity != null && tile.entity.items.has(item)){ + if(tile.items.has(item)){ data.unlockContent(item); } } diff --git a/core/src/mindustry/core/GameState.java b/core/src/mindustry/core/GameState.java index eb7d419a10..2b233789eb 100644 --- a/core/src/mindustry/core/GameState.java +++ b/core/src/mindustry/core/GameState.java @@ -26,7 +26,7 @@ public class GameState{ private State state = State.menu; public BaseUnit boss(){ - return unitGroup.find(u -> u.isBoss() && u.getTeam() == waveTeam); + return unitGroup.find(u -> u.isBoss() && u.getTeam() == rules.waveTeam); } public void set(State astate){ diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index 86061bc6c6..17fedab303 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -107,9 +107,9 @@ public class Logic implements ApplicationListener{ //add starting items if(!world.isZone()){ - for(Team team : Team.all){ - if(!state.teams.get(team).cores.isEmpty()){ - TileEntity entity = state.teams.get(team).cores.first().entity; + for(TeamData team : state.teams.getActive()){ + if(team.hasCore()){ + TileEntity entity = team.core(); entity.items.clear(); for(ItemStack stack : state.rules.loadout){ entity.items.add(stack.item, stack.amount); @@ -143,23 +143,23 @@ public class Logic implements ApplicationListener{ } private void checkGameOver(){ - if(!state.rules.attackMode && state.teams.get(defaultTeam).cores.size == 0 && !state.gameOver){ + if(!state.rules.attackMode && state.teams.playerCores().size == 0 && !state.gameOver){ state.gameOver = true; - Events.fire(new GameOverEvent(waveTeam)); + Events.fire(new GameOverEvent(state.rules.waveTeam)); }else if(state.rules.attackMode){ Team alive = null; - for(Team team : Team.all){ - if(state.teams.get(team).cores.size > 0){ + for(TeamData team : state.teams.getActive()){ + if(team.hasCore()){ if(alive != null){ return; } - alive = team; + alive = team.team; } } if(alive != null && !state.gameOver){ - if(world.isZone() && alive == defaultTeam){ + if(world.isZone() && alive == state.rules.defaultTeam){ //in attack maps, a victorious game over is equivalent to a launch Call.launchZone(); }else{ @@ -176,7 +176,7 @@ public class Logic implements ApplicationListener{ ui.hudfrag.showLaunch(); } - for(Tile tile : state.teams.get(defaultTeam).cores){ + for(TileEntity tile : state.teams.playerCores()){ Effects.effect(Fx.launch, tile); } @@ -185,19 +185,18 @@ public class Logic implements ApplicationListener{ } Time.runTask(30f, () -> { - for(Tile tile : state.teams.get(defaultTeam).cores){ + for(TileEntity entity : state.teams.playerCores()){ for(Item item : content.items()){ - if(tile == null || tile.entity == null || tile.entity.items == null) continue; - data.addItem(item, tile.entity.items.get(item)); - Events.fire(new LaunchItemEvent(item, tile.entity.items.get(item))); + data.addItem(item, entity.items.get(item)); + Events.fire(new LaunchItemEvent(item, entity.items.get(item))); } - world.removeBlock(tile); + entity.tile.remove(); } state.launched = true; state.gameOver = true; Events.fire(new LaunchEvent()); //manually fire game over event now - Events.fire(new GameOverEvent(defaultTeam)); + Events.fire(new GameOverEvent(state.rules.defaultTeam)); }); } @@ -213,7 +212,7 @@ public class Logic implements ApplicationListener{ if(!state.is(State.menu)){ if(!net.client()){ - state.enemies = unitGroup.count(b -> b.getTeam() == waveTeam && b.countsAsEnemy()); + state.enemies = unitGroup.count(b -> b.getTeam() == state.rules.waveTeam && b.countsAsEnemy()); } if(!state.isPaused()){ diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index 4c86ecb9d0..3e325e5b31 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -17,11 +17,13 @@ import mindustry.entities.traits.*; import mindustry.entities.type.*; import mindustry.game.EventType.*; import mindustry.game.*; +import mindustry.game.Teams.*; import mindustry.gen.*; import mindustry.net.*; import mindustry.net.Administration.*; import mindustry.net.Packets.*; import mindustry.world.*; +import mindustry.world.blocks.storage.CoreBlock.*; import java.io.*; import java.nio.*; @@ -402,18 +404,16 @@ public class NetServer implements ApplicationListener{ public Team assignTeam(Player current, Iterable players){ //find team with minimum amount of players and auto-assign player to that. - return Structs.findMin(Team.all, team -> { - if(state.teams.isActive(team) && !state.teams.get(team).cores.isEmpty()){ - int count = 0; - for(Player other : players){ - if(other.getTeam() == team && other != current){ - count++; - } + TeamData re = state.teams.getActive().min(data -> { + int count = 0; + for(Player other : players){ + if(other.getTeam() == data.team && other != current){ + count++; } - return count; } - return Integer.MAX_VALUE; + return count; }); + return re == null ? null : re.team; } public void sendWorldData(Player player){ @@ -584,8 +584,8 @@ public class NetServer implements ApplicationListener{ public boolean isWaitingForPlayers(){ if(state.rules.pvp){ int used = 0; - for(Team t : Team.all){ - if(playerGroup.count(p -> p.getTeam() == t) > 0){ + for(TeamData t : state.teams.getActive()){ + if(playerGroup.count(p -> p.getTeam() == t.team) > 0){ used++; } } @@ -647,13 +647,13 @@ public class NetServer implements ApplicationListener{ public void writeEntitySnapshot(Player player) throws IOException{ syncStream.reset(); - ObjectSet cores = state.teams.get(player.getTeam()).cores; + Array cores = state.teams.cores(player.getTeam()); dataStream.writeByte(cores.size); - for(Tile tile : cores){ - dataStream.writeInt(tile.pos()); - tile.entity.items.write(dataStream); + for(CoreEntity entity : cores){ + dataStream.writeInt(entity.tile.pos()); + entity.items.write(dataStream); } dataStream.close(); diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java index 2a7cd16922..94528a62d8 100644 --- a/core/src/mindustry/core/Renderer.java +++ b/core/src/mindustry/core/Renderer.java @@ -18,11 +18,10 @@ import mindustry.entities.effect.*; import mindustry.entities.effect.GroundEffectEntity.*; import mindustry.entities.traits.*; import mindustry.entities.type.*; -import mindustry.game.*; import mindustry.game.EventType.*; import mindustry.graphics.*; import mindustry.input.*; -import mindustry.ui.Cicon; +import mindustry.ui.*; import mindustry.world.blocks.defense.ForceProjector.*; import static arc.Core.*; @@ -344,11 +343,7 @@ public class Renderer implements ApplicationListener{ Draw.rect("circle-shadow", u.x, u.y, size * rad, size * rad); }; - for(EntityGroup group : unitGroups){ - if(!group.isEmpty()){ - group.draw(unit -> !unit.isDead(), draw::get); - } - } + unitGroup.draw(unit -> !unit.isDead(), draw::get); if(!playerGroup.isEmpty()){ playerGroup.draw(unit -> !unit.isDead(), draw::get); @@ -361,34 +356,21 @@ public class Renderer implements ApplicationListener{ float trnsX = -12, trnsY = -13; Draw.color(0, 0, 0, 0.22f); - for(EntityGroup group : unitGroups){ - if(!group.isEmpty()){ - group.draw(unit -> unit.isFlying() && !unit.isDead(), baseUnit -> baseUnit.drawShadow(trnsX, trnsY)); - } - } - - if(!playerGroup.isEmpty()){ - playerGroup.draw(unit -> unit.isFlying() && !unit.isDead(), player -> player.drawShadow(trnsX, trnsY)); - } + unitGroup.draw(unit -> unit.isFlying() && !unit.isDead(), baseUnit -> baseUnit.drawShadow(trnsX, trnsY)); + playerGroup.draw(unit -> unit.isFlying() && !unit.isDead(), player -> player.drawShadow(trnsX, trnsY)); Draw.color(); } private void drawAllTeams(boolean flying){ - for(Team team : Team.all){ - EntityGroup group = unitGroups[(int) team.id]; + unitGroup.draw(u -> u.isFlying() == flying && !u.isDead(), Unit::drawUnder); + playerGroup.draw(p -> p.isFlying() == flying && !p.isDead(), Unit::drawUnder); - if(group.count(p -> p.isFlying() == flying) + playerGroup.count(p -> p.isFlying() == flying && p.getTeam() == team) == 0 && flying) continue; + unitGroup.draw(u -> u.isFlying() == flying && !u.isDead(), Unit::drawAll); + playerGroup.draw(p -> p.isFlying() == flying, Unit::drawAll); - unitGroups[(int) team.id].draw(u -> u.isFlying() == flying && !u.isDead(), Unit::drawUnder); - playerGroup.draw(p -> p.isFlying() == flying && p.getTeam() == team && !p.isDead(), Unit::drawUnder); - - unitGroups[(int) team.id].draw(u -> u.isFlying() == flying && !u.isDead(), Unit::drawAll); - playerGroup.draw(p -> p.isFlying() == flying && p.getTeam() == team, Unit::drawAll); - - unitGroups[(int) team.id].draw(u -> u.isFlying() == flying && !u.isDead(), Unit::drawOver); - playerGroup.draw(p -> p.isFlying() == flying && p.getTeam() == team, Unit::drawOver); - } + unitGroup.draw(u -> u.isFlying() == flying && !u.isDead(), Unit::drawOver); + playerGroup.draw(p -> p.isFlying() == flying, Unit::drawOver); } public void scaleCamera(float amount){ diff --git a/core/src/mindustry/core/World.java b/core/src/mindustry/core/World.java index 3cdd2ca4f9..ea0e9aa054 100644 --- a/core/src/mindustry/core/World.java +++ b/core/src/mindustry/core/World.java @@ -1,15 +1,15 @@ package mindustry.core; import arc.*; -import arc.struct.*; import arc.math.*; import arc.math.geom.*; -import arc.util.*; +import arc.struct.*; import arc.util.ArcAnnotate.*; -import mindustry.content.*; +import arc.util.*; import mindustry.core.GameState.*; import mindustry.game.EventType.*; import mindustry.game.*; +import mindustry.game.Teams.*; import mindustry.io.*; import mindustry.maps.*; import mindustry.maps.filters.*; @@ -233,33 +233,22 @@ public class World{ invalidMap = false; if(!headless){ - if(state.teams.get(defaultTeam).cores.size == 0 && !checkRules.pvp){ + if(state.teams.playerCores().size == 0 && !checkRules.pvp){ ui.showErrorMessage("$map.nospawn"); invalidMap = true; }else if(checkRules.pvp){ //pvp maps need two cores to be valid - int teams = 0; - for(Team team : Team.all){ - if(state.teams.get(team).cores.size != 0){ - teams ++; - } - } - if(teams < 2){ + if(state.teams.getActive().count(TeamData::hasCore) < 2){ invalidMap = true; ui.showErrorMessage("$map.nospawn.pvp"); } }else if(checkRules.attackMode){ //attack maps need two cores to be valid - invalidMap = state.teams.get(waveTeam).cores.isEmpty(); + invalidMap = state.teams.get(state.rules.waveTeam).noCores(); if(invalidMap){ ui.showErrorMessage("$map.nospawn.attack"); } } }else{ - invalidMap = true; - for(Team team : Team.all){ - if(state.teams.get(team).cores.size != 0){ - invalidMap = false; - } - } + invalidMap = !state.teams.getActive().contains(TeamData::hasCore); if(invalidMap){ throw new MapException(map, "Map has no cores!"); @@ -275,36 +264,6 @@ public class World{ } } - public void removeBlock(Tile tile){ - if(tile == null) return; - tile.link().getLinkedTiles(other -> other.setBlock(Blocks.air)); - } - - public void setBlock(Tile tile, Block block, Team team){ - setBlock(tile, block, team, 0); - } - - public void setBlock(Tile tile, Block block, Team team, int rotation){ - tile.setBlock(block, team, rotation); - if(block.isMultiblock()){ - int offsetx = -(block.size - 1) / 2; - int offsety = -(block.size - 1) / 2; - - for(int dx = 0; dx < block.size; dx++){ - for(int dy = 0; dy < block.size; dy++){ - int worldx = dx + offsetx + tile.x; - int worldy = dy + offsety + tile.y; - if(!(worldx == tile.x && worldy == tile.y)){ - Tile toplace = world.tile(worldx, worldy); - if(toplace != null){ - toplace.setBlock(BlockPart.get(dx + offsetx, dy + offsety), team); - } - } - } - } - } - } - public void raycastEachWorld(float x0, float y0, float x1, float y1, Raycaster cons){ raycastEach(toTile(x0), toTile(y0), toTile(x1), toTile(y1), cons); } diff --git a/core/src/mindustry/editor/DrawOperation.java b/core/src/mindustry/editor/DrawOperation.java index 22a7ad5730..061a7aee84 100755 --- a/core/src/mindustry/editor/DrawOperation.java +++ b/core/src/mindustry/editor/DrawOperation.java @@ -69,7 +69,7 @@ public class DrawOperation{ }else if(type == OpType.rotation.ordinal()){ tile.rotation(to); }else if(type == OpType.team.ordinal()){ - tile.setTeam(Team.all[to]); + tile.setTeam(Team.get(to)); }else if(type == OpType.overlay.ordinal()){ tile.setOverlayID(to); } diff --git a/core/src/mindustry/editor/EditorTile.java b/core/src/mindustry/editor/EditorTile.java index f9d00b8903..4a9effccfd 100644 --- a/core/src/mindustry/editor/EditorTile.java +++ b/core/src/mindustry/editor/EditorTile.java @@ -74,7 +74,7 @@ public class EditorTile extends Tile{ return; } - if(getTeamID() == (int) team.id) return; + if(getTeamID() == (int)team.id) return; op(OpType.team, getTeamID()); super.setTeam(team); } diff --git a/core/src/mindustry/editor/EditorTool.java b/core/src/mindustry/editor/EditorTool.java index a2a6927398..50442ff0f2 100644 --- a/core/src/mindustry/editor/EditorTool.java +++ b/core/src/mindustry/editor/EditorTool.java @@ -1,15 +1,14 @@ package mindustry.editor; -import arc.struct.IntArray; import arc.func.*; -import arc.math.Mathf; -import arc.math.geom.Bresenham2; -import arc.util.Structs; -import mindustry.Vars; -import mindustry.content.Blocks; -import mindustry.game.Team; +import arc.math.*; +import arc.math.geom.*; +import arc.struct.*; +import arc.util.*; +import mindustry.content.*; +import mindustry.game.*; import mindustry.world.*; -import mindustry.world.blocks.BlockPart; +import mindustry.world.blocks.*; public enum EditorTool{ zoom, @@ -80,7 +79,7 @@ public enum EditorTool{ editor.drawCircle(x, y, tile -> { if(mode == -1){ //erase block - Vars.world.removeBlock(tile); + tile.remove(); }else if(mode == 0){ //erase ore tile.clearOverlay(); @@ -141,7 +140,7 @@ public enum EditorTool{ if(tile.link().synthetic()){ Team dest = tile.getTeam(); if(dest == editor.drawTeam) return; - fill(editor, x, y, false, t -> t.getTeamID() == (int) dest.id && t.link().synthetic(), t -> t.setTeam(editor.drawTeam)); + fill(editor, x, y, false, t -> t.getTeamID() == (int)dest.id && t.link().synthetic(), t -> t.setTeam(editor.drawTeam)); } } } diff --git a/core/src/mindustry/editor/MapEditor.java b/core/src/mindustry/editor/MapEditor.java index c83c754b4e..7cab015b1f 100644 --- a/core/src/mindustry/editor/MapEditor.java +++ b/core/src/mindustry/editor/MapEditor.java @@ -10,7 +10,6 @@ import arc.util.Structs; import mindustry.content.Blocks; import mindustry.game.Team; import mindustry.gen.TileOp; -import mindustry.io.LegacyMapIO; import mindustry.io.MapIO; import mindustry.maps.Map; import mindustry.world.*; @@ -65,7 +64,7 @@ public class MapEditor{ reset(); createTiles(pixmap.getWidth(), pixmap.getHeight()); - load(() -> LegacyMapIO.readPixmap(pixmap, tiles())); + load(() -> MapIO.readPixmap(pixmap, tiles())); renderer.resize(width(), height()); } @@ -86,7 +85,7 @@ public class MapEditor{ for(int x = 0; x < width(); x++){ for(int y = 0; y < height(); y++){ if(tiles[x][y].block().isMultiblock()){ - world.setBlock(tiles[x][y], tiles[x][y].block(), tiles[x][y].getTeam()); + tiles[x][y].set(tiles[x][y].block(), tiles[x][y].getTeam()); } } } @@ -176,7 +175,7 @@ public class MapEditor{ } } - world.setBlock(tile(x, y), drawBlock, drawTeam); + tile(x, y).set(drawBlock, drawTeam); }else{ boolean isFloor = drawBlock.isFloor() && drawBlock != Blocks.air; @@ -185,7 +184,7 @@ public class MapEditor{ //remove linked tiles blocking the way if(!isFloor && (tile.isLinked() || tile.block().isMultiblock())){ - world.removeBlock(tile.link()); + tile.link().remove(); } if(isFloor){ diff --git a/core/src/mindustry/editor/MapEditorDialog.java b/core/src/mindustry/editor/MapEditorDialog.java index 0ee0fca085..b9a28501b9 100644 --- a/core/src/mindustry/editor/MapEditorDialog.java +++ b/core/src/mindustry/editor/MapEditorDialog.java @@ -551,7 +551,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ int i = 0; - for(Team team : Team.all){ + for(Team team : Team.base()){ ImageButton button = new ImageButton(Tex.whiteui, Styles.clearTogglePartiali); button.margin(4f); button.getImageCell().grow(); diff --git a/core/src/mindustry/editor/MapGenerateDialog.java b/core/src/mindustry/editor/MapGenerateDialog.java index 976d7fc3b2..8704b8a209 100644 --- a/core/src/mindustry/editor/MapGenerateDialog.java +++ b/core/src/mindustry/editor/MapGenerateDialog.java @@ -138,7 +138,7 @@ public class MapGenerateDialog extends FloatingDialog{ tile.rotation(write.rotation); tile.setFloor((Floor)content.block(write.floor)); tile.setBlock(content.block(write.block)); - tile.setTeam(Team.all[write.team]); + tile.setTeam(Team.get(write.team)); tile.setOverlay(content.block(write.ore)); } } @@ -367,7 +367,7 @@ public class MapGenerateDialog extends FloatingDialog{ GenTile tile = buffer1[px][py]; input.apply(x, y, content.block(tile.floor), content.block(tile.block), content.block(tile.ore)); filter.apply(input); - buffer2[px][py].set(input.floor, input.block, input.ore, Team.all[tile.team], tile.rotation); + buffer2[px][py].set(input.floor, input.block, input.ore, Team.get(tile.team), tile.rotation); } } for(int px = 0; px < pixmap.getWidth(); px++){ @@ -415,7 +415,7 @@ public class MapGenerateDialog extends FloatingDialog{ this.floor = floor.id; this.block = wall.id; this.ore = ore.id; - this.team = (byte) (int) team.id; + this.team = (byte) (int)team.id; this.rotation = (byte)rotation; } @@ -437,7 +437,7 @@ public class MapGenerateDialog extends FloatingDialog{ ctile.setBlock(content.block(block)); ctile.setOverlay(content.block(ore)); ctile.rotation(rotation); - ctile.setTeam(Team.all[team]); + ctile.setTeam(Team.get(team)); return ctile; } } diff --git a/core/src/mindustry/entities/Damage.java b/core/src/mindustry/entities/Damage.java index a9bdd04f3f..3fe1b00d31 100644 --- a/core/src/mindustry/entities/Damage.java +++ b/core/src/mindustry/entities/Damage.java @@ -88,7 +88,7 @@ public class Damage{ tr.trns(angle, length); Intc2 collider = (cx, cy) -> { Tile tile = world.ltile(cx, cy); - if(tile != null && !collidedBlocks.contains(tile.pos()) && tile.entity != null && tile.getTeamID() != (int) team.id && tile.entity.collide(hitter)){ + if(tile != null && !collidedBlocks.contains(tile.pos()) && tile.entity != null && tile.getTeamID() != (int)team.id && tile.entity.collide(hitter)){ tile.entity.collision(hitter); collidedBlocks.add(tile.pos()); hitter.getBulletType().hit(hitter, tile.worldx(), tile.worldy()); diff --git a/core/src/mindustry/entities/Units.java b/core/src/mindustry/entities/Units.java index ad228556b8..09e0293241 100644 --- a/core/src/mindustry/entities/Units.java +++ b/core/src/mindustry/entities/Units.java @@ -157,7 +157,7 @@ public class Units{ /** Iterates over all units in a rectangle. */ public static void nearby(Team team, float x, float y, float width, float height, Cons cons){ - unitGroups[(int) team.id].intersect(x, y, width, height, cons); + unitGroups[(int)team.id].intersect(x, y, width, height, cons); playerGroup.intersect(x, y, width, height, player -> { if(player.getTeam() == team){ cons.get(player); @@ -167,7 +167,7 @@ public class Units{ /** Iterates over all units in a circle around this position. */ public static void nearby(Team team, float x, float y, float radius, Cons cons){ - unitGroups[(int) team.id].intersect(x - radius, y - radius, radius*2f, radius*2f, unit -> { + unitGroups[(int)team.id].intersect(x - radius, y - radius, radius*2f, radius*2f, unit -> { if(unit.withinDst(x, y, radius)){ cons.get(unit); } @@ -183,7 +183,7 @@ public class Units{ /** Iterates over all units in a rectangle. */ public static void nearby(float x, float y, float width, float height, Cons cons){ for(Team team : Team.all){ - unitGroups[(int) team.id].intersect(x, y, width, height, cons); + unitGroups[(int)team.id].intersect(x, y, width, height, cons); } playerGroup.intersect(x, y, width, height, cons); @@ -199,7 +199,7 @@ public class Units{ EnumSet targets = state.teams.enemiesOf(team); for(Team other : targets){ - unitGroups[(int) other.id].intersect(x, y, width, height, cons); + unitGroups[(int)other.id].intersect(x, y, width, height, cons); } playerGroup.intersect(x, y, width, height, player -> { @@ -216,10 +216,7 @@ public class Units{ /** Iterates over all units. */ public static void all(Cons cons){ - for(Team team : Team.all){ - unitGroups[(int) team.id].all().each(cons); - } - + unitGroup.all().each(cons); playerGroup.all().each(cons); } diff --git a/core/src/mindustry/entities/type/BaseUnit.java b/core/src/mindustry/entities/type/BaseUnit.java index 28a6eea861..03b4f2d0de 100644 --- a/core/src/mindustry/entities/type/BaseUnit.java +++ b/core/src/mindustry/entities/type/BaseUnit.java @@ -185,23 +185,16 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ } } - public Tile getClosest(BlockFlag flag){ + public @Nullable Tile getClosest(BlockFlag flag){ return Geometry.findClosest(x, y, indexer.getAllied(team, flag)); } - public Tile getClosestSpawner(){ + public @Nullable Tile getClosestSpawner(){ return Geometry.findClosest(x, y, Vars.spawner.getGroundSpawns()); } - public TileEntity getClosestEnemyCore(){ - for(Team enemy : Vars.state.teams.enemiesOf(team)){ - Tile tile = Geometry.findClosest(x, y, Vars.state.teams.get(enemy).cores); - if(tile != null){ - return tile.entity; - } - } - - return null; + public @Nullable TileEntity getClosestEnemyCore(){ + return Vars.state.teams.closestEnemyCore(x, y, team); } public UnitState getStartState(){ @@ -370,7 +363,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ @Override public EntityGroup targetGroup(){ - return unitGroups[(int) team.id]; + return unitGroup; } @Override diff --git a/core/src/mindustry/entities/type/TileEntity.java b/core/src/mindustry/entities/type/TileEntity.java index 85c6c9d2eb..4a2a5aee91 100644 --- a/core/src/mindustry/entities/type/TileEntity.java +++ b/core/src/mindustry/entities/type/TileEntity.java @@ -124,7 +124,8 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{ @CallSuper public void write(DataOutput stream) throws IOException{ stream.writeShort((short)health); - stream.writeByte(Pack.byteByte(tile.getTeamID(), tile.rotation())); //team + rotation + stream.writeByte(Pack.byteByte((byte)8, tile.rotation())); //rotation + marker to indicate that team is moved (8 isn't valid) + stream.writeByte(tile.getTeamID()); if(items != null) items.write(stream); if(power != null) power.write(stream); if(liquids != null) liquids.write(stream); @@ -134,11 +135,11 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{ @CallSuper public void read(DataInput stream, byte revision) throws IOException{ health = stream.readUnsignedShort(); - byte tr = stream.readByte(); - byte team = Pack.leftByte(tr); - byte rotation = Pack.rightByte(tr); + byte packedrot = stream.readByte(); + byte team = Pack.leftByte(packedrot) == 8 ? stream.readByte() : Pack.leftByte(packedrot); + byte rotation = Pack.rightByte(packedrot); - tile.setTeam(Team.all[team]); + tile.setTeam(Team.get(team)); tile.rotation(rotation); if(items != null) items.read(stream); @@ -277,7 +278,7 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{ Events.fire(new BlockDestroyEvent(tile)); block.breakSound.at(tile); block.onDestroyed(tile); - world.removeBlock(tile); + tile.remove(); remove(); } } diff --git a/core/src/mindustry/entities/type/Unit.java b/core/src/mindustry/entities/type/Unit.java index 81ec1de7cb..0b0ccc277a 100644 --- a/core/src/mindustry/entities/type/Unit.java +++ b/core/src/mindustry/entities/type/Unit.java @@ -1,12 +1,12 @@ package mindustry.entities.type; import arc.*; -import arc.struct.*; import arc.graphics.*; import arc.graphics.g2d.*; import arc.math.*; import arc.math.geom.*; import arc.scene.ui.layout.*; +import arc.struct.*; import arc.util.*; import arc.util.ArcAnnotate.*; import mindustry.content.*; @@ -16,13 +16,11 @@ import mindustry.entities.traits.*; import mindustry.entities.units.*; import mindustry.game.EventType.*; import mindustry.game.*; -import mindustry.game.Teams.*; import mindustry.gen.*; import mindustry.graphics.*; import mindustry.net.*; import mindustry.type.*; import mindustry.ui.*; -import mindustry.ui.Cicon; import mindustry.world.*; import mindustry.world.blocks.*; @@ -158,7 +156,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ this.item.amount = itemAmount; this.item.item = content.item(itemID); this.dead = dead; - this.team = Team.all[team]; + this.team = Team.get(team); this.health = health; this.x = x; this.y = y; @@ -169,7 +167,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ public void writeSave(DataOutput stream, boolean net) throws IOException{ if(item.item == null) item.item = Items.copper; - stream.writeByte((int) team.id); + stream.writeByte((int)team.id); stream.writeBoolean(isDead()); stream.writeFloat(net ? interpolator.target.x : x); stream.writeFloat(net ? interpolator.target.y : y); @@ -217,13 +215,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ float fsize = getSize() / radScl; moveVector.setZero(); float cx = x - fsize/2f, cy = y - fsize/2f; - - for(Team team : Team.all){ - if(team != getTeam() || !(this instanceof Player)){ - avoid(unitGroups[(int) team.id].intersect(cx, cy, fsize, fsize)); - } - } - + avoid(unitGroup.intersect(cx, cy, fsize, fsize)); if(!(this instanceof Player)){ avoid(playerGroup.intersect(cx, cy, fsize, fsize)); } @@ -242,14 +234,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ } public @Nullable TileEntity getClosestCore(){ - TeamData data = state.teams.get(team); - - Tile tile = Geometry.findClosest(x, y, data.cores); - if(tile == null){ - return null; - }else{ - return tile.entity; - } + return state.teams.closestCore(x, y, team); } public Floor getFloorOn(){ @@ -275,7 +260,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ } //apply knockback based on spawns - if(getTeam() != waveTeam){ + if(getTeam() != state.rules.waveTeam){ float relativeSize = state.rules.dropZoneRadius + getSize()/2f + 1f; for(Tile spawn : spawner.getGroundSpawns()){ if(withinDst(spawn.worldx(), spawn.worldy(), relativeSize)){ diff --git a/core/src/mindustry/entities/type/base/BuilderDrone.java b/core/src/mindustry/entities/type/base/BuilderDrone.java index aad348b9ce..83d4606122 100644 --- a/core/src/mindustry/entities/type/base/BuilderDrone.java +++ b/core/src/mindustry/entities/type/base/BuilderDrone.java @@ -114,7 +114,7 @@ public class BuilderDrone extends BaseDrone implements BuilderTrait{ public BuilderDrone(){ if(reset.check()){ Events.on(BuildSelectEvent.class, event -> { - EntityGroup group = unitGroups[(int) event.team.id]; + EntityGroup group = unitGroups[(int)event.team.id]; if(!(event.tile.entity instanceof BuildEntity)) return; diff --git a/core/src/mindustry/entities/units/UnitDrops.java b/core/src/mindustry/entities/units/UnitDrops.java index b58171ee2f..f57ff0a75d 100644 --- a/core/src/mindustry/entities/units/UnitDrops.java +++ b/core/src/mindustry/entities/units/UnitDrops.java @@ -7,13 +7,14 @@ import mindustry.entities.type.BaseUnit; import mindustry.entities.type.TileEntity; import mindustry.gen.Call; import mindustry.type.Item; +import static mindustry.Vars.*; public class UnitDrops{ private static Item[] dropTable; public static void dropItems(BaseUnit unit){ //items only dropped in waves for enemy team - if(unit.getTeam() != Vars.waveTeam || !Vars.state.rules.unitDrops){ + if(unit.getTeam() != state.rules.waveTeam || !Vars.state.rules.unitDrops){ return; } diff --git a/core/src/mindustry/game/Gamemode.java b/core/src/mindustry/game/Gamemode.java index aca4d3340e..3679ba0ad2 100644 --- a/core/src/mindustry/game/Gamemode.java +++ b/core/src/mindustry/game/Gamemode.java @@ -4,7 +4,7 @@ import arc.*; import arc.func.*; import mindustry.maps.*; -import static mindustry.Vars.waveTeam; +import static mindustry.Vars.*; /** Defines preset rule sets. */ public enum Gamemode{ @@ -22,7 +22,7 @@ public enum Gamemode{ attack(rules -> { rules.unitDrops = true; rules.attackMode = true; - }, map -> map.teams.contains((int) waveTeam.id)), + }, map -> map.teams.contains((int)state.rules.waveTeam.id)), pvp(rules -> { rules.pvp = true; rules.enemyCoreBuildRadius = 600f; diff --git a/core/src/mindustry/game/MusicControl.java b/core/src/mindustry/game/MusicControl.java index f4352f28be..26a44876ac 100644 --- a/core/src/mindustry/game/MusicControl.java +++ b/core/src/mindustry/game/MusicControl.java @@ -83,7 +83,7 @@ public class MusicControl{ /** Whether to play dark music.*/ private boolean isDark(){ - if(!state.teams.get(player.getTeam()).cores.isEmpty() && state.teams.get(player.getTeam()).cores.first().entity.healthf() < 0.85f){ + if(state.teams.get(player.getTeam()).hasCore() && state.teams.get(player.getTeam()).core().healthf() < 0.85f){ //core damaged -> dark return true; } diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java index 8b40abd1ae..d910952021 100644 --- a/core/src/mindustry/game/Rules.java +++ b/core/src/mindustry/game/Rules.java @@ -78,6 +78,10 @@ public class Rules{ public boolean lighting = false; /** Ambient light color, used when lighting is enabled. */ public Color ambientLight = new Color(0.01f, 0.01f, 0.04f, 0.99f); + /** team of the player by default */ + public Team defaultTeam = Team.sharded; + /** team of the enemy in waves/sectors */ + public Team waveTeam = Team.crux; /** Copies this ruleset exactly. Not very efficient at all, do not use often. */ public Rules copy(){ diff --git a/core/src/mindustry/game/Schematics.java b/core/src/mindustry/game/Schematics.java index b9c56744a3..b30658692e 100644 --- a/core/src/mindustry/game/Schematics.java +++ b/core/src/mindustry/game/Schematics.java @@ -254,7 +254,7 @@ public class Schematics implements Loadable{ Tile tile = world.tile(st.x + ox, st.y + oy); if(tile == null) return; - world.setBlock(tile, st.block, defaultTeam); + tile.set(st.block, state.rules.defaultTeam); tile.rotation(st.rotation); if(st.block.posConfig){ tile.configureAny(Pos.get(tile.x - st.x + Pos.x(st.config), tile.y - st.y + Pos.y(st.config))); diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java index a64e5fd127..a97d84a70b 100644 --- a/core/src/mindustry/game/Team.java +++ b/core/src/mindustry/game/Team.java @@ -2,34 +2,66 @@ package mindustry.game; import arc.*; import arc.graphics.*; -import arc.struct.*; +import arc.util.*; import mindustry.graphics.*; -public class Team{ - /** All registered teams. */ - public final static Array all = new Array<>(); - public final static Team - derelict = new Team("derelict", Color.valueOf("4d4e58")), - sharded = new Team("sharded", Pal.accent.cpy()), - crux = new Team("crux", Color.valueOf("e82d2d")), - green = new Team("green", Color.valueOf("4dd98b")), - purple = new Team("purple", Color.valueOf("9a4bdf")), - blue = new Team("blue", Color.royal.cpy()); - +public class Team implements Comparable{ public final Color color; public final int intColor; public final String name; - public final int id; + public final byte id; - public Team(String name, Color color){ + /** All 256 registered teams. */ + private static final Team[] all = new Team[256]; + /** The 6 base teams used in the editor. */ + private static final Team[] baseTeams = new Team[6]; + + public final static Team + derelict = new Team(0, "derelict", Color.valueOf("4d4e58")), + sharded = new Team(1, "sharded", Pal.accent.cpy()), + crux = new Team(2, "crux", Color.valueOf("e82d2d")), + green = new Team(3, "green", Color.valueOf("4dd98b")), + purple = new Team(4, "purple", Color.valueOf("9a4bdf")), + blue = new Team(5, "blue", Color.royal.cpy()); + + static{ + //create the whole 256 placeholder teams + for(int i = 6; i < all.length; i++){ + new Team(i, "team#" + i, Color.HSVtoRGB(360f * (float)(i) / all.length, 100f, 100f, 1f)); + } + } + + public static Team get(int id){ + return all[Pack.u((byte)id)]; + } + + /** @return the 6 base team colors. */ + public static Team[] base(){ + return baseTeams; + } + + /** @return all the teams - do not use this for lookup! */ + public static Team[] all(){ + return all; + } + + protected Team(int id, String name, Color color){ this.name = name; this.color = color; this.intColor = Color.rgba8888(color); - this.id = all.size; - all.add(this); + this.id = (byte)id; + + int us = Pack.u(this.id); + if(us < 6) baseTeams[us] = this; + all[us] = this; } public String localized(){ - return Core.bundle.get("team." + name + ".name"); + return Core.bundle.get("team." + name + ".name", name); + } + + @Override + public int compareTo(Team team){ + return Integer.compare(id, team.id); } } diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java index d77b7902ae..d5d033ec46 100644 --- a/core/src/mindustry/game/Teams.java +++ b/core/src/mindustry/game/Teams.java @@ -1,44 +1,82 @@ package mindustry.game; import arc.func.*; +import arc.math.geom.*; import arc.struct.*; -import mindustry.*; +import arc.util.*; +import arc.util.ArcAnnotate.*; import mindustry.entities.type.*; -import mindustry.world.*; +import mindustry.world.blocks.storage.CoreBlock.*; + +import static mindustry.Vars.state; /** Class for various team-based utilities. */ public class Teams{ /** Maps team IDs to team data. */ - private Array map = new Array<>(); + private TeamData[] map = new TeamData[256]; /** Active teams. */ private Array active = new Array<>(); - public T eachEnemyCore(Team team, Func ret){ - T out = null; - //todo each enemy, each enemy core... - return out; + public @Nullable CoreEntity closestEnemyCore(float x, float y, Team team){ + for(TeamData data : active){ + if(areEnemies(team, data.team)){ + CoreEntity tile = Geometry.findClosest(x, y, data.cores); + if(tile != null){ + return tile; + } + } + } + return null; } - /** - * Register a team. - * @param team The team type enum. - */ - public void add(Team team){ - map[team.id] = new TeamData(team); + public @Nullable CoreEntity closestCore(float x, float y, Team team){ + return Geometry.findClosest(x, y, get(team).cores); + } + + public boolean eachEnemyCore(Team team, Boolf ret){ + for(TeamData data : active){ + if(areEnemies(team, data.team)){ + for(CoreEntity tile : data.cores){ + if(ret.get(tile)){ + return true; + } + } + } + } + return false; + } + + public void eachEnemyCore(Team team, Cons ret){ + for(TeamData data : active){ + if(areEnemies(team, data.team)){ + for(TileEntity tile : data.cores){ + ret.get(tile); + } + } + } } /** Returns team data by type. */ public TeamData get(Team team){ - if(map[team.id] == null){ - add(team); + if(map[Pack.u(team.id)] == null){ + map[Pack.u(team.id)] = new TeamData(team); } - return map[team.id]; + return map[Pack.u(team.id)]; + } + + public Array playerCores(){ + return get(state.rules.defaultTeam).cores; + } + + /** Do not modify! */ + public Array cores(Team team){ + return get(team).cores; } /** Returns whether a team is active, e.g. whether it has any cores remaining. */ public boolean isActive(Team team){ //the enemy wave team is always active - return team == Vars.waveTeam || get(team).cores.size > 0; + return team == state.rules.waveTeam || get(team).cores.size > 0; } /** Returns whether {@param other} is an enemy of {@param #team}. */ @@ -47,20 +85,63 @@ public class Teams{ return team != other; } - /** Allocates a new array with the active teams. - * Never call in the main game loop.*/ - public Array getActive(){ - return Array.select(map, t -> t != null); + public boolean canInteract(Team team, Team other){ + return team == other || other == Team.derelict; } - public static class TeamData{ - public final ObjectSet cores = new ObjectSet<>(); + /** Do not modify. */ + public Array getActive(){ + return active; + } + + public void registerCore(CoreEntity core){ + TeamData data = get(core.getTeam()); + //add core if not present + if(!data.cores.contains(core)){ + data.cores.add(core); + } + + //register in active list if needed + if(data.active() && !active.contains(data)){ + active.add(data); + } + } + + public void unregisterCore(CoreEntity entity){ + TeamData data = get(entity.getTeam()); + //remove core + data.cores.remove(entity); + //unregister in active list + if(!data.active()){ + active.remove(data); + } + } + + public class TeamData{ + private final Array cores = new Array<>(); + public final Team team; public Queue brokenBlocks = new Queue<>(); public TeamData(Team team){ this.team = team; } + + public boolean active(){ + return team == state.rules.waveTeam || cores.size > 0; + } + + public boolean hasCore(){ + return cores.size > 0; + } + + public boolean noCores(){ + return cores.isEmpty(); + } + + public TileEntity core(){ + return cores.first(); + } } /** Represents a block made by this team that was destroyed somewhere on the map. diff --git a/core/src/mindustry/game/Tutorial.java b/core/src/mindustry/game/Tutorial.java index 569fbd380c..300ab01283 100644 --- a/core/src/mindustry/game/Tutorial.java +++ b/core/src/mindustry/game/Tutorial.java @@ -10,6 +10,7 @@ import arc.scene.ui.*; import arc.scene.ui.layout.*; import arc.util.*; import mindustry.content.*; +import mindustry.entities.type.*; import mindustry.game.EventType.*; import mindustry.graphics.*; import mindustry.type.*; @@ -161,7 +162,7 @@ public class Tutorial{ }, withdraw(() -> event("withdraw")){ void begin(){ - state.teams.get(defaultTeam).cores.first().entity.items.add(Items.copper, 10); + state.teams.playerCores().first().items.add(Items.copper, 10); } }, deposit(() -> event("deposit")), @@ -239,18 +240,18 @@ public class Tutorial{ //utility static void placeBlocks(){ - Tile core = state.teams.get(defaultTeam).cores.first(); + TileEntity core = state.teams.playerCores().first(); for(int i = 0; i < blocksToBreak; i++){ - world.removeBlock(world.ltile(core.x + blockOffset, core.y + i)); - world.tile(core.x + blockOffset, core.y + i).setBlock(Blocks.scrapWall, defaultTeam); + world.ltile(core.tile.x + blockOffset, core.tile.y + i).remove(); + world.tile(core.tile.x + blockOffset, core.tile.y + i).setBlock(Blocks.scrapWall, state.rules.defaultTeam); } } static boolean blocksBroken(){ - Tile core = state.teams.get(defaultTeam).cores.first(); + TileEntity core = state.teams.playerCores().first(); for(int i = 0; i < blocksToBreak; i++){ - if(world.tile(core.x + blockOffset, core.y + i).block() == Blocks.scrapWall){ + if(world.tile(core.tile.x + blockOffset, core.tile.y + i).block() == Blocks.scrapWall){ return false; } } @@ -270,7 +271,7 @@ public class Tutorial{ } static int item(Item item){ - return state.teams.get(defaultTeam).cores.isEmpty() ? 0 : state.teams.get(defaultTeam).cores.first().entity.items.get(item); + return state.teams.get(state.rules.defaultTeam).noCores() ? 0 : state.teams.playerCores().first().items.get(item); } static boolean toggled(String name){ diff --git a/core/src/mindustry/graphics/OverlayRenderer.java b/core/src/mindustry/graphics/OverlayRenderer.java index 3001159c74..3c65c1b9f4 100644 --- a/core/src/mindustry/graphics/OverlayRenderer.java +++ b/core/src/mindustry/graphics/OverlayRenderer.java @@ -10,13 +10,12 @@ import mindustry.*; import mindustry.content.*; import mindustry.entities.*; import mindustry.entities.type.*; -import mindustry.game.*; import mindustry.input.*; -import mindustry.type.Category; -import mindustry.ui.Cicon; +import mindustry.type.*; +import mindustry.ui.*; import mindustry.world.*; -import mindustry.world.blocks.units.MechPad; -import mindustry.world.meta.BlockFlag; +import mindustry.world.blocks.units.*; +import mindustry.world.meta.*; import static mindustry.Vars.*; @@ -95,17 +94,15 @@ public class OverlayRenderer{ Lines.stroke(buildFadeTime * 2f); if(buildFadeTime > 0.005f){ - for(Team enemy : state.teams.enemiesOf(player.getTeam())){ - for(Tile core : state.teams.get(enemy).cores){ - float dst = Mathf.dst(player.x, player.y, core.drawx(), core.drawy()); - if(dst < state.rules.enemyCoreBuildRadius * 1.5f){ - Draw.color(Color.darkGray); - Lines.circle(core.drawx(), core.drawy() - 2, state.rules.enemyCoreBuildRadius); - Draw.color(Pal.accent, enemy.color, 0.5f + Mathf.absin(Time.time(), 10f, 0.5f)); - Lines.circle(core.drawx(), core.drawy(), state.rules.enemyCoreBuildRadius); - } + state.teams.eachEnemyCore(player.getTeam(), core -> { + float dst = core.dst(player); + if(dst < state.rules.enemyCoreBuildRadius * 1.5f){ + Draw.color(Color.darkGray); + Lines.circle(core.x, core.y - 2, state.rules.enemyCoreBuildRadius); + Draw.color(Pal.accent, core.getTeam().color, 0.5f + Mathf.absin(Time.time(), 10f, 0.5f)); + Lines.circle(core.x, core.y, state.rules.enemyCoreBuildRadius); } - } + }); } Lines.stroke(2f); diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java index b156c3f7f4..38aa0c2fd4 100644 --- a/core/src/mindustry/input/DesktopInput.java +++ b/core/src/mindustry/input/DesktopInput.java @@ -397,7 +397,7 @@ public class DesktopInput extends InputHandler{ } if(mode == placing && block != null){ - if(!overrideLineRotation && !Core.input.keyDown(Binding.diagonal_placement) && (selectX != cursorX || selectY != cursorY) && ((int) Core.input.axisTap(Binding.rotate) != 0)){ + if(!overrideLineRotation && !Core.input.keyDown(Binding.diagonal_placement) && (selectX != cursorX || selectY != cursorY) && ((int)Core.input.axisTap(Binding.rotate) != 0)){ rotation = ((int)((Angles.angle(selectX, selectY, cursorX, cursorY) + 45) / 90f)) % 4; overrideLineRotation = true; } diff --git a/core/src/mindustry/io/LegacyMapIO.java b/core/src/mindustry/io/LegacyMapIO.java deleted file mode 100644 index d3f975e821..0000000000 --- a/core/src/mindustry/io/LegacyMapIO.java +++ /dev/null @@ -1,214 +0,0 @@ -package mindustry.io; - -import arc.struct.*; -import arc.files.*; -import arc.graphics.*; -import arc.util.*; -import arc.util.serialization.*; -import mindustry.content.*; -import mindustry.ctype.ContentType; -import mindustry.game.*; -import mindustry.io.MapIO.*; -import mindustry.maps.*; -import mindustry.world.*; -import mindustry.world.LegacyColorMapper.*; -import mindustry.world.blocks.*; - -import java.io.*; -import java.util.zip.*; - -import static mindustry.Vars.*; - -/** Map IO for the "old" .mmap format. - * Differentiate between legacy maps and new maps by checking the extension (or the header).*/ -public class LegacyMapIO{ - private static final ObjectMap fallback = ObjectMap.of("alpha-dart-mech-pad", "dart-mech-pad"); - private static final Json json = new Json(); - - /* Convert a map from the old format to the new format. */ - public static void convertMap(Fi in, Fi out) throws IOException{ - Map map = readMap(in, true); - - String waves = map.tags.get("waves", "[]"); - Array groups = new Array<>(json.fromJson(SpawnGroup[].class, waves)); - - Tile[][] tiles = world.createTiles(map.width, map.height); - for(int x = 0; x < map.width; x++){ - for(int y = 0; y < map.height; y++){ - tiles[x][y] = new CachedTile(); - tiles[x][y].x = (short)x; - tiles[x][y].y = (short)y; - } - } - state.rules.spawns = groups; - readTiles(map, tiles); - MapIO.writeMap(out, map); - } - - public static Map readMap(Fi file, boolean custom) throws IOException{ - try(DataInputStream stream = new DataInputStream(file.read(1024))){ - StringMap tags = new StringMap(); - - //meta is uncompressed - int version = stream.readInt(); - if(version != 1){ - throw new IOException("Outdated legacy map format"); - } - int build = stream.readInt(); - short width = stream.readShort(), height = stream.readShort(); - byte tagAmount = stream.readByte(); - - for(int i = 0; i < tagAmount; i++){ - String name = stream.readUTF(); - String value = stream.readUTF(); - tags.put(name, value); - } - - return new Map(file, width, height, tags, custom, version, build); - } - } - - public static void readTiles(Map map, Tile[][] tiles) throws IOException{ - readTiles(map, (x, y) -> tiles[x][y]); - } - - public static void readTiles(Map map, TileProvider tiles) throws IOException{ - readTiles(map.file, map.width, map.height, tiles); - } - - private static void readTiles(Fi file, int width, int height, Tile[][] tiles) throws IOException{ - readTiles(file, width, height, (x, y) -> tiles[x][y]); - } - - private static void readTiles(Fi file, int width, int height, TileProvider tiles) throws IOException{ - try(BufferedInputStream input = file.read(bufferSize)){ - - //read map - { - DataInputStream stream = new DataInputStream(input); - - stream.readInt(); //version - stream.readInt(); //build - stream.readInt(); //width + height - byte tagAmount = stream.readByte(); - - for(int i = 0; i < tagAmount; i++){ - stream.readUTF(); //key - stream.readUTF(); //val - } - } - - try(DataInputStream stream = new DataInputStream(new InflaterInputStream(input))){ - - try{ - byte mapped = stream.readByte(); - IntMap idmap = new IntMap<>(); - IntMap namemap = new IntMap<>(); - - for(int i = 0; i < mapped; i++){ - byte type = stream.readByte(); - short total = stream.readShort(); - - for(int j = 0; j < total; j++){ - String name = stream.readUTF(); - if(type == 1){ - Block res = content.getByName(ContentType.block, fallback.get(name, name)); - idmap.put(j, res == null ? Blocks.air : res); - namemap.put(j, fallback.get(name, name)); - } - } - } - - //read floor and create tiles first - for(int i = 0; i < width * height; i++){ - int x = i % width, y = i / width; - int floorid = stream.readUnsignedByte(); - int oreid = stream.readUnsignedByte(); - int consecutives = stream.readUnsignedByte(); - - Tile tile = tiles.get(x, y); - tile.setFloor((Floor)idmap.get(floorid)); - tile.setOverlay(idmap.get(oreid)); - - for(int j = i + 1; j < i + 1 + consecutives; j++){ - int newx = j % width, newy = j / width; - Tile newTile = tiles.get(newx, newy); - newTile.setFloor((Floor)idmap.get(floorid)); - newTile.setOverlay(idmap.get(oreid)); - } - - i += consecutives; - } - - //read blocks - for(int i = 0; i < width * height; i++){ - int x = i % width, y = i / width; - int id = stream.readUnsignedByte(); - Block block = idmap.get(id); - if(block == null) block = Blocks.air; - - Tile tile = tiles.get(x, y); - //the spawn block is saved in the block tile layer in older maps, shift it to the overlay - if(block != Blocks.spawn){ - tile.setBlock(block); - }else{ - tile.setOverlay(block); - } - - if(namemap.get(id, "").equals("part")){ - stream.readByte(); //link - }else if(tile.entity != null){ - byte tr = stream.readByte(); - stream.readShort(); //read health (which is actually irrelevant) - - byte team = Pack.leftByte(tr); - byte rotation = Pack.rightByte(tr); - - tile.setTeam(Team.all[team]); - tile.entity.health = tile.block().health; - tile.rotation(rotation); - - if(tile.block() == Blocks.liquidSource || tile.block() == Blocks.unloader || tile.block() == Blocks.sorter){ - stream.readByte(); //these blocks have an extra config byte, read it - } - }else{ //no entity/part, read consecutives - int consecutives = stream.readUnsignedByte(); - - for(int j = i + 1; j < i + 1 + consecutives; j++){ - int newx = j % width, newy = j / width; - tiles.get(newx, newy).setBlock(block); - } - - i += consecutives; - } - } - - }finally{ - content.setTemporaryMapper(null); - } - } - } - } - - /** Reads a pixmap in the 3.5 pixmap format. */ - public static void readPixmap(Pixmap pixmap, Tile[][] tiles){ - for(int x = 0; x < pixmap.getWidth(); x++){ - for(int y = 0; y < pixmap.getHeight(); y++){ - int color = pixmap.getPixel(x, pixmap.getHeight() - 1 - y); - LegacyBlock block = LegacyColorMapper.get(color); - Tile tile = tiles[x][y]; - - tile.setFloor(block.floor); - tile.setBlock(block.wall); - if(block.ore != null) tile.setOverlay(block.ore); - - //place core - if(color == Color.rgba8888(Color.green)){ - //actual core parts - tile.setBlock(Blocks.coreShard); - tile.setTeam(Team.sharded); - } - } - } - } -} diff --git a/core/src/mindustry/io/MapIO.java b/core/src/mindustry/io/MapIO.java index 07e9823569..d26adee127 100644 --- a/core/src/mindustry/io/MapIO.java +++ b/core/src/mindustry/io/MapIO.java @@ -10,6 +10,7 @@ import mindustry.core.*; import mindustry.game.*; import mindustry.maps.*; import mindustry.world.*; +import mindustry.world.LegacyColorMapper.*; import mindustry.world.blocks.storage.*; import java.io.*; @@ -91,7 +92,7 @@ public class MapIO{ public void setTeam(Team team){ super.setTeam(team); if(block instanceof CoreBlock){ - map.teams.add((int) team.id); + map.teams.add((int)team.id); } } }; @@ -150,6 +151,28 @@ public class MapIO{ return Color.rgba8888(wall.solid ? wall.color : ore == Blocks.air ? floor.color : ore.color); } + /** Reads a pixmap in the 3.5 pixmap format. */ + public static void readPixmap(Pixmap pixmap, Tile[][] tiles){ + for(int x = 0; x < pixmap.getWidth(); x++){ + for(int y = 0; y < pixmap.getHeight(); y++){ + int color = pixmap.getPixel(x, pixmap.getHeight() - 1 - y); + LegacyBlock block = LegacyColorMapper.get(color); + Tile tile = tiles[x][y]; + + tile.setFloor(block.floor); + tile.setBlock(block.wall); + if(block.ore != null) tile.setOverlay(block.ore); + + //place core + if(color == Color.rgba8888(Color.green)){ + //actual core parts + tile.setBlock(Blocks.coreShard); + tile.setTeam(Team.sharded); + } + } + } + } + interface TileProvider{ Tile get(int x, int y); } diff --git a/core/src/mindustry/io/SaveVersion.java b/core/src/mindustry/io/SaveVersion.java index f3fdc0c20e..1d4ab19859 100644 --- a/core/src/mindustry/io/SaveVersion.java +++ b/core/src/mindustry/io/SaveVersion.java @@ -217,7 +217,7 @@ public abstract class SaveVersion extends SaveFileReader{ Array data = state.teams.getActive(); stream.writeInt(data.size); for(TeamData team : data){ - stream.writeInt((int) team.team.id); + stream.writeInt((int)team.team.id); stream.writeInt(team.brokenBlocks.size); for(BrokenBlock block : team.brokenBlocks){ stream.writeShort(block.x); @@ -258,7 +258,7 @@ public abstract class SaveVersion extends SaveFileReader{ public void readEntities(DataInput stream) throws IOException{ int teamc = stream.readInt(); for(int i = 0; i < teamc; i++){ - Team team = Team.all[stream.readInt()]; + Team team = Team.get(stream.readInt()); TeamData data = state.teams.get(team); int blocks = stream.readInt(); for(int j = 0; j < blocks; j++){ diff --git a/core/src/mindustry/io/TypeIO.java b/core/src/mindustry/io/TypeIO.java index de0faaa372..5095ce396a 100644 --- a/core/src/mindustry/io/TypeIO.java +++ b/core/src/mindustry/io/TypeIO.java @@ -87,7 +87,7 @@ public class TypeIO{ @WriteClass(BaseUnit.class) public static void writeBaseUnit(ByteBuffer buffer, BaseUnit unit){ - buffer.put((byte) (int) unit.getTeam().id); + buffer.put((byte) (int)unit.getTeam().id); buffer.putInt(unit.getID()); } @@ -95,7 +95,7 @@ public class TypeIO{ public static BaseUnit readBaseUnit(ByteBuffer buffer){ byte tid = buffer.get(); int id = buffer.getInt(); - return unitGroups[tid].getByID(id); + return unitGroup.getByID(id); } @WriteClass(Tile.class) @@ -194,12 +194,12 @@ public class TypeIO{ @WriteClass(Team.class) public static void writeTeam(ByteBuffer buffer, Team reason){ - buffer.put((byte) (int) reason.id); + buffer.put((byte) (int)reason.id); } @ReadClass(Team.class) public static Team readTeam(ByteBuffer buffer){ - return Team.all[buffer.get()]; + return Team.get(buffer.get()); } @WriteClass(UnitCommand.class) diff --git a/core/src/mindustry/maps/generators/MapGenerator.java b/core/src/mindustry/maps/generators/MapGenerator.java index c0083c4738..69c11bdc7b 100644 --- a/core/src/mindustry/maps/generators/MapGenerator.java +++ b/core/src/mindustry/maps/generators/MapGenerator.java @@ -74,7 +74,7 @@ public class MapGenerator extends Generator{ for(int x = 0; x < width; x++){ for(int y = 0; y < height; y++){ - if(tiles[x][y].block() instanceof CoreBlock && tiles[x][y].getTeam() == defaultTeam){ + if(tiles[x][y].block() instanceof CoreBlock && tiles[x][y].getTeam() == state.rules.defaultTeam){ players.add(new Point2(x, y)); tiles[x][y].setBlock(Blocks.air); } diff --git a/core/src/mindustry/ui/ItemsDisplay.java b/core/src/mindustry/ui/ItemsDisplay.java index 432417b305..755590f34f 100644 --- a/core/src/mindustry/ui/ItemsDisplay.java +++ b/core/src/mindustry/ui/ItemsDisplay.java @@ -39,9 +39,9 @@ public class ItemsDisplay extends Table{ private String format(Item item){ builder.setLength(0); builder.append(ui.formatAmount(data.items().get(item, 0))); - if(!state.is(State.menu) && !state.teams.get(player.getTeam()).cores.isEmpty() && state.teams.get(player.getTeam()).cores.first().entity != null && state.teams.get(player.getTeam()).cores.first().entity.items.get(item) > 0){ + if(!state.is(State.menu) && state.teams.get(player.getTeam()).hasCore() && state.teams.get(player.getTeam()).core().items.get(item) > 0){ builder.append(" [unlaunched]+ "); - builder.append(ui.formatAmount(state.teams.get(player.getTeam()).cores.first().entity.items.get(item))); + builder.append(ui.formatAmount(state.teams.get(player.getTeam()).core().items.get(item))); } return builder.toString(); } diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index c2ca5b25e5..688923924c 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -168,7 +168,7 @@ public class HudFragment extends Fragment{ t.table(teams -> { teams.left(); int i = 0; - for(Team team : Team.all){ + for(Team team : Team.base()){ ImageButton button = teams.addImageButton(Tex.whiteui, Styles.clearTogglePartiali, 40f, () -> Call.setPlayerTeamEditor(player, team)) .size(50f).margin(6f).get(); button.getImageCell().grow(); @@ -287,7 +287,7 @@ public class HudFragment extends Fragment{ }); t.top().visible(() -> { - if(state.is(State.menu) || state.teams.get(player.getTeam()).cores.size == 0 || state.teams.get(player.getTeam()).cores.first().entity == null){ + if(state.is(State.menu) || !state.teams.get(player.getTeam()).hasCore()){ coreAttackTime[0] = 0f; return false; } @@ -628,7 +628,7 @@ public class HudFragment extends Fragment{ } if(state.rules.waveTimer){ - builder.append((state.rules.waitForWaveToEnd && unitGroups[(int) waveTeam.id].size() > 0) ? Core.bundle.get("wave.waveInProgress") : ( waitingf.get((int)(state.wavetime/60)))); + builder.append((state.rules.waitForWaveToEnd && state.enemies > 0 ? Core.bundle.get("wave.waveInProgress") : ( waitingf.get((int)(state.wavetime/60))))); }else if(state.enemies == 0){ builder.append(Core.bundle.get("waiting")); } diff --git a/core/src/mindustry/ui/fragments/PlayerListFragment.java b/core/src/mindustry/ui/fragments/PlayerListFragment.java index df0d9f7269..a9cca9fb85 100644 --- a/core/src/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/mindustry/ui/fragments/PlayerListFragment.java @@ -8,6 +8,7 @@ import arc.scene.ui.*; import arc.scene.ui.layout.*; import arc.util.*; import mindustry.core.GameState.*; +import mindustry.entities.type.*; import mindustry.gen.*; import mindustry.graphics.*; import mindustry.net.*; @@ -65,7 +66,7 @@ public class PlayerListFragment extends Fragment{ float h = 74f; - playerGroup.all().sort((p1, p2) -> p1.getTeam().compareTo(p2.getTeam())); + playerGroup.all().sort(Structs.comparing(Unit::getTeam)); playerGroup.all().each(user -> { NetConnection connection = user.con; diff --git a/core/src/mindustry/world/Build.java b/core/src/mindustry/world/Build.java index dafd9fe38d..f101068cf0 100644 --- a/core/src/mindustry/world/Build.java +++ b/core/src/mindustry/world/Build.java @@ -38,7 +38,7 @@ public class Build{ Block previous = tile.block(); Block sub = BuildBlock.get(previous.size); - world.setBlock(tile, sub, team, rotation); + tile.set(sub, team, rotation); tile.ent().setDeconstruct(previous); tile.entity.health = tile.entity.maxHealth() * prevPercent; @@ -60,7 +60,7 @@ public class Build{ Block previous = tile.block(); Block sub = BuildBlock.get(result.size); - world.setBlock(tile, sub, team, rotation); + tile.set(sub, team, rotation); tile.ent().setConstruct(previous, result); Core.app.post(() -> Events.fire(new BlockBuildBeginEvent(tile, team, false))); @@ -72,7 +72,7 @@ public class Build{ return false; } - if(state.rules.bannedBlocks.contains(type) && !(state.rules.waves && team == waveTeam)){ + if(state.rules.bannedBlocks.contains(type) && !(state.rules.waves && team == state.rules.waveTeam)){ return false; } @@ -80,13 +80,8 @@ public class Build{ return false; } - //check for enemy cores - for(Team enemy : state.teams.enemiesOf(team)){ - for(Tile core : state.teams.get(enemy).cores){ - if(Mathf.dst(x * tilesize + type.offset(), y * tilesize + type.offset(), core.drawx(), core.drawy()) < state.rules.enemyCoreBuildRadius + type.size * tilesize / 2f){ - return false; - } - } + if(!state.teams.eachEnemyCore(team, core -> Mathf.dst(x * tilesize + type.offset(), y * tilesize + type.offset(), core.x, core.y) < state.rules.enemyCoreBuildRadius + type.size * tilesize / 2f)){ + return false; } Tile tile = world.tile(x, y); diff --git a/core/src/mindustry/world/CachedTile.java b/core/src/mindustry/world/CachedTile.java index e46a57d3ba..281828dcd7 100644 --- a/core/src/mindustry/world/CachedTile.java +++ b/core/src/mindustry/world/CachedTile.java @@ -16,7 +16,7 @@ public class CachedTile extends Tile{ @Override public Team getTeam(){ - return Team.all[getTeamID()]; + return Team.get(getTeamID()); } @Override diff --git a/core/src/mindustry/world/Tile.java b/core/src/mindustry/world/Tile.java index a1fb5fa9ff..4a8b2fa629 100644 --- a/core/src/mindustry/world/Tile.java +++ b/core/src/mindustry/world/Tile.java @@ -142,11 +142,11 @@ public class Tile implements Position, TargetTrait{ @Override public Team getTeam(){ - return Team.all[link().team]; + return Team.get(link().team); } public void setTeam(Team team){ - this.team = (byte) (int) team.id; + this.team = (byte) (int)team.id; } public byte getTeamID(){ @@ -156,7 +156,7 @@ public class Tile implements Position, TargetTrait{ public void setBlock(@NonNull Block type, Team team, int rotation){ preChanged(); this.block = type; - this.team = (byte) (int) team.id; + this.team = (byte) (int)team.id; this.rotation = (byte)Mathf.mod(rotation, 4); changed(); } @@ -186,6 +186,35 @@ public class Tile implements Position, TargetTrait{ setOverlay(overlay); } + public void remove(){ + link().getLinkedTiles(other -> other.setBlock(Blocks.air)); + } + + public void set(Block block, Team team){ + set(block, team, 0); + } + + public void set(Block block, Team team, int rotation){ + setBlock(block, team, rotation); + if(block.isMultiblock()){ + int offsetx = -(block.size - 1) / 2; + int offsety = -(block.size - 1) / 2; + + for(int dx = 0; dx < block.size; dx++){ + for(int dy = 0; dy < block.size; dy++){ + int worldx = dx + offsetx + x; + int worldy = dy + offsety + y; + if(!(worldx == x && worldy == y)){ + Tile toplace = world.tile(worldx, worldy); + if(toplace != null){ + toplace.setBlock(BlockPart.get(dx + offsetx, dy + offsety), team); + } + } + } + } + } + } + public byte rotation(){ return rotation; } @@ -240,7 +269,7 @@ public class Tile implements Position, TargetTrait{ } public boolean isEnemyCheat(){ - return getTeam() == waveTeam && state.rules.enemyCheat; + return getTeam() == state.rules.waveTeam && state.rules.enemyCheat; } public boolean isLinked(){ @@ -344,7 +373,7 @@ public class Tile implements Position, TargetTrait{ } public boolean interactable(Team team){ - return getTeam() == Team.derelict || team == getTeam(); + return state.teams.canInteract(team, getTeam()); } public Item drop(){ diff --git a/core/src/mindustry/world/blocks/BuildBlock.java b/core/src/mindustry/world/blocks/BuildBlock.java index 69d9ba61e8..df90a969b7 100644 --- a/core/src/mindustry/world/blocks/BuildBlock.java +++ b/core/src/mindustry/world/blocks/BuildBlock.java @@ -66,7 +66,7 @@ public class BuildBlock extends Block{ public static void onConstructFinish(Tile tile, Block block, int builderID, byte rotation, Team team, boolean skipConfig){ if(tile == null) return; float healthf = tile.entity == null ? 1f : tile.entity.healthf(); - world.setBlock(tile, block, team, rotation); + tile.set(block, team, rotation); if(tile.entity != null){ tile.entity.health = block.health * healthf; } diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java index 7c766fd1d3..f9a5cf6c9b 100644 --- a/core/src/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java @@ -84,12 +84,12 @@ public class CoreBlock extends StorageBlock{ public void onProximityUpdate(Tile tile){ CoreEntity entity = tile.ent(); - for(Tile other : state.teams.get(tile.getTeam()).cores){ - if(other != tile){ - entity.items = other.entity.items; + for(TileEntity other : state.teams.cores(tile.getTeam())){ + if(other.tile != tile){ + entity.items = other.items; } } - state.teams.get(tile.getTeam()).cores.add(tile); + state.teams.registerCore(entity); entity.storageCapacity = itemCapacity + entity.proximity().sum(e -> isContainer(e) ? e.block().itemCapacity : 0); entity.proximity().each(this::isContainer, t -> { @@ -97,9 +97,9 @@ public class CoreBlock extends StorageBlock{ t.ent().linkedCore = tile; }); - for(Tile other : state.teams.get(tile.getTeam()).cores){ - if(other == tile) continue; - entity.storageCapacity += other.block().itemCapacity + other.entity.proximity().sum(e -> isContainer(e) ? e.block().itemCapacity : 0); + for(TileEntity other : state.teams.cores(tile.getTeam())){ + if(other.tile == tile) continue; + entity.storageCapacity += other.block.itemCapacity + entity.proximity().sum(e -> isContainer(e) ? e.block().itemCapacity : 0); } if(!world.isGenerating()){ @@ -108,9 +108,8 @@ public class CoreBlock extends StorageBlock{ } } - for(Tile other : state.teams.get(tile.getTeam()).cores){ - CoreEntity oe = other.ent(); - oe.storageCapacity = entity.storageCapacity; + for(CoreEntity other : state.teams.cores(tile.getTeam())){ + other.storageCapacity = entity.storageCapacity; } } @@ -151,8 +150,9 @@ public class CoreBlock extends StorageBlock{ @Override public void removed(Tile tile){ + CoreEntity entity = tile.ent(); int total = tile.entity.proximity().count(e -> e.entity.items == tile.entity.items); - float fract = 1f / total / state.teams.get(tile.getTeam()).cores.size; + float fract = 1f / total / state.teams.cores(tile.getTeam()).size; tile.entity.proximity().each(e -> isContainer(e) && e.entity.items == tile.entity.items, t -> { StorageBlockEntity ent = (StorageBlockEntity)t.entity; @@ -163,22 +163,23 @@ public class CoreBlock extends StorageBlock{ } }); - state.teams.get(tile.getTeam()).cores.remove(tile); + state.teams.unregisterCore(entity); - int max = itemCapacity * state.teams.get(tile.getTeam()).cores.size; + int max = itemCapacity * state.teams.cores(tile.getTeam()).size; for(Item item : content.items()){ tile.entity.items.set(item, Math.min(tile.entity.items.get(item), max)); } - for(Tile other : state.teams.get(tile.getTeam()).cores){ - other.block().onProximityUpdate(other); + for(CoreEntity other : state.teams.cores(tile.getTeam())){ + other.block.onProximityUpdate(other.tile); } } @Override public void placed(Tile tile){ super.placed(tile); - state.teams.get(tile.getTeam()).cores.add(tile); + CoreEntity entity = tile.ent(); + state.teams.registerCore(entity); } @Override diff --git a/core/src/mindustry/world/blocks/units/CommandCenter.java b/core/src/mindustry/world/blocks/units/CommandCenter.java index 9dae2923d3..0d2e0428de 100644 --- a/core/src/mindustry/world/blocks/units/CommandCenter.java +++ b/core/src/mindustry/world/blocks/units/CommandCenter.java @@ -58,7 +58,7 @@ public class CommandCenter extends Block{ ObjectSet set = indexer.getAllied(tile.getTeam(), BlockFlag.comandCenter); if(set.size == 1){ - for(BaseUnit unit : unitGroups[(int) tile.getTeam().id].all()){ + for(BaseUnit unit : unitGroups[(int)tile.getTeam().id].all()){ unit.onCommand(UnitCommand.all[0]); } } @@ -116,7 +116,7 @@ public class CommandCenter extends Block{ Team team = (player == null ? tile.getTeam() : player.getTeam()); - for(BaseUnit unit : unitGroups[(int) team.id].all()){ + for(BaseUnit unit : unitGroups[(int)team.id].all()){ unit.onCommand(command); } diff --git a/desktop/src/mindustry/desktop/steam/SStats.java b/desktop/src/mindustry/desktop/steam/SStats.java index 984fa9e985..bdbb86ad5e 100644 --- a/desktop/src/mindustry/desktop/steam/SStats.java +++ b/desktop/src/mindustry/desktop/steam/SStats.java @@ -55,13 +55,13 @@ public class SStats implements SteamUserStatsCallback{ private void checkUpdate(){ if(campaign()){ - SStat.maxUnitActive.max(unitGroups[(int) player.getTeam().id].size()); + SStat.maxUnitActive.max(unitGroups[(int)player.getTeam().id].size()); - if(unitGroups[(int) player.getTeam().id].count(u -> u.getType() == UnitTypes.phantom) >= 10){ + if(unitGroups[(int)player.getTeam().id].count(u -> u.getType() == UnitTypes.phantom) >= 10){ active10Phantoms.complete(); } - if(unitGroups[(int) player.getTeam().id].count(u -> u.getType() == UnitTypes.crawler) >= 50){ + if(unitGroups[(int)player.getTeam().id].count(u -> u.getType() == UnitTypes.crawler) >= 50){ active50Crawlers.complete(); } diff --git a/gradle.properties b/gradle.properties index 29c1e50fad..e28d4db59a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=88c1a9afe2f5be4dd06e47ac8afe070247b3da29 +archash=447f3bb0e4616f82680f3234ad4e0cce48880884 diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index 8ff1874407..109552adb4 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -292,7 +292,7 @@ public class ServerControl implements ApplicationListener{ info(" &lyPlaying on map &fi{0}&fb &lb/&ly Wave {1}", Strings.capitalize(world.getMap().name()), state.wave); if(state.rules.waves){ - info("&ly {0} enemies.", unitGroups[(int) Team.crux.id].size()); + info("&ly {0} enemies.", unitGroups[(int)Team.crux.id].size()); }else{ info("&ly {0} seconds until next wave.", (int)(state.wavetime / 60)); } @@ -421,14 +421,14 @@ public class ServerControl implements ApplicationListener{ try{ Team team = arg.length == 0 ? Team.sharded : Team.valueOf(arg[0]); - if(state.teams.get(team).cores.isEmpty()){ + if(state.teams.cores(team).isEmpty()){ err("That team has no cores."); return; } for(Item item : content.items()){ if(item.type == ItemType.material){ - state.teams.get(team).cores.first().entity.items.set(item, state.teams.get(team).cores.first().block().itemCapacity); + state.teams.cores(team).first().entity.items.set(item, state.teams.cores(team).first().block().itemCapacity); } } diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java index 43c819bdfd..722bf246d0 100644 --- a/tests/src/test/java/ApplicationTests.java +++ b/tests/src/test/java/ApplicationTests.java @@ -106,8 +106,8 @@ public class ApplicationTests{ Time.update(); Time.update(); Time.setDeltaProvider(() -> 1f); - unitGroups[(int) waveTeam.id].updateEvents(); - assertFalse(unitGroups[(int) waveTeam.id].isEmpty(), "No enemies spawned."); + unitGroup.update(); + assertFalse(unitGroup.isEmpty(), "No enemies spawned."); } @Test @@ -128,7 +128,7 @@ public class ApplicationTests{ createMap(); int bx = 4; int by = 4; - world.setBlock(world.tile(bx, by), Blocks.coreShard, Team.sharded); + world.tile(bx, by).set(Blocks.coreShard, Team.sharded); assertEquals(world.tile(bx, by).getTeam(), Team.sharded); for(int x = bx - 1; x <= bx + 1; x++){ for(int y = by - 1; y <= by + 1; y++){ @@ -198,7 +198,7 @@ public class ApplicationTests{ @Test void save(){ world.loadMap(testMap); - assertTrue(state.teams.get(defaultTeam).cores.size > 0); + assertTrue(state.teams.playerCores().size > 0); SaveIO.save(saveDirectory.child("0.msav")); } @@ -213,7 +213,7 @@ public class ApplicationTests{ assertEquals(world.width(), map.width); assertEquals(world.height(), map.height); - assertTrue(state.teams.get(defaultTeam).cores.size > 0); + assertTrue(state.teams.playerCores().size > 0); } @Test @@ -379,12 +379,12 @@ public class ApplicationTests{ createMap(); Tile core = world.tile(5, 5); - world.setBlock(core, Blocks.coreShard, Team.sharded); + core.set(Blocks.coreShard, Team.sharded); for(Item item : content.items()){ core.entity.items.set(item, 3000); } - assertEquals(core, state.teams.get(Team.sharded).cores.first()); + assertEquals(core.entity, state.teams.get(Team.sharded).core()); } void depositTest(Block block, Item item){ diff --git a/tests/src/test/java/ZoneTests.java b/tests/src/test/java/ZoneTests.java index 2a044d5b75..a238a815ee 100644 --- a/tests/src/test/java/ZoneTests.java +++ b/tests/src/test/java/ZoneTests.java @@ -52,7 +52,7 @@ public class ZoneTests{ if(tile.drop() != null){ resources.add(tile.drop()); } - if(tile.block() instanceof CoreBlock && tile.getTeam() == defaultTeam){ + if(tile.block() instanceof CoreBlock && tile.getTeam() == state.rules.defaultTeam){ hasSpawnPoint = true; } } @@ -69,7 +69,7 @@ public class ZoneTests{ } assertTrue(hasSpawnPoint, "Zone \"" + zone.name + "\" has no spawn points."); - assertTrue(spawner.countSpawns() > 0 || (state.rules.attackMode && !state.teams.get(waveTeam).cores.isEmpty()), "Zone \"" + zone.name + "\" has no enemy spawn points: " + spawner.countSpawns()); + assertTrue(spawner.countSpawns() > 0 || (state.rules.attackMode && state.teams.get(state.rules.waveTeam).hasCore()), "Zone \"" + zone.name + "\" has no enemy spawn points: " + spawner.countSpawns()); for(Item item : resources){ assertTrue(zone.resources.contains(item), "Zone \"" + zone.name + "\" is missing item in resource list: \"" + item.name + "\""); diff --git a/tools/build.gradle b/tools/build.gradle index ea158a66a1..033040e96d 100644 --- a/tools/build.gradle +++ b/tools/build.gradle @@ -240,7 +240,7 @@ task swapColors(){ Color.argb8888ToColor(tmpc, c) if(tmpc.a < 0.1f) continue if(map.containsKey(c)){ - img.setRGB(x, y, (int) map.get(c)) + img.setRGB(x, y, (int)map.get(c)) } } } From 4858e602ed5429e95e5416b757d226134728f92b Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 26 Dec 2019 19:40:54 -0500 Subject: [PATCH 08/78] Fixed compilation --- core/src/mindustry/ai/BlockIndexer.java | 61 ++++++++++++------- core/src/mindustry/ai/Pathfinder.java | 22 +++---- core/src/mindustry/ai/WaveSpawner.java | 14 ++--- core/src/mindustry/editor/EditorTile.java | 2 +- .../mindustry/editor/MapGenerateDialog.java | 2 +- core/src/mindustry/entities/Damage.java | 2 +- core/src/mindustry/entities/Units.java | 46 +++++++------- core/src/mindustry/entities/type/Unit.java | 2 +- .../entities/type/base/BuilderDrone.java | 6 +- core/src/mindustry/game/Team.java | 6 +- core/src/mindustry/game/Teams.java | 26 ++++++-- core/src/mindustry/io/MapIO.java | 4 +- core/src/mindustry/world/Tile.java | 4 +- .../mindustry/world/blocks/BuildBlock.java | 2 +- .../world/blocks/units/CommandCenter.java | 16 ++--- desktop/build.gradle | 2 +- .../src/mindustry/desktop/steam/SStats.java | 13 ++-- gradle.properties | 2 +- 18 files changed, 129 insertions(+), 103 deletions(-) diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java index bb90b37301..08e7fcf522 100644 --- a/core/src/mindustry/ai/BlockIndexer.java +++ b/core/src/mindustry/ai/BlockIndexer.java @@ -1,10 +1,10 @@ package mindustry.ai; import arc.*; -import arc.struct.*; import arc.func.*; import arc.math.*; import arc.math.geom.*; +import arc.struct.*; import mindustry.content.*; import mindustry.entities.type.*; import mindustry.game.EventType.*; @@ -28,15 +28,15 @@ public class BlockIndexer{ private final ObjectSet itemSet = new ObjectSet<>(); /** Stores all ore quadtrants on the map. */ private ObjectMap> ores = new ObjectMap<>(); - /** Tags all quadrants. */ + /** Maps each team ID to a quarant. A quadrant is a grid of bits, where each bit is set if and only if there is a block of that team in that quadrant. */ private GridBits[] structQuadrants; /** Stores all damaged tile entities by team. */ - private ObjectSet[] damagedTiles = new ObjectSet[Team.all.length]; + private ObjectSet[] damagedTiles = new ObjectSet[Team.all().length]; /**All ores available on this map.*/ private ObjectSet allOres = new ObjectSet<>(); /** Maps teams to a map of flagged tiles by type. */ - private ObjectSet[][] flagMap = new ObjectSet[Team.all.length][BlockFlag.all.length]; + private ObjectSet[][] flagMap = new ObjectSet[Team.all().length][BlockFlag.all.length]; /** Maps tile positions to their last known tile index data. */ private IntMap typeMap = new IntMap<>(); /** Empty set used for returning. */ @@ -59,8 +59,8 @@ public class BlockIndexer{ Events.on(WorldLoadEvent.class, event -> { scanOres.clear(); scanOres.addAll(Item.getAllOres()); - damagedTiles = new ObjectSet[Team.all.length]; - flagMap = new ObjectSet[Team.all.length][BlockFlag.all.length]; + damagedTiles = new ObjectSet[Team.all().length]; + flagMap = new ObjectSet[Team.all().length][BlockFlag.all.length]; for(int i = 0; i < flagMap.length; i++){ for(int j = 0; j < BlockFlag.all.length; j++){ @@ -73,10 +73,7 @@ public class BlockIndexer{ ores = null; //create bitset for each team type that contains each quadrant - structQuadrants = new GridBits[Team.all.length]; - for(int i = 0; i < Team.all.length; i++){ - structQuadrants[i] = new GridBits(Mathf.ceil(world.width() / (float)quadrantSize), Mathf.ceil(world.height() / (float)quadrantSize)); - } + structQuadrants = new GridBits[Team.all().length]; for(int x = 0; x < world.width(); x++){ for(int y = 0; y < world.height(); y++){ @@ -103,7 +100,29 @@ public class BlockIndexer{ } private ObjectSet[] getFlagged(Team team){ - return flagMap[(int)team.id]; + return flagMap[team.id]; + } + + private GridBits structQuadrant(Team t){ + if(structQuadrants[t.id] == null){ + structQuadrants[t.id] = new GridBits(Mathf.ceil(world.width() / (float)quadrantSize), Mathf.ceil(world.height() / (float)quadrantSize)); + } + return structQuadrants[t.id]; + } + + /** Updates all the structure quadrants for a newly activated team. */ + public void updateTeamIndex(Team team){ + //go through every tile... ouch + for(int x = 0; x < world.width(); x++){ + for(int y = 0; y < world.height(); y++){ + Tile tile = world.tile(x, y); + if(tile.getTeam() == team){ + int quadrantX = tile.x / quadrantSize; + int quadrantY = tile.y / quadrantSize; + structQuadrant(team).set(quadrantX, quadrantY); + } + } + } } /** @return whether this item is present on this map.*/ @@ -115,11 +134,11 @@ public class BlockIndexer{ public ObjectSet getDamaged(Team team){ returnArray.clear(); - if(damagedTiles[(int)team.id] == null){ - damagedTiles[(int)team.id] = new ObjectSet<>(); + if(damagedTiles[team.id] == null){ + damagedTiles[team.id] = new ObjectSet<>(); } - ObjectSet set = damagedTiles[(int)team.id]; + ObjectSet set = damagedTiles[team.id]; for(Tile tile : set){ if((tile.entity == null || tile.entity.getTeam() != team || !tile.entity.damaged()) || tile.block() instanceof BuildBlock){ returnArray.add(tile); @@ -135,7 +154,7 @@ public class BlockIndexer{ /** Get all allied blocks with a flag. */ public ObjectSet getAllied(Team team, BlockFlag type){ - return flagMap[(int)team.id][type.ordinal()]; + return flagMap[team.id][type.ordinal()]; } /** Get all enemy blocks with a flag. */ @@ -282,16 +301,16 @@ public class BlockIndexer{ int quadrantY = tile.y / quadrantSize; int index = quadrantX + quadrantY * quadWidth(); - for(Team team : Team.all){ - TeamData data = state.teams.get(team); + for(TeamData data : state.teams.getActive()){ + GridBits bits = structQuadrant(data.team); //fast-set this quadrant to 'occupied' if the tile just placed is already of this team if(tile.getTeam() == data.team && tile.entity != null && tile.block().targetable){ - structQuadrants[(int)data.team.id].set(quadrantX, quadrantY); + bits.set(quadrantX, quadrantY); continue; //no need to process futher } - structQuadrants[(int)data.team.id].set(quadrantX, quadrantY, false); + bits.set(quadrantX, quadrantY, false); outer: for(int x = quadrantX * quadrantSize; x < world.width() && x < (quadrantX + 1) * quadrantSize; x++){ @@ -299,7 +318,7 @@ public class BlockIndexer{ Tile result = world.ltile(x, y); //when a targetable block is found, mark this quadrant as occupied and stop searching if(result.entity != null && result.getTeam() == data.team){ - structQuadrants[(int)data.team.id].set(quadrantX, quadrantY); + bits.set(quadrantX, quadrantY); break outer; } } @@ -308,7 +327,7 @@ public class BlockIndexer{ } private boolean getQuad(Team team, int quadrantX, int quadrantY){ - return structQuadrants[(int)team.id].get(quadrantX, quadrantY); + return structQuadrant(team).get(quadrantX, quadrantY); } private int quadWidth(){ diff --git a/core/src/mindustry/ai/Pathfinder.java b/core/src/mindustry/ai/Pathfinder.java index 319c85ef2e..6a2515bb7a 100644 --- a/core/src/mindustry/ai/Pathfinder.java +++ b/core/src/mindustry/ai/Pathfinder.java @@ -27,9 +27,9 @@ public class Pathfinder implements Runnable{ /** unordered array of path data for iteration only. DO NOT iterate ot access this in the main thread.*/ private Array list = new Array<>(); /** Maps teams + flags to a valid path to get to that flag for that team. */ - private PathData[][] pathMap = new PathData[Team.all.length][PathTarget.all.length]; + private PathData[][] pathMap = new PathData[Team.all().length][PathTarget.all.length]; /** Grid map of created path data that should not be queued again. */ - private GridBits created = new GridBits(Team.all.length, PathTarget.all.length); + private GridBits created = new GridBits(Team.all().length, PathTarget.all.length); /** handles task scheduling on the update thread. */ private TaskQueue queue = new TaskQueue(); /** current pathfinding thread */ @@ -42,8 +42,8 @@ public class Pathfinder implements Runnable{ //reset and update internal tile array tiles = new int[world.width()][world.height()]; - pathMap = new PathData[Team.all.length][PathTarget.all.length]; - created = new GridBits(Team.all.length, PathTarget.all.length); + pathMap = new PathData[Team.all().length][PathTarget.all.length]; + created = new GridBits(Team.all().length, PathTarget.all.length); list = new Array<>(); for(int x = 0; x < world.width(); x++){ @@ -84,8 +84,8 @@ public class Pathfinder implements Runnable{ } public int debugValue(Team team, int x, int y){ - if(pathMap[(int)team.id][PathTarget.enemyCores.ordinal()] == null) return 0; - return pathMap[(int)team.id][PathTarget.enemyCores.ordinal()].weights[x][y]; + if(pathMap[team.id][PathTarget.enemyCores.ordinal()] == null) return 0; + return pathMap[team.id][PathTarget.enemyCores.ordinal()].weights[x][y]; } /** Update a tile in the internal pathfinding grid. Causes a complete pathfinding reclaculation. */ @@ -149,12 +149,12 @@ public class Pathfinder implements Runnable{ public Tile getTargetTile(Tile tile, Team team, PathTarget target){ if(tile == null) return null; - PathData data = pathMap[(int)team.id][target.ordinal()]; + PathData data = pathMap[team.id][target.ordinal()]; if(data == null){ //if this combination is not found, create it on request - if(!created.get((int)team.id, target.ordinal())){ - created.set((int)team.id, target.ordinal()); + if(!created.get(team.id, target.ordinal())){ + created.set(team.id, target.ordinal()); //grab targets since this is run on main thread IntArray targets = target.getTargets(team, new IntArray()); queue.post(() -> createPath(team, target, targets)); @@ -188,7 +188,7 @@ public class Pathfinder implements Runnable{ /** @return whether a tile can be passed through by this team. Pathfinding thread only.*/ private boolean passable(int x, int y, Team team){ int tile = tiles[x][y]; - return PathTile.passable(tile) || (PathTile.team(tile) != (int)team.id && PathTile.team(tile) != (int)Team.derelict.id); + return PathTile.passable(tile) || (PathTile.team(tile) != team.id && PathTile.team(tile) != (int)Team.derelict.id); } /** @@ -238,7 +238,7 @@ public class Pathfinder implements Runnable{ PathData path = new PathData(team, target, world.width(), world.height()); list.add(path); - pathMap[(int)team.id][target.ordinal()] = path; + pathMap[team.id][target.ordinal()] = path; //grab targets from passed array synchronized(path.targets){ diff --git a/core/src/mindustry/ai/WaveSpawner.java b/core/src/mindustry/ai/WaveSpawner.java index 25b9983db0..129b930d3b 100644 --- a/core/src/mindustry/ai/WaveSpawner.java +++ b/core/src/mindustry/ai/WaveSpawner.java @@ -11,7 +11,7 @@ import mindustry.content.Blocks; import mindustry.content.Fx; import mindustry.entities.Damage; import mindustry.entities.Effects; -import mindustry.entities.type.BaseUnit; +import mindustry.entities.type.*; import mindustry.game.EventType.WorldLoadEvent; import mindustry.game.SpawnGroup; import mindustry.world.Tile; @@ -91,10 +91,10 @@ public class WaveSpawner{ } if(state.rules.attackMode && state.teams.isActive(state.rules.waveTeam) && !state.teams.playerCores().isEmpty()){ - Tile firstCore = state.teams.playerCores().first(); - for(Tile core : state.teams.get(state.rules.waveTeam).cores){ - Tmp.v1.set(firstCore).sub(core.worldx(), core.worldy()).limit(coreMargin + core.block().size*tilesize); - cons.accept(core.worldx() + Tmp.v1.x, core.worldy() + Tmp.v1.y, false); + TileEntity firstCore = state.teams.playerCores().first(); + for(TileEntity core : state.teams.get(state.rules.waveTeam).cores){ + Tmp.v1.set(firstCore).sub(core.x, core.y).limit(coreMargin + core.block.size*tilesize); + cons.accept(core.x + Tmp.v1.x, core.y + Tmp.v1.y, false); } } } @@ -108,8 +108,8 @@ public class WaveSpawner{ } if(state.rules.attackMode && state.teams.isActive(state.rules.waveTeam)){ - for(Tile core : state.teams.get(state.rules.waveTeam).cores){ - cons.get(core.worldx(), core.worldy()); + for(TileEntity core : state.teams.get(state.rules.waveTeam).cores){ + cons.get(core.x, core.y); } } } diff --git a/core/src/mindustry/editor/EditorTile.java b/core/src/mindustry/editor/EditorTile.java index 4a9effccfd..6a2829b098 100644 --- a/core/src/mindustry/editor/EditorTile.java +++ b/core/src/mindustry/editor/EditorTile.java @@ -74,7 +74,7 @@ public class EditorTile extends Tile{ return; } - if(getTeamID() == (int)team.id) return; + if(getTeamID() == team.id) return; op(OpType.team, getTeamID()); super.setTeam(team); } diff --git a/core/src/mindustry/editor/MapGenerateDialog.java b/core/src/mindustry/editor/MapGenerateDialog.java index 8704b8a209..12f989c272 100644 --- a/core/src/mindustry/editor/MapGenerateDialog.java +++ b/core/src/mindustry/editor/MapGenerateDialog.java @@ -415,7 +415,7 @@ public class MapGenerateDialog extends FloatingDialog{ this.floor = floor.id; this.block = wall.id; this.ore = ore.id; - this.team = (byte) (int)team.id; + this.team = (byte) team.id; this.rotation = (byte)rotation; } diff --git a/core/src/mindustry/entities/Damage.java b/core/src/mindustry/entities/Damage.java index 3fe1b00d31..73f0b4996e 100644 --- a/core/src/mindustry/entities/Damage.java +++ b/core/src/mindustry/entities/Damage.java @@ -88,7 +88,7 @@ public class Damage{ tr.trns(angle, length); Intc2 collider = (cx, cy) -> { Tile tile = world.ltile(cx, cy); - if(tile != null && !collidedBlocks.contains(tile.pos()) && tile.entity != null && tile.getTeamID() != (int)team.id && tile.entity.collide(hitter)){ + if(tile != null && !collidedBlocks.contains(tile.pos()) && tile.entity != null && tile.getTeamID() != team.id && tile.entity.collide(hitter)){ tile.entity.collision(hitter); collidedBlocks.add(tile.pos()); hitter.getBulletType().hit(hitter, tile.worldx(), tile.worldy()); diff --git a/core/src/mindustry/entities/Units.java b/core/src/mindustry/entities/Units.java index 09e0293241..7592551ce4 100644 --- a/core/src/mindustry/entities/Units.java +++ b/core/src/mindustry/entities/Units.java @@ -1,15 +1,12 @@ package mindustry.entities; -import arc.struct.EnumSet; -import arc.func.Cons; -import arc.func.Boolf; -import arc.math.Mathf; -import arc.math.geom.Geometry; -import arc.math.geom.Rectangle; -import mindustry.entities.traits.TargetTrait; +import arc.func.*; +import arc.math.*; +import arc.math.geom.*; +import mindustry.entities.traits.*; import mindustry.entities.type.*; -import mindustry.game.Team; -import mindustry.world.Tile; +import mindustry.game.*; +import mindustry.world.*; import static mindustry.Vars.*; @@ -157,7 +154,11 @@ public class Units{ /** Iterates over all units in a rectangle. */ public static void nearby(Team team, float x, float y, float width, float height, Cons cons){ - unitGroups[(int)team.id].intersect(x, y, width, height, cons); + unitGroup.intersect(x, y, width, height, u -> { + if(u.getTeam() == team){ + cons.get(u); + } + }); playerGroup.intersect(x, y, width, height, player -> { if(player.getTeam() == team){ cons.get(player); @@ -167,8 +168,8 @@ public class Units{ /** Iterates over all units in a circle around this position. */ public static void nearby(Team team, float x, float y, float radius, Cons cons){ - unitGroups[(int)team.id].intersect(x - radius, y - radius, radius*2f, radius*2f, unit -> { - if(unit.withinDst(x, y, radius)){ + unitGroup.intersect(x - radius, y - radius, radius*2f, radius*2f, unit -> { + if(unit.getTeam() == team && unit.withinDst(x, y, radius)){ cons.get(unit); } }); @@ -182,10 +183,7 @@ public class Units{ /** Iterates over all units in a rectangle. */ public static void nearby(float x, float y, float width, float height, Cons cons){ - for(Team team : Team.all){ - unitGroups[(int)team.id].intersect(x, y, width, height, cons); - } - + unitGroup.intersect(x, y, width, height, cons); playerGroup.intersect(x, y, width, height, cons); } @@ -196,14 +194,14 @@ public class Units{ /** Iterates over all units that are enemies of this team. */ public static void nearbyEnemies(Team team, float x, float y, float width, float height, Cons cons){ - EnumSet targets = state.teams.enemiesOf(team); - - for(Team other : targets){ - unitGroups[(int)other.id].intersect(x, y, width, height, cons); - } + unitGroup.intersect(x, y, width, height, u -> { + if(state.teams.areEnemies(team, u.getTeam())){ + cons.get(u); + } + }); playerGroup.intersect(x, y, width, height, player -> { - if(targets.contains(player.getTeam())){ + if(state.teams.areEnemies(team, player.getTeam())){ cons.get(player); } }); @@ -220,4 +218,8 @@ public class Units{ playerGroup.all().each(cons); } + public static void each(Team team, Cons cons){ + unitGroup.all().each(t -> t.getTeam() == team, cons); + } + } diff --git a/core/src/mindustry/entities/type/Unit.java b/core/src/mindustry/entities/type/Unit.java index 0b0ccc277a..f9c78a747b 100644 --- a/core/src/mindustry/entities/type/Unit.java +++ b/core/src/mindustry/entities/type/Unit.java @@ -167,7 +167,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ public void writeSave(DataOutput stream, boolean net) throws IOException{ if(item.item == null) item.item = Items.copper; - stream.writeByte((int)team.id); + stream.writeByte(team.id); stream.writeBoolean(isDead()); stream.writeFloat(net ? interpolator.target.x : x); stream.writeFloat(net ? interpolator.target.y : y); diff --git a/core/src/mindustry/entities/type/base/BuilderDrone.java b/core/src/mindustry/entities/type/base/BuilderDrone.java index 83d4606122..6442347de4 100644 --- a/core/src/mindustry/entities/type/base/BuilderDrone.java +++ b/core/src/mindustry/entities/type/base/BuilderDrone.java @@ -114,12 +114,10 @@ public class BuilderDrone extends BaseDrone implements BuilderTrait{ public BuilderDrone(){ if(reset.check()){ Events.on(BuildSelectEvent.class, event -> { - EntityGroup group = unitGroups[(int)event.team.id]; - if(!(event.tile.entity instanceof BuildEntity)) return; - for(BaseUnit unit : group.all()){ - if(unit instanceof BuilderDrone){ + for(BaseUnit unit : unitGroup.all()){ + if(unit instanceof BuilderDrone && unit.getTeam() == getTeam()){ BuilderDrone drone = (BuilderDrone)unit; if(drone.isBuilding()){ //stop building if opposite building begins. diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java index a97d84a70b..809d60f714 100644 --- a/core/src/mindustry/game/Team.java +++ b/core/src/mindustry/game/Team.java @@ -6,10 +6,9 @@ import arc.util.*; import mindustry.graphics.*; public class Team implements Comparable{ - public final Color color; - public final int intColor; - public final String name; public final byte id; + public final Color color; + public String name; /** All 256 registered teams. */ private static final Team[] all = new Team[256]; @@ -48,7 +47,6 @@ public class Team implements Comparable{ protected Team(int id, String name, Color color){ this.name = name; this.color = color; - this.intColor = Color.rgba8888(color); this.id = (byte)id; int us = Pack.u(this.id); diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java index d5d033ec46..a0f489cff7 100644 --- a/core/src/mindustry/game/Teams.java +++ b/core/src/mindustry/game/Teams.java @@ -3,12 +3,12 @@ package mindustry.game; import arc.func.*; import arc.math.geom.*; import arc.struct.*; -import arc.util.*; import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.entities.type.*; import mindustry.world.blocks.storage.CoreBlock.*; -import static mindustry.Vars.state; +import static mindustry.Vars.*; /** Class for various team-based utilities. */ public class Teams{ @@ -33,6 +33,10 @@ public class Teams{ return Geometry.findClosest(x, y, get(team).cores); } + public Array enemiesOf(Team team){ + return get(team).enemies; + } + public boolean eachEnemyCore(Team team, Boolf ret){ for(TeamData data : active){ if(areEnemies(team, data.team)){ @@ -104,6 +108,8 @@ public class Teams{ //register in active list if needed if(data.active() && !active.contains(data)){ active.add(data); + updateEnemies(); + indexer.updateTeamIndex(data.team); } } @@ -114,12 +120,24 @@ public class Teams{ //unregister in active list if(!data.active()){ active.remove(data); + updateEnemies(); + } + } + + private void updateEnemies(){ + for(TeamData data : active){ + data.enemies.clear(); + for(TeamData other : active){ + if(areEnemies(data.team, other.team)){ + data.enemies.add(other.team); + } + } } } public class TeamData{ - private final Array cores = new Array<>(); - + public final Array cores = new Array<>(); + public final Array enemies = new Array<>(); public final Team team; public Queue brokenBlocks = new Queue<>(); diff --git a/core/src/mindustry/io/MapIO.java b/core/src/mindustry/io/MapIO.java index d26adee127..85c5cc9cb7 100644 --- a/core/src/mindustry/io/MapIO.java +++ b/core/src/mindustry/io/MapIO.java @@ -92,7 +92,7 @@ public class MapIO{ public void setTeam(Team team){ super.setTeam(team); if(block instanceof CoreBlock){ - map.teams.add((int)team.id); + map.teams.add(team.id); } } }; @@ -146,7 +146,7 @@ public class MapIO{ public static int colorFor(Block floor, Block wall, Block ore, Team team){ if(wall.synthetic()){ - return team.intColor; + return team.color.rgba(); } return Color.rgba8888(wall.solid ? wall.color : ore == Blocks.air ? floor.color : ore.color); } diff --git a/core/src/mindustry/world/Tile.java b/core/src/mindustry/world/Tile.java index 4a8b2fa629..c591307176 100644 --- a/core/src/mindustry/world/Tile.java +++ b/core/src/mindustry/world/Tile.java @@ -146,7 +146,7 @@ public class Tile implements Position, TargetTrait{ } public void setTeam(Team team){ - this.team = (byte) (int)team.id; + this.team = (byte) team.id; } public byte getTeamID(){ @@ -156,7 +156,7 @@ public class Tile implements Position, TargetTrait{ public void setBlock(@NonNull Block type, Team team, int rotation){ preChanged(); this.block = type; - this.team = (byte) (int)team.id; + this.team = (byte) team.id; this.rotation = (byte)Mathf.mod(rotation, 4); changed(); } diff --git a/core/src/mindustry/world/blocks/BuildBlock.java b/core/src/mindustry/world/blocks/BuildBlock.java index df90a969b7..1ba7bff365 100644 --- a/core/src/mindustry/world/blocks/BuildBlock.java +++ b/core/src/mindustry/world/blocks/BuildBlock.java @@ -57,7 +57,7 @@ public class BuildBlock extends Block{ public static void onDeconstructFinish(Tile tile, Block block, int builderID){ Team team = tile.getTeam(); Effects.effect(Fx.breakBlock, tile.drawx(), tile.drawy(), block.size); - world.removeBlock(tile); + tile.remove(); Events.fire(new BlockBuildEndEvent(tile, playerGroup.getByID(builderID), team, true)); if(shouldPlay()) Sounds.breaks.at(tile, calcPitch(false)); } diff --git a/core/src/mindustry/world/blocks/units/CommandCenter.java b/core/src/mindustry/world/blocks/units/CommandCenter.java index 0d2e0428de..be82783269 100644 --- a/core/src/mindustry/world/blocks/units/CommandCenter.java +++ b/core/src/mindustry/world/blocks/units/CommandCenter.java @@ -1,11 +1,11 @@ package mindustry.world.blocks.units; import arc.*; -import arc.struct.*; import arc.graphics.*; import arc.graphics.g2d.*; import arc.scene.ui.*; import arc.scene.ui.layout.*; +import arc.struct.*; import arc.util.*; import mindustry.content.*; import mindustry.entities.*; @@ -13,7 +13,6 @@ import mindustry.entities.Effects.*; import mindustry.entities.type.*; import mindustry.entities.units.*; import mindustry.game.EventType.*; -import mindustry.game.*; import mindustry.graphics.*; import mindustry.ui.*; import mindustry.world.*; @@ -21,7 +20,7 @@ import mindustry.world.meta.*; import java.io.*; -import static mindustry.Vars.*; +import static mindustry.Vars.indexer; public class CommandCenter extends Block{ protected TextureRegion[] commandRegions = new TextureRegion[UnitCommand.all.length]; @@ -58,9 +57,7 @@ public class CommandCenter extends Block{ ObjectSet set = indexer.getAllied(tile.getTeam(), BlockFlag.comandCenter); if(set.size == 1){ - for(BaseUnit unit : unitGroups[(int)tile.getTeam().id].all()){ - unit.onCommand(UnitCommand.all[0]); - } + Units.each(tile.getTeam(), u -> u.onCommand(UnitCommand.all[0])); } } @@ -114,12 +111,7 @@ public class CommandCenter extends Block{ } } - Team team = (player == null ? tile.getTeam() : player.getTeam()); - - for(BaseUnit unit : unitGroups[(int)team.id].all()){ - unit.onCommand(command); - } - + Units.each(tile.getTeam(), u -> u.onCommand(command)); Events.fire(new CommandIssueEvent(tile, command)); } diff --git a/desktop/build.gradle b/desktop/build.gradle index efedf8c57b..d03320d394 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -33,7 +33,7 @@ task run(dependsOn: classes, type: JavaExec){ } if(args.contains("debug")){ - main = "io.anuke.mindustry.DebugLauncher" + main = "mindustry.debug.DebugLauncher" } } diff --git a/desktop/src/mindustry/desktop/steam/SStats.java b/desktop/src/mindustry/desktop/steam/SStats.java index bdbb86ad5e..bc355c26b0 100644 --- a/desktop/src/mindustry/desktop/steam/SStats.java +++ b/desktop/src/mindustry/desktop/steam/SStats.java @@ -1,9 +1,9 @@ package mindustry.desktop.steam; import arc.*; -import com.codedisaster.steamworks.*; import arc.struct.*; import arc.util.*; +import com.codedisaster.steamworks.*; import mindustry.*; import mindustry.content.*; import mindustry.entities.type.*; @@ -11,7 +11,6 @@ import mindustry.entities.units.*; import mindustry.game.EventType.*; import mindustry.game.Stats.*; import mindustry.type.*; -import mindustry.world.*; import static mindustry.Vars.*; import static mindustry.desktop.steam.SAchievement.*; @@ -55,18 +54,18 @@ public class SStats implements SteamUserStatsCallback{ private void checkUpdate(){ if(campaign()){ - SStat.maxUnitActive.max(unitGroups[(int)player.getTeam().id].size()); + SStat.maxUnitActive.max(unitGroup.count(t -> t.getTeam() == player.getTeam())); - if(unitGroups[(int)player.getTeam().id].count(u -> u.getType() == UnitTypes.phantom) >= 10){ + if(unitGroup.count(u -> u.getType() == UnitTypes.phantom && u.getTeam() == player.getTeam()) >= 10){ active10Phantoms.complete(); } - if(unitGroups[(int)player.getTeam().id].count(u -> u.getType() == UnitTypes.crawler) >= 50){ + if(unitGroup.count(u -> u.getType() == UnitTypes.crawler && u.getTeam() == player.getTeam()) >= 50){ active50Crawlers.complete(); } - for(Tile tile : state.teams.get(player.getTeam()).cores){ - if(!content.items().contains(i -> i.type == ItemType.material && tile.entity.items.get(i) < tile.block().itemCapacity)){ + for(TileEntity entity : state.teams.get(player.getTeam()).cores){ + if(!content.items().contains(i -> i.type == ItemType.material && entity.items.get(i) < entity.block.itemCapacity)){ fillCoreAllCampaign.complete(); break; } diff --git a/gradle.properties b/gradle.properties index e28d4db59a..eb016eca65 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=447f3bb0e4616f82680f3234ad4e0cce48880884 +archash=44e060c9f2bf11eb7e41f79d967fdfeca9f8b62a From c449302d282102dff5e7a404b572582402b5d7f8 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 26 Dec 2019 19:57:24 -0500 Subject: [PATCH 09/78] Fixed tests --- core/src/mindustry/world/Build.java | 2 +- .../src/mindustry/server/ServerControl.java | 40 ++++++++++--------- tests/src/test/java/power/PowerTests.java | 3 ++ 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/core/src/mindustry/world/Build.java b/core/src/mindustry/world/Build.java index f101068cf0..b8d41df4f0 100644 --- a/core/src/mindustry/world/Build.java +++ b/core/src/mindustry/world/Build.java @@ -80,7 +80,7 @@ public class Build{ return false; } - if(!state.teams.eachEnemyCore(team, core -> Mathf.dst(x * tilesize + type.offset(), y * tilesize + type.offset(), core.x, core.y) < state.rules.enemyCoreBuildRadius + type.size * tilesize / 2f)){ + if(state.teams.eachEnemyCore(team, core -> Mathf.dst(x * tilesize + type.offset(), y * tilesize + type.offset(), core.x, core.y) < state.rules.enemyCoreBuildRadius + type.size * tilesize / 2f)){ return false; } diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index 109552adb4..3637ac972e 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -135,7 +135,7 @@ public class ServerControl implements ApplicationListener{ if(state.rules.waves){ info("&lcGame over! Reached wave &ly{0}&lc with &ly{1}&lc players online on map &ly{2}&lc.", state.wave, playerGroup.size(), Strings.capitalize(world.getMap().name())); }else{ - info("&lcGame over! Team &ly{0}&lc is victorious with &ly{1}&lc players online on map &ly{2}&lc.", event.winner.name(), playerGroup.size(), Strings.capitalize(world.getMap().name())); + info("&lcGame over! Team &ly{0}&lc is victorious with &ly{1}&lc players online on map &ly{2}&lc.", event.winner.name, playerGroup.size(), Strings.capitalize(world.getMap().name())); } //set next map to be played @@ -143,7 +143,7 @@ public class ServerControl implements ApplicationListener{ nextMapOverride = null; if(map != null){ Call.onInfoMessage((state.rules.pvp - ? "[YELLOW]The " + event.winner.name() + " team is victorious![]" : "[SCARLET]Game over![]") + ? "[YELLOW]The " + event.winner.name + " team is victorious![]" : "[SCARLET]Game over![]") + "\nNext selected map:[accent] " + map.name() + "[]" + (map.tags.containsKey("author") && !map.tags.get("author").trim().isEmpty() ? " by[accent] " + map.author() + "[]" : "") + "." + "\nNew game begins in " + roundExtraTime + "[] seconds."); @@ -292,7 +292,7 @@ public class ServerControl implements ApplicationListener{ info(" &lyPlaying on map &fi{0}&fb &lb/&ly Wave {1}", Strings.capitalize(world.getMap().name()), state.wave); if(state.rules.waves){ - info("&ly {0} enemies.", unitGroups[(int)Team.crux.id].size()); + info("&ly {0} enemies.", state.enemies); }else{ info("&ly {0} seconds until next wave.", (int)(state.wavetime / 60)); } @@ -418,24 +418,26 @@ public class ServerControl implements ApplicationListener{ return; } - try{ - Team team = arg.length == 0 ? Team.sharded : Team.valueOf(arg[0]); + Team team = arg.length == 0 ? Team.sharded : Structs.find(Team.all(), t -> t.name.equals(arg[0])); - if(state.teams.cores(team).isEmpty()){ - err("That team has no cores."); - return; - } - - for(Item item : content.items()){ - if(item.type == ItemType.material){ - state.teams.cores(team).first().entity.items.set(item, state.teams.cores(team).first().block().itemCapacity); - } - } - - info("Core filled."); - }catch(IllegalArgumentException ignored){ - err("No such team exists."); + if(team == null){ + err("No team with that name found."); + return; } + + if(state.teams.cores(team).isEmpty()){ + err("That team has no cores."); + return; + } + + for(Item item : content.items()){ + if(item.type == ItemType.material){ + state.teams.cores(team).first().items.set(item, state.teams.cores(team).first().block.itemCapacity); + } + } + + info("Core filled."); + }); handler.register("name", "[name...]", "Change the server display name.", arg -> { diff --git a/tests/src/test/java/power/PowerTests.java b/tests/src/test/java/power/PowerTests.java index f017bf6e82..6815f2e880 100644 --- a/tests/src/test/java/power/PowerTests.java +++ b/tests/src/test/java/power/PowerTests.java @@ -3,6 +3,8 @@ package power; import arc.*; import arc.math.*; import arc.util.*; +import mindustry.*; +import mindustry.core.*; import mindustry.world.*; import mindustry.world.blocks.power.*; import mindustry.world.consumers.*; @@ -23,6 +25,7 @@ public class PowerTests extends PowerTestFixture{ @BeforeAll static void init(){ Core.graphics = new FakeGraphics(); + Vars.state = new GameState(); } @Nested From 954e26fc145b7874af2c52f6b148c81d3fe2e10d Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 26 Dec 2019 20:08:53 -0500 Subject: [PATCH 10/78] Method cleanup --- core/src/mindustry/ai/BlockIndexer.java | 2 +- core/src/mindustry/ai/WaveSpawner.java | 2 +- core/src/mindustry/entities/Damage.java | 2 +- core/src/mindustry/entities/Units.java | 6 ++-- core/src/mindustry/entities/type/Unit.java | 2 +- .../entities/type/base/BuilderDrone.java | 5 ++-- .../entities/type/base/GroundUnit.java | 6 ++-- core/src/mindustry/game/Team.java | 29 +++++++++++++++++++ core/src/mindustry/game/Teams.java | 2 +- core/src/mindustry/game/Tutorial.java | 2 +- core/src/mindustry/input/InputHandler.java | 2 +- core/src/mindustry/input/MobileInput.java | 2 +- core/src/mindustry/io/SaveVersion.java | 2 +- core/src/mindustry/ui/ItemsDisplay.java | 2 +- .../src/mindustry/desktop/steam/SStats.java | 2 +- gradle.properties | 2 +- 16 files changed, 49 insertions(+), 21 deletions(-) diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java index d5d2f747e2..b010562595 100644 --- a/core/src/mindustry/ai/BlockIndexer.java +++ b/core/src/mindustry/ai/BlockIndexer.java @@ -162,7 +162,7 @@ public class BlockIndexer{ /** Get all enemy blocks with a flag. */ public Array getEnemy(Team team, BlockFlag type){ returnArray.clear(); - for(Team enemy : state.teams.enemiesOf(team)){ + for(Team enemy : team.enemies()){ if(state.teams.isActive(enemy)){ ObjectSet set = getFlagged(enemy)[type.ordinal()]; if(set != null){ diff --git a/core/src/mindustry/ai/WaveSpawner.java b/core/src/mindustry/ai/WaveSpawner.java index 129b930d3b..3bd5bc5400 100644 --- a/core/src/mindustry/ai/WaveSpawner.java +++ b/core/src/mindustry/ai/WaveSpawner.java @@ -92,7 +92,7 @@ public class WaveSpawner{ if(state.rules.attackMode && state.teams.isActive(state.rules.waveTeam) && !state.teams.playerCores().isEmpty()){ TileEntity firstCore = state.teams.playerCores().first(); - for(TileEntity core : state.teams.get(state.rules.waveTeam).cores){ + for(TileEntity core : state.rules.waveTeam.cores()){ Tmp.v1.set(firstCore).sub(core.x, core.y).limit(coreMargin + core.block.size*tilesize); cons.accept(core.x + Tmp.v1.x, core.y + Tmp.v1.y, false); } diff --git a/core/src/mindustry/entities/Damage.java b/core/src/mindustry/entities/Damage.java index 73f0b4996e..3c4b130e0d 100644 --- a/core/src/mindustry/entities/Damage.java +++ b/core/src/mindustry/entities/Damage.java @@ -259,7 +259,7 @@ public class Damage{ for(int dx = -trad; dx <= trad; dx++){ for(int dy = -trad; dy <= trad; dy++){ Tile tile = world.tile(Math.round(x / tilesize) + dx, Math.round(y / tilesize) + dy); - if(tile != null && tile.entity != null && (team == null || state.teams.areEnemies(team, tile.getTeam())) && Mathf.dst(dx, dy) <= trad){ + if(tile != null && tile.entity != null && (team == null ||team.isEnemy(tile.getTeam())) && Mathf.dst(dx, dy) <= trad){ tile.entity.damage(damage); } } diff --git a/core/src/mindustry/entities/Units.java b/core/src/mindustry/entities/Units.java index 7592551ce4..6bcd15e1c5 100644 --- a/core/src/mindustry/entities/Units.java +++ b/core/src/mindustry/entities/Units.java @@ -83,7 +83,7 @@ public class Units{ public static TileEntity findEnemyTile(Team team, float x, float y, float range, Boolf pred){ if(team == Team.derelict) return null; - for(Team enemy : state.teams.enemiesOf(team)){ + for(Team enemy : team.enemies()){ TileEntity entity = indexer.findTile(enemy, x, y, range, pred, true); if(entity != null){ return entity; @@ -195,13 +195,13 @@ public class Units{ /** Iterates over all units that are enemies of this team. */ public static void nearbyEnemies(Team team, float x, float y, float width, float height, Cons cons){ unitGroup.intersect(x, y, width, height, u -> { - if(state.teams.areEnemies(team, u.getTeam())){ + if(team.isEnemy(u.getTeam())){ cons.get(u); } }); playerGroup.intersect(x, y, width, height, player -> { - if(state.teams.areEnemies(team, player.getTeam())){ + if(team.isEnemy(player.getTeam())){ cons.get(player); } }); diff --git a/core/src/mindustry/entities/type/Unit.java b/core/src/mindustry/entities/type/Unit.java index f9c78a747b..ab02f24c83 100644 --- a/core/src/mindustry/entities/type/Unit.java +++ b/core/src/mindustry/entities/type/Unit.java @@ -88,7 +88,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ if(isDead()) return false; if(other instanceof DamageTrait){ - return other instanceof TeamTrait && state.teams.areEnemies((((TeamTrait)other).getTeam()), team); + return other instanceof TeamTrait && (((TeamTrait)other).getTeam()).isEnemy(team); }else{ return other instanceof Unit && ((Unit)other).isFlying() == isFlying(); } diff --git a/core/src/mindustry/entities/type/base/BuilderDrone.java b/core/src/mindustry/entities/type/base/BuilderDrone.java index 6442347de4..336be7be6e 100644 --- a/core/src/mindustry/entities/type/base/BuilderDrone.java +++ b/core/src/mindustry/entities/type/base/BuilderDrone.java @@ -1,10 +1,9 @@ package mindustry.entities.type.base; import arc.*; -import arc.struct.*; import arc.math.*; +import arc.struct.*; import arc.util.*; -import mindustry.*; import mindustry.entities.*; import mindustry.entities.traits.*; import mindustry.entities.type.*; @@ -187,7 +186,7 @@ public class BuilderDrone extends BaseDrone implements BuilderTrait{ } if(timer.get(timerTarget, 80) && Units.closestEnemy(getTeam(), x, y, 100f, u -> !(u instanceof BaseDrone)) == null && !isBuilding()){ - TeamData data = Vars.state.teams.get(team); + TeamData data = team.data(); if(!data.brokenBlocks.isEmpty()){ BrokenBlock block = data.brokenBlocks.removeLast(); if(Build.validPlace(getTeam(), block.x, block.y, content.block(block.block), block.rotation)){ diff --git a/core/src/mindustry/entities/type/base/GroundUnit.java b/core/src/mindustry/entities/type/base/GroundUnit.java index 5f7c6d2768..d680fa230a 100644 --- a/core/src/mindustry/entities/type/base/GroundUnit.java +++ b/core/src/mindustry/entities/type/base/GroundUnit.java @@ -237,15 +237,15 @@ public class GroundUnit extends BaseUnit{ protected void moveAwayFromCore(){ Team enemy = null; - for(Team team : Vars.state.teams.enemiesOf(team)){ - if(Vars.state.teams.isActive(team)){ + for(Team team : Vars.team.enemies()){ + if(team.active()){ enemy = team; break; } } if(enemy == null){ - for(Team team : Vars.state.teams.enemiesOf(team)){ + for(Team team : Vars.team.enemies()){ enemy = team; break; } diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java index 809d60f714..b6b608d5d0 100644 --- a/core/src/mindustry/game/Team.java +++ b/core/src/mindustry/game/Team.java @@ -2,8 +2,13 @@ package mindustry.game; import arc.*; import arc.graphics.*; +import arc.struct.*; import arc.util.*; +import mindustry.game.Teams.*; import mindustry.graphics.*; +import mindustry.world.blocks.storage.CoreBlock.*; + +import static mindustry.Vars.*; public class Team implements Comparable{ public final byte id; @@ -54,6 +59,30 @@ public class Team implements Comparable{ all[us] = this; } + public Array enemies(){ + return state.teams.enemiesOf(this); + } + + public TeamData data(){ + return state.teams.get(this); + } + + public CoreEntity core(){ + return data().core(); + } + + public boolean active(){ + return state.teams.isActive(this); + } + + public boolean isEnemy(Team other){ + return state.teams.areEnemies(this, other); + } + + public Array cores(){ + return state.teams.cores(this); + } + public String localized(){ return Core.bundle.get("team." + name + ".name", name); } diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java index 5d2b570cd2..dc44d47240 100644 --- a/core/src/mindustry/game/Teams.java +++ b/core/src/mindustry/game/Teams.java @@ -161,7 +161,7 @@ public class Teams{ return cores.isEmpty(); } - public TileEntity core(){ + public CoreEntity core(){ return cores.first(); } } diff --git a/core/src/mindustry/game/Tutorial.java b/core/src/mindustry/game/Tutorial.java index 300ab01283..4b344bc945 100644 --- a/core/src/mindustry/game/Tutorial.java +++ b/core/src/mindustry/game/Tutorial.java @@ -271,7 +271,7 @@ public class Tutorial{ } static int item(Item item){ - return state.teams.get(state.rules.defaultTeam).noCores() ? 0 : state.teams.playerCores().first().items.get(item); + return state.rules.defaultTeam.data().noCores() ? 0 : state.rules.defaultTeam.core().items.get(item); } static boolean toggled(String name){ diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index 2a4ce0343f..b35683c7e2 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -402,7 +402,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ } } - for(BrokenBlock req : state.teams.get(player.getTeam()).brokenBlocks){ + for(BrokenBlock req : player.getTeam().data().brokenBlocks){ Block block = content.block(req.block); if(block.bounds(req.x, req.y, Tmp.r2).overlaps(Tmp.r1)){ drawSelected(req.x, req.y, content.block(req.block), Pal.remove); diff --git a/core/src/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java index 5379caf113..81f657c876 100644 --- a/core/src/mindustry/input/MobileInput.java +++ b/core/src/mindustry/input/MobileInput.java @@ -77,7 +77,7 @@ public class MobileInput extends InputHandler implements GestureListener{ }else{ Tile tile = world.ltileWorld(x, y); - if(tile != null && tile.synthetic() && state.teams.areEnemies(player.getTeam(), tile.getTeam())){ + if(tile != null && tile.synthetic() && player.getTeam().isEnemy(tile.getTeam())){ TileEntity entity = tile.entity; player.setMineTile(null); player.target = entity; diff --git a/core/src/mindustry/io/SaveVersion.java b/core/src/mindustry/io/SaveVersion.java index 1d4ab19859..06c75bc878 100644 --- a/core/src/mindustry/io/SaveVersion.java +++ b/core/src/mindustry/io/SaveVersion.java @@ -259,7 +259,7 @@ public abstract class SaveVersion extends SaveFileReader{ int teamc = stream.readInt(); for(int i = 0; i < teamc; i++){ Team team = Team.get(stream.readInt()); - TeamData data = state.teams.get(team); + TeamData data = team.data(); int blocks = stream.readInt(); for(int j = 0; j < blocks; j++){ data.brokenBlocks.addLast(new BrokenBlock(stream.readShort(), stream.readShort(), stream.readShort(), content.block(stream.readShort()).id, stream.readInt())); diff --git a/core/src/mindustry/ui/ItemsDisplay.java b/core/src/mindustry/ui/ItemsDisplay.java index 755590f34f..d59a579c16 100644 --- a/core/src/mindustry/ui/ItemsDisplay.java +++ b/core/src/mindustry/ui/ItemsDisplay.java @@ -39,7 +39,7 @@ public class ItemsDisplay extends Table{ private String format(Item item){ builder.setLength(0); builder.append(ui.formatAmount(data.items().get(item, 0))); - if(!state.is(State.menu) && state.teams.get(player.getTeam()).hasCore() && state.teams.get(player.getTeam()).core().items.get(item) > 0){ + if(!state.is(State.menu) && player.getTeam().data().hasCore() && player.getTeam().core().items.get(item) > 0){ builder.append(" [unlaunched]+ "); builder.append(ui.formatAmount(state.teams.get(player.getTeam()).core().items.get(item))); } diff --git a/desktop/src/mindustry/desktop/steam/SStats.java b/desktop/src/mindustry/desktop/steam/SStats.java index bc355c26b0..950bffc249 100644 --- a/desktop/src/mindustry/desktop/steam/SStats.java +++ b/desktop/src/mindustry/desktop/steam/SStats.java @@ -64,7 +64,7 @@ public class SStats implements SteamUserStatsCallback{ active50Crawlers.complete(); } - for(TileEntity entity : state.teams.get(player.getTeam()).cores){ + for(TileEntity entity : player.getTeam().cores()){ if(!content.items().contains(i -> i.type == ItemType.material && entity.items.get(i) < entity.block.itemCapacity)){ fillCoreAllCampaign.complete(); break; diff --git a/gradle.properties b/gradle.properties index eb016eca65..f8748c523a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=44e060c9f2bf11eb7e41f79d967fdfeca9f8b62a +archash=29782072a3c824715118f51ebe23c189ba0d9597 From 684f3075cbab4509c3a3300b504c8378557fefcb Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 26 Dec 2019 20:20:12 -0500 Subject: [PATCH 11/78] Team#toString() --- core/src/mindustry/entities/type/base/GroundUnit.java | 4 ++-- core/src/mindustry/game/Team.java | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/entities/type/base/GroundUnit.java b/core/src/mindustry/entities/type/base/GroundUnit.java index d680fa230a..56ba404a30 100644 --- a/core/src/mindustry/entities/type/base/GroundUnit.java +++ b/core/src/mindustry/entities/type/base/GroundUnit.java @@ -237,7 +237,7 @@ public class GroundUnit extends BaseUnit{ protected void moveAwayFromCore(){ Team enemy = null; - for(Team team : Vars.team.enemies()){ + for(Team team : team.enemies()){ if(team.active()){ enemy = team; break; @@ -245,7 +245,7 @@ public class GroundUnit extends BaseUnit{ } if(enemy == null){ - for(Team team : Vars.team.enemies()){ + for(Team team : team.enemies()){ enemy = team; break; } diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java index b6b608d5d0..f5b02e4d9a 100644 --- a/core/src/mindustry/game/Team.java +++ b/core/src/mindustry/game/Team.java @@ -31,7 +31,7 @@ public class Team implements Comparable{ static{ //create the whole 256 placeholder teams for(int i = 6; i < all.length; i++){ - new Team(i, "team#" + i, Color.HSVtoRGB(360f * (float)(i) / all.length, 100f, 100f, 1f)); + new Team(i, "team#" + i, Color.HSVtoRGB(360f * (float)(i) / all.length * 10, 100f * 0.8f, 100f * 0.8f, 1f)); } } @@ -91,4 +91,9 @@ public class Team implements Comparable{ public int compareTo(Team team){ return Integer.compare(id, team.id); } + + @Override + public String toString(){ + return name; + } } From c339a0ecdf078391e405e58dd4c5ba2b9845bc39 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 26 Dec 2019 20:44:05 -0500 Subject: [PATCH 12/78] Merge --- core/src/mindustry/entities/bullet/ArtilleryBulletType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/entities/bullet/ArtilleryBulletType.java b/core/src/mindustry/entities/bullet/ArtilleryBulletType.java index 3a098e8765..c59dedf99a 100644 --- a/core/src/mindustry/entities/bullet/ArtilleryBulletType.java +++ b/core/src/mindustry/entities/bullet/ArtilleryBulletType.java @@ -25,7 +25,7 @@ public class ArtilleryBulletType extends BasicBulletType{ } @Override - public void update(mindustry.entities.type.Bullet b){ + public void update(Bullet b){ super.update(b); if(b.timer.get(0, 3 + b.fslope() * 2f)){ From 6080a7e4bcb9972c208630a8295c92f328a9054a Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 26 Dec 2019 20:53:53 -0500 Subject: [PATCH 13/78] Possibly fixed tests / Added support for mod icons --- core/src/mindustry/mod/Mods.java | 25 +++++++++++++++++-- .../src/test/java/power/PowerTestFixture.java | 1 + 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java index e4da45357b..b92b2fefc5 100644 --- a/core/src/mindustry/mod/Mods.java +++ b/core/src/mindustry/mod/Mods.java @@ -2,7 +2,6 @@ package mindustry.mod; import arc.*; import arc.assets.*; -import arc.struct.*; import arc.files.*; import arc.func.*; import arc.graphics.*; @@ -10,6 +9,7 @@ import arc.graphics.Texture.*; import arc.graphics.g2d.*; import arc.graphics.g2d.TextureAtlas.*; import arc.scene.ui.*; +import arc.struct.*; import arc.util.*; import arc.util.ArcAnnotate.*; import arc.util.io.*; @@ -142,6 +142,17 @@ public class Mods implements Loadable{ @Override public void loadSync(){ + for(LoadedMod mod : mods){ + //try to load icon for each mod that can have one + if(mod.root.child("icon.png").exists()){ + try{ + mod.iconTexture = new Texture(mod.root.child("icon.png")); + }catch(Throwable t){ + Log.err("Failed to load icon for mod '" + mod.name + "'.", t); + } + } + } + if(packer == null) return; Time.mark(); @@ -408,6 +419,7 @@ public class Mods implements Loadable{ //TODO make it less epic Core.atlas = new TextureAtlas(Core.files.internal("sprites/sprites.atlas")); + mods.each(LoadedMod::dispose); mods.clear(); Core.bundle = I18NBundle.createBundle(Core.files.internal("bundles/bundle"), Core.bundle.getLocale()); load(); @@ -643,7 +655,7 @@ public class Mods implements Loadable{ } /** Represents a plugin that has been loaded from a jar file.*/ - public static class LoadedMod implements Publishable{ + public static class LoadedMod implements Publishable, Disposable{ /** The location of this mod's zip file/folder on the disk. */ public final Fi file; /** The root zip file; points to the contents of this mod. In the case of folders, this is the same as the mod's file. */ @@ -664,6 +676,8 @@ public class Mods implements Loadable{ public ObjectSet erroredContent = new ObjectSet<>(); /** Current state of this mod. */ public ModState state = ModState.enabled; + /** Icon texture. Should be disposed. */ + public @Nullable Texture iconTexture; public LoadedMod(Fi file, Fi root, Mod main, ModMeta meta){ this.root = root; @@ -701,6 +715,13 @@ public class Mods implements Loadable{ return Version.build >= Strings.parseInt(meta.minGameVersion, 0); } + @Override + public void dispose(){ + if(iconTexture != null){ + iconTexture.dispose(); + } + } + @Override public String getSteamID(){ return Core.settings.getString(name + "-steamid", null); diff --git a/tests/src/test/java/power/PowerTestFixture.java b/tests/src/test/java/power/PowerTestFixture.java index fd445a2c25..e5735052f5 100644 --- a/tests/src/test/java/power/PowerTestFixture.java +++ b/tests/src/test/java/power/PowerTestFixture.java @@ -27,6 +27,7 @@ public class PowerTestFixture{ @BeforeAll static void initializeDependencies(){ Core.graphics = new FakeGraphics(); + Vars.state = new GameState(); Vars.content = new ContentLoader(){ @Override public void handleMappableContent(MappableContent content){ From d6d6dc29dc5cca2d702a67e09c78b36b3b84996d Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 26 Dec 2019 22:44:15 -0500 Subject: [PATCH 14/78] More plugin customization / Renamed Rectangle --- core/src/mindustry/core/Control.java | 2 +- core/src/mindustry/core/NetClient.java | 10 ++++- core/src/mindustry/core/NetServer.java | 43 +++++++++++-------- core/src/mindustry/core/Renderer.java | 6 +-- core/src/mindustry/editor/MapView.java | 2 +- core/src/mindustry/entities/Damage.java | 6 +-- .../mindustry/entities/EntityCollisions.java | 10 ++--- core/src/mindustry/entities/EntityGroup.java | 8 ++-- core/src/mindustry/entities/Units.java | 6 +-- .../entities/bullet/FlakBulletType.java | 4 +- .../mindustry/entities/effect/Lightning.java | 2 +- .../src/mindustry/entities/effect/Puddle.java | 12 +++--- .../entities/traits/BuilderTrait.java | 2 +- .../mindustry/entities/traits/SolidTrait.java | 4 +- .../src/mindustry/entities/type/BaseUnit.java | 8 ++-- core/src/mindustry/entities/type/Bullet.java | 8 ++-- core/src/mindustry/entities/type/Player.java | 10 ++--- core/src/mindustry/game/EventType.java | 5 ++- core/src/mindustry/game/Rules.java | 2 + .../mindustry/graphics/MinimapRenderer.java | 2 +- .../mindustry/graphics/OverlayRenderer.java | 2 +- core/src/mindustry/input/InputHandler.java | 2 +- core/src/mindustry/io/JsonIO.java | 14 +++++- core/src/mindustry/net/Administration.java | 30 +++++++++++-- core/src/mindustry/ui/Bar.java | 2 +- .../mindustry/ui/dialogs/DeployDialog.java | 2 +- .../mindustry/ui/dialogs/TechTreeDialog.java | 4 +- .../mindustry/ui/layout/BranchTreeLayout.java | 4 +- core/src/mindustry/world/Block.java | 2 +- core/src/mindustry/world/Tile.java | 2 +- .../world/blocks/defense/DeflectorWall.java | 4 +- .../mindustry/world/blocks/defense/Door.java | 2 +- .../world/blocks/units/RepairPoint.java | 4 +- gradle.properties | 2 +- tests/src/test/java/IOTests.java | 28 +++++++++--- 35 files changed, 166 insertions(+), 90 deletions(-) diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index ef31948c82..458cb313ae 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -63,7 +63,7 @@ public class Control implements ApplicationListener, Loadable{ }); Events.on(PlayEvent.class, event -> { - player.setTeam(state.rules.pvp ? netServer.assignTeam(player, playerGroup.all()) : state.rules.defaultTeam); + player.setTeam(netServer.assignTeam(player, playerGroup.all())); player.setDead(true); player.add(); diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java index 65c6122d72..96daa07041 100644 --- a/core/src/mindustry/core/NetClient.java +++ b/core/src/mindustry/core/NetClient.java @@ -160,9 +160,17 @@ public class NetClient implements ApplicationListener{ throw new ValidateException(player, "Player has sent a message above the text limit."); } + String original = message; + //check if it's a command CommandResponse response = netServer.clientCommands.handleMessage(message, player); if(response.type == ResponseType.noCommand){ //no command to handle + message = netServer.admins.filterMessage(player, message); + //supress chat message if it's filtered out + if(message == null){ + return; + } + //server console logging Log.info("&y{0}: &lb{1}", player.name, message); @@ -190,7 +198,7 @@ public class NetClient implements ApplicationListener{ } } - Events.fire(new PlayerChatEvent(player, message)); + Events.fire(new PlayerChatEvent(player, message, original)); } public static String colorizeName(int id, String name){ diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index 3e325e5b31..c74f14211c 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -33,14 +33,31 @@ import static mindustry.Vars.*; public class NetServer implements ApplicationListener{ private final static int maxSnapshotSize = 430, timerBlockSync = 0; - private final static float serverSyncTime = 12, kickDuration = 30 * 1000, blockSyncTime = 60 * 10; + private final static float serverSyncTime = 12, kickDuration = 30 * 1000, blockSyncTime = 60 * 8; private final static Vec2 vector = new Vec2(); - private final static Rectangle viewport = new Rectangle(); + private final static Rect viewport = new Rect(); /** If a player goes away of their server-side coordinates by this distance, they get teleported back. */ private final static float correctDist = 16f; public final Administration admins = new Administration(); public final CommandHandler clientCommands = new CommandHandler("/"); + public TeamAssigner assigner = (player, players) -> { + if(state.rules.pvp){ + //find team with minimum amount of players and auto-assign player to that. + TeamData re = state.teams.getActive().min(data -> { + int count = 0; + for(Player other : players){ + if(other.getTeam() == data.team && other != player){ + count++; + } + } + return count; + }); + return re == null ? null : re.team; + } + + return state.rules.defaultTeam; + }; private boolean closing = false; private Interval timer = new Interval(); @@ -199,10 +216,8 @@ public class NetServer implements ApplicationListener{ con.player = player; //playing in pvp mode automatically assigns players to teams - if(state.rules.pvp){ - player.setTeam(assignTeam(player, playerGroup.all())); - Log.info("Auto-assigned player {0} to team {1}.", player.name, player.getTeam()); - } + player.setTeam(assignTeam(player, playerGroup.all())); + Log.info("Auto-assigned player {0} to team {1}.", player.name, player.getTeam()); sendWorldData(player); @@ -403,17 +418,7 @@ public class NetServer implements ApplicationListener{ } public Team assignTeam(Player current, Iterable players){ - //find team with minimum amount of players and auto-assign player to that. - TeamData re = state.teams.getActive().min(data -> { - int count = 0; - for(Player other : players){ - if(other.getTeam() == data.team && other != current){ - count++; - } - } - return count; - }); - return re == null ? null : re.team; + return assigner.assign(current, players); } public void sendWorldData(Player player){ @@ -784,4 +789,8 @@ public class NetServer implements ApplicationListener{ e.printStackTrace(); } } + + public interface TeamAssigner{ + Team assign(Player player, Iterable players); + } } diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java index 94528a62d8..d4983e992a 100644 --- a/core/src/mindustry/core/Renderer.java +++ b/core/src/mindustry/core/Renderer.java @@ -41,7 +41,7 @@ public class Renderer implements ApplicationListener{ private float camerascale = targetscale; private float landscale = 0f, landTime; private float minZoomScl = Scl.scl(0.01f); - private Rectangle rect = new Rectangle(), rect2 = new Rectangle(); + private Rect rect = new Rect(), rect2 = new Rect(); private float shakeIntensity, shaketime; public Renderer(){ @@ -56,8 +56,8 @@ public class Renderer implements ApplicationListener{ Effects.setEffectProvider((effect, color, x, y, rotation, data) -> { if(effect == Fx.none) return; if(Core.settings.getBool("effects")){ - Rectangle view = camera.bounds(rect); - Rectangle pos = rect2.setSize(effect.size).setCenter(x, y); + Rect view = camera.bounds(rect); + Rect pos = rect2.setSize(effect.size).setCenter(x, y); if(view.overlaps(pos)){ diff --git a/core/src/mindustry/editor/MapView.java b/core/src/mindustry/editor/MapView.java index 4c99ffba61..6787f418ab 100644 --- a/core/src/mindustry/editor/MapView.java +++ b/core/src/mindustry/editor/MapView.java @@ -28,7 +28,7 @@ public class MapView extends Element implements GestureListener{ private boolean grid = false; private GridImage image = new GridImage(0, 0); private Vec2 vec = new Vec2(); - private Rectangle rect = new Rectangle(); + private Rect rect = new Rect(); private Vec2[][] brushPolygons = new Vec2[MapEditor.brushSizes.length][0]; private boolean drawing; diff --git a/core/src/mindustry/entities/Damage.java b/core/src/mindustry/entities/Damage.java index 3c4b130e0d..335ac96385 100644 --- a/core/src/mindustry/entities/Damage.java +++ b/core/src/mindustry/entities/Damage.java @@ -22,8 +22,8 @@ import static mindustry.Vars.*; /** Utility class for damaging in an area. */ public class Damage{ - private static Rectangle rect = new Rectangle(); - private static Rectangle hitrect = new Rectangle(); + private static Rect rect = new Rect(); + private static Rect hitrect = new Rect(); private static Vec2 tr = new Vec2(); private static GridBits bits = new GridBits(30, 30); private static IntQueue propagation = new IntQueue(); @@ -127,7 +127,7 @@ public class Damage{ Cons cons = e -> { e.hitbox(hitrect); - Rectangle other = hitrect; + Rect other = hitrect; other.y -= expand; other.x -= expand; other.width += expand * 2; diff --git a/core/src/mindustry/entities/EntityCollisions.java b/core/src/mindustry/entities/EntityCollisions.java index 6a7fefffd1..72e177d71e 100644 --- a/core/src/mindustry/entities/EntityCollisions.java +++ b/core/src/mindustry/entities/EntityCollisions.java @@ -17,11 +17,11 @@ public class EntityCollisions{ private static final float seg = 1f; //tile collisions - private Rectangle tmp = new Rectangle(); + private Rect tmp = new Rect(); private Vec2 vector = new Vec2(); private Vec2 l1 = new Vec2(); - private Rectangle r1 = new Rectangle(); - private Rectangle r2 = new Rectangle(); + private Rect r1 = new Rect(); + private Rect r2 = new Rect(); //entity collisions private Array arrOut = new Array<>(); @@ -57,7 +57,7 @@ public class EntityCollisions{ public void moveDelta(SolidTrait entity, float deltax, float deltay, boolean x){ - Rectangle rect = r1; + Rect rect = r1; entity.hitboxTile(rect); entity.hitboxTile(r2); rect.x += deltax; @@ -84,7 +84,7 @@ public class EntityCollisions{ entity.setY(entity.getY() + rect.y - r2.y); } - public boolean overlapsTile(Rectangle rect){ + public boolean overlapsTile(Rect rect){ rect.getCenter(vector); int r = 1; diff --git a/core/src/mindustry/entities/EntityGroup.java b/core/src/mindustry/entities/EntityGroup.java index d691949272..8c0ac76442 100644 --- a/core/src/mindustry/entities/EntityGroup.java +++ b/core/src/mindustry/entities/EntityGroup.java @@ -19,13 +19,13 @@ public class EntityGroup{ private final Array entitiesToRemove = new Array<>(false, 32); private final Array entitiesToAdd = new Array<>(false, 32); private final Array intersectArray = new Array<>(); - private final Rectangle intersectRect = new Rectangle(); + private final Rect intersectRect = new Rect(); private IntMap map; private QuadTree tree; private Cons removeListener; private Cons addListener; - private final Rectangle viewport = new Rectangle(); + private final Rect viewport = new Rect(); private int count = 0; public EntityGroup(int id, Class type, boolean useTree){ @@ -34,7 +34,7 @@ public class EntityGroup{ this.type = type; if(useTree){ - tree = new QuadTree<>(new Rectangle(0, 0, 0, 0)); + tree = new QuadTree<>(new Rect(0, 0, 0, 0)); } } @@ -180,7 +180,7 @@ public class EntityGroup{ /** Resizes the internal quadtree, if it is enabled.*/ public void resize(float x, float y, float w, float h){ if(useTree){ - tree = new QuadTree<>(new Rectangle(x, y, w, h)); + tree = new QuadTree<>(new Rect(x, y, w, h)); } } diff --git a/core/src/mindustry/entities/Units.java b/core/src/mindustry/entities/Units.java index 6bcd15e1c5..fac56dcc0e 100644 --- a/core/src/mindustry/entities/Units.java +++ b/core/src/mindustry/entities/Units.java @@ -12,7 +12,7 @@ import static mindustry.Vars.*; /** Utility class for unit and team interactions.*/ public class Units{ - private static Rectangle hitrect = new Rectangle(); + private static Rect hitrect = new Rect(); private static Unit result; private static float cdist; private static boolean boolResult; @@ -188,7 +188,7 @@ public class Units{ } /** Iterates over all units in a rectangle. */ - public static void nearby(Rectangle rect, Cons cons){ + public static void nearby(Rect rect, Cons cons){ nearby(rect.x, rect.y, rect.width, rect.height, cons); } @@ -208,7 +208,7 @@ public class Units{ } /** Iterates over all units that are enemies of this team. */ - public static void nearbyEnemies(Team team, Rectangle rect, Cons cons){ + public static void nearbyEnemies(Team team, Rect rect, Cons cons){ nearbyEnemies(team, rect.x, rect.y, rect.width, rect.height, cons); } diff --git a/core/src/mindustry/entities/bullet/FlakBulletType.java b/core/src/mindustry/entities/bullet/FlakBulletType.java index b68e3af59a..ead19859cc 100644 --- a/core/src/mindustry/entities/bullet/FlakBulletType.java +++ b/core/src/mindustry/entities/bullet/FlakBulletType.java @@ -1,13 +1,13 @@ package mindustry.entities.bullet; -import arc.math.geom.Rectangle; +import arc.math.geom.Rect; import arc.util.Time; import mindustry.content.Fx; import mindustry.entities.Units; import mindustry.entities.type.Bullet; public class FlakBulletType extends BasicBulletType{ - protected static Rectangle rect = new Rectangle(); + protected static Rect rect = new Rect(); protected float explodeRange = 30f; public FlakBulletType(float speed, float damage){ diff --git a/core/src/mindustry/entities/effect/Lightning.java b/core/src/mindustry/entities/effect/Lightning.java index 1e88c29df2..59b7f833fa 100644 --- a/core/src/mindustry/entities/effect/Lightning.java +++ b/core/src/mindustry/entities/effect/Lightning.java @@ -28,7 +28,7 @@ public class Lightning extends TimedEntity implements DrawTrait, TimeTrait{ public static final float lifetime = 10f; private static final RandomXS128 random = new RandomXS128(); - private static final Rectangle rect = new Rectangle(); + private static final Rect rect = new Rect(); private static final Array entities = new Array<>(); private static final IntSet hit = new IntSet(); private static final int maxChain = 8; diff --git a/core/src/mindustry/entities/effect/Puddle.java b/core/src/mindustry/entities/effect/Puddle.java index e2d5d2e10c..132c2d1379 100644 --- a/core/src/mindustry/entities/effect/Puddle.java +++ b/core/src/mindustry/entities/effect/Puddle.java @@ -27,8 +27,8 @@ public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrai private static final float maxLiquid = 70f; private static final int maxGeneration = 2; private static final Color tmp = new Color(); - private static final Rectangle rect = new Rectangle(); - private static final Rectangle rect2 = new Rectangle(); + private static final Rect rect = new Rect(); + private static final Rect rect2 = new Rect(); private static int seeds; private int loadedPosition = -1; @@ -151,13 +151,13 @@ public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrai } @Override - public void hitbox(Rectangle rectangle){ - rectangle.setCenter(x, y).setSize(tilesize); + public void hitbox(Rect rect){ + rect.setCenter(x, y).setSize(tilesize); } @Override - public void hitboxTile(Rectangle rectangle){ - rectangle.setCenter(x, y).setSize(0f); + public void hitboxTile(Rect rect){ + rect.setCenter(x, y).setSize(0f); } @Override diff --git a/core/src/mindustry/entities/traits/BuilderTrait.java b/core/src/mindustry/entities/traits/BuilderTrait.java index 2f302be8e6..02ae0bca5b 100644 --- a/core/src/mindustry/entities/traits/BuilderTrait.java +++ b/core/src/mindustry/entities/traits/BuilderTrait.java @@ -343,7 +343,7 @@ public interface BuilderTrait extends Entity, TeamTrait{ return this; } - public Rectangle bounds(Rectangle rect){ + public Rect bounds(Rect rect){ if(breaking){ return rect.set(-100f, -100f, 0f, 0f); }else{ diff --git a/core/src/mindustry/entities/traits/SolidTrait.java b/core/src/mindustry/entities/traits/SolidTrait.java index f799f13cba..afa2efd6b0 100644 --- a/core/src/mindustry/entities/traits/SolidTrait.java +++ b/core/src/mindustry/entities/traits/SolidTrait.java @@ -7,9 +7,9 @@ import mindustry.Vars; public interface SolidTrait extends QuadTreeObject, MoveTrait, VelocityTrait, Entity, Position{ - void hitbox(Rectangle rectangle); + void hitbox(Rect rect); - void hitboxTile(Rectangle rectangle); + void hitboxTile(Rect rect); Vec2 lastPosition(); diff --git a/core/src/mindustry/entities/type/BaseUnit.java b/core/src/mindustry/entities/type/BaseUnit.java index 03b4f2d0de..6062662e9b 100644 --- a/core/src/mindustry/entities/type/BaseUnit.java +++ b/core/src/mindustry/entities/type/BaseUnit.java @@ -352,13 +352,13 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ } @Override - public void hitbox(Rectangle rectangle){ - rectangle.setSize(type.hitsize).setCenter(x, y); + public void hitbox(Rect rect){ + rect.setSize(type.hitsize).setCenter(x, y); } @Override - public void hitboxTile(Rectangle rectangle){ - rectangle.setSize(type.hitsizeTile).setCenter(x, y); + public void hitboxTile(Rect rect){ + rect.setSize(type.hitsizeTile).setCenter(x, y); } @Override diff --git a/core/src/mindustry/entities/type/Bullet.java b/core/src/mindustry/entities/type/Bullet.java index 6afafb5f29..f7e676ecc9 100644 --- a/core/src/mindustry/entities/type/Bullet.java +++ b/core/src/mindustry/entities/type/Bullet.java @@ -246,13 +246,13 @@ public class Bullet extends SolidEntity implements DamageTrait, ScaleTrait, Pool } @Override - public void hitbox(Rectangle rectangle){ - rectangle.setSize(type.hitSize).setCenter(x, y); + public void hitbox(Rect rect){ + rect.setSize(type.hitSize).setCenter(x, y); } @Override - public void hitboxTile(Rectangle rectangle){ - rectangle.setSize(type.hitSize).setCenter(x, y); + public void hitboxTile(Rect rect){ + rect.setSize(type.hitSize).setCenter(x, y); } @Override diff --git a/core/src/mindustry/entities/type/Player.java b/core/src/mindustry/entities/type/Player.java index a6a74683bb..af5165fc60 100644 --- a/core/src/mindustry/entities/type/Player.java +++ b/core/src/mindustry/entities/type/Player.java @@ -41,7 +41,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{ private static final int timerShootRight = 1; private static final float liftoffBoost = 0.2f; - private static final Rectangle rect = new Rectangle(); + private static final Rect rect = new Rect(); //region instance variables @@ -93,13 +93,13 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{ } @Override - public void hitbox(Rectangle rectangle){ - rectangle.setSize(mech.hitsize).setCenter(x, y); + public void hitbox(Rect rect){ + rect.setSize(mech.hitsize).setCenter(x, y); } @Override - public void hitboxTile(Rectangle rectangle){ - rectangle.setSize(mech.hitsize * 2f / 3f).setCenter(x, y); + public void hitboxTile(Rect rect){ + rect.setSize(mech.hitsize * 2f / 3f).setCenter(x, y); } @Override diff --git a/core/src/mindustry/game/EventType.java b/core/src/mindustry/game/EventType.java index cf26f06fec..dfa1469fc1 100644 --- a/core/src/mindustry/game/EventType.java +++ b/core/src/mindustry/game/EventType.java @@ -62,10 +62,13 @@ public class EventType{ public static class PlayerChatEvent{ public final Player player; public final String message; + /** The original, unfiltered message. */ + public final String originalMessage; - public PlayerChatEvent(Player player, String message){ + public PlayerChatEvent(Player player, String message, String originalMessage){ this.player = player; this.message = message; + this.originalMessage = originalMessage; } } diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java index d910952021..93ceaf5cfe 100644 --- a/core/src/mindustry/game/Rules.java +++ b/core/src/mindustry/game/Rules.java @@ -82,6 +82,8 @@ public class Rules{ public Team defaultTeam = Team.sharded; /** team of the enemy in waves/sectors */ public Team waveTeam = Team.crux; + /** special tags for additional info */ + public StringMap tags = new StringMap(); /** Copies this ruleset exactly. Not very efficient at all, do not use often. */ public Rules copy(){ diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java index ffeadc98da..60f3d2974b 100644 --- a/core/src/mindustry/graphics/MinimapRenderer.java +++ b/core/src/mindustry/graphics/MinimapRenderer.java @@ -25,7 +25,7 @@ public class MinimapRenderer implements Disposable{ private Pixmap pixmap; private Texture texture; private TextureRegion region; - private Rectangle rect = new Rectangle(); + private Rect rect = new Rect(); private float zoom = 4; public MinimapRenderer(){ diff --git a/core/src/mindustry/graphics/OverlayRenderer.java b/core/src/mindustry/graphics/OverlayRenderer.java index 3c65c1b9f4..c0cd917952 100644 --- a/core/src/mindustry/graphics/OverlayRenderer.java +++ b/core/src/mindustry/graphics/OverlayRenderer.java @@ -22,7 +22,7 @@ import static mindustry.Vars.*; public class OverlayRenderer{ private static final float indicatorLength = 14f; private static final float spawnerMargin = tilesize*11f; - private static final Rectangle rect = new Rectangle(); + private static final Rect rect = new Rect(); private float buildFadeTime; public void drawBottom(){ diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index b35683c7e2..4a6ffb575b 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -44,7 +44,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ /** Maximum line length. */ final static int maxLength = 100; final static Vec2 stackTrns = new Vec2(); - final static Rectangle r1 = new Rectangle(), r2 = new Rectangle(); + final static Rect r1 = new Rect(), r2 = new Rect(); /** Distance on the back from where items originate. */ final static float backTrns = 3f; diff --git a/core/src/mindustry/io/JsonIO.java b/core/src/mindustry/io/JsonIO.java index 7c570bace8..ef37dd9d65 100644 --- a/core/src/mindustry/io/JsonIO.java +++ b/core/src/mindustry/io/JsonIO.java @@ -20,7 +20,7 @@ public class JsonIO{ @Override public void writeValue(Object value, Class knownType, Class elementType){ - if(value instanceof mindustry.ctype.MappableContent){ + if(value instanceof MappableContent){ try{ getWriter().value(((MappableContent)value).name); }catch(IOException e){ @@ -95,6 +95,18 @@ public class JsonIO{ } }); + json.setSerializer(Team.class, new Serializer(){ + @Override + public void write(Json json, Team object, Class knownType){ + json.writeValue(object.id); + } + + @Override + public Team read(Json json, JsonValue jsonData, Class type){ + return Team.get(jsonData.asInt()); + } + }); + json.setSerializer(Block.class, new Serializer(){ @Override public void write(Json json, Block object, Class knownType){ diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java index cd490eed04..dabf679d34 100644 --- a/core/src/mindustry/net/Administration.java +++ b/core/src/mindustry/net/Administration.java @@ -1,10 +1,11 @@ package mindustry.net; import arc.*; -import mindustry.annotations.Annotations.*; import arc.struct.*; -import mindustry.Vars; - +import arc.util.ArcAnnotate.*; +import mindustry.*; +import mindustry.annotations.Annotations.*; +import mindustry.entities.type.*; import static mindustry.Vars.headless; import static mindustry.game.EventType.*; @@ -14,6 +15,7 @@ public class Administration{ private ObjectMap playerInfo = new ObjectMap<>(); private Array bannedIPs = new Array<>(); private Array whitelist = new Array<>(); + private Array chatFilters = new Array<>(); public Administration(){ Core.settings.defaults( @@ -24,6 +26,23 @@ public class Administration{ load(); } + /** Adds a chat filter. This will transform the chat messages of every player. + * This functionality can be used to implement things like swear filters and special commands. + * Note that commands (starting with /) are not filtered.*/ + public void addChatFilter(ChatFilter filter){ + chatFilters.add(filter); + } + + /** Filters out a chat message. */ + public @Nullable String filterMessage(Player player, String message){ + String current = message; + for(ChatFilter f : chatFilters){ + current = f.filter(player, message); + if(current == null) return null; + } + return current; + } + public int getPlayerLimit(){ return Core.settings.getInt("playerlimit", 0); } @@ -334,6 +353,11 @@ public class Administration{ } } + public interface ChatFilter{ + /** @return the filtered message; a null string signals that the message should not be sent. */ + @Nullable String filter(Player player, String message); + } + public static class TraceInfo{ public String ip, uuid; public boolean modded, mobile; diff --git a/core/src/mindustry/ui/Bar.java b/core/src/mindustry/ui/Bar.java index c04a25167f..8c23ec0ad3 100644 --- a/core/src/mindustry/ui/Bar.java +++ b/core/src/mindustry/ui/Bar.java @@ -12,7 +12,7 @@ import arc.util.pooling.*; import mindustry.gen.*; public class Bar extends Element{ - private static Rectangle scissor = new Rectangle(); + private static Rect scissor = new Rect(); private Floatp fraction; private String name = ""; diff --git a/core/src/mindustry/ui/dialogs/DeployDialog.java b/core/src/mindustry/ui/dialogs/DeployDialog.java index dda43d0e13..811caca161 100644 --- a/core/src/mindustry/ui/dialogs/DeployDialog.java +++ b/core/src/mindustry/ui/dialogs/DeployDialog.java @@ -33,7 +33,7 @@ public class DeployDialog extends FloatingDialog{ private final float nodeSize = Scl.scl(230f); private ObjectSet nodes = new ObjectSet<>(); private ZoneInfoDialog info = new ZoneInfoDialog(); - private Rectangle bounds = new Rectangle(); + private Rect bounds = new Rect(); private View view = new View(); public DeployDialog(){ diff --git a/core/src/mindustry/ui/dialogs/TechTreeDialog.java b/core/src/mindustry/ui/dialogs/TechTreeDialog.java index 6bbb249a66..0d28af70c5 100644 --- a/core/src/mindustry/ui/dialogs/TechTreeDialog.java +++ b/core/src/mindustry/ui/dialogs/TechTreeDialog.java @@ -31,7 +31,7 @@ public class TechTreeDialog extends FloatingDialog{ private final float nodeSize = Scl.scl(60f); private ObjectSet nodes = new ObjectSet<>(); private TechTreeNode root = new TechTreeNode(TechTree.root, null); - private Rectangle bounds = new Rectangle(); + private Rect bounds = new Rect(); private ItemsDisplay items; private View view; @@ -123,7 +123,7 @@ public class TechTreeDialog extends FloatingDialog{ miny = Math.min(n.y - n.height/2f, miny); maxy = Math.max(n.y + n.height/2f, maxy); } - bounds = new Rectangle(minx, miny, maxx - minx, maxy - miny); + bounds = new Rect(minx, miny, maxx - minx, maxy - miny); bounds.y += nodeSize*1.5f; } diff --git a/core/src/mindustry/ui/layout/BranchTreeLayout.java b/core/src/mindustry/ui/layout/BranchTreeLayout.java index b012d68e71..07c3fb5497 100644 --- a/core/src/mindustry/ui/layout/BranchTreeLayout.java +++ b/core/src/mindustry/ui/layout/BranchTreeLayout.java @@ -66,8 +66,8 @@ public class BranchTreeLayout implements TreeLayout{ } } - public Rectangle getBounds(){ - return new Rectangle(boundsLeft, boundsBottom, boundsRight - boundsLeft, boundsTop - boundsBottom); + public Rect getBounds(){ + return new Rect(boundsLeft, boundsBottom, boundsRight - boundsLeft, boundsTop - boundsBottom); } private void calcSizeOfLevels(TreeNode node, int level){ diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index 9bd64f023a..9bec4cd0f6 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -864,7 +864,7 @@ public class Block extends BlockStorage{ return ((size + 1) % 2) * tilesize / 2f; } - public Rectangle bounds(int x, int y, Rectangle rect){ + public Rect bounds(int x, int y, Rect rect){ return rect.setSize(size * tilesize).setCenter(x * tilesize + offset(), y * tilesize + offset()); } diff --git a/core/src/mindustry/world/Tile.java b/core/src/mindustry/world/Tile.java index c591307176..0572c74286 100644 --- a/core/src/mindustry/world/Tile.java +++ b/core/src/mindustry/world/Tile.java @@ -327,7 +327,7 @@ public class Tile implements Position, TargetTrait{ return tmpArray; } - public Rectangle getHitbox(Rectangle rect){ + public Rect getHitbox(Rect rect){ return rect.setSize(block().size * tilesize).setCenter(drawx(), drawy()); } diff --git a/core/src/mindustry/world/blocks/defense/DeflectorWall.java b/core/src/mindustry/world/blocks/defense/DeflectorWall.java index cf8f54a8ce..ae535ca8a6 100644 --- a/core/src/mindustry/world/blocks/defense/DeflectorWall.java +++ b/core/src/mindustry/world/blocks/defense/DeflectorWall.java @@ -15,8 +15,8 @@ public class DeflectorWall extends Wall{ public static final float hitTime = 10f; protected float maxDamageDeflect = 10f; - protected Rectangle rect = new Rectangle(); - protected Rectangle rect2 = new Rectangle(); + protected Rect rect = new Rect(); + protected Rect rect2 = new Rect(); public DeflectorWall(String name){ super(name); diff --git a/core/src/mindustry/world/blocks/defense/Door.java b/core/src/mindustry/world/blocks/defense/Door.java index 27a0d26bff..df75416207 100644 --- a/core/src/mindustry/world/blocks/defense/Door.java +++ b/core/src/mindustry/world/blocks/defense/Door.java @@ -18,7 +18,7 @@ import java.io.*; import static mindustry.Vars.*; public class Door extends Wall{ - protected final static Rectangle rect = new Rectangle(); + protected final static Rect rect = new Rect(); public final int timerToggle = timers++; public Effect openfx = Fx.dooropen; diff --git a/core/src/mindustry/world/blocks/units/RepairPoint.java b/core/src/mindustry/world/blocks/units/RepairPoint.java index 183404148d..a17fffe1b1 100644 --- a/core/src/mindustry/world/blocks/units/RepairPoint.java +++ b/core/src/mindustry/world/blocks/units/RepairPoint.java @@ -6,7 +6,7 @@ import arc.graphics.Color; import arc.graphics.g2d.*; import arc.math.Angles; import arc.math.Mathf; -import arc.math.geom.Rectangle; +import arc.math.geom.Rect; import arc.util.Time; import mindustry.entities.Units; import mindustry.entities.type.TileEntity; @@ -19,7 +19,7 @@ import mindustry.world.meta.*; import static mindustry.Vars.tilesize; public class RepairPoint extends Block{ - private static Rectangle rect = new Rectangle(); + private static Rect rect = new Rect(); public int timerTarget = timers++; diff --git a/gradle.properties b/gradle.properties index f8748c523a..19101944cf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=29782072a3c824715118f51ebe23c189ba0d9597 +archash=60a9ebe264f92f2c3082596c77b9ab29474c4a7f diff --git a/tests/src/test/java/IOTests.java b/tests/src/test/java/IOTests.java index 240334f6dd..79f7a213cf 100644 --- a/tests/src/test/java/IOTests.java +++ b/tests/src/test/java/IOTests.java @@ -1,11 +1,11 @@ +import arc.util.*; import mindustry.game.*; -import mindustry.io.TypeIO; -import org.junit.jupiter.api.Test; +import mindustry.io.*; +import org.junit.jupiter.api.*; -import java.nio.ByteBuffer; +import java.nio.*; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.*; public class IOTests{ @@ -49,5 +49,23 @@ public class IOTests{ assertEquals(rules.attackMode, res.attackMode); } + @Test + void writeRules2(){ + Rules rules = new Rules(); + rules.attackMode = true; + rules.tags.put("blah", "bleh"); + rules.buildSpeedMultiplier = 99.1f; + String str = JsonIO.write(rules); + Rules res = JsonIO.read(Rules.class, str); + + assertEquals(rules.buildSpeedMultiplier, res.buildSpeedMultiplier); + assertEquals(rules.attackMode, res.attackMode); + assertEquals(rules.tags.get("blah"), res.tags.get("blah")); + + String str2 = JsonIO.write(new Rules(){{ + attackMode = true; + }}); + Log.info(str2); + } } From 98f8a1732e1185e24ad6b0999186aff3b5d378e0 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 26 Dec 2019 23:00:26 -0500 Subject: [PATCH 15/78] Renamed Calls -> Call --- core/assets/scripts/base.js | 3 ++- core/assets/scripts/global.js | 3 ++- core/src/mindustry/game/Team.java | 5 ++++- core/src/mindustry/mod/ClassAccess.java | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/core/assets/scripts/base.js b/core/assets/scripts/base.js index 9b3fb5dcb4..a83a66c728 100755 --- a/core/assets/scripts/base.js +++ b/core/assets/scripts/base.js @@ -16,4 +16,5 @@ const boolp = method => new Boolp(){get: method} const cons = method => new Cons(){get: method} const prov = method => new Prov(){get: method} const newEffect = (lifetime, renderer) => new Effects.Effect(lifetime, new Effects.EffectRenderer({render: renderer})) -const Calls = Packages.io.anuke.mindustry.gen.Call \ No newline at end of file +Call = Packages.io.anuke.mindustry.gen.Call +const Calls = Call //backwards compat \ No newline at end of file diff --git a/core/assets/scripts/global.js b/core/assets/scripts/global.js index badba9d273..862ded3759 100755 --- a/core/assets/scripts/global.js +++ b/core/assets/scripts/global.js @@ -18,7 +18,8 @@ const boolp = method => new Boolp(){get: method} const cons = method => new Cons(){get: method} const prov = method => new Prov(){get: method} const newEffect = (lifetime, renderer) => new Effects.Effect(lifetime, new Effects.EffectRenderer({render: renderer})) -const Calls = Packages.io.anuke.mindustry.gen.Call +Call = Packages.io.anuke.mindustry.gen.Call +const Calls = Call //backwards compat importPackage(Packages.arc) importPackage(Packages.arc.func) importPackage(Packages.arc.graphics) diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java index f5b02e4d9a..a6e9d1e20a 100644 --- a/core/src/mindustry/game/Team.java +++ b/core/src/mindustry/game/Team.java @@ -2,6 +2,7 @@ package mindustry.game; import arc.*; import arc.graphics.*; +import arc.math.*; import arc.struct.*; import arc.util.*; import mindustry.game.Teams.*; @@ -29,10 +30,12 @@ public class Team implements Comparable{ blue = new Team(5, "blue", Color.royal.cpy()); static{ + Mathf.random.setSeed(7); //create the whole 256 placeholder teams for(int i = 6; i < all.length; i++){ - new Team(i, "team#" + i, Color.HSVtoRGB(360f * (float)(i) / all.length * 10, 100f * 0.8f, 100f * 0.8f, 1f)); + new Team(i, "team#" + i, Color.HSVtoRGB(360f * Mathf.random(), 100f * Mathf.random(0.6f, 1f), 100f * Mathf.random(0.8f, 1f), 1f)); } + Mathf.random.setSeed(new RandomXS128().nextLong()); } public static Team get(int id){ diff --git a/core/src/mindustry/mod/ClassAccess.java b/core/src/mindustry/mod/ClassAccess.java index 62f089a107..06ff74766c 100644 --- a/core/src/mindustry/mod/ClassAccess.java +++ b/core/src/mindustry/mod/ClassAccess.java @@ -3,5 +3,5 @@ package mindustry.mod; import arc.struct.*; //obviously autogenerated, do not touch public class ClassAccess{ - public static final ObjectSet allowedClassNames = ObjectSet.with("arc.Core", "arc.func.Boolc", "arc.func.Boolf", "arc.func.Boolf2", "arc.func.Boolp", "arc.func.Cons", "arc.func.Cons2", "arc.func.Floatc", "arc.func.Floatc2", "arc.func.Floatc4", "arc.func.Floatf", "arc.func.Floatp", "arc.func.Func", "arc.func.Func2", "arc.func.Func3", "arc.func.Intc", "arc.func.Intc2", "arc.func.Intc4", "arc.func.Intf", "arc.func.Intp", "arc.func.Prov", "arc.graphics.Color", "arc.graphics.Pixmap", "arc.graphics.Texture", "arc.graphics.TextureData", "arc.graphics.g2d.Draw", "arc.graphics.g2d.Fill", "arc.graphics.g2d.Lines", "arc.graphics.g2d.TextureAtlas", "arc.graphics.g2d.TextureAtlas$AtlasRegion", "arc.graphics.g2d.TextureRegion", "arc.math.Angles", "arc.math.Mathf", "arc.scene.Action", "arc.scene.Element", "arc.scene.Group", "arc.scene.Scene", "arc.scene.actions.Actions", "arc.scene.actions.AddAction", "arc.scene.actions.AddListenerAction", "arc.scene.actions.AfterAction", "arc.scene.actions.AlphaAction", "arc.scene.actions.ColorAction", "arc.scene.actions.DelayAction", "arc.scene.actions.DelegateAction", "arc.scene.actions.FloatAction", "arc.scene.actions.IntAction", "arc.scene.actions.LayoutAction", "arc.scene.actions.MoveByAction", "arc.scene.actions.MoveToAction", "arc.scene.actions.OriginAction", "arc.scene.actions.ParallelAction", "arc.scene.actions.RelativeTemporalAction", "arc.scene.actions.RemoveAction", "arc.scene.actions.RemoveActorAction", "arc.scene.actions.RemoveListenerAction", "arc.scene.actions.RepeatAction", "arc.scene.actions.RotateByAction", "arc.scene.actions.RotateToAction", "arc.scene.actions.RunnableAction", "arc.scene.actions.ScaleByAction", "arc.scene.actions.ScaleToAction", "arc.scene.actions.SequenceAction", "arc.scene.actions.SizeByAction", "arc.scene.actions.SizeToAction", "arc.scene.actions.TemporalAction", "arc.scene.actions.TimeScaleAction", "arc.scene.actions.TouchableAction", "arc.scene.actions.TranslateByAction", "arc.scene.actions.VisibleAction", "arc.scene.event.ChangeListener", "arc.scene.event.ChangeListener$ChangeEvent", "arc.scene.event.ClickListener", "arc.scene.event.DragListener", "arc.scene.event.DragScrollListener", "arc.scene.event.ElementGestureListener", "arc.scene.event.EventListener", "arc.scene.event.FocusListener", "arc.scene.event.FocusListener$FocusEvent", "arc.scene.event.FocusListener$FocusEvent$Type", "arc.scene.event.HandCursorListener", "arc.scene.event.IbeamCursorListener", "arc.scene.event.InputEvent", "arc.scene.event.InputEvent$Type", "arc.scene.event.InputListener", "arc.scene.event.SceneEvent", "arc.scene.event.Touchable", "arc.scene.event.VisibilityEvent", "arc.scene.event.VisibilityListener", "arc.scene.style.BaseDrawable", "arc.scene.style.Drawable", "arc.scene.style.NinePatchDrawable", "arc.scene.style.ScaledNinePatchDrawable", "arc.scene.style.Style", "arc.scene.style.TextureRegionDrawable", "arc.scene.style.TiledDrawable", "arc.scene.style.TransformDrawable", "arc.scene.ui.Button", "arc.scene.ui.Button$ButtonStyle", "arc.scene.ui.ButtonGroup", "arc.scene.ui.CheckBox", "arc.scene.ui.CheckBox$CheckBoxStyle", "arc.scene.ui.ColorImage", "arc.scene.ui.Dialog", "arc.scene.ui.Dialog$DialogStyle", "arc.scene.ui.Image", "arc.scene.ui.ImageButton", "arc.scene.ui.ImageButton$ImageButtonStyle", "arc.scene.ui.KeybindDialog", "arc.scene.ui.KeybindDialog$KeybindDialogStyle", "arc.scene.ui.Label", "arc.scene.ui.Label$LabelStyle", "arc.scene.ui.ProgressBar", "arc.scene.ui.ProgressBar$ProgressBarStyle", "arc.scene.ui.ScrollPane", "arc.scene.ui.ScrollPane$ScrollPaneStyle", "arc.scene.ui.SettingsDialog", "arc.scene.ui.SettingsDialog$SettingsTable", "arc.scene.ui.SettingsDialog$SettingsTable$CheckSetting", "arc.scene.ui.SettingsDialog$SettingsTable$Setting", "arc.scene.ui.SettingsDialog$SettingsTable$SliderSetting", "arc.scene.ui.SettingsDialog$StringProcessor", "arc.scene.ui.Slider", "arc.scene.ui.Slider$SliderStyle", "arc.scene.ui.TextArea", "arc.scene.ui.TextArea$TextAreaListener", "arc.scene.ui.TextButton", "arc.scene.ui.TextButton$TextButtonStyle", "arc.scene.ui.TextField", "arc.scene.ui.TextField$DefaultOnscreenKeyboard", "arc.scene.ui.TextField$OnscreenKeyboard", "arc.scene.ui.TextField$TextFieldClickListener", "arc.scene.ui.TextField$TextFieldFilter", "arc.scene.ui.TextField$TextFieldListener", "arc.scene.ui.TextField$TextFieldStyle", "arc.scene.ui.TextField$TextFieldValidator", "arc.scene.ui.Tooltip", "arc.scene.ui.Tooltip$Tooltips", "arc.scene.ui.Touchpad", "arc.scene.ui.Touchpad$TouchpadStyle", "arc.scene.ui.TreeElement", "arc.scene.ui.TreeElement$Node", "arc.scene.ui.TreeElement$TreeStyle", "arc.scene.ui.layout.Cell", "arc.scene.ui.layout.Collapser", "arc.scene.ui.layout.HorizontalGroup", "arc.scene.ui.layout.Scl", "arc.scene.ui.layout.Stack", "arc.scene.ui.layout.Table", "arc.scene.ui.layout.Table$DrawRect", "arc.scene.ui.layout.VerticalGroup", "arc.scene.ui.layout.WidgetGroup", "arc.scene.utils.ArraySelection", "arc.scene.utils.Cullable", "arc.scene.utils.Disableable", "arc.scene.utils.DragAndDrop", "arc.scene.utils.DragAndDrop$Payload", "arc.scene.utils.DragAndDrop$Source", "arc.scene.utils.DragAndDrop$Target", "arc.scene.utils.Elements", "arc.scene.utils.Layout", "arc.scene.utils.Selection", "arc.struct.Array", "arc.struct.Array$ArrayIterable", "arc.struct.ArrayMap", "arc.struct.ArrayMap$Entries", "arc.struct.ArrayMap$Keys", "arc.struct.ArrayMap$Values", "arc.struct.AtomicQueue", "arc.struct.BinaryHeap", "arc.struct.BinaryHeap$Node", "arc.struct.Bits", "arc.struct.BooleanArray", "arc.struct.ByteArray", "arc.struct.CharArray", "arc.struct.ComparableTimSort", "arc.struct.DelayedRemovalArray", "arc.struct.EnumSet", "arc.struct.EnumSet$EnumSetIterator", "arc.struct.FloatArray", "arc.struct.GridBits", "arc.struct.GridMap", "arc.struct.IdentityMap", "arc.struct.IdentityMap$Entries", "arc.struct.IdentityMap$Entry", "arc.struct.IdentityMap$Keys", "arc.struct.IdentityMap$Values", "arc.struct.IntArray", "arc.struct.IntFloatMap", "arc.struct.IntFloatMap$Entries", "arc.struct.IntFloatMap$Entry", "arc.struct.IntFloatMap$Keys", "arc.struct.IntFloatMap$Values", "arc.struct.IntIntMap", "arc.struct.IntIntMap$Entries", "arc.struct.IntIntMap$Entry", "arc.struct.IntIntMap$Keys", "arc.struct.IntIntMap$Values", "arc.struct.IntMap", "arc.struct.IntMap$Entries", "arc.struct.IntMap$Entry", "arc.struct.IntMap$Keys", "arc.struct.IntMap$Values", "arc.struct.IntQueue", "arc.struct.IntSet", "arc.struct.IntSet$IntSetIterator", "arc.struct.LongArray", "arc.struct.LongMap", "arc.struct.LongMap$Entries", "arc.struct.LongMap$Entry", "arc.struct.LongMap$Keys", "arc.struct.LongMap$Values", "arc.struct.LongQueue", "arc.struct.ObjectFloatMap", "arc.struct.ObjectFloatMap$Entries", "arc.struct.ObjectFloatMap$Entry", "arc.struct.ObjectFloatMap$Keys", "arc.struct.ObjectFloatMap$Values", "arc.struct.ObjectIntMap", "arc.struct.ObjectIntMap$Entries", "arc.struct.ObjectIntMap$Entry", "arc.struct.ObjectIntMap$Keys", "arc.struct.ObjectIntMap$Values", "arc.struct.ObjectMap", "arc.struct.ObjectMap$Entries", "arc.struct.ObjectMap$Entry", "arc.struct.ObjectMap$Keys", "arc.struct.ObjectMap$Values", "arc.struct.ObjectSet", "arc.struct.ObjectSet$ObjectSetIterator", "arc.struct.OrderedMap", "arc.struct.OrderedMap$OrderedMapEntries", "arc.struct.OrderedMap$OrderedMapKeys", "arc.struct.OrderedMap$OrderedMapValues", "arc.struct.OrderedSet", "arc.struct.OrderedSet$OrderedSetIterator", "arc.struct.PooledLinkedList", "arc.struct.PooledLinkedList$Item", "arc.struct.Queue", "arc.struct.Queue$QueueIterable", "arc.struct.ShortArray", "arc.struct.SnapshotArray", "arc.struct.Sort", "arc.struct.SortedIntList", "arc.struct.SortedIntList$Iterator", "arc.struct.SortedIntList$Node", "arc.struct.StringMap", "arc.struct.TimSort", "arc.util.I18NBundle", "arc.util.Time", "java.io.PrintStream", "java.lang.Object", "java.lang.Runnable", "java.lang.String", "java.lang.System", "mindustry.Vars", "mindustry.ai.BlockIndexer", "mindustry.ai.Pathfinder", "mindustry.ai.Pathfinder$PathData", "mindustry.ai.Pathfinder$PathTarget", "mindustry.ai.Pathfinder$PathTileStruct", "mindustry.ai.WaveSpawner", "mindustry.content.Blocks", "mindustry.content.Bullets", "mindustry.content.Fx", "mindustry.content.Items", "mindustry.content.Liquids", "mindustry.content.Loadouts", "mindustry.content.Mechs", "mindustry.content.StatusEffects", "mindustry.content.TechTree", "mindustry.content.TechTree$TechNode", "mindustry.content.TypeIDs", "mindustry.content.UnitTypes", "mindustry.content.Zones", "mindustry.core.ContentLoader", "mindustry.core.Control", "mindustry.core.FileTree", "mindustry.core.GameState", "mindustry.core.GameState$State", "mindustry.core.Logic", "mindustry.core.Platform", "mindustry.core.Renderer", "mindustry.core.UI", "mindustry.core.Version", "mindustry.core.World", "mindustry.core.World$Raycaster", "mindustry.ctype.Content", "mindustry.ctype.Content$ModContentInfo", "mindustry.ctype.ContentList", "mindustry.ctype.ContentType", "mindustry.ctype.MappableContent", "mindustry.ctype.UnlockableContent", "mindustry.editor.DrawOperation", "mindustry.editor.DrawOperation$OpType", "mindustry.editor.DrawOperation$TileOpStruct", "mindustry.editor.EditorTile", "mindustry.editor.EditorTool", "mindustry.editor.MapEditor", "mindustry.editor.MapEditor$Context", "mindustry.editor.MapEditorDialog", "mindustry.editor.MapGenerateDialog", "mindustry.editor.MapInfoDialog", "mindustry.editor.MapLoadDialog", "mindustry.editor.MapRenderer", "mindustry.editor.MapResizeDialog", "mindustry.editor.MapSaveDialog", "mindustry.editor.MapView", "mindustry.editor.OperationStack", "mindustry.editor.WaveInfoDialog", "mindustry.entities.Damage", "mindustry.entities.Damage$PropCellStruct", "mindustry.entities.Effects", "mindustry.entities.Effects$Effect", "mindustry.entities.Effects$EffectContainer", "mindustry.entities.Effects$EffectProvider", "mindustry.entities.Effects$EffectRenderer", "mindustry.entities.Effects$ScreenshakeProvider", "mindustry.entities.Entities", "mindustry.entities.EntityCollisions", "mindustry.entities.EntityGroup", "mindustry.entities.Predict", "mindustry.entities.TargetPriority", "mindustry.entities.Units", "mindustry.entities.bullet.ArtilleryBulletType", "mindustry.entities.bullet.BasicBulletType", "mindustry.entities.bullet.BombBulletType", "mindustry.entities.bullet.BulletType", "mindustry.entities.bullet.FlakBulletType", "mindustry.entities.bullet.HealBulletType", "mindustry.entities.bullet.LiquidBulletType", "mindustry.entities.bullet.MassDriverBolt", "mindustry.entities.bullet.MissileBulletType", "mindustry.entities.effect.Decal", "mindustry.entities.effect.Fire", "mindustry.entities.effect.GroundEffectEntity", "mindustry.entities.effect.GroundEffectEntity$GroundEffect", "mindustry.entities.effect.ItemTransfer", "mindustry.entities.effect.Lightning", "mindustry.entities.effect.Puddle", "mindustry.entities.effect.RubbleDecal", "mindustry.entities.effect.ScorchDecal", "mindustry.entities.traits.AbsorbTrait", "mindustry.entities.traits.BelowLiquidTrait", "mindustry.entities.traits.BuilderMinerTrait", "mindustry.entities.traits.BuilderTrait", "mindustry.entities.traits.BuilderTrait$BuildDataStatic", "mindustry.entities.traits.BuilderTrait$BuildRequest", "mindustry.entities.traits.DamageTrait", "mindustry.entities.traits.DrawTrait", "mindustry.entities.traits.Entity", "mindustry.entities.traits.HealthTrait", "mindustry.entities.traits.KillerTrait", "mindustry.entities.traits.MinerTrait", "mindustry.entities.traits.MoveTrait", "mindustry.entities.traits.SaveTrait", "mindustry.entities.traits.Saveable", "mindustry.entities.traits.ScaleTrait", "mindustry.entities.traits.ShooterTrait", "mindustry.entities.traits.SolidTrait", "mindustry.entities.traits.SpawnerTrait", "mindustry.entities.traits.SyncTrait", "mindustry.entities.traits.TargetTrait", "mindustry.entities.traits.TeamTrait", "mindustry.entities.traits.TimeTrait", "mindustry.entities.traits.TypeTrait", "mindustry.entities.traits.VelocityTrait", "mindustry.entities.type.BaseEntity", "mindustry.entities.type.BaseUnit", "mindustry.entities.type.Bullet", "mindustry.entities.type.DestructibleEntity", "mindustry.entities.type.EffectEntity", "mindustry.entities.type.Player", "mindustry.entities.type.SolidEntity", "mindustry.entities.type.TileEntity", "mindustry.entities.type.TimedEntity", "mindustry.entities.type.Unit", "mindustry.entities.type.base.BaseDrone", "mindustry.entities.type.base.BuilderDrone", "mindustry.entities.type.base.FlyingUnit", "mindustry.entities.type.base.GroundUnit", "mindustry.entities.type.base.HoverUnit", "mindustry.entities.type.base.MinerDrone", "mindustry.entities.type.base.RepairDrone", "mindustry.entities.units.StateMachine", "mindustry.entities.units.Statuses", "mindustry.entities.units.Statuses$StatusEntry", "mindustry.entities.units.UnitCommand", "mindustry.entities.units.UnitDrops", "mindustry.entities.units.UnitState", "mindustry.game.DefaultWaves", "mindustry.game.Difficulty", "mindustry.game.EventType", "mindustry.game.EventType$BlockBuildBeginEvent", "mindustry.game.EventType$BlockBuildEndEvent", "mindustry.game.EventType$BlockDestroyEvent", "mindustry.game.EventType$BlockInfoEvent", "mindustry.game.EventType$BuildSelectEvent", "mindustry.game.EventType$ClientLoadEvent", "mindustry.game.EventType$CommandIssueEvent", "mindustry.game.EventType$ContentReloadEvent", "mindustry.game.EventType$CoreItemDeliverEvent", "mindustry.game.EventType$DepositEvent", "mindustry.game.EventType$DisposeEvent", "mindustry.game.EventType$GameOverEvent", "mindustry.game.EventType$LaunchEvent", "mindustry.game.EventType$LaunchItemEvent", "mindustry.game.EventType$LineConfirmEvent", "mindustry.game.EventType$LoseEvent", "mindustry.game.EventType$MapMakeEvent", "mindustry.game.EventType$MapPublishEvent", "mindustry.game.EventType$MechChangeEvent", "mindustry.game.EventType$PlayEvent", "mindustry.game.EventType$PlayerBanEvent", "mindustry.game.EventType$PlayerChatEvent", "mindustry.game.EventType$PlayerConnect", "mindustry.game.EventType$PlayerIpBanEvent", "mindustry.game.EventType$PlayerIpUnbanEvent", "mindustry.game.EventType$PlayerJoin", "mindustry.game.EventType$PlayerLeave", "mindustry.game.EventType$PlayerUnbanEvent", "mindustry.game.EventType$ResearchEvent", "mindustry.game.EventType$ResetEvent", "mindustry.game.EventType$ResizeEvent", "mindustry.game.EventType$ServerLoadEvent", "mindustry.game.EventType$StateChangeEvent", "mindustry.game.EventType$TapConfigEvent", "mindustry.game.EventType$TapEvent", "mindustry.game.EventType$TileChangeEvent", "mindustry.game.EventType$Trigger", "mindustry.game.EventType$TurretAmmoDeliverEvent", "mindustry.game.EventType$UnitCreateEvent", "mindustry.game.EventType$UnitDestroyEvent", "mindustry.game.EventType$UnlockEvent", "mindustry.game.EventType$WaveEvent", "mindustry.game.EventType$WinEvent", "mindustry.game.EventType$WithdrawEvent", "mindustry.game.EventType$WorldLoadEvent", "mindustry.game.EventType$ZoneConfigureCompleteEvent", "mindustry.game.EventType$ZoneRequireCompleteEvent", "mindustry.game.Gamemode", "mindustry.game.GlobalData", "mindustry.game.LoopControl", "mindustry.game.MusicControl", "mindustry.game.Objective", "mindustry.game.Objectives", "mindustry.game.Objectives$Launched", "mindustry.game.Objectives$Unlock", "mindustry.game.Objectives$Wave", "mindustry.game.Objectives$ZoneObjective", "mindustry.game.Objectives$ZoneWave", "mindustry.game.Rules", "mindustry.game.Saves", "mindustry.game.Saves$SaveSlot", "mindustry.game.Schematic", "mindustry.game.Schematic$Stile", "mindustry.game.Schematics", "mindustry.game.SoundLoop", "mindustry.game.SpawnGroup", "mindustry.game.Stats", "mindustry.game.Stats$Rank", "mindustry.game.Stats$RankResult", "mindustry.game.Team", "mindustry.game.Teams", "mindustry.game.Teams$BrokenBlock", "mindustry.game.Teams$TeamData", "mindustry.game.Tutorial", "mindustry.game.Tutorial$TutorialStage", "mindustry.gen.BufferItem", "mindustry.gen.Call", "mindustry.gen.Call", "mindustry.gen.Icon", "mindustry.gen.Icon", "mindustry.gen.MethodHash", "mindustry.gen.Musics", "mindustry.gen.Musics", "mindustry.gen.PathTile", "mindustry.gen.PropCell", "mindustry.gen.RemoteReadClient", "mindustry.gen.RemoteReadServer", "mindustry.gen.Serialization", "mindustry.gen.Sounds", "mindustry.gen.Sounds", "mindustry.gen.Tex", "mindustry.gen.Tex", "mindustry.gen.TileOp", "mindustry.graphics.BlockRenderer", "mindustry.graphics.Bloom", "mindustry.graphics.CacheLayer", "mindustry.graphics.Drawf", "mindustry.graphics.FloorRenderer", "mindustry.graphics.IndexedRenderer", "mindustry.graphics.Layer", "mindustry.graphics.LightRenderer", "mindustry.graphics.MenuRenderer", "mindustry.graphics.MinimapRenderer", "mindustry.graphics.MultiPacker", "mindustry.graphics.MultiPacker$PageType", "mindustry.graphics.OverlayRenderer", "mindustry.graphics.Pal", "mindustry.graphics.Pixelator", "mindustry.graphics.Shaders", "mindustry.input.Binding", "mindustry.input.DesktopInput", "mindustry.input.InputHandler", "mindustry.input.InputHandler$PlaceLine", "mindustry.input.MobileInput", "mindustry.input.PlaceMode", "mindustry.input.Placement", "mindustry.input.Placement$DistanceHeuristic", "mindustry.input.Placement$NormalizeDrawResult", "mindustry.input.Placement$NormalizeResult", "mindustry.input.Placement$TileHueristic", "mindustry.maps.Map", "mindustry.maps.Maps", "mindustry.maps.Maps$MapProvider", "mindustry.maps.Maps$ShuffleMode", "mindustry.maps.Maps$ShuffleMode", "mindustry.maps.filters.BlendFilter", "mindustry.maps.filters.ClearFilter", "mindustry.maps.filters.DistortFilter", "mindustry.maps.filters.FilterOption", "mindustry.maps.filters.FilterOption$BlockOption", "mindustry.maps.filters.FilterOption$SliderOption", "mindustry.maps.filters.GenerateFilter", "mindustry.maps.filters.GenerateFilter$GenerateInput", "mindustry.maps.filters.GenerateFilter$GenerateInput$TileProvider", "mindustry.maps.filters.MedianFilter", "mindustry.maps.filters.MirrorFilter", "mindustry.maps.filters.NoiseFilter", "mindustry.maps.filters.OreFilter", "mindustry.maps.filters.OreMedianFilter", "mindustry.maps.filters.RiverNoiseFilter", "mindustry.maps.filters.ScatterFilter", "mindustry.maps.filters.TerrainFilter", "mindustry.maps.generators.BasicGenerator", "mindustry.maps.generators.BasicGenerator$DistanceHeuristic", "mindustry.maps.generators.BasicGenerator$TileHueristic", "mindustry.maps.generators.Generator", "mindustry.maps.generators.MapGenerator", "mindustry.maps.generators.MapGenerator$Decoration", "mindustry.maps.generators.RandomGenerator", "mindustry.maps.zonegen.DesertWastesGenerator", "mindustry.maps.zonegen.OvergrowthGenerator", "mindustry.type.Category", "mindustry.type.ErrorContent", "mindustry.type.Item", "mindustry.type.ItemStack", "mindustry.type.ItemType", "mindustry.type.Liquid", "mindustry.type.LiquidStack", "mindustry.type.Mech", "mindustry.type.Publishable", "mindustry.type.StatusEffect", "mindustry.type.StatusEffect$TransitionHandler", "mindustry.type.TypeID", "mindustry.type.UnitType", "mindustry.type.Weapon", "mindustry.type.WeatherEvent", "mindustry.type.Zone", "mindustry.ui.Bar", "mindustry.ui.BorderImage", "mindustry.ui.Cicon", "mindustry.ui.ContentDisplay", "mindustry.ui.Fonts", "mindustry.ui.GridImage", "mindustry.ui.IconSize", "mindustry.ui.IntFormat", "mindustry.ui.ItemDisplay", "mindustry.ui.ItemImage", "mindustry.ui.ItemsDisplay", "mindustry.ui.Links", "mindustry.ui.Links$LinkEntry", "mindustry.ui.LiquidDisplay", "mindustry.ui.Minimap", "mindustry.ui.MobileButton", "mindustry.ui.MultiReqImage", "mindustry.ui.ReqImage", "mindustry.ui.Styles", "mindustry.ui.dialogs.AboutDialog", "mindustry.ui.dialogs.AdminsDialog", "mindustry.ui.dialogs.BansDialog", "mindustry.ui.dialogs.ColorPicker", "mindustry.ui.dialogs.ContentInfoDialog", "mindustry.ui.dialogs.ControlsDialog", "mindustry.ui.dialogs.CustomGameDialog", "mindustry.ui.dialogs.CustomRulesDialog", "mindustry.ui.dialogs.DatabaseDialog", "mindustry.ui.dialogs.DeployDialog", "mindustry.ui.dialogs.DeployDialog$View", "mindustry.ui.dialogs.DeployDialog$ZoneNode", "mindustry.ui.dialogs.DiscordDialog", "mindustry.ui.dialogs.FileChooser", "mindustry.ui.dialogs.FileChooser$FileHistory", "mindustry.ui.dialogs.FloatingDialog", "mindustry.ui.dialogs.GameOverDialog", "mindustry.ui.dialogs.HostDialog", "mindustry.ui.dialogs.JoinDialog", "mindustry.ui.dialogs.JoinDialog$Server", "mindustry.ui.dialogs.LanguageDialog", "mindustry.ui.dialogs.LoadDialog", "mindustry.ui.dialogs.LoadoutDialog", "mindustry.ui.dialogs.MapPlayDialog", "mindustry.ui.dialogs.MapsDialog", "mindustry.ui.dialogs.MinimapDialog", "mindustry.ui.dialogs.ModsDialog", "mindustry.ui.dialogs.PaletteDialog", "mindustry.ui.dialogs.PausedDialog", "mindustry.ui.dialogs.SaveDialog", "mindustry.ui.dialogs.SchematicsDialog", "mindustry.ui.dialogs.SchematicsDialog$SchematicImage", "mindustry.ui.dialogs.SchematicsDialog$SchematicInfoDialog", "mindustry.ui.dialogs.SettingsMenuDialog", "mindustry.ui.dialogs.TechTreeDialog", "mindustry.ui.dialogs.TechTreeDialog$LayoutNode", "mindustry.ui.dialogs.TechTreeDialog$TechTreeNode", "mindustry.ui.dialogs.TechTreeDialog$View", "mindustry.ui.dialogs.TraceDialog", "mindustry.ui.dialogs.ZoneInfoDialog", "mindustry.ui.fragments.BlockConfigFragment", "mindustry.ui.fragments.BlockInventoryFragment", "mindustry.ui.fragments.ChatFragment", "mindustry.ui.fragments.FadeInFragment", "mindustry.ui.fragments.Fragment", "mindustry.ui.fragments.HudFragment", "mindustry.ui.fragments.LoadingFragment", "mindustry.ui.fragments.MenuFragment", "mindustry.ui.fragments.OverlayFragment", "mindustry.ui.fragments.PlacementFragment", "mindustry.ui.fragments.PlayerListFragment", "mindustry.ui.fragments.ScriptConsoleFragment", "mindustry.ui.layout.BranchTreeLayout", "mindustry.ui.layout.BranchTreeLayout$TreeAlignment", "mindustry.ui.layout.BranchTreeLayout$TreeLocation", "mindustry.ui.layout.RadialTreeLayout", "mindustry.ui.layout.TreeLayout", "mindustry.ui.layout.TreeLayout$TreeNode", "mindustry.world.Block", "mindustry.world.BlockStorage", "mindustry.world.Build", "mindustry.world.CachedTile", "mindustry.world.DirectionalItemBuffer", "mindustry.world.DirectionalItemBuffer$BufferItemStruct", "mindustry.world.Edges", "mindustry.world.ItemBuffer", "mindustry.world.LegacyColorMapper", "mindustry.world.LegacyColorMapper$LegacyBlock", "mindustry.world.Pos", "mindustry.world.StaticTree", "mindustry.world.Tile", "mindustry.world.WorldContext", "mindustry.world.blocks.Attributes", "mindustry.world.blocks.Autotiler", "mindustry.world.blocks.Autotiler$AutotilerHolder", "mindustry.world.blocks.BlockPart", "mindustry.world.blocks.BuildBlock", "mindustry.world.blocks.BuildBlock$BuildEntity", "mindustry.world.blocks.DoubleOverlayFloor", "mindustry.world.blocks.Floor", "mindustry.world.blocks.ItemSelection", "mindustry.world.blocks.LiquidBlock", "mindustry.world.blocks.OreBlock", "mindustry.world.blocks.OverlayFloor", "mindustry.world.blocks.PowerBlock", "mindustry.world.blocks.RespawnBlock", "mindustry.world.blocks.Rock", "mindustry.world.blocks.StaticWall", "mindustry.world.blocks.TreeBlock", "mindustry.world.blocks.defense.DeflectorWall", "mindustry.world.blocks.defense.DeflectorWall$DeflectorEntity", "mindustry.world.blocks.defense.Door", "mindustry.world.blocks.defense.Door$DoorEntity", "mindustry.world.blocks.defense.ForceProjector", "mindustry.world.blocks.defense.ForceProjector$ForceEntity", "mindustry.world.blocks.defense.ForceProjector$ShieldEntity", "mindustry.world.blocks.defense.MendProjector", "mindustry.world.blocks.defense.MendProjector$MendEntity", "mindustry.world.blocks.defense.OverdriveProjector", "mindustry.world.blocks.defense.OverdriveProjector$OverdriveEntity", "mindustry.world.blocks.defense.ShockMine", "mindustry.world.blocks.defense.SurgeWall", "mindustry.world.blocks.defense.Wall", "mindustry.world.blocks.defense.turrets.ArtilleryTurret", "mindustry.world.blocks.defense.turrets.BurstTurret", "mindustry.world.blocks.defense.turrets.ChargeTurret", "mindustry.world.blocks.defense.turrets.ChargeTurret$LaserTurretEntity", "mindustry.world.blocks.defense.turrets.CooledTurret", "mindustry.world.blocks.defense.turrets.DoubleTurret", "mindustry.world.blocks.defense.turrets.ItemTurret", "mindustry.world.blocks.defense.turrets.ItemTurret$ItemEntry", "mindustry.world.blocks.defense.turrets.ItemTurret$ItemTurretEntity", "mindustry.world.blocks.defense.turrets.LaserTurret", "mindustry.world.blocks.defense.turrets.LaserTurret$LaserTurretEntity", "mindustry.world.blocks.defense.turrets.LiquidTurret", "mindustry.world.blocks.defense.turrets.PowerTurret", "mindustry.world.blocks.defense.turrets.Turret", "mindustry.world.blocks.defense.turrets.Turret$AmmoEntry", "mindustry.world.blocks.defense.turrets.Turret$TurretEntity", "mindustry.world.blocks.distribution.ArmoredConveyor", "mindustry.world.blocks.distribution.BufferedItemBridge", "mindustry.world.blocks.distribution.BufferedItemBridge$BufferedItemBridgeEntity", "mindustry.world.blocks.distribution.Conveyor", "mindustry.world.blocks.distribution.Conveyor$ConveyorEntity", "mindustry.world.blocks.distribution.Conveyor$ItemPos", "mindustry.world.blocks.distribution.ExtendingItemBridge", "mindustry.world.blocks.distribution.ItemBridge", "mindustry.world.blocks.distribution.ItemBridge$ItemBridgeEntity", "mindustry.world.blocks.distribution.Junction", "mindustry.world.blocks.distribution.Junction$JunctionEntity", "mindustry.world.blocks.distribution.MassDriver", "mindustry.world.blocks.distribution.MassDriver$DriverBulletData", "mindustry.world.blocks.distribution.MassDriver$DriverState", "mindustry.world.blocks.distribution.MassDriver$MassDriverEntity", "mindustry.world.blocks.distribution.OverflowGate", "mindustry.world.blocks.distribution.OverflowGate$OverflowGateEntity", "mindustry.world.blocks.distribution.Router", "mindustry.world.blocks.distribution.Router$RouterEntity", "mindustry.world.blocks.distribution.Sorter", "mindustry.world.blocks.distribution.Sorter$SorterEntity", "mindustry.world.blocks.liquid.ArmoredConduit", "mindustry.world.blocks.liquid.Conduit", "mindustry.world.blocks.liquid.Conduit$ConduitEntity", "mindustry.world.blocks.liquid.LiquidBridge", "mindustry.world.blocks.liquid.LiquidExtendingBridge", "mindustry.world.blocks.liquid.LiquidJunction", "mindustry.world.blocks.liquid.LiquidOverflowGate", "mindustry.world.blocks.liquid.LiquidRouter", "mindustry.world.blocks.liquid.LiquidTank", "mindustry.world.blocks.logic.LogicBlock", "mindustry.world.blocks.logic.MessageBlock", "mindustry.world.blocks.logic.MessageBlock$MessageBlockEntity", "mindustry.world.blocks.power.Battery", "mindustry.world.blocks.power.BurnerGenerator", "mindustry.world.blocks.power.ConditionalConsumePower", "mindustry.world.blocks.power.DecayGenerator", "mindustry.world.blocks.power.ImpactReactor", "mindustry.world.blocks.power.ImpactReactor$FusionReactorEntity", "mindustry.world.blocks.power.ItemLiquidGenerator", "mindustry.world.blocks.power.ItemLiquidGenerator$ItemLiquidGeneratorEntity", "mindustry.world.blocks.power.LightBlock", "mindustry.world.blocks.power.LightBlock$LightEntity", "mindustry.world.blocks.power.NuclearReactor", "mindustry.world.blocks.power.NuclearReactor$NuclearReactorEntity", "mindustry.world.blocks.power.PowerDiode", "mindustry.world.blocks.power.PowerDistributor", "mindustry.world.blocks.power.PowerGenerator", "mindustry.world.blocks.power.PowerGenerator$GeneratorEntity", "mindustry.world.blocks.power.PowerGraph", "mindustry.world.blocks.power.PowerNode", "mindustry.world.blocks.power.SingleTypeGenerator", "mindustry.world.blocks.power.SolarGenerator", "mindustry.world.blocks.power.ThermalGenerator", "mindustry.world.blocks.production.Cultivator", "mindustry.world.blocks.production.Cultivator$CultivatorEntity", "mindustry.world.blocks.production.Drill", "mindustry.world.blocks.production.Drill$DrillEntity", "mindustry.world.blocks.production.Fracker", "mindustry.world.blocks.production.Fracker$FrackerEntity", "mindustry.world.blocks.production.GenericCrafter", "mindustry.world.blocks.production.GenericCrafter$GenericCrafterEntity", "mindustry.world.blocks.production.GenericSmelter", "mindustry.world.blocks.production.Incinerator", "mindustry.world.blocks.production.Incinerator$IncineratorEntity", "mindustry.world.blocks.production.LiquidConverter", "mindustry.world.blocks.production.Pump", "mindustry.world.blocks.production.Separator", "mindustry.world.blocks.production.SolidPump", "mindustry.world.blocks.production.SolidPump$SolidPumpEntity", "mindustry.world.blocks.sandbox.ItemSource", "mindustry.world.blocks.sandbox.ItemSource$ItemSourceEntity", "mindustry.world.blocks.sandbox.ItemVoid", "mindustry.world.blocks.sandbox.LiquidSource", "mindustry.world.blocks.sandbox.LiquidSource$LiquidSourceEntity", "mindustry.world.blocks.sandbox.PowerSource", "mindustry.world.blocks.sandbox.PowerVoid", "mindustry.world.blocks.storage.CoreBlock", "mindustry.world.blocks.storage.CoreBlock$CoreEntity", "mindustry.world.blocks.storage.LaunchPad", "mindustry.world.blocks.storage.StorageBlock", "mindustry.world.blocks.storage.StorageBlock$StorageBlockEntity", "mindustry.world.blocks.storage.Unloader", "mindustry.world.blocks.storage.Unloader$UnloaderEntity", "mindustry.world.blocks.storage.Vault", "mindustry.world.blocks.units.CommandCenter", "mindustry.world.blocks.units.CommandCenter$CommandCenterEntity", "mindustry.world.blocks.units.MechPad", "mindustry.world.blocks.units.MechPad$MechFactoryEntity", "mindustry.world.blocks.units.RallyPoint", "mindustry.world.blocks.units.RepairPoint", "mindustry.world.blocks.units.RepairPoint$RepairPointEntity", "mindustry.world.blocks.units.UnitFactory", "mindustry.world.blocks.units.UnitFactory$UnitFactoryEntity", "mindustry.world.consumers.Consume", "mindustry.world.consumers.ConsumeItemFilter", "mindustry.world.consumers.ConsumeItems", "mindustry.world.consumers.ConsumeLiquid", "mindustry.world.consumers.ConsumeLiquidBase", "mindustry.world.consumers.ConsumeLiquidFilter", "mindustry.world.consumers.ConsumePower", "mindustry.world.consumers.ConsumeType", "mindustry.world.consumers.Consumers", "mindustry.world.meta.Attribute", "mindustry.world.meta.BlockBars", "mindustry.world.meta.BlockFlag", "mindustry.world.meta.BlockGroup", "mindustry.world.meta.BlockStat", "mindustry.world.meta.BlockStats", "mindustry.world.meta.BuildVisibility", "mindustry.world.meta.PowerType", "mindustry.world.meta.Producers", "mindustry.world.meta.StatCategory", "mindustry.world.meta.StatUnit", "mindustry.world.meta.StatValue", "mindustry.world.meta.values.AmmoListValue", "mindustry.world.meta.values.BooleanValue", "mindustry.world.meta.values.BoosterListValue", "mindustry.world.meta.values.ItemFilterValue", "mindustry.world.meta.values.ItemListValue", "mindustry.world.meta.values.LiquidFilterValue", "mindustry.world.meta.values.LiquidValue", "mindustry.world.meta.values.NumberValue", "mindustry.world.meta.values.StringValue", "mindustry.world.modules.BlockModule", "mindustry.world.modules.ConsumeModule", "mindustry.world.modules.ItemModule", "mindustry.world.modules.ItemModule$ItemCalculator", "mindustry.world.modules.ItemModule$ItemConsumer", "mindustry.world.modules.LiquidModule", "mindustry.world.modules.LiquidModule$LiquidCalculator", "mindustry.world.modules.LiquidModule$LiquidConsumer", "mindustry.world.modules.PowerModule", "mindustry.world.producers.Produce", "mindustry.world.producers.ProduceItem"); + public static final ObjectSet allowedClassNames = ObjectSet.with("arc.Core", "arc.func.Boolc", "arc.func.Boolf", "arc.func.Boolf2", "arc.func.Boolp", "arc.func.Cons", "arc.func.Cons2", "arc.func.Floatc", "arc.func.Floatc2", "arc.func.Floatc4", "arc.func.Floatf", "arc.func.Floatp", "arc.func.Func", "arc.func.Func2", "arc.func.Func3", "arc.func.Intc", "arc.func.Intc2", "arc.func.Intc4", "arc.func.Intf", "arc.func.Intp", "arc.func.Prov", "arc.graphics.Color", "arc.graphics.Pixmap", "arc.graphics.Texture", "arc.graphics.TextureData", "arc.graphics.g2d.Draw", "arc.graphics.g2d.Fill", "arc.graphics.g2d.Lines", "arc.graphics.g2d.TextureAtlas", "arc.graphics.g2d.TextureAtlas$AtlasRegion", "arc.graphics.g2d.TextureRegion", "arc.math.Angles", "arc.math.Mathf", "arc.scene.Action", "arc.scene.Element", "arc.scene.Group", "arc.scene.Scene", "arc.scene.actions.Actions", "arc.scene.actions.AddAction", "arc.scene.actions.AddListenerAction", "arc.scene.actions.AfterAction", "arc.scene.actions.AlphaAction", "arc.scene.actions.ColorAction", "arc.scene.actions.DelayAction", "arc.scene.actions.DelegateAction", "arc.scene.actions.FloatAction", "arc.scene.actions.IntAction", "arc.scene.actions.LayoutAction", "arc.scene.actions.MoveByAction", "arc.scene.actions.MoveToAction", "arc.scene.actions.OriginAction", "arc.scene.actions.ParallelAction", "arc.scene.actions.RelativeTemporalAction", "arc.scene.actions.RemoveAction", "arc.scene.actions.RemoveActorAction", "arc.scene.actions.RemoveListenerAction", "arc.scene.actions.RepeatAction", "arc.scene.actions.RotateByAction", "arc.scene.actions.RotateToAction", "arc.scene.actions.RunnableAction", "arc.scene.actions.ScaleByAction", "arc.scene.actions.ScaleToAction", "arc.scene.actions.SequenceAction", "arc.scene.actions.SizeByAction", "arc.scene.actions.SizeToAction", "arc.scene.actions.TemporalAction", "arc.scene.actions.TimeScaleAction", "arc.scene.actions.TouchableAction", "arc.scene.actions.TranslateByAction", "arc.scene.actions.VisibleAction", "arc.scene.event.ChangeListener", "arc.scene.event.ChangeListener$ChangeEvent", "arc.scene.event.ClickListener", "arc.scene.event.DragListener", "arc.scene.event.DragScrollListener", "arc.scene.event.ElementGestureListener", "arc.scene.event.EventListener", "arc.scene.event.FocusListener", "arc.scene.event.FocusListener$FocusEvent", "arc.scene.event.FocusListener$FocusEvent$Type", "arc.scene.event.HandCursorListener", "arc.scene.event.IbeamCursorListener", "arc.scene.event.InputEvent", "arc.scene.event.InputEvent$Type", "arc.scene.event.InputListener", "arc.scene.event.SceneEvent", "arc.scene.event.Touchable", "arc.scene.event.VisibilityEvent", "arc.scene.event.VisibilityListener", "arc.scene.style.BaseDrawable", "arc.scene.style.Drawable", "arc.scene.style.NinePatchDrawable", "arc.scene.style.ScaledNinePatchDrawable", "arc.scene.style.Style", "arc.scene.style.TextureRegionDrawable", "arc.scene.style.TiledDrawable", "arc.scene.style.TransformDrawable", "arc.scene.ui.Button", "arc.scene.ui.Button$ButtonStyle", "arc.scene.ui.ButtonGroup", "arc.scene.ui.CheckBox", "arc.scene.ui.CheckBox$CheckBoxStyle", "arc.scene.ui.ColorImage", "arc.scene.ui.Dialog", "arc.scene.ui.Dialog$DialogStyle", "arc.scene.ui.Image", "arc.scene.ui.ImageButton", "arc.scene.ui.ImageButton$ImageButtonStyle", "arc.scene.ui.KeybindDialog", "arc.scene.ui.KeybindDialog$KeybindDialogStyle", "arc.scene.ui.Label", "arc.scene.ui.Label$LabelStyle", "arc.scene.ui.ProgressBar", "arc.scene.ui.ProgressBar$ProgressBarStyle", "arc.scene.ui.ScrollPane", "arc.scene.ui.ScrollPane$ScrollPaneStyle", "arc.scene.ui.SettingsDialog", "arc.scene.ui.SettingsDialog$SettingsTable", "arc.scene.ui.SettingsDialog$SettingsTable$CheckSetting", "arc.scene.ui.SettingsDialog$SettingsTable$Setting", "arc.scene.ui.SettingsDialog$SettingsTable$SliderSetting", "arc.scene.ui.SettingsDialog$StringProcessor", "arc.scene.ui.Slider", "arc.scene.ui.Slider$SliderStyle", "arc.scene.ui.TextArea", "arc.scene.ui.TextArea$TextAreaListener", "arc.scene.ui.TextButton", "arc.scene.ui.TextButton$TextButtonStyle", "arc.scene.ui.TextField", "arc.scene.ui.TextField$DefaultOnscreenKeyboard", "arc.scene.ui.TextField$OnscreenKeyboard", "arc.scene.ui.TextField$TextFieldClickListener", "arc.scene.ui.TextField$TextFieldFilter", "arc.scene.ui.TextField$TextFieldListener", "arc.scene.ui.TextField$TextFieldStyle", "arc.scene.ui.TextField$TextFieldValidator", "arc.scene.ui.Tooltip", "arc.scene.ui.Tooltip$Tooltips", "arc.scene.ui.Touchpad", "arc.scene.ui.Touchpad$TouchpadStyle", "arc.scene.ui.TreeElement", "arc.scene.ui.TreeElement$Node", "arc.scene.ui.TreeElement$TreeStyle", "arc.scene.ui.layout.Cell", "arc.scene.ui.layout.Collapser", "arc.scene.ui.layout.HorizontalGroup", "arc.scene.ui.layout.Scl", "arc.scene.ui.layout.Stack", "arc.scene.ui.layout.Table", "arc.scene.ui.layout.Table$DrawRect", "arc.scene.ui.layout.VerticalGroup", "arc.scene.ui.layout.WidgetGroup", "arc.scene.utils.ArraySelection", "arc.scene.utils.Cullable", "arc.scene.utils.Disableable", "arc.scene.utils.DragAndDrop", "arc.scene.utils.DragAndDrop$Payload", "arc.scene.utils.DragAndDrop$Source", "arc.scene.utils.DragAndDrop$Target", "arc.scene.utils.Elements", "arc.scene.utils.Layout", "arc.scene.utils.Selection", "arc.struct.Array", "arc.struct.Array$ArrayIterable", "arc.struct.ArrayMap", "arc.struct.ArrayMap$Entries", "arc.struct.ArrayMap$Keys", "arc.struct.ArrayMap$Values", "arc.struct.AtomicQueue", "arc.struct.BinaryHeap", "arc.struct.BinaryHeap$Node", "arc.struct.Bits", "arc.struct.BooleanArray", "arc.struct.ByteArray", "arc.struct.CharArray", "arc.struct.ComparableTimSort", "arc.struct.DelayedRemovalArray", "arc.struct.EnumSet", "arc.struct.EnumSet$EnumSetIterator", "arc.struct.FloatArray", "arc.struct.GridBits", "arc.struct.GridMap", "arc.struct.IdentityMap", "arc.struct.IdentityMap$Entries", "arc.struct.IdentityMap$Entry", "arc.struct.IdentityMap$Keys", "arc.struct.IdentityMap$Values", "arc.struct.IntArray", "arc.struct.IntFloatMap", "arc.struct.IntFloatMap$Entries", "arc.struct.IntFloatMap$Entry", "arc.struct.IntFloatMap$Keys", "arc.struct.IntFloatMap$Values", "arc.struct.IntIntMap", "arc.struct.IntIntMap$Entries", "arc.struct.IntIntMap$Entry", "arc.struct.IntIntMap$Keys", "arc.struct.IntIntMap$Values", "arc.struct.IntMap", "arc.struct.IntMap$Entries", "arc.struct.IntMap$Entry", "arc.struct.IntMap$Keys", "arc.struct.IntMap$Values", "arc.struct.IntQueue", "arc.struct.IntSet", "arc.struct.IntSet$IntSetIterator", "arc.struct.LongArray", "arc.struct.LongMap", "arc.struct.LongMap$Entries", "arc.struct.LongMap$Entry", "arc.struct.LongMap$Keys", "arc.struct.LongMap$Values", "arc.struct.LongQueue", "arc.struct.ObjectFloatMap", "arc.struct.ObjectFloatMap$Entries", "arc.struct.ObjectFloatMap$Entry", "arc.struct.ObjectFloatMap$Keys", "arc.struct.ObjectFloatMap$Values", "arc.struct.ObjectIntMap", "arc.struct.ObjectIntMap$Entries", "arc.struct.ObjectIntMap$Entry", "arc.struct.ObjectIntMap$Keys", "arc.struct.ObjectIntMap$Values", "arc.struct.ObjectMap", "arc.struct.ObjectMap$Entries", "arc.struct.ObjectMap$Entry", "arc.struct.ObjectMap$Keys", "arc.struct.ObjectMap$Values", "arc.struct.ObjectSet", "arc.struct.ObjectSet$ObjectSetIterator", "arc.struct.OrderedMap", "arc.struct.OrderedMap$OrderedMapEntries", "arc.struct.OrderedMap$OrderedMapKeys", "arc.struct.OrderedMap$OrderedMapValues", "arc.struct.OrderedSet", "arc.struct.OrderedSet$OrderedSetIterator", "arc.struct.PooledLinkedList", "arc.struct.PooledLinkedList$Item", "arc.struct.Queue", "arc.struct.Queue$QueueIterable", "arc.struct.ShortArray", "arc.struct.SnapshotArray", "arc.struct.Sort", "arc.struct.SortedIntList", "arc.struct.SortedIntList$Iterator", "arc.struct.SortedIntList$Node", "arc.struct.StringMap", "arc.struct.TimSort", "arc.util.I18NBundle", "arc.util.Time", "java.io.PrintStream", "java.lang.Object", "java.lang.Runnable", "java.lang.String", "java.lang.System", "mindustry.Vars", "mindustry.ai.BlockIndexer", "mindustry.ai.Pathfinder", "mindustry.ai.Pathfinder$PathData", "mindustry.ai.Pathfinder$PathTarget", "mindustry.ai.Pathfinder$PathTileStruct", "mindustry.ai.WaveSpawner", "mindustry.content.Blocks", "mindustry.content.Bullets", "mindustry.content.Fx", "mindustry.content.Items", "mindustry.content.Liquids", "mindustry.content.Loadouts", "mindustry.content.Mechs", "mindustry.content.StatusEffects", "mindustry.content.TechTree", "mindustry.content.TechTree$TechNode", "mindustry.content.TypeIDs", "mindustry.content.UnitTypes", "mindustry.content.Zones", "mindustry.core.ContentLoader", "mindustry.core.Control", "mindustry.core.FileTree", "mindustry.core.GameState", "mindustry.core.GameState$State", "mindustry.core.Logic", "mindustry.core.NetServer$TeamAssigner", "mindustry.core.Platform", "mindustry.core.Renderer", "mindustry.core.UI", "mindustry.core.Version", "mindustry.core.World", "mindustry.core.World$Raycaster", "mindustry.ctype.Content", "mindustry.ctype.Content$ModContentInfo", "mindustry.ctype.ContentList", "mindustry.ctype.ContentType", "mindustry.ctype.MappableContent", "mindustry.ctype.UnlockableContent", "mindustry.editor.DrawOperation", "mindustry.editor.DrawOperation$OpType", "mindustry.editor.DrawOperation$TileOpStruct", "mindustry.editor.EditorTile", "mindustry.editor.EditorTool", "mindustry.editor.MapEditor", "mindustry.editor.MapEditor$Context", "mindustry.editor.MapEditorDialog", "mindustry.editor.MapGenerateDialog", "mindustry.editor.MapInfoDialog", "mindustry.editor.MapLoadDialog", "mindustry.editor.MapRenderer", "mindustry.editor.MapResizeDialog", "mindustry.editor.MapSaveDialog", "mindustry.editor.MapView", "mindustry.editor.OperationStack", "mindustry.editor.WaveInfoDialog", "mindustry.entities.Damage", "mindustry.entities.Damage$PropCellStruct", "mindustry.entities.Effects", "mindustry.entities.Effects$Effect", "mindustry.entities.Effects$EffectContainer", "mindustry.entities.Effects$EffectProvider", "mindustry.entities.Effects$EffectRenderer", "mindustry.entities.Effects$ScreenshakeProvider", "mindustry.entities.Entities", "mindustry.entities.EntityCollisions", "mindustry.entities.EntityGroup", "mindustry.entities.Predict", "mindustry.entities.TargetPriority", "mindustry.entities.Units", "mindustry.entities.bullet.ArtilleryBulletType", "mindustry.entities.bullet.BasicBulletType", "mindustry.entities.bullet.BombBulletType", "mindustry.entities.bullet.BulletType", "mindustry.entities.bullet.FlakBulletType", "mindustry.entities.bullet.HealBulletType", "mindustry.entities.bullet.LiquidBulletType", "mindustry.entities.bullet.MassDriverBolt", "mindustry.entities.bullet.MissileBulletType", "mindustry.entities.effect.Decal", "mindustry.entities.effect.Fire", "mindustry.entities.effect.GroundEffectEntity", "mindustry.entities.effect.GroundEffectEntity$GroundEffect", "mindustry.entities.effect.ItemTransfer", "mindustry.entities.effect.Lightning", "mindustry.entities.effect.Puddle", "mindustry.entities.effect.RubbleDecal", "mindustry.entities.effect.ScorchDecal", "mindustry.entities.traits.AbsorbTrait", "mindustry.entities.traits.BelowLiquidTrait", "mindustry.entities.traits.BuilderMinerTrait", "mindustry.entities.traits.BuilderTrait", "mindustry.entities.traits.BuilderTrait$BuildDataStatic", "mindustry.entities.traits.BuilderTrait$BuildRequest", "mindustry.entities.traits.DamageTrait", "mindustry.entities.traits.DrawTrait", "mindustry.entities.traits.Entity", "mindustry.entities.traits.HealthTrait", "mindustry.entities.traits.KillerTrait", "mindustry.entities.traits.MinerTrait", "mindustry.entities.traits.MoveTrait", "mindustry.entities.traits.SaveTrait", "mindustry.entities.traits.Saveable", "mindustry.entities.traits.ScaleTrait", "mindustry.entities.traits.ShooterTrait", "mindustry.entities.traits.SolidTrait", "mindustry.entities.traits.SpawnerTrait", "mindustry.entities.traits.SyncTrait", "mindustry.entities.traits.TargetTrait", "mindustry.entities.traits.TeamTrait", "mindustry.entities.traits.TimeTrait", "mindustry.entities.traits.TypeTrait", "mindustry.entities.traits.VelocityTrait", "mindustry.entities.type.BaseEntity", "mindustry.entities.type.BaseUnit", "mindustry.entities.type.Bullet", "mindustry.entities.type.DestructibleEntity", "mindustry.entities.type.EffectEntity", "mindustry.entities.type.Player", "mindustry.entities.type.SolidEntity", "mindustry.entities.type.TileEntity", "mindustry.entities.type.TimedEntity", "mindustry.entities.type.Unit", "mindustry.entities.type.base.BaseDrone", "mindustry.entities.type.base.BuilderDrone", "mindustry.entities.type.base.FlyingUnit", "mindustry.entities.type.base.GroundUnit", "mindustry.entities.type.base.HoverUnit", "mindustry.entities.type.base.MinerDrone", "mindustry.entities.type.base.RepairDrone", "mindustry.entities.units.StateMachine", "mindustry.entities.units.Statuses", "mindustry.entities.units.Statuses$StatusEntry", "mindustry.entities.units.UnitCommand", "mindustry.entities.units.UnitDrops", "mindustry.entities.units.UnitState", "mindustry.game.DefaultWaves", "mindustry.game.Difficulty", "mindustry.game.EventType", "mindustry.game.EventType$BlockBuildBeginEvent", "mindustry.game.EventType$BlockBuildEndEvent", "mindustry.game.EventType$BlockDestroyEvent", "mindustry.game.EventType$BlockInfoEvent", "mindustry.game.EventType$BuildSelectEvent", "mindustry.game.EventType$ClientLoadEvent", "mindustry.game.EventType$CommandIssueEvent", "mindustry.game.EventType$ContentReloadEvent", "mindustry.game.EventType$CoreItemDeliverEvent", "mindustry.game.EventType$DepositEvent", "mindustry.game.EventType$DisposeEvent", "mindustry.game.EventType$GameOverEvent", "mindustry.game.EventType$LaunchEvent", "mindustry.game.EventType$LaunchItemEvent", "mindustry.game.EventType$LineConfirmEvent", "mindustry.game.EventType$LoseEvent", "mindustry.game.EventType$MapMakeEvent", "mindustry.game.EventType$MapPublishEvent", "mindustry.game.EventType$MechChangeEvent", "mindustry.game.EventType$PlayEvent", "mindustry.game.EventType$PlayerBanEvent", "mindustry.game.EventType$PlayerChatEvent", "mindustry.game.EventType$PlayerConnect", "mindustry.game.EventType$PlayerIpBanEvent", "mindustry.game.EventType$PlayerIpUnbanEvent", "mindustry.game.EventType$PlayerJoin", "mindustry.game.EventType$PlayerLeave", "mindustry.game.EventType$PlayerUnbanEvent", "mindustry.game.EventType$ResearchEvent", "mindustry.game.EventType$ResetEvent", "mindustry.game.EventType$ResizeEvent", "mindustry.game.EventType$ServerLoadEvent", "mindustry.game.EventType$StateChangeEvent", "mindustry.game.EventType$TapConfigEvent", "mindustry.game.EventType$TapEvent", "mindustry.game.EventType$TileChangeEvent", "mindustry.game.EventType$Trigger", "mindustry.game.EventType$TurretAmmoDeliverEvent", "mindustry.game.EventType$UnitCreateEvent", "mindustry.game.EventType$UnitDestroyEvent", "mindustry.game.EventType$UnlockEvent", "mindustry.game.EventType$WaveEvent", "mindustry.game.EventType$WinEvent", "mindustry.game.EventType$WithdrawEvent", "mindustry.game.EventType$WorldLoadEvent", "mindustry.game.EventType$ZoneConfigureCompleteEvent", "mindustry.game.EventType$ZoneRequireCompleteEvent", "mindustry.game.Gamemode", "mindustry.game.GlobalData", "mindustry.game.LoopControl", "mindustry.game.MusicControl", "mindustry.game.Objective", "mindustry.game.Objectives", "mindustry.game.Objectives$Launched", "mindustry.game.Objectives$Unlock", "mindustry.game.Objectives$Wave", "mindustry.game.Objectives$ZoneObjective", "mindustry.game.Objectives$ZoneWave", "mindustry.game.Rules", "mindustry.game.Saves", "mindustry.game.Saves$SaveSlot", "mindustry.game.Schematic", "mindustry.game.Schematic$Stile", "mindustry.game.Schematics", "mindustry.game.SoundLoop", "mindustry.game.SpawnGroup", "mindustry.game.Stats", "mindustry.game.Stats$Rank", "mindustry.game.Stats$RankResult", "mindustry.game.Team", "mindustry.game.Teams", "mindustry.game.Teams$BrokenBlock", "mindustry.game.Teams$TeamData", "mindustry.game.Tutorial", "mindustry.game.Tutorial$TutorialStage", "mindustry.gen.BufferItem", "mindustry.gen.Call", "mindustry.gen.Call", "mindustry.gen.Icon", "mindustry.gen.Icon", "mindustry.gen.MethodHash", "mindustry.gen.Musics", "mindustry.gen.Musics", "mindustry.gen.PathTile", "mindustry.gen.PropCell", "mindustry.gen.RemoteReadClient", "mindustry.gen.RemoteReadServer", "mindustry.gen.Serialization", "mindustry.gen.Sounds", "mindustry.gen.Sounds", "mindustry.gen.Tex", "mindustry.gen.Tex", "mindustry.gen.TileOp", "mindustry.graphics.BlockRenderer", "mindustry.graphics.Bloom", "mindustry.graphics.CacheLayer", "mindustry.graphics.Drawf", "mindustry.graphics.FloorRenderer", "mindustry.graphics.IndexedRenderer", "mindustry.graphics.Layer", "mindustry.graphics.LightRenderer", "mindustry.graphics.MenuRenderer", "mindustry.graphics.MinimapRenderer", "mindustry.graphics.MultiPacker", "mindustry.graphics.MultiPacker$PageType", "mindustry.graphics.OverlayRenderer", "mindustry.graphics.Pal", "mindustry.graphics.Pixelator", "mindustry.graphics.Shaders", "mindustry.input.Binding", "mindustry.input.DesktopInput", "mindustry.input.InputHandler", "mindustry.input.InputHandler$PlaceLine", "mindustry.input.MobileInput", "mindustry.input.PlaceMode", "mindustry.input.Placement", "mindustry.input.Placement$DistanceHeuristic", "mindustry.input.Placement$NormalizeDrawResult", "mindustry.input.Placement$NormalizeResult", "mindustry.input.Placement$TileHueristic", "mindustry.maps.Map", "mindustry.maps.Maps", "mindustry.maps.Maps$MapProvider", "mindustry.maps.Maps$ShuffleMode", "mindustry.maps.Maps$ShuffleMode", "mindustry.maps.filters.BlendFilter", "mindustry.maps.filters.ClearFilter", "mindustry.maps.filters.DistortFilter", "mindustry.maps.filters.FilterOption", "mindustry.maps.filters.FilterOption$BlockOption", "mindustry.maps.filters.FilterOption$SliderOption", "mindustry.maps.filters.GenerateFilter", "mindustry.maps.filters.GenerateFilter$GenerateInput", "mindustry.maps.filters.GenerateFilter$GenerateInput$TileProvider", "mindustry.maps.filters.MedianFilter", "mindustry.maps.filters.MirrorFilter", "mindustry.maps.filters.NoiseFilter", "mindustry.maps.filters.OreFilter", "mindustry.maps.filters.OreMedianFilter", "mindustry.maps.filters.RiverNoiseFilter", "mindustry.maps.filters.ScatterFilter", "mindustry.maps.filters.TerrainFilter", "mindustry.maps.generators.BasicGenerator", "mindustry.maps.generators.BasicGenerator$DistanceHeuristic", "mindustry.maps.generators.BasicGenerator$TileHueristic", "mindustry.maps.generators.Generator", "mindustry.maps.generators.MapGenerator", "mindustry.maps.generators.MapGenerator$Decoration", "mindustry.maps.generators.RandomGenerator", "mindustry.maps.zonegen.DesertWastesGenerator", "mindustry.maps.zonegen.OvergrowthGenerator", "mindustry.type.Category", "mindustry.type.ErrorContent", "mindustry.type.Item", "mindustry.type.ItemStack", "mindustry.type.ItemType", "mindustry.type.Liquid", "mindustry.type.LiquidStack", "mindustry.type.Mech", "mindustry.type.Publishable", "mindustry.type.StatusEffect", "mindustry.type.StatusEffect$TransitionHandler", "mindustry.type.TypeID", "mindustry.type.UnitType", "mindustry.type.Weapon", "mindustry.type.WeatherEvent", "mindustry.type.Zone", "mindustry.ui.Bar", "mindustry.ui.BorderImage", "mindustry.ui.Cicon", "mindustry.ui.ContentDisplay", "mindustry.ui.Fonts", "mindustry.ui.GridImage", "mindustry.ui.IconSize", "mindustry.ui.IntFormat", "mindustry.ui.ItemDisplay", "mindustry.ui.ItemImage", "mindustry.ui.ItemsDisplay", "mindustry.ui.Links", "mindustry.ui.Links$LinkEntry", "mindustry.ui.LiquidDisplay", "mindustry.ui.Minimap", "mindustry.ui.MobileButton", "mindustry.ui.MultiReqImage", "mindustry.ui.ReqImage", "mindustry.ui.Styles", "mindustry.ui.dialogs.AboutDialog", "mindustry.ui.dialogs.AdminsDialog", "mindustry.ui.dialogs.BansDialog", "mindustry.ui.dialogs.ColorPicker", "mindustry.ui.dialogs.ContentInfoDialog", "mindustry.ui.dialogs.ControlsDialog", "mindustry.ui.dialogs.CustomGameDialog", "mindustry.ui.dialogs.CustomRulesDialog", "mindustry.ui.dialogs.DatabaseDialog", "mindustry.ui.dialogs.DeployDialog", "mindustry.ui.dialogs.DeployDialog$View", "mindustry.ui.dialogs.DeployDialog$ZoneNode", "mindustry.ui.dialogs.DiscordDialog", "mindustry.ui.dialogs.FileChooser", "mindustry.ui.dialogs.FileChooser$FileHistory", "mindustry.ui.dialogs.FloatingDialog", "mindustry.ui.dialogs.GameOverDialog", "mindustry.ui.dialogs.HostDialog", "mindustry.ui.dialogs.JoinDialog", "mindustry.ui.dialogs.JoinDialog$Server", "mindustry.ui.dialogs.LanguageDialog", "mindustry.ui.dialogs.LoadDialog", "mindustry.ui.dialogs.LoadoutDialog", "mindustry.ui.dialogs.MapPlayDialog", "mindustry.ui.dialogs.MapsDialog", "mindustry.ui.dialogs.MinimapDialog", "mindustry.ui.dialogs.ModsDialog", "mindustry.ui.dialogs.PaletteDialog", "mindustry.ui.dialogs.PausedDialog", "mindustry.ui.dialogs.SaveDialog", "mindustry.ui.dialogs.SchematicsDialog", "mindustry.ui.dialogs.SchematicsDialog$SchematicImage", "mindustry.ui.dialogs.SchematicsDialog$SchematicInfoDialog", "mindustry.ui.dialogs.SettingsMenuDialog", "mindustry.ui.dialogs.TechTreeDialog", "mindustry.ui.dialogs.TechTreeDialog$LayoutNode", "mindustry.ui.dialogs.TechTreeDialog$TechTreeNode", "mindustry.ui.dialogs.TechTreeDialog$View", "mindustry.ui.dialogs.TraceDialog", "mindustry.ui.dialogs.ZoneInfoDialog", "mindustry.ui.fragments.BlockConfigFragment", "mindustry.ui.fragments.BlockInventoryFragment", "mindustry.ui.fragments.ChatFragment", "mindustry.ui.fragments.FadeInFragment", "mindustry.ui.fragments.Fragment", "mindustry.ui.fragments.HudFragment", "mindustry.ui.fragments.LoadingFragment", "mindustry.ui.fragments.MenuFragment", "mindustry.ui.fragments.OverlayFragment", "mindustry.ui.fragments.PlacementFragment", "mindustry.ui.fragments.PlayerListFragment", "mindustry.ui.fragments.ScriptConsoleFragment", "mindustry.ui.layout.BranchTreeLayout", "mindustry.ui.layout.BranchTreeLayout$TreeAlignment", "mindustry.ui.layout.BranchTreeLayout$TreeLocation", "mindustry.ui.layout.RadialTreeLayout", "mindustry.ui.layout.TreeLayout", "mindustry.ui.layout.TreeLayout$TreeNode", "mindustry.world.Block", "mindustry.world.BlockStorage", "mindustry.world.Build", "mindustry.world.CachedTile", "mindustry.world.DirectionalItemBuffer", "mindustry.world.DirectionalItemBuffer$BufferItemStruct", "mindustry.world.Edges", "mindustry.world.ItemBuffer", "mindustry.world.LegacyColorMapper", "mindustry.world.LegacyColorMapper$LegacyBlock", "mindustry.world.Pos", "mindustry.world.StaticTree", "mindustry.world.Tile", "mindustry.world.WorldContext", "mindustry.world.blocks.Attributes", "mindustry.world.blocks.Autotiler", "mindustry.world.blocks.Autotiler$AutotilerHolder", "mindustry.world.blocks.BlockPart", "mindustry.world.blocks.BuildBlock", "mindustry.world.blocks.BuildBlock$BuildEntity", "mindustry.world.blocks.DoubleOverlayFloor", "mindustry.world.blocks.Floor", "mindustry.world.blocks.ItemSelection", "mindustry.world.blocks.LiquidBlock", "mindustry.world.blocks.OreBlock", "mindustry.world.blocks.OverlayFloor", "mindustry.world.blocks.PowerBlock", "mindustry.world.blocks.RespawnBlock", "mindustry.world.blocks.Rock", "mindustry.world.blocks.StaticWall", "mindustry.world.blocks.TreeBlock", "mindustry.world.blocks.defense.DeflectorWall", "mindustry.world.blocks.defense.DeflectorWall$DeflectorEntity", "mindustry.world.blocks.defense.Door", "mindustry.world.blocks.defense.Door$DoorEntity", "mindustry.world.blocks.defense.ForceProjector", "mindustry.world.blocks.defense.ForceProjector$ForceEntity", "mindustry.world.blocks.defense.ForceProjector$ShieldEntity", "mindustry.world.blocks.defense.MendProjector", "mindustry.world.blocks.defense.MendProjector$MendEntity", "mindustry.world.blocks.defense.OverdriveProjector", "mindustry.world.blocks.defense.OverdriveProjector$OverdriveEntity", "mindustry.world.blocks.defense.ShockMine", "mindustry.world.blocks.defense.SurgeWall", "mindustry.world.blocks.defense.Wall", "mindustry.world.blocks.defense.turrets.ArtilleryTurret", "mindustry.world.blocks.defense.turrets.BurstTurret", "mindustry.world.blocks.defense.turrets.ChargeTurret", "mindustry.world.blocks.defense.turrets.ChargeTurret$LaserTurretEntity", "mindustry.world.blocks.defense.turrets.CooledTurret", "mindustry.world.blocks.defense.turrets.DoubleTurret", "mindustry.world.blocks.defense.turrets.ItemTurret", "mindustry.world.blocks.defense.turrets.ItemTurret$ItemEntry", "mindustry.world.blocks.defense.turrets.ItemTurret$ItemTurretEntity", "mindustry.world.blocks.defense.turrets.LaserTurret", "mindustry.world.blocks.defense.turrets.LaserTurret$LaserTurretEntity", "mindustry.world.blocks.defense.turrets.LiquidTurret", "mindustry.world.blocks.defense.turrets.PowerTurret", "mindustry.world.blocks.defense.turrets.Turret", "mindustry.world.blocks.defense.turrets.Turret$AmmoEntry", "mindustry.world.blocks.defense.turrets.Turret$TurretEntity", "mindustry.world.blocks.distribution.ArmoredConveyor", "mindustry.world.blocks.distribution.BufferedItemBridge", "mindustry.world.blocks.distribution.BufferedItemBridge$BufferedItemBridgeEntity", "mindustry.world.blocks.distribution.Conveyor", "mindustry.world.blocks.distribution.Conveyor$ConveyorEntity", "mindustry.world.blocks.distribution.Conveyor$ItemPos", "mindustry.world.blocks.distribution.ExtendingItemBridge", "mindustry.world.blocks.distribution.ItemBridge", "mindustry.world.blocks.distribution.ItemBridge$ItemBridgeEntity", "mindustry.world.blocks.distribution.Junction", "mindustry.world.blocks.distribution.Junction$JunctionEntity", "mindustry.world.blocks.distribution.MassDriver", "mindustry.world.blocks.distribution.MassDriver$DriverBulletData", "mindustry.world.blocks.distribution.MassDriver$DriverState", "mindustry.world.blocks.distribution.MassDriver$MassDriverEntity", "mindustry.world.blocks.distribution.OverflowGate", "mindustry.world.blocks.distribution.OverflowGate$OverflowGateEntity", "mindustry.world.blocks.distribution.Router", "mindustry.world.blocks.distribution.Router$RouterEntity", "mindustry.world.blocks.distribution.Sorter", "mindustry.world.blocks.distribution.Sorter$SorterEntity", "mindustry.world.blocks.liquid.ArmoredConduit", "mindustry.world.blocks.liquid.Conduit", "mindustry.world.blocks.liquid.Conduit$ConduitEntity", "mindustry.world.blocks.liquid.LiquidBridge", "mindustry.world.blocks.liquid.LiquidExtendingBridge", "mindustry.world.blocks.liquid.LiquidJunction", "mindustry.world.blocks.liquid.LiquidOverflowGate", "mindustry.world.blocks.liquid.LiquidRouter", "mindustry.world.blocks.liquid.LiquidTank", "mindustry.world.blocks.logic.LogicBlock", "mindustry.world.blocks.logic.MessageBlock", "mindustry.world.blocks.logic.MessageBlock$MessageBlockEntity", "mindustry.world.blocks.power.Battery", "mindustry.world.blocks.power.BurnerGenerator", "mindustry.world.blocks.power.ConditionalConsumePower", "mindustry.world.blocks.power.DecayGenerator", "mindustry.world.blocks.power.ImpactReactor", "mindustry.world.blocks.power.ImpactReactor$FusionReactorEntity", "mindustry.world.blocks.power.ItemLiquidGenerator", "mindustry.world.blocks.power.ItemLiquidGenerator$ItemLiquidGeneratorEntity", "mindustry.world.blocks.power.LightBlock", "mindustry.world.blocks.power.LightBlock$LightEntity", "mindustry.world.blocks.power.NuclearReactor", "mindustry.world.blocks.power.NuclearReactor$NuclearReactorEntity", "mindustry.world.blocks.power.PowerDiode", "mindustry.world.blocks.power.PowerDistributor", "mindustry.world.blocks.power.PowerGenerator", "mindustry.world.blocks.power.PowerGenerator$GeneratorEntity", "mindustry.world.blocks.power.PowerGraph", "mindustry.world.blocks.power.PowerNode", "mindustry.world.blocks.power.SingleTypeGenerator", "mindustry.world.blocks.power.SolarGenerator", "mindustry.world.blocks.power.ThermalGenerator", "mindustry.world.blocks.production.Cultivator", "mindustry.world.blocks.production.Cultivator$CultivatorEntity", "mindustry.world.blocks.production.Drill", "mindustry.world.blocks.production.Drill$DrillEntity", "mindustry.world.blocks.production.Fracker", "mindustry.world.blocks.production.Fracker$FrackerEntity", "mindustry.world.blocks.production.GenericCrafter", "mindustry.world.blocks.production.GenericCrafter$GenericCrafterEntity", "mindustry.world.blocks.production.GenericSmelter", "mindustry.world.blocks.production.Incinerator", "mindustry.world.blocks.production.Incinerator$IncineratorEntity", "mindustry.world.blocks.production.LiquidConverter", "mindustry.world.blocks.production.Pump", "mindustry.world.blocks.production.Separator", "mindustry.world.blocks.production.SolidPump", "mindustry.world.blocks.production.SolidPump$SolidPumpEntity", "mindustry.world.blocks.sandbox.ItemSource", "mindustry.world.blocks.sandbox.ItemSource$ItemSourceEntity", "mindustry.world.blocks.sandbox.ItemVoid", "mindustry.world.blocks.sandbox.LiquidSource", "mindustry.world.blocks.sandbox.LiquidSource$LiquidSourceEntity", "mindustry.world.blocks.sandbox.PowerSource", "mindustry.world.blocks.sandbox.PowerVoid", "mindustry.world.blocks.storage.CoreBlock", "mindustry.world.blocks.storage.CoreBlock$CoreEntity", "mindustry.world.blocks.storage.LaunchPad", "mindustry.world.blocks.storage.StorageBlock", "mindustry.world.blocks.storage.StorageBlock$StorageBlockEntity", "mindustry.world.blocks.storage.Unloader", "mindustry.world.blocks.storage.Unloader$UnloaderEntity", "mindustry.world.blocks.storage.Vault", "mindustry.world.blocks.units.CommandCenter", "mindustry.world.blocks.units.CommandCenter$CommandCenterEntity", "mindustry.world.blocks.units.MechPad", "mindustry.world.blocks.units.MechPad$MechFactoryEntity", "mindustry.world.blocks.units.RallyPoint", "mindustry.world.blocks.units.RepairPoint", "mindustry.world.blocks.units.RepairPoint$RepairPointEntity", "mindustry.world.blocks.units.UnitFactory", "mindustry.world.blocks.units.UnitFactory$UnitFactoryEntity", "mindustry.world.consumers.Consume", "mindustry.world.consumers.ConsumeItemFilter", "mindustry.world.consumers.ConsumeItems", "mindustry.world.consumers.ConsumeLiquid", "mindustry.world.consumers.ConsumeLiquidBase", "mindustry.world.consumers.ConsumeLiquidFilter", "mindustry.world.consumers.ConsumePower", "mindustry.world.consumers.ConsumeType", "mindustry.world.consumers.Consumers", "mindustry.world.meta.Attribute", "mindustry.world.meta.BlockBars", "mindustry.world.meta.BlockFlag", "mindustry.world.meta.BlockGroup", "mindustry.world.meta.BlockStat", "mindustry.world.meta.BlockStats", "mindustry.world.meta.BuildVisibility", "mindustry.world.meta.PowerType", "mindustry.world.meta.Producers", "mindustry.world.meta.StatCategory", "mindustry.world.meta.StatUnit", "mindustry.world.meta.StatValue", "mindustry.world.meta.values.AmmoListValue", "mindustry.world.meta.values.BooleanValue", "mindustry.world.meta.values.BoosterListValue", "mindustry.world.meta.values.ItemFilterValue", "mindustry.world.meta.values.ItemListValue", "mindustry.world.meta.values.LiquidFilterValue", "mindustry.world.meta.values.LiquidValue", "mindustry.world.meta.values.NumberValue", "mindustry.world.meta.values.StringValue", "mindustry.world.modules.BlockModule", "mindustry.world.modules.ConsumeModule", "mindustry.world.modules.ItemModule", "mindustry.world.modules.ItemModule$ItemCalculator", "mindustry.world.modules.ItemModule$ItemConsumer", "mindustry.world.modules.LiquidModule", "mindustry.world.modules.LiquidModule$LiquidCalculator", "mindustry.world.modules.LiquidModule$LiquidConsumer", "mindustry.world.modules.PowerModule", "mindustry.world.producers.Produce", "mindustry.world.producers.ProduceItem"); } \ No newline at end of file From c0c0ffa6829c385bbafff92887fe9c10cd3d7fff Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 27 Dec 2019 01:22:50 -0500 Subject: [PATCH 16/78] Bugfixes --- core/src/mindustry/content/Fx.java | 1 + core/src/mindustry/input/DesktopInput.java | 2 +- core/src/mindustry/mod/Mods.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index 379e01f9a6..a116034e1a 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -1079,6 +1079,7 @@ public class Fx implements ContentList{ healBlockFull = new Effect(20, e -> { Draw.color(e.color); Draw.alpha(e.fout()); + Fill.square(e.x, e.y, e.rotation * tilesize / 2f); }); overdriveBlockFull = new Effect(60, e -> { diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java index 38aa0c2fd4..c76968a56e 100644 --- a/core/src/mindustry/input/DesktopInput.java +++ b/core/src/mindustry/input/DesktopInput.java @@ -300,7 +300,7 @@ public class DesktopInput extends InputHandler{ } } - if(Core.input.keyTap(Binding.clear_building)){ + if(Core.input.keyTap(Binding.clear_building) || isPlacing()){ lastSchematic = null; selectRequests.clear(); } diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java index b92b2fefc5..e4907ed26c 100644 --- a/core/src/mindustry/mod/Mods.java +++ b/core/src/mindustry/mod/Mods.java @@ -85,6 +85,7 @@ public class Mods implements Loadable{ try{ mods.add(loadMod(dest)); requiresReload = true; + sortMods(); }catch(IOException e){ dest.delete(); throw e; From d43b40fab557a96612e77cce8b4d1183c36a5c34 Mon Sep 17 00:00:00 2001 From: AmateurPotion <47741752+AmateurPotion@users.noreply.github.com> Date: Sun, 29 Dec 2019 01:21:55 +0900 Subject: [PATCH 17/78] Update bundle_ko.properties (#1262) --- core/assets/bundles/bundle_ko.properties | 68 +++++++++++++----------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index 71a44a6bff..3d9c8e0475 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -7,14 +7,15 @@ link.reddit.description = Mindustry 레딧 link.github.description = 게임 소스코드 link.changelog.description = 새로 추가된 것들 link.dev-builds.description = 불안정한 개발 빌드들 -link.trello.description = 다음 출시될 기능들을 게시한 공식 Trello 보드 +link.trello.description = 출시 예정중인 기능들을 게시한 공식 Trello 보드 link.itch.io.description = PC 버전 다운로드와 HTML5 버전이 있는 itch.io 사이트 link.google-play.description = Google Play 스토어 정보 link.f-droid.description = F-Droid 카탈로그 link.wiki.description = 공식 Mindustry 위키 +link.feathub.description = 기능 아이디어 건의하기 linkfail = 링크를 여는 데 실패했습니다!\nURL이 기기의 클립보드에 복사되었습니다. -screenshot = 스크린샷이 {0} 경로에 저장되었습니다. -screenshot.invalid = 맵이 너무 커서 스크린샷을 찍을 메모리가 충분하지 않습니다. +screenshot = 스크린 샷이 {0} 경로에 저장되었습니다. +screenshot.invalid = 맵이 너무 커서 스크린 샷을 찍을 메모리가 충분하지 않습니다. gameover = 게임 오버 gameover.pvp = [accent]{0}[] 팀이 승리했습니다! highscore = [accent]최고점수 달성! @@ -35,11 +36,11 @@ schematic.replace = 이 설계도와 같은 이름의 설계도가 이미 존재 schematic.import = 설계도 불러오기 schematic.exportfile = 파일 내보내기 schematic.importfile = 파일 불러오기 -schematic.browseworkshop = 워크샵 탐색 +schematic.browseworkshop = Workshop 탐색 schematic.copy = 클립보드에 복사하기 schematic.copy.import = 클립보드에서 붙여넣기 schematic.shareworkshop = 워크샵에 공유 -schematic.flip = 좌우 뒤집기 :[accent][[{0}][] / 상하 뒤집기 : [accent][[{1}][] +schematic.flip = 좌우 뒤집기 : [accent][[{0}][] / 상하 뒤집기 : [accent][[{1}][] schematic.saved = 설계도 저장됨. schematic.delete.confirm = 삭제된 설계도는 복구할 수 없습니다. 정말로 삭제하시겠습니까? schematic.rename = 설계도명 변경 @@ -94,7 +95,7 @@ mods.alpha = [scarlet](Alpha) mods = 모드 mods.none = [LIGHT_GRAY]추가한 모드가 없습니다! mods.guide = 모드 가이드 -mods.report = 버그 신고 +mods.report = 문제 신고 mods.openfolder = 모드 폴더 열기 mod.enabled = [lightgray]활성화 mod.disabled = [scarlet]비활성화 @@ -102,7 +103,10 @@ mod.disable = 비활성화 mod.delete.error = 모드를 삭제할 수 없습니다. 아마도 해당 모드가 사용중인 것 같습니다. mod.requiresversion = [scarlet]게임의 버전이 낮아 모드를 활성화할 수 없습니다!\n[scarlet]요구되는 게임 버전 : [accent]{0} mod.missingdependencies = [scarlet]의존되는 모드: {0} -mod.nowdisabled = [scarlet]모드 '{0}'는 다음의 모드에 의존합니다 :[accent] {1}\n[lightgray]이 모드를 먼저 다운로드해야합니다.\n이 모드는 자동으로 비활성화됩니다. +mod.erroredcontent = [scarlet]컨텐츠 오류 +mod.errors = 컨텐츠를 불러오는 중 오류가 발생하였습니다. +mod.noerrorplay = [scarlet]모드에 오류가 존재합니다.[] 해당 오류가 발생하는 모드를 비활성화하거나 모드의 오류를 고친 후 플레이가 가능합니다. +mod.nowdisabled = [scarlet]모드 '{0}'는 다음의 모드에 의존합니다 : [accent] {1}\n[lightgray]이 모드를 먼저 다운로드해야합니다.\n이 모드는 자동으로 비활성화됩니다. mod.enable = 활성화 mod.requiresrestart = 모드 변경사항을 적용하기 위해 게임을 종료합니다. mod.reloadrequired = [scarlet]새로고침 예정됨 @@ -111,7 +115,7 @@ mod.import.github = 깃허브 모드 추가 mod.item.remove = 이것은 모드[accent] '{0}'[]의 자원입니다. 이 자원을 삭제하려면, 이 모드를 제거해야합니다. mod.remove.confirm = 이 모드를 삭제하시겠습니까? mod.author = [LIGHT_GRAY]제작자 : [] {0} -mod.missing = 이 세이브파일에는 설치하지 않은 모드 혹은 이 버전에 속해있지 않은 데이터가 포함되어 있습니다. 이 파일을 불러올 경우 세이브파일의 데이터가 손상될 수 있습니다. 정말로 이 파일을 불러오시겠습니까?\n[lightgray]모드 :\n{0} +mod.missing = 이 세이브파일에는 설치하지 않은 모드 혹은 현재 버전에 속해있지 않은 데이터가 포함되어 있습니다. 이 파일을 불러올 경우 세이브파일의 데이터가 손상될 수 있습니다. 정말로 이 파일을 불러오시겠습니까?\n[lightgray]모드 :\n{0} mod.preview.missing = 워크샵에 당신의 모드를 업로드하기 전에 미리보기 이미지를 먼저 추가해야합니다.\n[accent] preview.png[]라는 이름으로 미리보기 이미지를 당신의 모드 폴더안에 준비한 후 다시 시도해주세요. mod.folder.missing = 워크샵에는 폴더 형태의 모드만 게시할 수 있습니다.\n모드를 폴더 형태로 바꾸려면 파일을 폴더에 압축 해제하고 이전 압축파일을 제거한 후, 게임을 재시작하거나 모드를 다시 로드하십시오. mod.scripts.unsupported = 당신의 기기는 모드스크립트를 지원하지 않습니다. 모드의 일부 기능이 작동하지 않을 수 있습니다. @@ -594,8 +598,8 @@ unit.persecond = /초 unit.timesspeed = x 배 unit.percent = % unit.items = 자원 -unit.thousands = 천 -unit.millions = 백만 +unit.thousands = k +unit.millions = mil category.general = 일반 category.power = 전력 category.liquids = 액체 @@ -635,7 +639,7 @@ setting.sensitivity.name = 컨트롤러 감도 setting.saveinterval.name = 저장 간격 setting.seconds = {0} 초 setting.blockselecttimeout.name = 블록 선택 시간 초과 -setting.milliseconds = {0} 밀리초 +setting.milliseconds = {0} ms setting.fullscreen.name = 전체 화면 setting.borderlesswindow.name = 테두리 없는 창모드[LIGHT_GRAY] (재시작이 필요할 수 있습니다) setting.fps.name = FPS 표시 @@ -683,20 +687,20 @@ keybind.schematic_flip_x.name = 설계도 X축 뒤집기 keybind.schematic_flip_y.name = 설계도 Y축 뒤집기 keybind.category_prev.name = 이전 목록 keybind.category_next.name = 다음 목록 -keybind.block_select_left.name = 블럭 왼쪽 선택 -keybind.block_select_right.name = 블럭 오른쪽 선택 -keybind.block_select_up.name = 블럭 위쪽 선택 -keybind.block_select_down.name = 블럭 아래쪽 선택 -keybind.block_select_01.name = 카테고리/블럭 선택 1 -keybind.block_select_02.name = 카테고리/블럭 선택 2 -keybind.block_select_03.name = 카테고리/블럭 선택 3 -keybind.block_select_04.name = 카테고리/블럭 선택 4 -keybind.block_select_05.name = 카테고리/블럭 선택 5 -keybind.block_select_06.name = 카테고리/블럭 선택 6 -keybind.block_select_07.name = 카테고리/블럭 선택 7 -keybind.block_select_08.name = 카테고리/블럭 선택 8 -keybind.block_select_09.name = 카테고리/블럭 선택 9 -keybind.block_select_10.name = 카테고리/블럭 선택 10 +keybind.block_select_left.name = 블록 왼쪽 선택 +keybind.block_select_right.name = 블록 오른쪽 선택 +keybind.block_select_up.name = 블록 위쪽 선택 +keybind.block_select_down.name = 블록 아래쪽 선택 +keybind.block_select_01.name = 카테고리/블록 선택 1 +keybind.block_select_02.name = 카테고리/블록 선택 2 +keybind.block_select_03.name = 카테고리/블록 선택 3 +keybind.block_select_04.name = 카테고리/블록 선택 4 +keybind.block_select_05.name = 카테고리/블록 선택 5 +keybind.block_select_06.name = 카테고리/블록 선택 6 +keybind.block_select_07.name = 카테고리/블록 선택 7 +keybind.block_select_08.name = 카테고리/블록 선택 8 +keybind.block_select_09.name = 카테고리/블록 선택 9 +keybind.block_select_10.name = 카테고리/블록 선택 10 keybind.fullscreen.name = 전체 화면 keybind.select.name = 선택/공격 keybind.diagonal_placement.name = 대각선 설치 @@ -716,8 +720,8 @@ keybind.console.name = 콘솔 keybind.rotate.name = 회전 keybind.rotateplaced.name = 기존 회전 (고정) keybind.toggle_menus.name = 메뉴 보이기/숨기기 -keybind.chat_history_prev.name = 이전 채팅기록 -keybind.chat_history_next.name = 다음 채팅기록 +keybind.chat_history_prev.name = 이전 채팅 기록 +keybind.chat_history_next.name = 다음 채팅 기록 keybind.chat_scroll.name = 채팅 스크롤 keybind.drop_unit.name = 유닛 처치 시 자원획득 keybind.zoom_minimap.name = 미니맵 확대 @@ -730,11 +734,11 @@ mode.editor.name = 편집기 mode.pvp.name = PvP mode.pvp.description = 실제 플레이어와 PvP를 합니다. 맵에 적어도 2개의 다른 색상 코어가 있어야 합니다. mode.attack.name = 공격 -mode.attack.description = 적 기지를 파괴하세요. 맵에 빨간팀 코어가 있어야 플레이 가능합니다. +mode.attack.description = 적 기지를 파괴하세요. 맵에 빨간 팀 코어가 있어야 플레이 가능합니다. mode.custom = 사용자 정의 규칙 rules.infiniteresources = 무한 자원 -rules.reactorexplosions = 원자로 폭발 허가여부 +rules.reactorexplosions = 원자로 폭발 허가 여부 rules.wavetimer = 단계 대기시간 rules.waves = 단계 활성화 rules.attack = 공격 모드 @@ -750,7 +754,7 @@ rules.respawntime = 플레이어 부활 대기 시간 : [LIGHT_GRAY] (초) rules.wavespacing = 단계 간격 : [LIGHT_GRAY] (초) rules.buildcostmultiplier = 건설 소모 배수 rules.buildspeedmultiplier = 건설 속도 배수 -rules.waitForWaveToEnd = 단계가 끝날때까지 기다리는중 +rules.waitForWaveToEnd = 단계가 끝날때까지 기다리는 중 rules.dropzoneradius = 소환 충격파 범위 : [LIGHT_GRAY] (타일) rules.respawns = 단계당 최대 플레이어 부활 횟수 rules.limitedRespawns = 플레이어 부활 제한 @@ -810,7 +814,7 @@ mech.trident-ship.name = 트라이던트 mech.trident-ship.weapon = 폭탄 저장고 mech.glaive-ship.name = 글레이브 mech.glaive-ship.weapon = 중무장 인화성 소총 -item.corestorable = [lightgray]코어 잔여 저장공간: {0} +item.corestorable = [lightgray]코어 저장 가능 여부 : {0} item.explosiveness = [LIGHT_GRAY]폭발성 : {0} item.flammability = [LIGHT_GRAY]인화성 : {0} item.radioactivity = [LIGHT_GRAY]방사능 : {0} @@ -1117,7 +1121,7 @@ block.cryofluidmixer.description = 물과 티타늄을 냉각에 훨씬 더 효 block.blast-mixer.description = 포자를 사용하여 파이라타이트를 폭발성 화합물로 변환시킵니다. block.pyratite-mixer.description = 석탄, 납, 모래를 가연성이 높은 파이라타이트로 만듭니다. block.melter.description = 고철을 녹여 파도의 탄약 혹은 원심 분리기에 사용할 수 있는 액체인 광재로 만듭니다. -block.separator.description = 광재룰 각종 자원으로 재활용 할 수 있게 해 주는 건물입니다. +block.separator.description = 광재를 각종 자원으로 재활용 할 수 있게 해 주는 건물입니다. block.spore-press.description = 포자를 압축해 기름을 추출합니다. block.pulverizer.description = 고철을 갈아 모래로 만듭니다. 맵에 모래가 부족할 때 유용합니다. block.coal-centrifuge.description = 석유로 석탄을 만듭니다. From e1bf8bdab19d8c8bb5290800d9e02194bc10e060 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Dec 2019 16:30:40 -0500 Subject: [PATCH 18/78] Added BE auto-updater / Server config / Fixed #1266 --- core/assets/bundles/bundle.properties | 7 + core/src/mindustry/Vars.java | 6 + core/src/mindustry/ai/Pathfinder.java | 2 +- core/src/mindustry/core/Version.java | 4 +- core/src/mindustry/core/World.java | 2 +- core/src/mindustry/game/EventType.java | 3 +- core/src/mindustry/net/Administration.java | 97 +++++++--- core/src/mindustry/net/BeControl.java | 168 ++++++++++++++++++ core/src/mindustry/net/CrashSender.java | 20 ++- core/src/mindustry/net/NetworkIO.java | 4 +- core/src/mindustry/ui/dialogs/ModsDialog.java | 2 +- .../mindustry/ui/fragments/MenuFragment.java | 12 ++ core/src/mindustry/world/Tile.java | 2 +- .../world/blocks/production/SolidPump.java | 8 +- gradle.properties | 2 +- run-server | 8 + .../src/mindustry/server/ServerControl.java | 146 +++++---------- 17 files changed, 349 insertions(+), 144 deletions(-) create mode 100644 core/src/mindustry/net/BeControl.java diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 9ee0b4842a..2b2a1aa548 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -29,6 +29,13 @@ load.system = System load.mod = Mods load.scripts = Scripts +be.update = A new Bleeding Edge build is available: +be.update.confirm = Download it and restart now? +be.updating = Updating... +be.ignore = Ignore +be.noupdates = No updates found. +be.check = Check for updates + schematic = Schematic schematic.add = Save Schematic... schematics = Schematics diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index dfefeb2a68..2cfa4bad45 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -21,6 +21,7 @@ import mindustry.gen.*; import mindustry.input.*; import mindustry.maps.*; import mindustry.mod.*; +import mindustry.net.*; import mindustry.net.Net; import mindustry.world.blocks.defense.ForceProjector.*; @@ -136,6 +137,8 @@ public class Vars implements Loadable{ public static Fi modDirectory; /** data subdirectory used for schematics */ public static Fi schematicDirectory; + /** data subdirectory used for bleeding edge build versions */ + public static Fi bebuildDirectory; /** map file extension */ public static final String mapExtension = "msav"; /** save file extension */ @@ -157,6 +160,7 @@ public class Vars implements Loadable{ public static Platform platform = new Platform(){}; public static Mods mods; public static Schematics schematics = new Schematics(); + public static BeControl becontrol; public static World world; public static Maps maps; @@ -220,6 +224,7 @@ public class Vars implements Loadable{ defaultWaves = new DefaultWaves(); collisions = new EntityCollisions(); world = new World(); + becontrol = new BeControl(); maps = new Maps(); spawner = new WaveSpawner(); @@ -260,6 +265,7 @@ public class Vars implements Loadable{ tmpDirectory = dataDirectory.child("tmp/"); modDirectory = dataDirectory.child("mods/"); schematicDirectory = dataDirectory.child("schematics/"); + bebuildDirectory = dataDirectory.child("be_builds/"); modDirectory.mkdirs(); diff --git a/core/src/mindustry/ai/Pathfinder.java b/core/src/mindustry/ai/Pathfinder.java index 6a2515bb7a..a16ac8f410 100644 --- a/core/src/mindustry/ai/Pathfinder.java +++ b/core/src/mindustry/ai/Pathfinder.java @@ -139,7 +139,7 @@ public class Pathfinder implements Runnable{ //stop looping when interrupted externally return; } - }catch(Exception e){ + }catch(Throwable e){ e.printStackTrace(); } } diff --git a/core/src/mindustry/core/Version.java b/core/src/mindustry/core/Version.java index 700b8776e6..08a105d8fb 100644 --- a/core/src/mindustry/core/Version.java +++ b/core/src/mindustry/core/Version.java @@ -9,9 +9,9 @@ import arc.util.io.*; public class Version{ /** Build type. 'official' for official releases; 'custom' or 'bleeding edge' are also used. */ - public static String type; + public static String type = "unknown"; /** Build modifier, e.g. 'alpha' or 'release' */ - public static String modifier; + public static String modifier = "unknown"; /** Number specifying the major version, e.g. '4' */ public static int number; /** Build number, e.g. '43'. set to '-1' for custom builds. */ diff --git a/core/src/mindustry/core/World.java b/core/src/mindustry/core/World.java index ea0e9aa054..bbc3f4074c 100644 --- a/core/src/mindustry/core/World.java +++ b/core/src/mindustry/core/World.java @@ -217,7 +217,7 @@ public class World{ public void loadMap(Map map, Rules checkRules){ try{ SaveIO.load(map.file, new FilterContext(map)); - }catch(Exception e){ + }catch(Throwable e){ Log.err(e); if(!headless){ ui.showErrorMessage("$map.invalid"); diff --git a/core/src/mindustry/game/EventType.java b/core/src/mindustry/game/EventType.java index dfa1469fc1..6cbaba5e4b 100644 --- a/core/src/mindustry/game/EventType.java +++ b/core/src/mindustry/game/EventType.java @@ -28,7 +28,8 @@ public class EventType{ exclusionDeath, suicideBomb, openWiki, - teamCoreDamage + teamCoreDamage, + socketConfigChanged } public static class WinEvent{} diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java index dabf679d34..157566a5c3 100644 --- a/core/src/mindustry/net/Administration.java +++ b/core/src/mindustry/net/Administration.java @@ -18,11 +18,6 @@ public class Administration{ private Array chatFilters = new Array<>(); public Administration(){ - Core.settings.defaults( - "strict", true, - "servername", "Server" - ); - load(); } @@ -51,21 +46,12 @@ public class Administration{ Core.settings.putSave("playerlimit", limit); } - public void setStrict(boolean on){ - Core.settings.putSave("strict", on); - } - public boolean getStrict(){ - return Core.settings.getBool("strict"); + return Config.strict.bool(); } public boolean allowsCustomClients(){ - return Core.settings.getBool("allow-custom", !headless); - } - - public void setCustomClients(boolean allowed){ - Core.settings.put("allow-custom", allowed); - Core.settings.save(); + return Config.allowCustomClients.bool(); } /** Call when a player joins to update their information here. */ @@ -219,11 +205,7 @@ public class Administration{ } public boolean isWhitelistEnabled(){ - return Core.settings.getBool("whitelist", false); - } - - public void setWhitelist(boolean enabled){ - Core.settings.putSave("whitelist", enabled); + return Config.whitelist.bool(); } public boolean isWhitelisted(String id, String usid){ @@ -333,6 +315,79 @@ public class Administration{ whitelist = Core.settings.getObject("whitelisted", Array.class, Array::new); } + /** Server configuration definition. Each config value can be a string, boolean or number. */ + public enum Config{ + name("The server name as displayed on clients.", "Server", "servername"), + port("The port to host on.", Vars.port), + autoUpdate("Whether to auto-restart when a new update arrives.", false), + crashReport("Whether to send crash reports.", false, "crashreport"), + logging("Whether to log everything to files.", true), + strict("Whether strict mode is on - corrects positions and prevents duplicate UUIDs.", true), + socketInput("Allows a local application to control this server through a local TCP socket.", false, "socket", () -> Events.fire(Trigger.socketConfigChanged)), + socketInputPort("The port for socket input.", 6859, () -> Events.fire(Trigger.socketConfigChanged)), + socketInputAddress("The bind address for socket input.", "localhost", () -> Events.fire(Trigger.socketConfigChanged)), + allowCustomClients("Whether custom clients are allowed to connect.", !headless, "allow-custom"), + whitelist("Whether the whitelist is used.", false); + + public static final Config[] all = values(); + + public final Object defaultValue; + public final String key, description; + final Runnable changed; + + Config(String description, Object def){ + this(description, def, null, null); + } + + Config(String description, Object def, String key){ + this(description, def, key, null); + } + + Config(String description, Object def, Runnable changed){ + this(description, def, null, changed); + } + + Config(String description, Object def, String key, Runnable changed){ + this.description = description; + this.key = key == null ? name() : key; + this.defaultValue = def; + this.changed = changed == null ? () -> {} : changed; + } + + public boolean isNum(){ + return defaultValue instanceof Integer; + } + + public boolean isBool(){ + return defaultValue instanceof Boolean; + } + + public boolean isString(){ + return defaultValue instanceof String; + } + + public Object get(){ + return Core.settings.get(key, defaultValue); + } + + public boolean bool(){ + return Core.settings.getBool(key, (Boolean)defaultValue); + } + + public int num(){ + return Core.settings.getInt(key, (Integer)defaultValue); + } + + public String string(){ + return Core.settings.getString(key, (String)defaultValue); + } + + public void set(Object value){ + Core.settings.putSave(key, value); + changed.run(); + } + } + @Serialize public static class PlayerInfo{ public String id; diff --git a/core/src/mindustry/net/BeControl.java b/core/src/mindustry/net/BeControl.java new file mode 100644 index 0000000000..d81c5e721d --- /dev/null +++ b/core/src/mindustry/net/BeControl.java @@ -0,0 +1,168 @@ +package mindustry.net; + +import arc.*; +import arc.Net.*; +import arc.files.*; +import arc.func.*; +import arc.util.*; +import arc.util.async.*; +import arc.util.serialization.*; +import mindustry.core.*; +import mindustry.gen.*; +import mindustry.graphics.*; +import mindustry.net.Administration.*; +import mindustry.ui.*; +import mindustry.ui.dialogs.*; + +import java.io.*; +import java.net.*; + +import static mindustry.Vars.*; + +/** Handles control of bleeding edge builds. */ +public class BeControl{ + private static final int updateInterval = 60; + + private AsyncExecutor executor = new AsyncExecutor(1); + private boolean checkUpdates = true; + private boolean updateAvailable; + private String updateUrl; + private int updateBuild; + + /** @return whether this is a bleeding edge build. */ + public boolean active(){ + return Version.type.equals("bleeding-edge"); + } + + public BeControl(){ + if(active()){ + Timer.schedule(() -> { + if(checkUpdates && !mobile){ + checkUpdate(t -> {}); + } + }, 1, updateInterval); + } + } + + /** asynchronously checks for updates. */ + public void checkUpdate(Boolc done){ + Core.net.httpGet("https://api.github.com/repos/Anuken/MindustryBuilds/releases/latest", res -> { + if(res.getStatus() == HttpStatus.OK){ + Jval val = Jval.read(res.getResultAsString()); + int newBuild = Strings.parseInt(val.getString("tag_name", "0")); + if(newBuild > Version.build){ + Jval asset = val.get("assets").asArray().find(v -> v.getString("name", "").startsWith(headless ? "Mindustry-BE-Server" : "Mindustry-BE-Desktop")); + String url = asset.getString("browser_download_url", ""); + updateAvailable = true; + updateBuild = newBuild; + updateUrl = url; + showUpdateDialog(); + Core.app.post(() -> done.get(true)); + }else{ + Core.app.post(() -> done.get(false)); + } + }else{ + Core.app.post(() -> done.get(false)); + Log.err("Update check responded with: {0}", res.getStatus()); + } + }, error -> { + if(!headless){ + ui.showException(error); + }else{ + error.printStackTrace(); + } + }); + } + + /** @return whether a new update is available */ + public boolean isUpdateAvailable(){ + return updateAvailable; + } + + /** shows the dialog for updating the game on desktop, or a prompt for doing so on the server */ + public void showUpdateDialog(){ + if(!updateAvailable) return; + + if(!headless){ + ui.showCustomConfirm(Core.bundle.format("be.update", "") + " " + updateBuild, "$be.update.confirm", "$ok", "$be.ignore", () -> { + boolean[] cancel = {false}; + float[] progress = {0}; + int[] length = {0}; + Fi file = bebuildDirectory.child("client-be-" + updateBuild + ".jar"); + + FloatingDialog dialog = new FloatingDialog("$be.updating"); + download(updateUrl, file, i -> length[0] = i, v -> progress[0] = v, () -> cancel[0], () -> { + try{ + Runtime.getRuntime().exec(new String[]{"java", "-DlastBuild=" + Version.build, "-Dberestart", "-jar", file.absolutePath()}); + System.exit(0); + }catch(IOException e){ + ui.showException(e); + } + }, e -> { + dialog.hide(); + ui.showException(e); + }); + + dialog.cont.add(new Bar(() -> length[0] == 0 ? Core.bundle.get("be.updating") : (int)(progress[0] * length[0]) / 1024/ 1024 + "/" + length[0]/1024/1024 + " MB", () -> Pal.accent, () -> progress[0])).width(400f).height(70f); + dialog.buttons.addImageTextButton("$cancel", Icon.cancelSmall, () -> { + cancel[0] = true; + dialog.hide(); + }).size(210f, 64f); + dialog.setFillParent(false); + dialog.show(); + }, () -> checkUpdates = false); + }else{ + Log.info("&lcA new update is available: &lyBleeding Edge build {0}", updateBuild); + if(Config.autoUpdate.bool()){ + Log.info("&lcAuto-downloading next version..."); + + try{ + Fi source = Fi.get(BeControl.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath()); + Fi dest = source.sibling("server-be-" + updateBuild + ".jar"); + + download(updateUrl, dest, + len -> Core.app.post(() -> Log.info("&ly| Size: {0} MB.", Strings.fixed((float)len / 1024 / 1024, 2))), + progress -> {}, + () -> false, + () -> { + Log.info("&lcVersion downloaded, exiting. Note that if you are not using the run-server script, the server will not restart automatically."); + dest.copyTo(source); + dest.delete(); + System.exit(2); //this will cause a restart if using the script + }, + Throwable::printStackTrace); + }catch(Exception e){ + e.printStackTrace(); + } + } + checkUpdates = false; + //todo server updates + } + } + + private void download(String furl, Fi dest, Intc length, Floatc progressor, Boolp canceled, Runnable done, Cons error){ + executor.submit(() -> { + try{ + HttpURLConnection con = (HttpURLConnection)new URL(furl).openConnection(); + BufferedInputStream in = new BufferedInputStream(con.getInputStream()); + OutputStream out = dest.write(false, 4096); + + byte[] data = new byte[4096]; + long size = con.getContentLength(); + long counter = 0; + length.get((int)size); + int x; + while((x = in.read(data, 0, data.length)) >= 0 && !canceled.get()){ + counter += x; + progressor.get((float)counter / (float)size); + out.write(data, 0, x); + } + out.close(); + in.close(); + if(!canceled.get()) done.run(); + }catch(Throwable e){ + error.get(e); + } + }); + } +} diff --git a/core/src/mindustry/net/CrashSender.java b/core/src/mindustry/net/CrashSender.java index 43692c77d6..1b24b2af3a 100644 --- a/core/src/mindustry/net/CrashSender.java +++ b/core/src/mindustry/net/CrashSender.java @@ -27,7 +27,9 @@ public class CrashSender{ exception.printStackTrace(); //don't create crash logs for custom builds, as it's expected - if(Version.build == -1 || (System.getProperty("user.name").equals("anuke") && "release".equals(Version.modifier))) return; + if(Version.build == -1 || (System.getProperty("user.name").equals("anuke") && "release".equals(Version.modifier))){ + ret(); + } //attempt to load version regardless if(Version.number == 0){ @@ -63,7 +65,7 @@ public class CrashSender{ try{ //check crash report setting if(!Core.settings.getBool("crashreport", true)){ - return; + ret(); } }catch(Throwable ignored){ //if there's no settings init we don't know what the user wants but chances are it's an important crash, so send it anyway @@ -72,14 +74,14 @@ public class CrashSender{ try{ //check any mods - if there are any, don't send reports if(Vars.mods != null && !Vars.mods.list().isEmpty()){ - return; + ret(); } }catch(Throwable ignored){ } //do not send exceptions that occur for versions that can't be parsed if(Version.number == 0){ - return; + ret(); } boolean netActive = false, netServer = false; @@ -130,12 +132,16 @@ public class CrashSender{ while(!sent[0]){ Thread.sleep(30); } - }catch(InterruptedException ignored){ - } + }catch(InterruptedException ignored){} }catch(Throwable death){ death.printStackTrace(); - System.exit(1); } + + ret(); + } + + private static void ret(){ + System.exit(1); } private static void httpPost(String url, String content, Cons success, Cons failure){ diff --git a/core/src/mindustry/net/NetworkIO.java b/core/src/mindustry/net/NetworkIO.java index d877ac6e3a..1c6e1acba2 100644 --- a/core/src/mindustry/net/NetworkIO.java +++ b/core/src/mindustry/net/NetworkIO.java @@ -1,12 +1,12 @@ package mindustry.net; -import arc.*; import arc.util.*; import mindustry.core.*; import mindustry.entities.type.*; import mindustry.game.*; import mindustry.io.*; import mindustry.maps.Map; +import mindustry.net.Administration.*; import java.io.*; import java.nio.*; @@ -62,7 +62,7 @@ public class NetworkIO{ } public static ByteBuffer writeServerData(){ - String name = (headless ? Core.settings.getString("servername") : player.name); + String name = (headless ? Config.name.string() : player.name); String map = world.getMap() == null ? "None" : world.getMap().name(); ByteBuffer buffer = ByteBuffer.allocate(256); diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java index 96b71b6861..4b42f64d80 100644 --- a/core/src/mindustry/ui/dialogs/ModsDialog.java +++ b/core/src/mindustry/ui/dialogs/ModsDialog.java @@ -32,7 +32,7 @@ public class ModsDialog extends FloatingDialog{ buttons.row(); - buttons.addImageTextButton("$mods.guide", Icon.wiki, + buttons.addImageTextButton("$mods.guide", Icon.link, () -> Core.net.openURI(modGuideURL)) .size(210, 64f); diff --git a/core/src/mindustry/ui/fragments/MenuFragment.java b/core/src/mindustry/ui/fragments/MenuFragment.java index 535f4d6046..8737db0d9a 100644 --- a/core/src/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/mindustry/ui/fragments/MenuFragment.java @@ -59,6 +59,18 @@ public class MenuFragment extends Fragment{ if(mobile){ parent.fill(c -> c.bottom().left().addButton("", Styles.infot, ui.about::show).size(84, 45)); parent.fill(c -> c.bottom().right().addButton("", Styles.discordt, ui.discord::show).size(84, 45)); + }else if(becontrol.active()){ + parent.fill(c -> c.bottom().right().addImageTextButton("$be.check", Icon.refreshSmall, () -> { + ui.loadfrag.show(); + becontrol.checkUpdate(result -> { + ui.loadfrag.hide(); + if(!result){ + ui.showInfo("$be.noupdates"); + } + }); + }).size(200, 60).update(t -> { + t.getLabel().setColor(becontrol.isUpdateAvailable() ? Tmp.c1.set(Color.white).lerp(Pal.accent, Mathf.absin(5f, 1f)) : Color.white); + })); } String versionText = "[#ffffffba]" + ((Version.build == -1) ? "[#fc8140aa]custom build" : (Version.type.equals("official") ? Version.modifier : Version.type) + " build " + Version.build + (Version.revision == 0 ? "" : "." + Version.revision)); diff --git a/core/src/mindustry/world/Tile.java b/core/src/mindustry/world/Tile.java index 0572c74286..119af5b8df 100644 --- a/core/src/mindustry/world/Tile.java +++ b/core/src/mindustry/world/Tile.java @@ -257,7 +257,7 @@ public class Tile implements Position, TargetTrait{ } public boolean solid(){ - return block.solid || block.isSolidFor(this) || (isLinked() && link().solid()); + return block.solid || block.isSolidFor(this) || (isLinked() && link() != this && link().solid()); } public boolean breakable(){ diff --git a/core/src/mindustry/world/blocks/production/SolidPump.java b/core/src/mindustry/world/blocks/production/SolidPump.java index 854d4be010..ac199c7b27 100644 --- a/core/src/mindustry/world/blocks/production/SolidPump.java +++ b/core/src/mindustry/world/blocks/production/SolidPump.java @@ -4,6 +4,7 @@ import arc.Core; import arc.graphics.g2d.Draw; import arc.graphics.g2d.TextureRegion; import arc.math.Mathf; +import arc.util.*; import mindustry.content.Fx; import mindustry.content.Liquids; import mindustry.entities.Effects; @@ -51,8 +52,8 @@ public class SolidPump extends Pump{ public void setBars(){ super.setBars(); bars.add("efficiency", entity -> new Bar(() -> - Core.bundle.formatFloat("bar.efficiency", - ((((SolidPumpEntity)entity).boost + 1f) * ((SolidPumpEntity)entity).warmup) * 100 * percentSolid(entity.tile.x, entity.tile.y), 1), + Core.bundle.formatFloat("bar.pumpspeed", + ((SolidPumpEntity)entity).lastPump / Time.delta() * 60, 1), () -> Pal.ammo, () -> ((SolidPumpEntity)entity).warmup)); } @@ -104,11 +105,13 @@ public class SolidPump extends Pump{ if(tile.entity.cons.valid() && typeLiquid(tile) < liquidCapacity - 0.001f){ float maxPump = Math.min(liquidCapacity - typeLiquid(tile), pumpAmount * entity.delta() * fraction * entity.efficiency()); tile.entity.liquids.add(result, maxPump); + entity.lastPump = maxPump; entity.warmup = Mathf.lerpDelta(entity.warmup, 1f, 0.02f); if(Mathf.chance(entity.delta() * updateEffectChance)) Effects.effect(updateEffect, entity.x + Mathf.range(size * 2f), entity.y + Mathf.range(size * 2f)); }else{ entity.warmup = Mathf.lerpDelta(entity.warmup, 0f, 0.02f); + entity.lastPump = 0f; } entity.pumpTime += entity.warmup * entity.delta(); @@ -153,5 +156,6 @@ public class SolidPump extends Pump{ public float warmup; public float pumpTime; public float boost; + public float lastPump; } } diff --git a/gradle.properties b/gradle.properties index 19101944cf..0b0bc673e4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=60a9ebe264f92f2c3082596c77b9ab29474c4a7f +archash=0e25944f7f3a065ed6707f0dbe48548980cad8a6 diff --git a/run-server b/run-server index 0358cb521b..25a8254723 100755 --- a/run-server +++ b/run-server @@ -5,4 +5,12 @@ if [[ $# -eq 0 ]] ; then fi ./gradlew server:dist -Pbuildversion=$1 + +while true; do +#auto-restart until ctrl-c or exit 0 java -jar -XX:+HeapDumpOnOutOfMemoryError server/build/libs/server-release.jar +excode=$? +if [ $excode -eq 0 ] || [ $excode -eq 130 ]; then + exit 0 +fi +done diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index 3637ac972e..f1dbb59803 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -40,7 +40,6 @@ import static mindustry.Vars.*; public class ServerControl implements ApplicationListener{ private static final int roundExtraTime = 12; private static final int maxLogLength = 1024 * 512; - private static final int commandSocketPort = 6859; protected static String[] tags = {"&lc&fb[D]", "&lg&fb[I]", "&ly&fb[W]", "&lr&fb[E]", ""}; protected static DateTimeFormatter dateTime = DateTimeFormatter.ofPattern("MM-dd-yyyy | HH:mm:ss"); @@ -64,10 +63,6 @@ public class ServerControl implements ApplicationListener{ "bans", "", "admins", "", "shufflemode", "custom", - "crashreport", false, - "port", port, - "logging", true, - "socket", false, "globalrules", "{reactorExplosions: false}" ); @@ -75,7 +70,7 @@ public class ServerControl implements ApplicationListener{ String result = "[" + dateTime.format(LocalDateTime.now()) + "] " + format(tags[level.ordinal()] + " " + text + "&fr", args1); System.out.println(result); - if(Core.settings.getBool("logging")){ + if(Config.logging.bool()){ logToFile("[" + dateTime.format(LocalDateTime.now()) + "] " + format(tags[level.ordinal()] + " " + text + "&fr", false, args1)); } @@ -158,16 +153,19 @@ public class ServerControl implements ApplicationListener{ } }); + Events.on(Trigger.socketConfigChanged, () -> { + toggleSocket(false); + toggleSocket(Config.socketInput.bool()); + }); + if(!mods.list().isEmpty()){ info("&lc{0} mods loaded.", mods.list().size); } + toggleSocket(Config.socketInput.bool()); + info("&lcServer loaded. Type &ly'help'&lc for help."); System.out.print("> "); - - if(Core.settings.getBool("socket")){ - toggleSocket(true); - } } private void registerCommands(){ @@ -247,21 +245,6 @@ public class ServerControl implements ApplicationListener{ } }); - handler.register("port", "[port]", "Sets or displays the port for hosting the server.", arg -> { - if(arg.length == 0){ - info("&lyPort: &lc{0}", Core.settings.getInt("port")); - }else{ - int port = Strings.parseInt(arg[0]); - if(port < 0 || port > 65535){ - err("Port must be a number between 0 and 65535."); - return; - } - info("&lyPort set to {0}.", port); - Core.settings.put("port", port); - Core.settings.save(); - } - }); - handler.register("maps", "Display all available maps.", arg -> { if(!maps.all().isEmpty()){ info("Maps:"); @@ -440,16 +423,6 @@ public class ServerControl implements ApplicationListener{ }); - handler.register("name", "[name...]", "Change the server display name.", arg -> { - if(arg.length == 0){ - info("Server name is currently &lc'{0}'.", Core.settings.getString("servername")); - return; - } - Core.settings.put("servername", arg[0]); - Core.settings.save(); - info("Server name is now &lc'{0}'.", arg[0]); - }); - handler.register("playerlimit", "[off/somenumber]", "Set the server player limit.", arg -> { if(arg.length == 0){ info("Player limit is currently &lc{0}.", netServer.admins.getPlayerLimit() == 0 ? "off" : netServer.admins.getPlayerLimit()); @@ -470,14 +443,40 @@ public class ServerControl implements ApplicationListener{ } }); - handler.register("whitelist", "[on/off...]", "Enable/disable whitelisting.", arg -> { + handler.register("config", "[name] [value]", "Configure server settings.", arg -> { if(arg.length == 0){ - info("Whitelist is currently &lc{0}.", netServer.admins.isWhitelistEnabled() ? "on" : "off"); + info("&lyAll config values:"); + for(Config c : Config.all){ + Log.info("&ly| &lc{0}:&lm {1}", c.name(), c.get()); + Log.info("&ly| | {0}", c.description); + Log.info("&ly|"); + } return; } - boolean on = arg[0].equalsIgnoreCase("on"); - netServer.admins.setWhitelist(on); - info("Whitelist is now &lc{0}.", on ? "on" : "off"); + + try{ + Config c = Config.valueOf(arg[0]); + if(arg.length == 1){ + Log.info("&lc'{0}'&lg is currently &lc{0}.", c.name(), c.get()); + }else{ + if(c.isBool()){ + c.set(arg[1].equals("on") || arg[1].equals("true")); + }else if(c.isNum()){ + try{ + c.set(Integer.parseInt(arg[1])); + }catch(NumberFormatException e){ + Log.err("Not a valid number: {0}", arg[1]); + return; + } + }else if(c.isString()){ + c.set(arg[1]); + } + + Log.info("&lc{0}&lg set to &lc{1}.", c.name(), c.get()); + } + }catch(IllegalArgumentException e){ + err("Unknown config: '{0}'. Run the command with no arguments to get a list of valid configs.", arg[0]); + } }); handler.register("whitelisted", "List the entire whitelist.", arg -> { @@ -512,67 +511,6 @@ public class ServerControl implements ApplicationListener{ info("Player &ly'{0}'&lg has been un-whitelisted.", info.lastName); }); - handler.register("sync", "[on/off...]", "Enable/disable block sync. Experimental.", arg -> { - if(arg.length == 0){ - info("Block sync is currently &lc{0}.", Core.settings.getBool("blocksync") ? "enabled" : "disabled"); - return; - } - boolean on = arg[0].equalsIgnoreCase("on"); - Core.settings.putSave("blocksync", on); - info("Block syncing is now &lc{0}.", on ? "on" : "off"); - }); - - handler.register("crashreport", "", "Disables or enables automatic crash reporting", arg -> { - boolean value = arg[0].equalsIgnoreCase("on"); - Core.settings.put("crashreport", value); - Core.settings.save(); - info("Crash reporting is now {0}.", value ? "on" : "off"); - }); - - handler.register("logging", "", "Disables or enables server logs", arg -> { - boolean value = arg[0].equalsIgnoreCase("on"); - Core.settings.put("logging", value); - Core.settings.save(); - info("Logging is now {0}.", value ? "on" : "off"); - }); - - handler.register("strict", "", "Disables or enables strict mode", arg -> { - boolean value = arg[0].equalsIgnoreCase("on"); - netServer.admins.setStrict(value); - info("Strict mode is now {0}.", netServer.admins.getStrict() ? "on" : "off"); - }); - - handler.register("socketinput", "[on/off]", "Disables or enables a local TCP socket at port "+commandSocketPort+" to recieve commands from other applications", arg -> { - if(arg.length == 0){ - info("Socket input is currently &lc{0}.", Core.settings.getBool("socket") ? "on" : "off"); - return; - } - - boolean value = arg[0].equalsIgnoreCase("on"); - toggleSocket(value); - Core.settings.put("socket", value); - Core.settings.save(); - info("Socket input is now &lc{0}.", value ? "on" : "off"); - }); - - handler.register("allow-custom-clients", "[on/off]", "Allow or disallow custom clients.", arg -> { - if(arg.length == 0){ - info("Custom clients are currently &lc{0}.", netServer.admins.allowsCustomClients() ? "allowed" : "disallowed"); - return; - } - - String s = arg[0]; - if(s.equalsIgnoreCase("on")){ - netServer.admins.setCustomClients(true); - info("Custom clients enabled."); - }else if(s.equalsIgnoreCase("off")){ - netServer.admins.setCustomClients(false); - info("Custom clients disabled."); - }else{ - err("Incorrect command usage."); - } - }); - handler.register("shuffle", "[none/all/custom/builtin]", "Set map shuffling mode.", arg -> { if(arg.length == 0){ info("Shuffle mode current set to &ly'{0}'&lg.", maps.getShuffleMode()); @@ -933,8 +871,8 @@ public class ServerControl implements ApplicationListener{ private void host(){ try{ - net.host(Core.settings.getInt("port")); - info("&lcOpened a server on port {0}.", Core.settings.getInt("port")); + net.host(Config.port.num()); + info("&lcOpened a server on port {0}.", Config.port.num()); }catch(BindException e){ Log.err("Unable to host: Port already in use! Make sure no other servers are running on the same port in your network."); state.set(State.menu); @@ -968,7 +906,7 @@ public class ServerControl implements ApplicationListener{ socketThread = new Thread(() -> { try{ serverSocket = new ServerSocket(); - serverSocket.bind(new InetSocketAddress("localhost", commandSocketPort)); + serverSocket.bind(new InetSocketAddress(Config.socketInputAddress.string(), Config.socketInputPort.num())); while(true){ Socket client = serverSocket.accept(); info("&lmRecieved command socket connection: &lb{0}", serverSocket.getLocalSocketAddress()); From 179bf4d525dbe3f4bf23df9e837a95f7b291fc70 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Dec 2019 16:34:35 -0500 Subject: [PATCH 19/78] Added BE-specific server list --- core/src/mindustry/Vars.java | 4 +++- core/src/mindustry/net/BeControl.java | 3 ++- core/src/mindustry/ui/dialogs/JoinDialog.java | 2 +- servers_be.json | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 servers_be.json diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index 2cfa4bad45..80e6241e09 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -54,8 +54,10 @@ public class Vars implements Loadable{ public static final String crashReportURL = "http://192.99.169.18/report"; /** URL the links to the wiki's modding guide.*/ public static final String modGuideURL = "https://mindustrygame.github.io/wiki/modding/"; - /** URL to the JSON file containing all the global, public servers. */ + /** URL to the JSON file containing all the global, public servers. Not queried in BE. */ public static final String serverJsonURL = "https://raw.githubusercontent.com/Anuken/Mindustry/master/servers.json"; + /** URL to the JSON file containing all the BE servers. Only queried in BE. */ + public static final String serverJsonBeURL = "https://raw.githubusercontent.com/Anuken/Mindustry/master/servers_be.json"; /** URL the links to the wiki's modding guide.*/ public static final String reportIssueURL = "https://github.com/Anuken/Mindustry/issues/new?template=bug_report.md"; /** list of built-in servers.*/ diff --git a/core/src/mindustry/net/BeControl.java b/core/src/mindustry/net/BeControl.java index d81c5e721d..4de581108f 100644 --- a/core/src/mindustry/net/BeControl.java +++ b/core/src/mindustry/net/BeControl.java @@ -117,6 +117,7 @@ public class BeControl{ Log.info("&lcAuto-downloading next version..."); try{ + //download new file from github Fi source = Fi.get(BeControl.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath()); Fi dest = source.sibling("server-be-" + updateBuild + ".jar"); @@ -126,6 +127,7 @@ public class BeControl{ () -> false, () -> { Log.info("&lcVersion downloaded, exiting. Note that if you are not using the run-server script, the server will not restart automatically."); + //replace old file with new dest.copyTo(source); dest.delete(); System.exit(2); //this will cause a restart if using the script @@ -136,7 +138,6 @@ public class BeControl{ } } checkUpdates = false; - //todo server updates } } diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java index 4c8ae3cc58..8984939bcf 100644 --- a/core/src/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/mindustry/ui/dialogs/JoinDialog.java @@ -362,7 +362,7 @@ public class JoinDialog extends FloatingDialog{ servers = Core.settings.getObject("server-list", Array.class, Array::new); //get servers - Core.net.httpGet(serverJsonURL, result -> { + Core.net.httpGet(becontrol.active() ? serverJsonBeURL : serverJsonURL, result -> { try{ Jval val = Jval.read(result.getResultAsString()); Core.app.post(() -> { diff --git a/servers_be.json b/servers_be.json new file mode 100644 index 0000000000..0637a088a0 --- /dev/null +++ b/servers_be.json @@ -0,0 +1 @@ +[] \ No newline at end of file From d3c559fa0061a26963e0daeee6261331f77dda19 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Dec 2019 17:33:17 -0500 Subject: [PATCH 20/78] Moved server run scripts --- core/src/mindustry/net/Administration.java | 2 +- core/src/mindustry/net/BeControl.java | 2 +- server/run-jar | 19 +++++++++++++++++++ run-server => server/run-server | 11 ++++++++++- 4 files changed, 31 insertions(+), 3 deletions(-) create mode 100755 server/run-jar rename run-server => server/run-server (81%) diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java index 157566a5c3..268e8d089f 100644 --- a/core/src/mindustry/net/Administration.java +++ b/core/src/mindustry/net/Administration.java @@ -319,7 +319,7 @@ public class Administration{ public enum Config{ name("The server name as displayed on clients.", "Server", "servername"), port("The port to host on.", Vars.port), - autoUpdate("Whether to auto-restart when a new update arrives.", false), + autoUpdate("Whether to auto-update and exit when a new bleeding-edge update arrives.", false), crashReport("Whether to send crash reports.", false, "crashreport"), logging("Whether to log everything to files.", true), strict("Whether strict mode is on - corrects positions and prevents duplicate UUIDs.", true), diff --git a/core/src/mindustry/net/BeControl.java b/core/src/mindustry/net/BeControl.java index 4de581108f..bce61a1663 100644 --- a/core/src/mindustry/net/BeControl.java +++ b/core/src/mindustry/net/BeControl.java @@ -126,7 +126,7 @@ public class BeControl{ progress -> {}, () -> false, () -> { - Log.info("&lcVersion downloaded, exiting. Note that if you are not using the run-server script, the server will not restart automatically."); + Log.info("&lcVersion downloaded, exiting. Note that if you are not using a auto-restart script, the server will not restart automatically."); //replace old file with new dest.copyTo(source); dest.delete(); diff --git a/server/run-jar b/server/run-jar new file mode 100755 index 0000000000..2ab341566f --- /dev/null +++ b/server/run-jar @@ -0,0 +1,19 @@ +#!/usr/bin/env bash +if [[ $# -eq 0 ]] ; then + echo 'A server jar must be supplied as the first argument.' + exit 1 +fi + +if [[ ! -e $1 ]] ; then + echo "The supplied jar file '$1' must exist." + exit 1 +fi + +while true; do +#auto-restart until ctrl-c or exit 0 +java -jar -XX:+HeapDumpOnOutOfMemoryError $1 +excode=$? +if [ $excode -eq 0 ] || [ $excode -eq 130 ]; then + exit 0 +fi +done diff --git a/run-server b/server/run-server similarity index 81% rename from run-server rename to server/run-server index 25a8254723..4e337686a0 100755 --- a/run-server +++ b/server/run-server @@ -4,13 +4,22 @@ if [[ $# -eq 0 ]] ; then exit 1 fi +cd .. + ./gradlew server:dist -Pbuildversion=$1 +excode=$? + +if [ $excode -ne 0 ]; then + echo $excode + exit 1 +fi + while true; do #auto-restart until ctrl-c or exit 0 java -jar -XX:+HeapDumpOnOutOfMemoryError server/build/libs/server-release.jar excode=$? if [ $excode -eq 0 ] || [ $excode -eq 130 ]; then - exit 0 + exit 0 fi done From e0f59404c1ac46c7e074fa91428b64696a164a4a Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Dec 2019 17:49:49 -0500 Subject: [PATCH 21/78] Added BE server --- servers_be.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/servers_be.json b/servers_be.json index 0637a088a0..be72d9d6da 100644 --- a/servers_be.json +++ b/servers_be.json @@ -1 +1,5 @@ -[] \ No newline at end of file +[ + { + "address": "mindustry.us.to:6568" + } +] \ No newline at end of file From 60d83751e87122d1e80ebedceda61ef5b3168218 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Dec 2019 17:55:00 -0500 Subject: [PATCH 22/78] Fixed server port not being parsed --- core/src/mindustry/ui/dialogs/JoinDialog.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java index 8984939bcf..8ab0ff8fd2 100644 --- a/core/src/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/mindustry/ui/dialogs/JoinDialog.java @@ -288,7 +288,13 @@ public class JoinDialog extends FloatingDialog{ local.table(Tex.button, t -> t.label(() -> "[accent]" + Core.bundle.get("hosts.discovering.any") + Strings.animated(Time.time(), 4, 10f, ".")).pad(10f)).growX(); net.discoverServers(this::addLocalHost, this::finishLocalHosts); for(String host : defaultServers){ - net.pingHost(host, port, this::addLocalHost, e -> {}); + String address = host; + int p = port; + if(host.contains(":")){ + address = host.split(":")[0]; + p = Strings.parseInt(host.split(":")[1]); + } + net.pingHost(address, p, this::addLocalHost, e -> {}); } } From 7543d92473e79d3957740cc07523d05adfe186c1 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Dec 2019 18:05:45 -0500 Subject: [PATCH 23/78] Added startup commands to server --- core/src/mindustry/net/Administration.java | 1 + server/src/mindustry/server/ServerControl.java | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java index 268e8d089f..57a728a020 100644 --- a/core/src/mindustry/net/Administration.java +++ b/core/src/mindustry/net/Administration.java @@ -320,6 +320,7 @@ public class Administration{ name("The server name as displayed on clients.", "Server", "servername"), port("The port to host on.", Vars.port), autoUpdate("Whether to auto-update and exit when a new bleeding-edge update arrives.", false), + startCommands("Commands run at startup. This should be a comma-separated list.", ""), crashReport("Whether to send crash reports.", false, "crashreport"), logging("Whether to log everything to files.", true), strict("Whether strict mode is on - corrects positions and prevents duplicate UUIDs.", true), diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index f1dbb59803..619004f79f 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -90,11 +90,17 @@ public class ServerControl implements ApplicationListener{ registerCommands(); Core.app.post(() -> { - String[] commands = {}; + Array commands = new Array<>(); if(args.length > 0){ - commands = Strings.join(" ", args).split(","); - info("&lmFound {0} command-line arguments to parse.", commands.length); + commands.addAll(Strings.join(" ", args).split(",")); + info("&lmFound {0} command-line arguments to parse.", commands.size); + } + + if(!Config.startCommands.string().isEmpty()){ + String[] startup = Strings.join(" ", Config.startCommands.string()).split(","); + info("&lmFound {0} startup commands.", startup.length); + commands.addAll(startup); } for(String s : commands){ @@ -102,7 +108,6 @@ public class ServerControl implements ApplicationListener{ if(response.type != ResponseType.valid){ err("Invalid command argument sent: '{0}': {1}", s, response.type.name()); err("Argument usage: &lc , "); - System.exit(1); } } }); @@ -443,7 +448,7 @@ public class ServerControl implements ApplicationListener{ } }); - handler.register("config", "[name] [value]", "Configure server settings.", arg -> { + handler.register("config", "[name] [value...]", "Configure server settings.", arg -> { if(arg.length == 0){ info("&lyAll config values:"); for(Config c : Config.all){ From 497ae740aae893c8e842eccead533eddac2a7fd9 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Dec 2019 18:12:34 -0500 Subject: [PATCH 24/78] Removed pointless "> " --- core/src/mindustry/net/BeControl.java | 1 + server/src/mindustry/server/ServerControl.java | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/core/src/mindustry/net/BeControl.java b/core/src/mindustry/net/BeControl.java index bce61a1663..76fa81f310 100644 --- a/core/src/mindustry/net/BeControl.java +++ b/core/src/mindustry/net/BeControl.java @@ -84,6 +84,7 @@ public class BeControl{ if(!updateAvailable) return; if(!headless){ + checkUpdates = false; ui.showCustomConfirm(Core.bundle.format("be.update", "") + " " + updateBuild, "$be.update.confirm", "$ok", "$be.ignore", () -> { boolean[] cancel = {false}; float[] progress = {0}; diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index 619004f79f..655e7951b5 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -170,7 +170,6 @@ public class ServerControl implements ApplicationListener{ toggleSocket(Config.socketInput.bool()); info("&lcServer loaded. Type &ly'help'&lc for help."); - System.out.print("> "); } private void registerCommands(){ @@ -822,8 +821,6 @@ public class ServerControl implements ApplicationListener{ }else if(response.type == ResponseType.manyArguments){ err("Too many command arguments. Usage: " + response.command.text + " " + response.command.paramText); } - - System.out.print("> "); } private void play(boolean wait, Runnable run){ From b01d56aae84bfd3282d23248642058c3ec6448f4 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Dec 2019 18:22:20 -0500 Subject: [PATCH 25/78] Bugfixes --- core/src/mindustry/net/Host.java | 3 ++- core/src/mindustry/ui/dialogs/JoinDialog.java | 15 +++++++-------- server/src/mindustry/server/ServerControl.java | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/src/mindustry/net/Host.java b/core/src/mindustry/net/Host.java index 387fafc043..5c3b010c45 100644 --- a/core/src/mindustry/net/Host.java +++ b/core/src/mindustry/net/Host.java @@ -1,5 +1,6 @@ package mindustry.net; +import mindustry.*; import mindustry.game.*; public class Host{ @@ -11,7 +12,7 @@ public class Host{ public final int version; public final String versionType; public final Gamemode mode; - public int ping; + public int ping, port = Vars.port; public Host(String name, String address, String mapname, int wave, int players, int version, String versionType, Gamemode mode, int playerLimit){ this.name = name; diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java index 8ab0ff8fd2..d3e154b3b1 100644 --- a/core/src/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/mindustry/ui/dialogs/JoinDialog.java @@ -288,13 +288,12 @@ public class JoinDialog extends FloatingDialog{ local.table(Tex.button, t -> t.label(() -> "[accent]" + Core.bundle.get("hosts.discovering.any") + Strings.animated(Time.time(), 4, 10f, ".")).pad(10f)).growX(); net.discoverServers(this::addLocalHost, this::finishLocalHosts); for(String host : defaultServers){ - String address = host; - int p = port; - if(host.contains(":")){ - address = host.split(":")[0]; - p = Strings.parseInt(host.split(":")[1]); - } - net.pingHost(address, p, this::addLocalHost, e -> {}); + String resaddress = host.contains(":") ? host.split(":")[0] : host; + int resport = host.contains(":") ? Strings.parseInt(host.split(":")[1]) : port; + net.pingHost(resaddress, resport, res -> { + res.port = resport; + addLocalHost(res); + }, e -> {}); } } @@ -320,7 +319,7 @@ public class JoinDialog extends FloatingDialog{ local.row(); - TextButton button = local.addButton("", Styles.cleart, () -> safeConnect(host.address, port, host.version)) + TextButton button = local.addButton("", Styles.cleart, () -> safeConnect(host.address, host.port, host.version)) .width(w).pad(5f).get(); button.clearChildren(); buildServer(host, button); diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index 655e7951b5..df70cf3c0a 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -461,7 +461,7 @@ public class ServerControl implements ApplicationListener{ try{ Config c = Config.valueOf(arg[0]); if(arg.length == 1){ - Log.info("&lc'{0}'&lg is currently &lc{0}.", c.name(), c.get()); + Log.info("&lc'{0}'&lg is currently &lc{1}.", c.name(), c.get()); }else{ if(c.isBool()){ c.set(arg[1].equals("on") || arg[1].equals("true")); From 8c941c7165d100dc1952e65fbed254dd0757d8d9 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Dec 2019 21:34:20 -0500 Subject: [PATCH 26/78] Added update trigger / Server moddability tweaks --- core/assets/bundles/bundle.properties | 1 + core/src/mindustry/core/Logic.java | 3 ++- core/src/mindustry/core/NetServer.java | 1 - core/src/mindustry/game/EventType.java | 3 ++- core/src/mindustry/game/Rules.java | 2 ++ core/src/mindustry/net/BeControl.java | 8 +++++-- core/src/mindustry/net/Packets.java | 3 ++- .../src/mindustry/server/ServerControl.java | 24 +++++++++---------- 8 files changed, 26 insertions(+), 19 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 2b2a1aa548..0ee7e3bd4e 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -155,6 +155,7 @@ server.kicked.nameEmpty = Your chosen name is invalid. server.kicked.idInUse = You are already on this server! Connecting with two accounts is not permitted. server.kicked.customClient = This server does not support custom builds. Download an official version. server.kicked.gameover = Game over! +server.kicked.serverRestarting = The server is restarting. server.versions = Your version:[accent] {0}[]\nServer version:[accent] {1}[] host.info = The [accent]host[] button hosts a server on port [scarlet]6567[]. \nAnybody on the same [lightgray]wifi or local network[] should be able to see your server in their server list.\n\nIf you want people to be able to connect from anywhere by IP, [accent]port forwarding[] is required.\n\n[lightgray]Note: If someone is experiencing trouble connecting to your LAN game, make sure you have allowed Mindustry access to your local network in your firewall settings. Note that public networks sometimes do not allow server discovery. join.info = Here, you can enter a [accent]server IP[] to connect to, or discover [accent]local network[] servers to connect to.\nBoth LAN and WAN multiplayer is supported.\n\n[lightgray]Note: There is no automatic global server list; if you want to connect to someone by IP, you would need to ask the host for their IP. diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index 17fedab303..12761439b7 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -209,6 +209,7 @@ public class Logic implements ApplicationListener{ @Override public void update(){ + Events.fire(Trigger.update); if(!state.is(State.menu)){ if(!net.client()){ @@ -260,7 +261,7 @@ public class Logic implements ApplicationListener{ } } - if(!net.client() && !world.isInvalidMap() && !state.isEditor()){ + if(!net.client() && !world.isInvalidMap() && !state.isEditor() && !state.rules.canGameOver){ checkGameOver(); } } diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index c74f14211c..a355ecbd76 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -217,7 +217,6 @@ public class NetServer implements ApplicationListener{ //playing in pvp mode automatically assigns players to teams player.setTeam(assignTeam(player, playerGroup.all())); - Log.info("Auto-assigned player {0} to team {1}.", player.name, player.getTeam()); sendWorldData(player); diff --git a/core/src/mindustry/game/EventType.java b/core/src/mindustry/game/EventType.java index 6cbaba5e4b..5a9950b489 100644 --- a/core/src/mindustry/game/EventType.java +++ b/core/src/mindustry/game/EventType.java @@ -29,7 +29,8 @@ public class EventType{ suicideBomb, openWiki, teamCoreDamage, - socketConfigChanged + socketConfigChanged, + update } public static class WinEvent{} diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java index 93ceaf5cfe..06231e5318 100644 --- a/core/src/mindustry/game/Rules.java +++ b/core/src/mindustry/game/Rules.java @@ -70,6 +70,8 @@ public class Rules{ public boolean editor = false; /** Whether the tutorial is enabled. False by default. */ public boolean tutorial = false; + /** Whether a gameover can happen at all. Set this to false to implement custom gameover conditions. */ + public boolean canGameOver = true; /** Starting items put in cores */ public Array loadout = Array.with(ItemStack.with(Items.copper, 100)); /** Blocks that cannot be placed. */ diff --git a/core/src/mindustry/net/BeControl.java b/core/src/mindustry/net/BeControl.java index 76fa81f310..13f645b996 100644 --- a/core/src/mindustry/net/BeControl.java +++ b/core/src/mindustry/net/BeControl.java @@ -11,6 +11,7 @@ import mindustry.core.*; import mindustry.gen.*; import mindustry.graphics.*; import mindustry.net.Administration.*; +import mindustry.net.Packets.*; import mindustry.ui.*; import mindustry.ui.dialogs.*; @@ -126,13 +127,16 @@ public class BeControl{ len -> Core.app.post(() -> Log.info("&ly| Size: {0} MB.", Strings.fixed((float)len / 1024 / 1024, 2))), progress -> {}, () -> false, - () -> { + () -> Core.app.post(() -> { + netServer.kickAll(KickReason.serverRestarting); + Threads.sleep(32); + Log.info("&lcVersion downloaded, exiting. Note that if you are not using a auto-restart script, the server will not restart automatically."); //replace old file with new dest.copyTo(source); dest.delete(); System.exit(2); //this will cause a restart if using the script - }, + }), Throwable::printStackTrace); }catch(Exception e){ e.printStackTrace(); diff --git a/core/src/mindustry/net/Packets.java b/core/src/mindustry/net/Packets.java index 683983d69b..98a3bad857 100644 --- a/core/src/mindustry/net/Packets.java +++ b/core/src/mindustry/net/Packets.java @@ -15,7 +15,8 @@ public class Packets{ public enum KickReason{ kick, clientOutdated, serverOutdated, banned, gameover(true), recentKick, - nameInUse, idInUse, nameEmpty, customClient, serverClose, vote, typeMismatch, whitelist, playerLimit; + nameInUse, idInUse, nameEmpty, customClient, serverClose, vote, typeMismatch, + whitelist, playerLimit, serverRestarting; public final boolean quiet; diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index df70cf3c0a..094d020e78 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -163,6 +163,15 @@ public class ServerControl implements ApplicationListener{ toggleSocket(Config.socketInput.bool()); }); + Events.on(PlayEvent.class, e -> { + try{ + JsonValue value = JsonIO.json().fromJson(null, Core.settings.getString("globalrules")); + JsonIO.json().readFields(state.rules, value); + }catch(Throwable t){ + Log.err("Error applying custom rules, proceeding without them.", t); + } + }); + if(!mods.list().isEmpty()){ info("&lc{0} mods loaded.", mods.list().size); } @@ -238,7 +247,6 @@ public class ServerControl implements ApplicationListener{ try{ world.loadMap(result, result.applyRules(lastMode)); state.rules = result.applyRules(preset); - applyRules(); logic.play(); info("Map loaded."); @@ -390,7 +398,7 @@ public class ServerControl implements ApplicationListener{ base.addChild(arg[1], value); Log.info("Changed rule: &ly{0}", value.toString().replace("\n", " ")); }catch(Throwable e){ - Log.err("Error parsing rule JSON", e); + Log.err("Error parsing rule JSON: {0}", e.getMessage()); } } @@ -777,15 +785,6 @@ public class ServerControl implements ApplicationListener{ mods.eachClass(p -> p.registerClientCommands(netServer.clientCommands)); } - private void applyRules(){ - try{ - JsonValue value = JsonIO.json().fromJson(null, Core.settings.getString("globalrules")); - JsonIO.json().readFields(state.rules, value); - }catch(Throwable t){ - Log.err("Error applying custom rules, proceeding without them.", t); - } - } - private void readCommands(){ Scanner scan = new Scanner(System.in); @@ -836,9 +835,8 @@ public class ServerControl implements ApplicationListener{ Call.onWorldDataBegin(); run.run(); - logic.play(); state.rules = world.getMap().applyRules(lastMode); - applyRules(); + logic.play(); for(Player p : players){ if(p.con == null) continue; From df4a0dd5e4b40c2ad4b97ddfa31d3e177b7b11f4 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 28 Dec 2019 22:18:16 -0500 Subject: [PATCH 27/78] Added openServer method --- core/src/mindustry/core/NetServer.java | 21 +++++++++++++++++-- .../src/mindustry/server/ServerControl.java | 17 ++------------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index a355ecbd76..b37ab7a57a 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -1,14 +1,14 @@ package mindustry.core; import arc.*; -import mindustry.annotations.Annotations.*; -import arc.struct.*; import arc.graphics.*; import arc.math.*; import arc.math.geom.*; +import arc.struct.*; import arc.util.*; import arc.util.CommandHandler.*; import arc.util.io.*; +import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.core.GameState.*; import mindustry.entities.*; @@ -26,9 +26,11 @@ import mindustry.world.*; import mindustry.world.blocks.storage.CoreBlock.*; import java.io.*; +import java.net.*; import java.nio.*; import java.util.zip.*; +import static arc.util.Log.*; import static mindustry.Vars.*; public class NetServer implements ApplicationListener{ @@ -598,6 +600,7 @@ public class NetServer implements ApplicationListener{ return false; } + @Override public void update(){ if(!headless && !closing && net.server() && state.is(State.menu)){ @@ -615,6 +618,20 @@ public class NetServer implements ApplicationListener{ } } + /** Should only be used on the headless backend. */ + public void openServer(){ + try{ + net.host(Config.port.num()); + info("&lcOpened a server on port {0}.", Config.port.num()); + }catch(BindException e){ + Log.err("Unable to host: Port already in use! Make sure no other servers are running on the same port in your network."); + state.set(State.menu); + }catch(IOException e){ + err(e); + state.set(State.menu); + } + } + public void kickAll(KickReason reason){ for(NetConnection con : net.getConnections()){ con.kick(reason); diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index 094d020e78..352331f80c 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -251,7 +251,7 @@ public class ServerControl implements ApplicationListener{ info("Map loaded."); - host(); + netServer.openServer(); }catch(MapException e){ Log.err(e.map.name() + ": " + e.getMessage()); } @@ -711,8 +711,8 @@ public class ServerControl implements ApplicationListener{ SaveIO.load(file); state.rules.zone = null; info("Save loaded."); - host(); state.set(State.playing); + netServer.openServer(); }catch(Throwable t){ err("Failed to load save. Outdated or corrupt file."); } @@ -869,19 +869,6 @@ public class ServerControl implements ApplicationListener{ } } - private void host(){ - try{ - net.host(Config.port.num()); - info("&lcOpened a server on port {0}.", Config.port.num()); - }catch(BindException e){ - Log.err("Unable to host: Port already in use! Make sure no other servers are running on the same port in your network."); - state.set(State.menu); - }catch(IOException e){ - err(e); - state.set(State.menu); - } - } - private void logToFile(String text){ if(currentLogFile != null && currentLogFile.length() > maxLogLength){ String date = DateTimeFormatter.ofPattern("MM-dd-yyyy | HH:mm:ss").format(LocalDateTime.now()); From 77b89d45d69f811c92d1124a25f3d23563638a54 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Dec 2019 00:09:46 -0500 Subject: [PATCH 28/78] Cleanup / Desktop dead camera panning --- core/src/mindustry/core/Renderer.java | 2 +- core/src/mindustry/entities/EntityGroup.java | 11 ++++++++-- core/src/mindustry/input/DesktopInput.java | 7 +++++++ .../world/blocks/defense/ForceProjector.java | 21 ++----------------- gradle.properties | 2 +- 5 files changed, 20 insertions(+), 23 deletions(-) diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java index d4983e992a..9c284a5f06 100644 --- a/core/src/mindustry/core/Renderer.java +++ b/core/src/mindustry/core/Renderer.java @@ -125,7 +125,7 @@ public class Renderer implements ApplicationListener{ TileEntity core = player.getClosestCore(); if(core != null && player.spawner == null){ camera.position.lerpDelta(core.x, core.y, 0.08f); - }else{ + }else if(core != null){ camera.position.lerpDelta(position, 0.08f); } }else if(control.input instanceof DesktopInput){ diff --git a/core/src/mindustry/entities/EntityGroup.java b/core/src/mindustry/entities/EntityGroup.java index 8c0ac76442..24c3f0e4f0 100644 --- a/core/src/mindustry/entities/EntityGroup.java +++ b/core/src/mindustry/entities/EntityGroup.java @@ -7,11 +7,13 @@ import arc.graphics.*; import arc.math.geom.*; import mindustry.entities.traits.*; +import java.util.*; + import static mindustry.Vars.collisions; /** Represents a group of a certain type of entity.*/ @SuppressWarnings("unchecked") -public class EntityGroup{ +public class EntityGroup implements Iterable{ private final boolean useTree; private final int id; private final Class type; @@ -253,8 +255,13 @@ public class EntityGroup{ return null; } - /** Returns the logic-only array for iteration. */ + /** Returns the array for iteration. */ public Array all(){ return entityArray; } + + @Override + public Iterator iterator(){ + return entityArray.iterator(); + } } diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java index c76968a56e..df735999d8 100644 --- a/core/src/mindustry/input/DesktopInput.java +++ b/core/src/mindustry/input/DesktopInput.java @@ -10,6 +10,7 @@ import arc.scene.event.*; import arc.scene.ui.*; import arc.scene.ui.layout.*; import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.*; import mindustry.core.GameState.*; import mindustry.entities.traits.BuilderTrait.*; @@ -135,6 +136,12 @@ public class DesktopInput extends InputHandler{ ui.listfrag.toggle(); } + if(player.getClosestCore() == null){ + //move camera around + float camSpeed = 6f; + Core.camera.position.add(Tmp.v1.setZero().add(Core.input.axis(Binding.move_x), Core.input.axis(Binding.move_y)).nor().scl(Time.delta() * camSpeed)); + } + if(Core.input.keyRelease(Binding.select)){ player.isShooting = false; } diff --git a/core/src/mindustry/world/blocks/defense/ForceProjector.java b/core/src/mindustry/world/blocks/defense/ForceProjector.java index a417c2b9e5..36ed812b5d 100644 --- a/core/src/mindustry/world/blocks/defense/ForceProjector.java +++ b/core/src/mindustry/world/blocks/defense/ForceProjector.java @@ -5,6 +5,7 @@ import arc.func.*; import arc.graphics.*; import arc.graphics.g2d.*; import arc.math.*; +import arc.math.geom.*; import arc.util.*; import mindustry.content.*; import mindustry.entities.*; @@ -37,7 +38,7 @@ public class ForceProjector extends Block{ private static ForceProjector paramBlock; private static ForceEntity paramEntity; private static Cons shieldConsumer = trait -> { - if(trait.canBeAbsorbed() && trait.getTeam() != paramTile.getTeam() && paramBlock.isInsideHexagon(trait.getX(), trait.getY(), paramBlock.realRadius(paramEntity) * 2f, paramTile.drawx(), paramTile.drawy())){ + if(trait.canBeAbsorbed() && trait.getTeam() != paramTile.getTeam() && Intersector.isInsideHexagon(trait.getX(), trait.getY(), paramBlock.realRadius(paramEntity) * 2f, paramTile.drawx(), paramTile.drawy())){ trait.absorb(); Effects.effect(Fx.absorb, trait); paramEntity.hit = 1f; @@ -111,17 +112,6 @@ public class ForceProjector extends Block{ entity.warmup = Mathf.lerpDelta(entity.warmup, entity.efficiency(), 0.1f); -/* - if(entity.power.status < relativePowerDraw){ - entity.warmup = Mathf.lerpDelta(entity.warmup, 0f, 0.15f); - entity.power.status = 0f; - if(entity.warmup <= 0.09f){ - entity.broken = true; - } - }else{ - entity.warmup = Mathf.lerpDelta(entity.warmup, 1f, 0.1f); - }*/ - if(entity.buildup > 0){ float scale = !entity.broken ? cooldownNormal : cooldownBrokenBase; ConsumeLiquidFilter cons = consumes.get(ConsumeType.liquid); @@ -159,13 +149,6 @@ public class ForceProjector extends Block{ return (radius + entity.phaseHeat * phaseRadiusBoost) * entity.radscl; } - boolean isInsideHexagon(float x0, float y0, float d, float x, float y){ - float dx = Math.abs(x - x0) / d; - float dy = Math.abs(y - y0) / d; - float a = 0.25f * Mathf.sqrt3; - return (dy <= a) && (a * dx + 0.25 * dy <= 0.5 * a); - } - @Override public void draw(Tile tile){ super.draw(tile); diff --git a/gradle.properties b/gradle.properties index 0b0bc673e4..51de1f3142 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=0e25944f7f3a065ed6707f0dbe48548980cad8a6 +archash=fe82ca9037028044764cc4b02fdbf851e3d09f78 From e04c592f9eae9aa047b1b28a1589544f155b41da Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Dec 2019 00:40:25 -0500 Subject: [PATCH 29/78] Bugfixes --- core/src/mindustry/graphics/MinimapRenderer.java | 1 + core/src/mindustry/net/BeControl.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java index 60f3d2974b..5d8af45304 100644 --- a/core/src/mindustry/graphics/MinimapRenderer.java +++ b/core/src/mindustry/graphics/MinimapRenderer.java @@ -82,6 +82,7 @@ public class MinimapRenderer implements Disposable{ rect.set((dx - sz) * tilesize, (dy - sz) * tilesize, sz * 2 * tilesize, sz * 2 * tilesize); for(Unit unit : units){ + if(unit.isDead()) continue; float rx = (unit.x - rect.x) / rect.width * w; float ry = (unit.y - rect.y) / rect.width * h; diff --git a/core/src/mindustry/net/BeControl.java b/core/src/mindustry/net/BeControl.java index 13f645b996..ee084f743a 100644 --- a/core/src/mindustry/net/BeControl.java +++ b/core/src/mindustry/net/BeControl.java @@ -22,7 +22,7 @@ import static mindustry.Vars.*; /** Handles control of bleeding edge builds. */ public class BeControl{ - private static final int updateInterval = 60; + private static final int updateInterval = 60 * 2; private AsyncExecutor executor = new AsyncExecutor(1); private boolean checkUpdates = true; @@ -64,7 +64,6 @@ public class BeControl{ } }else{ Core.app.post(() -> done.get(false)); - Log.err("Update check responded with: {0}", res.getStatus()); } }, error -> { if(!headless){ From 730d30ef9829fb3e54032e694c4af464ce5860b2 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Dec 2019 11:40:52 -0500 Subject: [PATCH 30/78] Added core schematic selection setting --- core/assets/bundles/bundle.properties | 1 + core/src/mindustry/content/Blocks.java | 6 +++--- core/src/mindustry/content/Loadouts.java | 14 ++++---------- core/src/mindustry/game/Schematics.java | 11 ++++++++--- .../src/mindustry/ui/dialogs/SchematicsDialog.java | 2 +- .../mindustry/ui/dialogs/SettingsMenuDialog.java | 1 + 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 0ee7e3bd4e..73fee4471d 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -643,6 +643,7 @@ setting.screenshake.name = Screen Shake setting.effects.name = Display Effects setting.destroyedblocks.name = Display Destroyed Blocks setting.conveyorpathfinding.name = Conveyor Placement Pathfinding +setting.coreselect.name = Allow Schematic Cores setting.sensitivity.name = Controller Sensitivity setting.saveinterval.name = Save Interval setting.seconds = {0} seconds diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 8fe9cdb52f..58ff4a7c35 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1234,7 +1234,7 @@ public class Blocks implements ContentList{ //region storage coreShard = new CoreBlock("core-shard"){{ - requirements(Category.effect, BuildVisibility.debugOnly, ItemStack.with(Items.titanium, 4000)); + requirements(Category.effect, BuildVisibility.debugOnly, ItemStack.with()); alwaysUnlocked = true; health = 1100; @@ -1243,7 +1243,7 @@ public class Blocks implements ContentList{ }}; coreFoundation = new CoreBlock("core-foundation"){{ - requirements(Category.effect, BuildVisibility.debugOnly, ItemStack.with(Items.titanium, 400, Items.silicon, 3000)); + requirements(Category.effect, BuildVisibility.debugOnly, ItemStack.with()); health = 2000; itemCapacity = 9000; @@ -1251,7 +1251,7 @@ public class Blocks implements ContentList{ }}; coreNucleus = new CoreBlock("core-nucleus"){{ - requirements(Category.effect, BuildVisibility.debugOnly, ItemStack.with(Items.titanium, 4000, Items.silicon, 2000, Items.surgealloy, 3000)); + requirements(Category.effect, BuildVisibility.debugOnly, ItemStack.with()); health = 4000; itemCapacity = 13000; diff --git a/core/src/mindustry/content/Loadouts.java b/core/src/mindustry/content/Loadouts.java index 16252b686f..145da6120e 100644 --- a/core/src/mindustry/content/Loadouts.java +++ b/core/src/mindustry/content/Loadouts.java @@ -3,8 +3,6 @@ package mindustry.content; import mindustry.ctype.*; import mindustry.game.*; -import java.io.*; - public class Loadouts implements ContentList{ public static Schematic basicShard, @@ -14,13 +12,9 @@ public class Loadouts implements ContentList{ @Override public void load(){ - try{ - basicShard = Schematics.readBase64("bXNjaAB4nD2K2wqAIBiD5ymibnoRn6YnEP1BwUMoBL19FuJ2sbFvUFgYZDaJsLeQrkinN9UJHImsNzlYE7WrIUastuSbnlKx2VJJt+8IQGGKdfO/8J5yrGJSMegLg+YUIA=="); - advancedShard = Schematics.readBase64("bXNjaAB4nD2LjQqAIAyET7OMIOhFfJqeYMxBgSkYCL199gu33fFtB4tOwUTaBCP5QpHFzwtl32DahBeKK1NwPq8hoOcUixwpY+CUxe3XIwBbB/pa6tadVCUP02hgHvp5vZq/0b7pBHPYFOQ="); - basicFoundation = Schematics.readBase64("bXNjaAB4nD1OSQ6DMBBzFhVu8BG+0X8MQyoiJTNSukj8nlCi2Adbtg/GA4OBF8oB00rvyE/9ykafqOIw58A7SWRKy1ZiShhZ5RcOLZhYS1hefQ1gRIeptH9jq/qW2lvc1d2tgWsOfVX/tOwE86AYBA=="); - basicNucleus = Schematics.readBase64("bXNjaAB4nD2MUQqAIBBEJy0s6qOLdJXuYNtCgikYBd2+LNmdj308hkGHtkId7M4YFns4mk/yfB4a48602eDI+mlNznu0FMPFd0wYKCaewl8F0EOueqM+yKSLVfJrNKWnSw/FZGzEGXFG9sy/px4gEBW1"); - }catch(IOException e){ - throw new RuntimeException(e); - } + basicShard = Schematics.readBase64("bXNjaAB4nD2K2wqAIBiD5ymibnoRn6YnEP1BwUMoBL19FuJ2sbFvUFgYZDaJsLeQrkinN9UJHImsNzlYE7WrIUastuSbnlKx2VJJt+8IQGGKdfO/8J5yrGJSMegLg+YUIA=="); + advancedShard = Schematics.readBase64("bXNjaAB4nD2LjQqAIAyET7OMIOhFfJqeYMxBgSkYCL199gu33fFtB4tOwUTaBCP5QpHFzwtl32DahBeKK1NwPq8hoOcUixwpY+CUxe3XIwBbB/pa6tadVCUP02hgHvp5vZq/0b7pBHPYFOQ="); + basicFoundation = Schematics.readBase64("bXNjaAB4nD1OSQ6DMBBzFhVu8BG+0X8MQyoiJTNSukj8nlCi2Adbtg/GA4OBF8oB00rvyE/9ykafqOIw58A7SWRKy1ZiShhZ5RcOLZhYS1hefQ1gRIeptH9jq/qW2lvc1d2tgWsOfVX/tOwE86AYBA=="); + basicNucleus = Schematics.readBase64("bXNjaAB4nD2MUQqAIBBEJy0s6qOLdJXuYNtCgikYBd2+LNmdj308hkGHtkId7M4YFns4mk/yfB4a48602eDI+mlNznu0FMPFd0wYKCaewl8F0EOueqM+yKSLVfJrNKWnSw/FZGzEGXFG9sy/px4gEBW1"); } } diff --git a/core/src/mindustry/game/Schematics.java b/core/src/mindustry/game/Schematics.java index b30658692e..072f063e1f 100644 --- a/core/src/mindustry/game/Schematics.java +++ b/core/src/mindustry/game/Schematics.java @@ -339,7 +339,8 @@ public class Schematics implements Loadable{ for(int cy = oy; cy <= oy2; cy++){ Tile tile = world.ltile(cx, cy); - if(tile != null && tile.entity != null && !counted.contains(tile.pos()) && !(tile.block() instanceof BuildBlock) && tile.entity.block.isVisible()){ + if(tile != null && tile.entity != null && !counted.contains(tile.pos()) && !(tile.block() instanceof BuildBlock) + && (tile.entity.block.isVisible() || (tile.entity.block instanceof CoreBlock && Core.settings.getBool("coreselect")))){ int config = tile.entity.config(); if(tile.block().posConfig){ config = Pos.get(Pos.x(config) + offsetX, Pos.y(config) + offsetY); @@ -368,8 +369,12 @@ public class Schematics implements Loadable{ //region IO methods /** Loads a schematic from base64. May throw an exception. */ - public static Schematic readBase64(String schematic) throws IOException{ - return read(new ByteArrayInputStream(Base64Coder.decode(schematic))); + public static Schematic readBase64(String schematic){ + try{ + return read(new ByteArrayInputStream(Base64Coder.decode(schematic))); + }catch(IOException e){ + throw new RuntimeException(e); + } } public static Schematic read(Fi file) throws IOException{ diff --git a/core/src/mindustry/ui/dialogs/SchematicsDialog.java b/core/src/mindustry/ui/dialogs/SchematicsDialog.java index d12bc4af54..1747cdf2a0 100644 --- a/core/src/mindustry/ui/dialogs/SchematicsDialog.java +++ b/core/src/mindustry/ui/dialogs/SchematicsDialog.java @@ -163,7 +163,7 @@ public class SchematicsDialog extends FloatingDialog{ setup(); ui.showInfoFade("$schematic.saved"); showInfo(s); - }catch(Exception e){ + }catch(Throwable e){ ui.showException(e); } }).marginLeft(12f).disabled(b -> Core.app.getClipboardText() == null || !Core.app.getClipboardText().startsWith(schematicBaseStart)); diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java index 4c01c10abb..3ce8457ec1 100644 --- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -229,6 +229,7 @@ public class SettingsMenuDialog extends SettingsDialog{ game.checkPref("savecreate", true); game.checkPref("blockreplace", true); game.checkPref("conveyorpathfinding", true); + game.checkPref("coreselect", false); game.checkPref("hints", true); if(!mobile){ game.checkPref("buildautopause", false); From 566052cabfc8d1b9917e47b206455816d5ab5f0f Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Dec 2019 12:24:51 -0500 Subject: [PATCH 31/78] Fixed #1272 --- core/assets/scripts/global.js | 1 + core/src/mindustry/game/Schematics.java | 1 + core/src/mindustry/mod/ClassAccess.java | 2 +- tools/src/mindustry/tools/ScriptStubGenerator.java | 3 ++- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/assets/scripts/global.js b/core/assets/scripts/global.js index 862ded3759..9ba7fc5e4c 100755 --- a/core/assets/scripts/global.js +++ b/core/assets/scripts/global.js @@ -25,6 +25,7 @@ importPackage(Packages.arc.func) importPackage(Packages.arc.graphics) importPackage(Packages.arc.graphics.g2d) importPackage(Packages.arc.math) +importPackage(Packages.arc.math.geom) importPackage(Packages.arc.scene) importPackage(Packages.arc.scene.actions) importPackage(Packages.arc.scene.event) diff --git a/core/src/mindustry/game/Schematics.java b/core/src/mindustry/game/Schematics.java index 072f063e1f..fd6e10022d 100644 --- a/core/src/mindustry/game/Schematics.java +++ b/core/src/mindustry/game/Schematics.java @@ -249,6 +249,7 @@ public class Schematics implements Loadable{ public void placeLoadout(Schematic schem, int x, int y){ Stile coreTile = schem.tiles.find(s -> s.block instanceof CoreBlock); + if(coreTile == null) throw new IllegalArgumentException("Schematic has no core tile. Exiting."); int ox = x - coreTile.x, oy = y - coreTile.y; schem.tiles.each(st -> { Tile tile = world.tile(st.x + ox, st.y + oy); diff --git a/core/src/mindustry/mod/ClassAccess.java b/core/src/mindustry/mod/ClassAccess.java index 06ff74766c..2d1e32cfad 100644 --- a/core/src/mindustry/mod/ClassAccess.java +++ b/core/src/mindustry/mod/ClassAccess.java @@ -3,5 +3,5 @@ package mindustry.mod; import arc.struct.*; //obviously autogenerated, do not touch public class ClassAccess{ - public static final ObjectSet allowedClassNames = ObjectSet.with("arc.Core", "arc.func.Boolc", "arc.func.Boolf", "arc.func.Boolf2", "arc.func.Boolp", "arc.func.Cons", "arc.func.Cons2", "arc.func.Floatc", "arc.func.Floatc2", "arc.func.Floatc4", "arc.func.Floatf", "arc.func.Floatp", "arc.func.Func", "arc.func.Func2", "arc.func.Func3", "arc.func.Intc", "arc.func.Intc2", "arc.func.Intc4", "arc.func.Intf", "arc.func.Intp", "arc.func.Prov", "arc.graphics.Color", "arc.graphics.Pixmap", "arc.graphics.Texture", "arc.graphics.TextureData", "arc.graphics.g2d.Draw", "arc.graphics.g2d.Fill", "arc.graphics.g2d.Lines", "arc.graphics.g2d.TextureAtlas", "arc.graphics.g2d.TextureAtlas$AtlasRegion", "arc.graphics.g2d.TextureRegion", "arc.math.Angles", "arc.math.Mathf", "arc.scene.Action", "arc.scene.Element", "arc.scene.Group", "arc.scene.Scene", "arc.scene.actions.Actions", "arc.scene.actions.AddAction", "arc.scene.actions.AddListenerAction", "arc.scene.actions.AfterAction", "arc.scene.actions.AlphaAction", "arc.scene.actions.ColorAction", "arc.scene.actions.DelayAction", "arc.scene.actions.DelegateAction", "arc.scene.actions.FloatAction", "arc.scene.actions.IntAction", "arc.scene.actions.LayoutAction", "arc.scene.actions.MoveByAction", "arc.scene.actions.MoveToAction", "arc.scene.actions.OriginAction", "arc.scene.actions.ParallelAction", "arc.scene.actions.RelativeTemporalAction", "arc.scene.actions.RemoveAction", "arc.scene.actions.RemoveActorAction", "arc.scene.actions.RemoveListenerAction", "arc.scene.actions.RepeatAction", "arc.scene.actions.RotateByAction", "arc.scene.actions.RotateToAction", "arc.scene.actions.RunnableAction", "arc.scene.actions.ScaleByAction", "arc.scene.actions.ScaleToAction", "arc.scene.actions.SequenceAction", "arc.scene.actions.SizeByAction", "arc.scene.actions.SizeToAction", "arc.scene.actions.TemporalAction", "arc.scene.actions.TimeScaleAction", "arc.scene.actions.TouchableAction", "arc.scene.actions.TranslateByAction", "arc.scene.actions.VisibleAction", "arc.scene.event.ChangeListener", "arc.scene.event.ChangeListener$ChangeEvent", "arc.scene.event.ClickListener", "arc.scene.event.DragListener", "arc.scene.event.DragScrollListener", "arc.scene.event.ElementGestureListener", "arc.scene.event.EventListener", "arc.scene.event.FocusListener", "arc.scene.event.FocusListener$FocusEvent", "arc.scene.event.FocusListener$FocusEvent$Type", "arc.scene.event.HandCursorListener", "arc.scene.event.IbeamCursorListener", "arc.scene.event.InputEvent", "arc.scene.event.InputEvent$Type", "arc.scene.event.InputListener", "arc.scene.event.SceneEvent", "arc.scene.event.Touchable", "arc.scene.event.VisibilityEvent", "arc.scene.event.VisibilityListener", "arc.scene.style.BaseDrawable", "arc.scene.style.Drawable", "arc.scene.style.NinePatchDrawable", "arc.scene.style.ScaledNinePatchDrawable", "arc.scene.style.Style", "arc.scene.style.TextureRegionDrawable", "arc.scene.style.TiledDrawable", "arc.scene.style.TransformDrawable", "arc.scene.ui.Button", "arc.scene.ui.Button$ButtonStyle", "arc.scene.ui.ButtonGroup", "arc.scene.ui.CheckBox", "arc.scene.ui.CheckBox$CheckBoxStyle", "arc.scene.ui.ColorImage", "arc.scene.ui.Dialog", "arc.scene.ui.Dialog$DialogStyle", "arc.scene.ui.Image", "arc.scene.ui.ImageButton", "arc.scene.ui.ImageButton$ImageButtonStyle", "arc.scene.ui.KeybindDialog", "arc.scene.ui.KeybindDialog$KeybindDialogStyle", "arc.scene.ui.Label", "arc.scene.ui.Label$LabelStyle", "arc.scene.ui.ProgressBar", "arc.scene.ui.ProgressBar$ProgressBarStyle", "arc.scene.ui.ScrollPane", "arc.scene.ui.ScrollPane$ScrollPaneStyle", "arc.scene.ui.SettingsDialog", "arc.scene.ui.SettingsDialog$SettingsTable", "arc.scene.ui.SettingsDialog$SettingsTable$CheckSetting", "arc.scene.ui.SettingsDialog$SettingsTable$Setting", "arc.scene.ui.SettingsDialog$SettingsTable$SliderSetting", "arc.scene.ui.SettingsDialog$StringProcessor", "arc.scene.ui.Slider", "arc.scene.ui.Slider$SliderStyle", "arc.scene.ui.TextArea", "arc.scene.ui.TextArea$TextAreaListener", "arc.scene.ui.TextButton", "arc.scene.ui.TextButton$TextButtonStyle", "arc.scene.ui.TextField", "arc.scene.ui.TextField$DefaultOnscreenKeyboard", "arc.scene.ui.TextField$OnscreenKeyboard", "arc.scene.ui.TextField$TextFieldClickListener", "arc.scene.ui.TextField$TextFieldFilter", "arc.scene.ui.TextField$TextFieldListener", "arc.scene.ui.TextField$TextFieldStyle", "arc.scene.ui.TextField$TextFieldValidator", "arc.scene.ui.Tooltip", "arc.scene.ui.Tooltip$Tooltips", "arc.scene.ui.Touchpad", "arc.scene.ui.Touchpad$TouchpadStyle", "arc.scene.ui.TreeElement", "arc.scene.ui.TreeElement$Node", "arc.scene.ui.TreeElement$TreeStyle", "arc.scene.ui.layout.Cell", "arc.scene.ui.layout.Collapser", "arc.scene.ui.layout.HorizontalGroup", "arc.scene.ui.layout.Scl", "arc.scene.ui.layout.Stack", "arc.scene.ui.layout.Table", "arc.scene.ui.layout.Table$DrawRect", "arc.scene.ui.layout.VerticalGroup", "arc.scene.ui.layout.WidgetGroup", "arc.scene.utils.ArraySelection", "arc.scene.utils.Cullable", "arc.scene.utils.Disableable", "arc.scene.utils.DragAndDrop", "arc.scene.utils.DragAndDrop$Payload", "arc.scene.utils.DragAndDrop$Source", "arc.scene.utils.DragAndDrop$Target", "arc.scene.utils.Elements", "arc.scene.utils.Layout", "arc.scene.utils.Selection", "arc.struct.Array", "arc.struct.Array$ArrayIterable", "arc.struct.ArrayMap", "arc.struct.ArrayMap$Entries", "arc.struct.ArrayMap$Keys", "arc.struct.ArrayMap$Values", "arc.struct.AtomicQueue", "arc.struct.BinaryHeap", "arc.struct.BinaryHeap$Node", "arc.struct.Bits", "arc.struct.BooleanArray", "arc.struct.ByteArray", "arc.struct.CharArray", "arc.struct.ComparableTimSort", "arc.struct.DelayedRemovalArray", "arc.struct.EnumSet", "arc.struct.EnumSet$EnumSetIterator", "arc.struct.FloatArray", "arc.struct.GridBits", "arc.struct.GridMap", "arc.struct.IdentityMap", "arc.struct.IdentityMap$Entries", "arc.struct.IdentityMap$Entry", "arc.struct.IdentityMap$Keys", "arc.struct.IdentityMap$Values", "arc.struct.IntArray", "arc.struct.IntFloatMap", "arc.struct.IntFloatMap$Entries", "arc.struct.IntFloatMap$Entry", "arc.struct.IntFloatMap$Keys", "arc.struct.IntFloatMap$Values", "arc.struct.IntIntMap", "arc.struct.IntIntMap$Entries", "arc.struct.IntIntMap$Entry", "arc.struct.IntIntMap$Keys", "arc.struct.IntIntMap$Values", "arc.struct.IntMap", "arc.struct.IntMap$Entries", "arc.struct.IntMap$Entry", "arc.struct.IntMap$Keys", "arc.struct.IntMap$Values", "arc.struct.IntQueue", "arc.struct.IntSet", "arc.struct.IntSet$IntSetIterator", "arc.struct.LongArray", "arc.struct.LongMap", "arc.struct.LongMap$Entries", "arc.struct.LongMap$Entry", "arc.struct.LongMap$Keys", "arc.struct.LongMap$Values", "arc.struct.LongQueue", "arc.struct.ObjectFloatMap", "arc.struct.ObjectFloatMap$Entries", "arc.struct.ObjectFloatMap$Entry", "arc.struct.ObjectFloatMap$Keys", "arc.struct.ObjectFloatMap$Values", "arc.struct.ObjectIntMap", "arc.struct.ObjectIntMap$Entries", "arc.struct.ObjectIntMap$Entry", "arc.struct.ObjectIntMap$Keys", "arc.struct.ObjectIntMap$Values", "arc.struct.ObjectMap", "arc.struct.ObjectMap$Entries", "arc.struct.ObjectMap$Entry", "arc.struct.ObjectMap$Keys", "arc.struct.ObjectMap$Values", "arc.struct.ObjectSet", "arc.struct.ObjectSet$ObjectSetIterator", "arc.struct.OrderedMap", "arc.struct.OrderedMap$OrderedMapEntries", "arc.struct.OrderedMap$OrderedMapKeys", "arc.struct.OrderedMap$OrderedMapValues", "arc.struct.OrderedSet", "arc.struct.OrderedSet$OrderedSetIterator", "arc.struct.PooledLinkedList", "arc.struct.PooledLinkedList$Item", "arc.struct.Queue", "arc.struct.Queue$QueueIterable", "arc.struct.ShortArray", "arc.struct.SnapshotArray", "arc.struct.Sort", "arc.struct.SortedIntList", "arc.struct.SortedIntList$Iterator", "arc.struct.SortedIntList$Node", "arc.struct.StringMap", "arc.struct.TimSort", "arc.util.I18NBundle", "arc.util.Time", "java.io.PrintStream", "java.lang.Object", "java.lang.Runnable", "java.lang.String", "java.lang.System", "mindustry.Vars", "mindustry.ai.BlockIndexer", "mindustry.ai.Pathfinder", "mindustry.ai.Pathfinder$PathData", "mindustry.ai.Pathfinder$PathTarget", "mindustry.ai.Pathfinder$PathTileStruct", "mindustry.ai.WaveSpawner", "mindustry.content.Blocks", "mindustry.content.Bullets", "mindustry.content.Fx", "mindustry.content.Items", "mindustry.content.Liquids", "mindustry.content.Loadouts", "mindustry.content.Mechs", "mindustry.content.StatusEffects", "mindustry.content.TechTree", "mindustry.content.TechTree$TechNode", "mindustry.content.TypeIDs", "mindustry.content.UnitTypes", "mindustry.content.Zones", "mindustry.core.ContentLoader", "mindustry.core.Control", "mindustry.core.FileTree", "mindustry.core.GameState", "mindustry.core.GameState$State", "mindustry.core.Logic", "mindustry.core.NetServer$TeamAssigner", "mindustry.core.Platform", "mindustry.core.Renderer", "mindustry.core.UI", "mindustry.core.Version", "mindustry.core.World", "mindustry.core.World$Raycaster", "mindustry.ctype.Content", "mindustry.ctype.Content$ModContentInfo", "mindustry.ctype.ContentList", "mindustry.ctype.ContentType", "mindustry.ctype.MappableContent", "mindustry.ctype.UnlockableContent", "mindustry.editor.DrawOperation", "mindustry.editor.DrawOperation$OpType", "mindustry.editor.DrawOperation$TileOpStruct", "mindustry.editor.EditorTile", "mindustry.editor.EditorTool", "mindustry.editor.MapEditor", "mindustry.editor.MapEditor$Context", "mindustry.editor.MapEditorDialog", "mindustry.editor.MapGenerateDialog", "mindustry.editor.MapInfoDialog", "mindustry.editor.MapLoadDialog", "mindustry.editor.MapRenderer", "mindustry.editor.MapResizeDialog", "mindustry.editor.MapSaveDialog", "mindustry.editor.MapView", "mindustry.editor.OperationStack", "mindustry.editor.WaveInfoDialog", "mindustry.entities.Damage", "mindustry.entities.Damage$PropCellStruct", "mindustry.entities.Effects", "mindustry.entities.Effects$Effect", "mindustry.entities.Effects$EffectContainer", "mindustry.entities.Effects$EffectProvider", "mindustry.entities.Effects$EffectRenderer", "mindustry.entities.Effects$ScreenshakeProvider", "mindustry.entities.Entities", "mindustry.entities.EntityCollisions", "mindustry.entities.EntityGroup", "mindustry.entities.Predict", "mindustry.entities.TargetPriority", "mindustry.entities.Units", "mindustry.entities.bullet.ArtilleryBulletType", "mindustry.entities.bullet.BasicBulletType", "mindustry.entities.bullet.BombBulletType", "mindustry.entities.bullet.BulletType", "mindustry.entities.bullet.FlakBulletType", "mindustry.entities.bullet.HealBulletType", "mindustry.entities.bullet.LiquidBulletType", "mindustry.entities.bullet.MassDriverBolt", "mindustry.entities.bullet.MissileBulletType", "mindustry.entities.effect.Decal", "mindustry.entities.effect.Fire", "mindustry.entities.effect.GroundEffectEntity", "mindustry.entities.effect.GroundEffectEntity$GroundEffect", "mindustry.entities.effect.ItemTransfer", "mindustry.entities.effect.Lightning", "mindustry.entities.effect.Puddle", "mindustry.entities.effect.RubbleDecal", "mindustry.entities.effect.ScorchDecal", "mindustry.entities.traits.AbsorbTrait", "mindustry.entities.traits.BelowLiquidTrait", "mindustry.entities.traits.BuilderMinerTrait", "mindustry.entities.traits.BuilderTrait", "mindustry.entities.traits.BuilderTrait$BuildDataStatic", "mindustry.entities.traits.BuilderTrait$BuildRequest", "mindustry.entities.traits.DamageTrait", "mindustry.entities.traits.DrawTrait", "mindustry.entities.traits.Entity", "mindustry.entities.traits.HealthTrait", "mindustry.entities.traits.KillerTrait", "mindustry.entities.traits.MinerTrait", "mindustry.entities.traits.MoveTrait", "mindustry.entities.traits.SaveTrait", "mindustry.entities.traits.Saveable", "mindustry.entities.traits.ScaleTrait", "mindustry.entities.traits.ShooterTrait", "mindustry.entities.traits.SolidTrait", "mindustry.entities.traits.SpawnerTrait", "mindustry.entities.traits.SyncTrait", "mindustry.entities.traits.TargetTrait", "mindustry.entities.traits.TeamTrait", "mindustry.entities.traits.TimeTrait", "mindustry.entities.traits.TypeTrait", "mindustry.entities.traits.VelocityTrait", "mindustry.entities.type.BaseEntity", "mindustry.entities.type.BaseUnit", "mindustry.entities.type.Bullet", "mindustry.entities.type.DestructibleEntity", "mindustry.entities.type.EffectEntity", "mindustry.entities.type.Player", "mindustry.entities.type.SolidEntity", "mindustry.entities.type.TileEntity", "mindustry.entities.type.TimedEntity", "mindustry.entities.type.Unit", "mindustry.entities.type.base.BaseDrone", "mindustry.entities.type.base.BuilderDrone", "mindustry.entities.type.base.FlyingUnit", "mindustry.entities.type.base.GroundUnit", "mindustry.entities.type.base.HoverUnit", "mindustry.entities.type.base.MinerDrone", "mindustry.entities.type.base.RepairDrone", "mindustry.entities.units.StateMachine", "mindustry.entities.units.Statuses", "mindustry.entities.units.Statuses$StatusEntry", "mindustry.entities.units.UnitCommand", "mindustry.entities.units.UnitDrops", "mindustry.entities.units.UnitState", "mindustry.game.DefaultWaves", "mindustry.game.Difficulty", "mindustry.game.EventType", "mindustry.game.EventType$BlockBuildBeginEvent", "mindustry.game.EventType$BlockBuildEndEvent", "mindustry.game.EventType$BlockDestroyEvent", "mindustry.game.EventType$BlockInfoEvent", "mindustry.game.EventType$BuildSelectEvent", "mindustry.game.EventType$ClientLoadEvent", "mindustry.game.EventType$CommandIssueEvent", "mindustry.game.EventType$ContentReloadEvent", "mindustry.game.EventType$CoreItemDeliverEvent", "mindustry.game.EventType$DepositEvent", "mindustry.game.EventType$DisposeEvent", "mindustry.game.EventType$GameOverEvent", "mindustry.game.EventType$LaunchEvent", "mindustry.game.EventType$LaunchItemEvent", "mindustry.game.EventType$LineConfirmEvent", "mindustry.game.EventType$LoseEvent", "mindustry.game.EventType$MapMakeEvent", "mindustry.game.EventType$MapPublishEvent", "mindustry.game.EventType$MechChangeEvent", "mindustry.game.EventType$PlayEvent", "mindustry.game.EventType$PlayerBanEvent", "mindustry.game.EventType$PlayerChatEvent", "mindustry.game.EventType$PlayerConnect", "mindustry.game.EventType$PlayerIpBanEvent", "mindustry.game.EventType$PlayerIpUnbanEvent", "mindustry.game.EventType$PlayerJoin", "mindustry.game.EventType$PlayerLeave", "mindustry.game.EventType$PlayerUnbanEvent", "mindustry.game.EventType$ResearchEvent", "mindustry.game.EventType$ResetEvent", "mindustry.game.EventType$ResizeEvent", "mindustry.game.EventType$ServerLoadEvent", "mindustry.game.EventType$StateChangeEvent", "mindustry.game.EventType$TapConfigEvent", "mindustry.game.EventType$TapEvent", "mindustry.game.EventType$TileChangeEvent", "mindustry.game.EventType$Trigger", "mindustry.game.EventType$TurretAmmoDeliverEvent", "mindustry.game.EventType$UnitCreateEvent", "mindustry.game.EventType$UnitDestroyEvent", "mindustry.game.EventType$UnlockEvent", "mindustry.game.EventType$WaveEvent", "mindustry.game.EventType$WinEvent", "mindustry.game.EventType$WithdrawEvent", "mindustry.game.EventType$WorldLoadEvent", "mindustry.game.EventType$ZoneConfigureCompleteEvent", "mindustry.game.EventType$ZoneRequireCompleteEvent", "mindustry.game.Gamemode", "mindustry.game.GlobalData", "mindustry.game.LoopControl", "mindustry.game.MusicControl", "mindustry.game.Objective", "mindustry.game.Objectives", "mindustry.game.Objectives$Launched", "mindustry.game.Objectives$Unlock", "mindustry.game.Objectives$Wave", "mindustry.game.Objectives$ZoneObjective", "mindustry.game.Objectives$ZoneWave", "mindustry.game.Rules", "mindustry.game.Saves", "mindustry.game.Saves$SaveSlot", "mindustry.game.Schematic", "mindustry.game.Schematic$Stile", "mindustry.game.Schematics", "mindustry.game.SoundLoop", "mindustry.game.SpawnGroup", "mindustry.game.Stats", "mindustry.game.Stats$Rank", "mindustry.game.Stats$RankResult", "mindustry.game.Team", "mindustry.game.Teams", "mindustry.game.Teams$BrokenBlock", "mindustry.game.Teams$TeamData", "mindustry.game.Tutorial", "mindustry.game.Tutorial$TutorialStage", "mindustry.gen.BufferItem", "mindustry.gen.Call", "mindustry.gen.Call", "mindustry.gen.Icon", "mindustry.gen.Icon", "mindustry.gen.MethodHash", "mindustry.gen.Musics", "mindustry.gen.Musics", "mindustry.gen.PathTile", "mindustry.gen.PropCell", "mindustry.gen.RemoteReadClient", "mindustry.gen.RemoteReadServer", "mindustry.gen.Serialization", "mindustry.gen.Sounds", "mindustry.gen.Sounds", "mindustry.gen.Tex", "mindustry.gen.Tex", "mindustry.gen.TileOp", "mindustry.graphics.BlockRenderer", "mindustry.graphics.Bloom", "mindustry.graphics.CacheLayer", "mindustry.graphics.Drawf", "mindustry.graphics.FloorRenderer", "mindustry.graphics.IndexedRenderer", "mindustry.graphics.Layer", "mindustry.graphics.LightRenderer", "mindustry.graphics.MenuRenderer", "mindustry.graphics.MinimapRenderer", "mindustry.graphics.MultiPacker", "mindustry.graphics.MultiPacker$PageType", "mindustry.graphics.OverlayRenderer", "mindustry.graphics.Pal", "mindustry.graphics.Pixelator", "mindustry.graphics.Shaders", "mindustry.input.Binding", "mindustry.input.DesktopInput", "mindustry.input.InputHandler", "mindustry.input.InputHandler$PlaceLine", "mindustry.input.MobileInput", "mindustry.input.PlaceMode", "mindustry.input.Placement", "mindustry.input.Placement$DistanceHeuristic", "mindustry.input.Placement$NormalizeDrawResult", "mindustry.input.Placement$NormalizeResult", "mindustry.input.Placement$TileHueristic", "mindustry.maps.Map", "mindustry.maps.Maps", "mindustry.maps.Maps$MapProvider", "mindustry.maps.Maps$ShuffleMode", "mindustry.maps.Maps$ShuffleMode", "mindustry.maps.filters.BlendFilter", "mindustry.maps.filters.ClearFilter", "mindustry.maps.filters.DistortFilter", "mindustry.maps.filters.FilterOption", "mindustry.maps.filters.FilterOption$BlockOption", "mindustry.maps.filters.FilterOption$SliderOption", "mindustry.maps.filters.GenerateFilter", "mindustry.maps.filters.GenerateFilter$GenerateInput", "mindustry.maps.filters.GenerateFilter$GenerateInput$TileProvider", "mindustry.maps.filters.MedianFilter", "mindustry.maps.filters.MirrorFilter", "mindustry.maps.filters.NoiseFilter", "mindustry.maps.filters.OreFilter", "mindustry.maps.filters.OreMedianFilter", "mindustry.maps.filters.RiverNoiseFilter", "mindustry.maps.filters.ScatterFilter", "mindustry.maps.filters.TerrainFilter", "mindustry.maps.generators.BasicGenerator", "mindustry.maps.generators.BasicGenerator$DistanceHeuristic", "mindustry.maps.generators.BasicGenerator$TileHueristic", "mindustry.maps.generators.Generator", "mindustry.maps.generators.MapGenerator", "mindustry.maps.generators.MapGenerator$Decoration", "mindustry.maps.generators.RandomGenerator", "mindustry.maps.zonegen.DesertWastesGenerator", "mindustry.maps.zonegen.OvergrowthGenerator", "mindustry.type.Category", "mindustry.type.ErrorContent", "mindustry.type.Item", "mindustry.type.ItemStack", "mindustry.type.ItemType", "mindustry.type.Liquid", "mindustry.type.LiquidStack", "mindustry.type.Mech", "mindustry.type.Publishable", "mindustry.type.StatusEffect", "mindustry.type.StatusEffect$TransitionHandler", "mindustry.type.TypeID", "mindustry.type.UnitType", "mindustry.type.Weapon", "mindustry.type.WeatherEvent", "mindustry.type.Zone", "mindustry.ui.Bar", "mindustry.ui.BorderImage", "mindustry.ui.Cicon", "mindustry.ui.ContentDisplay", "mindustry.ui.Fonts", "mindustry.ui.GridImage", "mindustry.ui.IconSize", "mindustry.ui.IntFormat", "mindustry.ui.ItemDisplay", "mindustry.ui.ItemImage", "mindustry.ui.ItemsDisplay", "mindustry.ui.Links", "mindustry.ui.Links$LinkEntry", "mindustry.ui.LiquidDisplay", "mindustry.ui.Minimap", "mindustry.ui.MobileButton", "mindustry.ui.MultiReqImage", "mindustry.ui.ReqImage", "mindustry.ui.Styles", "mindustry.ui.dialogs.AboutDialog", "mindustry.ui.dialogs.AdminsDialog", "mindustry.ui.dialogs.BansDialog", "mindustry.ui.dialogs.ColorPicker", "mindustry.ui.dialogs.ContentInfoDialog", "mindustry.ui.dialogs.ControlsDialog", "mindustry.ui.dialogs.CustomGameDialog", "mindustry.ui.dialogs.CustomRulesDialog", "mindustry.ui.dialogs.DatabaseDialog", "mindustry.ui.dialogs.DeployDialog", "mindustry.ui.dialogs.DeployDialog$View", "mindustry.ui.dialogs.DeployDialog$ZoneNode", "mindustry.ui.dialogs.DiscordDialog", "mindustry.ui.dialogs.FileChooser", "mindustry.ui.dialogs.FileChooser$FileHistory", "mindustry.ui.dialogs.FloatingDialog", "mindustry.ui.dialogs.GameOverDialog", "mindustry.ui.dialogs.HostDialog", "mindustry.ui.dialogs.JoinDialog", "mindustry.ui.dialogs.JoinDialog$Server", "mindustry.ui.dialogs.LanguageDialog", "mindustry.ui.dialogs.LoadDialog", "mindustry.ui.dialogs.LoadoutDialog", "mindustry.ui.dialogs.MapPlayDialog", "mindustry.ui.dialogs.MapsDialog", "mindustry.ui.dialogs.MinimapDialog", "mindustry.ui.dialogs.ModsDialog", "mindustry.ui.dialogs.PaletteDialog", "mindustry.ui.dialogs.PausedDialog", "mindustry.ui.dialogs.SaveDialog", "mindustry.ui.dialogs.SchematicsDialog", "mindustry.ui.dialogs.SchematicsDialog$SchematicImage", "mindustry.ui.dialogs.SchematicsDialog$SchematicInfoDialog", "mindustry.ui.dialogs.SettingsMenuDialog", "mindustry.ui.dialogs.TechTreeDialog", "mindustry.ui.dialogs.TechTreeDialog$LayoutNode", "mindustry.ui.dialogs.TechTreeDialog$TechTreeNode", "mindustry.ui.dialogs.TechTreeDialog$View", "mindustry.ui.dialogs.TraceDialog", "mindustry.ui.dialogs.ZoneInfoDialog", "mindustry.ui.fragments.BlockConfigFragment", "mindustry.ui.fragments.BlockInventoryFragment", "mindustry.ui.fragments.ChatFragment", "mindustry.ui.fragments.FadeInFragment", "mindustry.ui.fragments.Fragment", "mindustry.ui.fragments.HudFragment", "mindustry.ui.fragments.LoadingFragment", "mindustry.ui.fragments.MenuFragment", "mindustry.ui.fragments.OverlayFragment", "mindustry.ui.fragments.PlacementFragment", "mindustry.ui.fragments.PlayerListFragment", "mindustry.ui.fragments.ScriptConsoleFragment", "mindustry.ui.layout.BranchTreeLayout", "mindustry.ui.layout.BranchTreeLayout$TreeAlignment", "mindustry.ui.layout.BranchTreeLayout$TreeLocation", "mindustry.ui.layout.RadialTreeLayout", "mindustry.ui.layout.TreeLayout", "mindustry.ui.layout.TreeLayout$TreeNode", "mindustry.world.Block", "mindustry.world.BlockStorage", "mindustry.world.Build", "mindustry.world.CachedTile", "mindustry.world.DirectionalItemBuffer", "mindustry.world.DirectionalItemBuffer$BufferItemStruct", "mindustry.world.Edges", "mindustry.world.ItemBuffer", "mindustry.world.LegacyColorMapper", "mindustry.world.LegacyColorMapper$LegacyBlock", "mindustry.world.Pos", "mindustry.world.StaticTree", "mindustry.world.Tile", "mindustry.world.WorldContext", "mindustry.world.blocks.Attributes", "mindustry.world.blocks.Autotiler", "mindustry.world.blocks.Autotiler$AutotilerHolder", "mindustry.world.blocks.BlockPart", "mindustry.world.blocks.BuildBlock", "mindustry.world.blocks.BuildBlock$BuildEntity", "mindustry.world.blocks.DoubleOverlayFloor", "mindustry.world.blocks.Floor", "mindustry.world.blocks.ItemSelection", "mindustry.world.blocks.LiquidBlock", "mindustry.world.blocks.OreBlock", "mindustry.world.blocks.OverlayFloor", "mindustry.world.blocks.PowerBlock", "mindustry.world.blocks.RespawnBlock", "mindustry.world.blocks.Rock", "mindustry.world.blocks.StaticWall", "mindustry.world.blocks.TreeBlock", "mindustry.world.blocks.defense.DeflectorWall", "mindustry.world.blocks.defense.DeflectorWall$DeflectorEntity", "mindustry.world.blocks.defense.Door", "mindustry.world.blocks.defense.Door$DoorEntity", "mindustry.world.blocks.defense.ForceProjector", "mindustry.world.blocks.defense.ForceProjector$ForceEntity", "mindustry.world.blocks.defense.ForceProjector$ShieldEntity", "mindustry.world.blocks.defense.MendProjector", "mindustry.world.blocks.defense.MendProjector$MendEntity", "mindustry.world.blocks.defense.OverdriveProjector", "mindustry.world.blocks.defense.OverdriveProjector$OverdriveEntity", "mindustry.world.blocks.defense.ShockMine", "mindustry.world.blocks.defense.SurgeWall", "mindustry.world.blocks.defense.Wall", "mindustry.world.blocks.defense.turrets.ArtilleryTurret", "mindustry.world.blocks.defense.turrets.BurstTurret", "mindustry.world.blocks.defense.turrets.ChargeTurret", "mindustry.world.blocks.defense.turrets.ChargeTurret$LaserTurretEntity", "mindustry.world.blocks.defense.turrets.CooledTurret", "mindustry.world.blocks.defense.turrets.DoubleTurret", "mindustry.world.blocks.defense.turrets.ItemTurret", "mindustry.world.blocks.defense.turrets.ItemTurret$ItemEntry", "mindustry.world.blocks.defense.turrets.ItemTurret$ItemTurretEntity", "mindustry.world.blocks.defense.turrets.LaserTurret", "mindustry.world.blocks.defense.turrets.LaserTurret$LaserTurretEntity", "mindustry.world.blocks.defense.turrets.LiquidTurret", "mindustry.world.blocks.defense.turrets.PowerTurret", "mindustry.world.blocks.defense.turrets.Turret", "mindustry.world.blocks.defense.turrets.Turret$AmmoEntry", "mindustry.world.blocks.defense.turrets.Turret$TurretEntity", "mindustry.world.blocks.distribution.ArmoredConveyor", "mindustry.world.blocks.distribution.BufferedItemBridge", "mindustry.world.blocks.distribution.BufferedItemBridge$BufferedItemBridgeEntity", "mindustry.world.blocks.distribution.Conveyor", "mindustry.world.blocks.distribution.Conveyor$ConveyorEntity", "mindustry.world.blocks.distribution.Conveyor$ItemPos", "mindustry.world.blocks.distribution.ExtendingItemBridge", "mindustry.world.blocks.distribution.ItemBridge", "mindustry.world.blocks.distribution.ItemBridge$ItemBridgeEntity", "mindustry.world.blocks.distribution.Junction", "mindustry.world.blocks.distribution.Junction$JunctionEntity", "mindustry.world.blocks.distribution.MassDriver", "mindustry.world.blocks.distribution.MassDriver$DriverBulletData", "mindustry.world.blocks.distribution.MassDriver$DriverState", "mindustry.world.blocks.distribution.MassDriver$MassDriverEntity", "mindustry.world.blocks.distribution.OverflowGate", "mindustry.world.blocks.distribution.OverflowGate$OverflowGateEntity", "mindustry.world.blocks.distribution.Router", "mindustry.world.blocks.distribution.Router$RouterEntity", "mindustry.world.blocks.distribution.Sorter", "mindustry.world.blocks.distribution.Sorter$SorterEntity", "mindustry.world.blocks.liquid.ArmoredConduit", "mindustry.world.blocks.liquid.Conduit", "mindustry.world.blocks.liquid.Conduit$ConduitEntity", "mindustry.world.blocks.liquid.LiquidBridge", "mindustry.world.blocks.liquid.LiquidExtendingBridge", "mindustry.world.blocks.liquid.LiquidJunction", "mindustry.world.blocks.liquid.LiquidOverflowGate", "mindustry.world.blocks.liquid.LiquidRouter", "mindustry.world.blocks.liquid.LiquidTank", "mindustry.world.blocks.logic.LogicBlock", "mindustry.world.blocks.logic.MessageBlock", "mindustry.world.blocks.logic.MessageBlock$MessageBlockEntity", "mindustry.world.blocks.power.Battery", "mindustry.world.blocks.power.BurnerGenerator", "mindustry.world.blocks.power.ConditionalConsumePower", "mindustry.world.blocks.power.DecayGenerator", "mindustry.world.blocks.power.ImpactReactor", "mindustry.world.blocks.power.ImpactReactor$FusionReactorEntity", "mindustry.world.blocks.power.ItemLiquidGenerator", "mindustry.world.blocks.power.ItemLiquidGenerator$ItemLiquidGeneratorEntity", "mindustry.world.blocks.power.LightBlock", "mindustry.world.blocks.power.LightBlock$LightEntity", "mindustry.world.blocks.power.NuclearReactor", "mindustry.world.blocks.power.NuclearReactor$NuclearReactorEntity", "mindustry.world.blocks.power.PowerDiode", "mindustry.world.blocks.power.PowerDistributor", "mindustry.world.blocks.power.PowerGenerator", "mindustry.world.blocks.power.PowerGenerator$GeneratorEntity", "mindustry.world.blocks.power.PowerGraph", "mindustry.world.blocks.power.PowerNode", "mindustry.world.blocks.power.SingleTypeGenerator", "mindustry.world.blocks.power.SolarGenerator", "mindustry.world.blocks.power.ThermalGenerator", "mindustry.world.blocks.production.Cultivator", "mindustry.world.blocks.production.Cultivator$CultivatorEntity", "mindustry.world.blocks.production.Drill", "mindustry.world.blocks.production.Drill$DrillEntity", "mindustry.world.blocks.production.Fracker", "mindustry.world.blocks.production.Fracker$FrackerEntity", "mindustry.world.blocks.production.GenericCrafter", "mindustry.world.blocks.production.GenericCrafter$GenericCrafterEntity", "mindustry.world.blocks.production.GenericSmelter", "mindustry.world.blocks.production.Incinerator", "mindustry.world.blocks.production.Incinerator$IncineratorEntity", "mindustry.world.blocks.production.LiquidConverter", "mindustry.world.blocks.production.Pump", "mindustry.world.blocks.production.Separator", "mindustry.world.blocks.production.SolidPump", "mindustry.world.blocks.production.SolidPump$SolidPumpEntity", "mindustry.world.blocks.sandbox.ItemSource", "mindustry.world.blocks.sandbox.ItemSource$ItemSourceEntity", "mindustry.world.blocks.sandbox.ItemVoid", "mindustry.world.blocks.sandbox.LiquidSource", "mindustry.world.blocks.sandbox.LiquidSource$LiquidSourceEntity", "mindustry.world.blocks.sandbox.PowerSource", "mindustry.world.blocks.sandbox.PowerVoid", "mindustry.world.blocks.storage.CoreBlock", "mindustry.world.blocks.storage.CoreBlock$CoreEntity", "mindustry.world.blocks.storage.LaunchPad", "mindustry.world.blocks.storage.StorageBlock", "mindustry.world.blocks.storage.StorageBlock$StorageBlockEntity", "mindustry.world.blocks.storage.Unloader", "mindustry.world.blocks.storage.Unloader$UnloaderEntity", "mindustry.world.blocks.storage.Vault", "mindustry.world.blocks.units.CommandCenter", "mindustry.world.blocks.units.CommandCenter$CommandCenterEntity", "mindustry.world.blocks.units.MechPad", "mindustry.world.blocks.units.MechPad$MechFactoryEntity", "mindustry.world.blocks.units.RallyPoint", "mindustry.world.blocks.units.RepairPoint", "mindustry.world.blocks.units.RepairPoint$RepairPointEntity", "mindustry.world.blocks.units.UnitFactory", "mindustry.world.blocks.units.UnitFactory$UnitFactoryEntity", "mindustry.world.consumers.Consume", "mindustry.world.consumers.ConsumeItemFilter", "mindustry.world.consumers.ConsumeItems", "mindustry.world.consumers.ConsumeLiquid", "mindustry.world.consumers.ConsumeLiquidBase", "mindustry.world.consumers.ConsumeLiquidFilter", "mindustry.world.consumers.ConsumePower", "mindustry.world.consumers.ConsumeType", "mindustry.world.consumers.Consumers", "mindustry.world.meta.Attribute", "mindustry.world.meta.BlockBars", "mindustry.world.meta.BlockFlag", "mindustry.world.meta.BlockGroup", "mindustry.world.meta.BlockStat", "mindustry.world.meta.BlockStats", "mindustry.world.meta.BuildVisibility", "mindustry.world.meta.PowerType", "mindustry.world.meta.Producers", "mindustry.world.meta.StatCategory", "mindustry.world.meta.StatUnit", "mindustry.world.meta.StatValue", "mindustry.world.meta.values.AmmoListValue", "mindustry.world.meta.values.BooleanValue", "mindustry.world.meta.values.BoosterListValue", "mindustry.world.meta.values.ItemFilterValue", "mindustry.world.meta.values.ItemListValue", "mindustry.world.meta.values.LiquidFilterValue", "mindustry.world.meta.values.LiquidValue", "mindustry.world.meta.values.NumberValue", "mindustry.world.meta.values.StringValue", "mindustry.world.modules.BlockModule", "mindustry.world.modules.ConsumeModule", "mindustry.world.modules.ItemModule", "mindustry.world.modules.ItemModule$ItemCalculator", "mindustry.world.modules.ItemModule$ItemConsumer", "mindustry.world.modules.LiquidModule", "mindustry.world.modules.LiquidModule$LiquidCalculator", "mindustry.world.modules.LiquidModule$LiquidConsumer", "mindustry.world.modules.PowerModule", "mindustry.world.producers.Produce", "mindustry.world.producers.ProduceItem"); + public static final ObjectSet allowedClassNames = ObjectSet.with("arc.Core", "arc.func.Boolc", "arc.func.Boolf", "arc.func.Boolf2", "arc.func.Boolp", "arc.func.Cons", "arc.func.Cons2", "arc.func.Floatc", "arc.func.Floatc2", "arc.func.Floatc4", "arc.func.Floatf", "arc.func.Floatp", "arc.func.Func", "arc.func.Func2", "arc.func.Func3", "arc.func.Intc", "arc.func.Intc2", "arc.func.Intc4", "arc.func.Intf", "arc.func.Intp", "arc.func.Prov", "arc.graphics.Color", "arc.graphics.Pixmap", "arc.graphics.Texture", "arc.graphics.TextureData", "arc.graphics.g2d.Draw", "arc.graphics.g2d.Fill", "arc.graphics.g2d.Lines", "arc.graphics.g2d.TextureAtlas", "arc.graphics.g2d.TextureAtlas$AtlasRegion", "arc.graphics.g2d.TextureRegion", "arc.math.Affine2", "arc.math.Angles", "arc.math.Angles", "arc.math.Angles$ParticleConsumer", "arc.math.CumulativeDistribution", "arc.math.CumulativeDistribution$CumulativeValue", "arc.math.DelaunayTriangulator", "arc.math.EarClippingTriangulator", "arc.math.Extrapolator", "arc.math.FloatCounter", "arc.math.Interpolation", "arc.math.Interpolation$Bounce", "arc.math.Interpolation$BounceIn", "arc.math.Interpolation$BounceOut", "arc.math.Interpolation$Elastic", "arc.math.Interpolation$ElasticIn", "arc.math.Interpolation$ElasticOut", "arc.math.Interpolation$Exp", "arc.math.Interpolation$ExpIn", "arc.math.Interpolation$ExpOut", "arc.math.Interpolation$Pow", "arc.math.Interpolation$PowIn", "arc.math.Interpolation$PowOut", "arc.math.Interpolation$Swing", "arc.math.Interpolation$SwingIn", "arc.math.Interpolation$SwingOut", "arc.math.Mathf", "arc.math.Mathf", "arc.math.Matrix3", "arc.math.WindowedMean", "arc.math.geom.BSpline", "arc.math.geom.Bezier", "arc.math.geom.Bresenham2", "arc.math.geom.CatmullRomSpline", "arc.math.geom.Circle", "arc.math.geom.ConvexHull", "arc.math.geom.Ellipse", "arc.math.geom.FixedPosition", "arc.math.geom.Geometry", "arc.math.geom.Geometry$Raycaster", "arc.math.geom.Geometry$SolidChecker", "arc.math.geom.Intersector", "arc.math.geom.Intersector$MinimumTranslationVector", "arc.math.geom.Path", "arc.math.geom.Point2", "arc.math.geom.Point3", "arc.math.geom.Polygon", "arc.math.geom.Polyline", "arc.math.geom.Position", "arc.math.geom.QuadTree", "arc.math.geom.QuadTree$QuadTreeObject", "arc.math.geom.Rect", "arc.math.geom.Shape2D", "arc.math.geom.Spring1D", "arc.math.geom.Spring2D", "arc.math.geom.Vec2", "arc.math.geom.Vec3", "arc.math.geom.Vector", "arc.scene.Action", "arc.scene.Element", "arc.scene.Group", "arc.scene.Scene", "arc.scene.actions.Actions", "arc.scene.actions.AddAction", "arc.scene.actions.AddListenerAction", "arc.scene.actions.AfterAction", "arc.scene.actions.AlphaAction", "arc.scene.actions.ColorAction", "arc.scene.actions.DelayAction", "arc.scene.actions.DelegateAction", "arc.scene.actions.FloatAction", "arc.scene.actions.IntAction", "arc.scene.actions.LayoutAction", "arc.scene.actions.MoveByAction", "arc.scene.actions.MoveToAction", "arc.scene.actions.OriginAction", "arc.scene.actions.ParallelAction", "arc.scene.actions.RelativeTemporalAction", "arc.scene.actions.RemoveAction", "arc.scene.actions.RemoveActorAction", "arc.scene.actions.RemoveListenerAction", "arc.scene.actions.RepeatAction", "arc.scene.actions.RotateByAction", "arc.scene.actions.RotateToAction", "arc.scene.actions.RunnableAction", "arc.scene.actions.ScaleByAction", "arc.scene.actions.ScaleToAction", "arc.scene.actions.SequenceAction", "arc.scene.actions.SizeByAction", "arc.scene.actions.SizeToAction", "arc.scene.actions.TemporalAction", "arc.scene.actions.TimeScaleAction", "arc.scene.actions.TouchableAction", "arc.scene.actions.TranslateByAction", "arc.scene.actions.VisibleAction", "arc.scene.event.ChangeListener", "arc.scene.event.ChangeListener$ChangeEvent", "arc.scene.event.ClickListener", "arc.scene.event.DragListener", "arc.scene.event.DragScrollListener", "arc.scene.event.ElementGestureListener", "arc.scene.event.EventListener", "arc.scene.event.FocusListener", "arc.scene.event.FocusListener$FocusEvent", "arc.scene.event.FocusListener$FocusEvent$Type", "arc.scene.event.HandCursorListener", "arc.scene.event.IbeamCursorListener", "arc.scene.event.InputEvent", "arc.scene.event.InputEvent$Type", "arc.scene.event.InputListener", "arc.scene.event.SceneEvent", "arc.scene.event.Touchable", "arc.scene.event.VisibilityEvent", "arc.scene.event.VisibilityListener", "arc.scene.style.BaseDrawable", "arc.scene.style.Drawable", "arc.scene.style.NinePatchDrawable", "arc.scene.style.ScaledNinePatchDrawable", "arc.scene.style.Style", "arc.scene.style.TextureRegionDrawable", "arc.scene.style.TiledDrawable", "arc.scene.style.TransformDrawable", "arc.scene.ui.Button", "arc.scene.ui.Button$ButtonStyle", "arc.scene.ui.ButtonGroup", "arc.scene.ui.CheckBox", "arc.scene.ui.CheckBox$CheckBoxStyle", "arc.scene.ui.ColorImage", "arc.scene.ui.Dialog", "arc.scene.ui.Dialog$DialogStyle", "arc.scene.ui.Image", "arc.scene.ui.ImageButton", "arc.scene.ui.ImageButton$ImageButtonStyle", "arc.scene.ui.KeybindDialog", "arc.scene.ui.KeybindDialog$KeybindDialogStyle", "arc.scene.ui.Label", "arc.scene.ui.Label$LabelStyle", "arc.scene.ui.ProgressBar", "arc.scene.ui.ProgressBar$ProgressBarStyle", "arc.scene.ui.ScrollPane", "arc.scene.ui.ScrollPane$ScrollPaneStyle", "arc.scene.ui.SettingsDialog", "arc.scene.ui.SettingsDialog$SettingsTable", "arc.scene.ui.SettingsDialog$SettingsTable$CheckSetting", "arc.scene.ui.SettingsDialog$SettingsTable$Setting", "arc.scene.ui.SettingsDialog$SettingsTable$SliderSetting", "arc.scene.ui.SettingsDialog$StringProcessor", "arc.scene.ui.Slider", "arc.scene.ui.Slider$SliderStyle", "arc.scene.ui.TextArea", "arc.scene.ui.TextArea$TextAreaListener", "arc.scene.ui.TextButton", "arc.scene.ui.TextButton$TextButtonStyle", "arc.scene.ui.TextField", "arc.scene.ui.TextField$DefaultOnscreenKeyboard", "arc.scene.ui.TextField$OnscreenKeyboard", "arc.scene.ui.TextField$TextFieldClickListener", "arc.scene.ui.TextField$TextFieldFilter", "arc.scene.ui.TextField$TextFieldListener", "arc.scene.ui.TextField$TextFieldStyle", "arc.scene.ui.TextField$TextFieldValidator", "arc.scene.ui.Tooltip", "arc.scene.ui.Tooltip$Tooltips", "arc.scene.ui.Touchpad", "arc.scene.ui.Touchpad$TouchpadStyle", "arc.scene.ui.TreeElement", "arc.scene.ui.TreeElement$Node", "arc.scene.ui.TreeElement$TreeStyle", "arc.scene.ui.layout.Cell", "arc.scene.ui.layout.Collapser", "arc.scene.ui.layout.HorizontalGroup", "arc.scene.ui.layout.Scl", "arc.scene.ui.layout.Stack", "arc.scene.ui.layout.Table", "arc.scene.ui.layout.Table$DrawRect", "arc.scene.ui.layout.VerticalGroup", "arc.scene.ui.layout.WidgetGroup", "arc.scene.utils.ArraySelection", "arc.scene.utils.Cullable", "arc.scene.utils.Disableable", "arc.scene.utils.DragAndDrop", "arc.scene.utils.DragAndDrop$Payload", "arc.scene.utils.DragAndDrop$Source", "arc.scene.utils.DragAndDrop$Target", "arc.scene.utils.Elements", "arc.scene.utils.Layout", "arc.scene.utils.Selection", "arc.struct.Array", "arc.struct.Array$ArrayIterable", "arc.struct.ArrayMap", "arc.struct.ArrayMap$Entries", "arc.struct.ArrayMap$Keys", "arc.struct.ArrayMap$Values", "arc.struct.AtomicQueue", "arc.struct.BinaryHeap", "arc.struct.BinaryHeap$Node", "arc.struct.Bits", "arc.struct.BooleanArray", "arc.struct.ByteArray", "arc.struct.CharArray", "arc.struct.ComparableTimSort", "arc.struct.DelayedRemovalArray", "arc.struct.EnumSet", "arc.struct.EnumSet$EnumSetIterator", "arc.struct.FloatArray", "arc.struct.GridBits", "arc.struct.GridMap", "arc.struct.IdentityMap", "arc.struct.IdentityMap$Entries", "arc.struct.IdentityMap$Entry", "arc.struct.IdentityMap$Keys", "arc.struct.IdentityMap$Values", "arc.struct.IntArray", "arc.struct.IntFloatMap", "arc.struct.IntFloatMap$Entries", "arc.struct.IntFloatMap$Entry", "arc.struct.IntFloatMap$Keys", "arc.struct.IntFloatMap$Values", "arc.struct.IntIntMap", "arc.struct.IntIntMap$Entries", "arc.struct.IntIntMap$Entry", "arc.struct.IntIntMap$Keys", "arc.struct.IntIntMap$Values", "arc.struct.IntMap", "arc.struct.IntMap$Entries", "arc.struct.IntMap$Entry", "arc.struct.IntMap$Keys", "arc.struct.IntMap$Values", "arc.struct.IntQueue", "arc.struct.IntSet", "arc.struct.IntSet$IntSetIterator", "arc.struct.LongArray", "arc.struct.LongMap", "arc.struct.LongMap$Entries", "arc.struct.LongMap$Entry", "arc.struct.LongMap$Keys", "arc.struct.LongMap$Values", "arc.struct.LongQueue", "arc.struct.ObjectFloatMap", "arc.struct.ObjectFloatMap$Entries", "arc.struct.ObjectFloatMap$Entry", "arc.struct.ObjectFloatMap$Keys", "arc.struct.ObjectFloatMap$Values", "arc.struct.ObjectIntMap", "arc.struct.ObjectIntMap$Entries", "arc.struct.ObjectIntMap$Entry", "arc.struct.ObjectIntMap$Keys", "arc.struct.ObjectIntMap$Values", "arc.struct.ObjectMap", "arc.struct.ObjectMap$Entries", "arc.struct.ObjectMap$Entry", "arc.struct.ObjectMap$Keys", "arc.struct.ObjectMap$Values", "arc.struct.ObjectSet", "arc.struct.ObjectSet$ObjectSetIterator", "arc.struct.OrderedMap", "arc.struct.OrderedMap$OrderedMapEntries", "arc.struct.OrderedMap$OrderedMapKeys", "arc.struct.OrderedMap$OrderedMapValues", "arc.struct.OrderedSet", "arc.struct.OrderedSet$OrderedSetIterator", "arc.struct.PooledLinkedList", "arc.struct.PooledLinkedList$Item", "arc.struct.Queue", "arc.struct.Queue$QueueIterable", "arc.struct.ShortArray", "arc.struct.SnapshotArray", "arc.struct.Sort", "arc.struct.SortedIntList", "arc.struct.SortedIntList$Iterator", "arc.struct.SortedIntList$Node", "arc.struct.StringMap", "arc.struct.TimSort", "arc.util.I18NBundle", "arc.util.Interval", "arc.util.Time", "java.io.DataInput", "java.io.DataInputStream", "java.io.DataOutput", "java.io.DataOutputStream", "java.io.PrintStream", "java.lang.Object", "java.lang.Runnable", "java.lang.String", "java.lang.System", "mindustry.Vars", "mindustry.ai.BlockIndexer", "mindustry.ai.Pathfinder", "mindustry.ai.Pathfinder$PathData", "mindustry.ai.Pathfinder$PathTarget", "mindustry.ai.Pathfinder$PathTileStruct", "mindustry.ai.WaveSpawner", "mindustry.content.Blocks", "mindustry.content.Bullets", "mindustry.content.Fx", "mindustry.content.Items", "mindustry.content.Liquids", "mindustry.content.Loadouts", "mindustry.content.Mechs", "mindustry.content.StatusEffects", "mindustry.content.TechTree", "mindustry.content.TechTree$TechNode", "mindustry.content.TypeIDs", "mindustry.content.UnitTypes", "mindustry.content.Zones", "mindustry.core.ContentLoader", "mindustry.core.Control", "mindustry.core.FileTree", "mindustry.core.GameState", "mindustry.core.GameState$State", "mindustry.core.Logic", "mindustry.core.NetServer$TeamAssigner", "mindustry.core.Platform", "mindustry.core.Renderer", "mindustry.core.UI", "mindustry.core.Version", "mindustry.core.World", "mindustry.core.World$Raycaster", "mindustry.ctype.Content", "mindustry.ctype.Content$ModContentInfo", "mindustry.ctype.ContentList", "mindustry.ctype.ContentType", "mindustry.ctype.MappableContent", "mindustry.ctype.UnlockableContent", "mindustry.editor.DrawOperation", "mindustry.editor.DrawOperation$OpType", "mindustry.editor.DrawOperation$TileOpStruct", "mindustry.editor.EditorTile", "mindustry.editor.EditorTool", "mindustry.editor.MapEditor", "mindustry.editor.MapEditor$Context", "mindustry.editor.MapEditorDialog", "mindustry.editor.MapGenerateDialog", "mindustry.editor.MapInfoDialog", "mindustry.editor.MapLoadDialog", "mindustry.editor.MapRenderer", "mindustry.editor.MapResizeDialog", "mindustry.editor.MapSaveDialog", "mindustry.editor.MapView", "mindustry.editor.OperationStack", "mindustry.editor.WaveInfoDialog", "mindustry.entities.Damage", "mindustry.entities.Damage$PropCellStruct", "mindustry.entities.Effects", "mindustry.entities.Effects$Effect", "mindustry.entities.Effects$EffectContainer", "mindustry.entities.Effects$EffectProvider", "mindustry.entities.Effects$EffectRenderer", "mindustry.entities.Effects$ScreenshakeProvider", "mindustry.entities.Entities", "mindustry.entities.EntityCollisions", "mindustry.entities.EntityGroup", "mindustry.entities.Predict", "mindustry.entities.TargetPriority", "mindustry.entities.Units", "mindustry.entities.bullet.ArtilleryBulletType", "mindustry.entities.bullet.BasicBulletType", "mindustry.entities.bullet.BombBulletType", "mindustry.entities.bullet.BulletType", "mindustry.entities.bullet.FlakBulletType", "mindustry.entities.bullet.HealBulletType", "mindustry.entities.bullet.LiquidBulletType", "mindustry.entities.bullet.MassDriverBolt", "mindustry.entities.bullet.MissileBulletType", "mindustry.entities.effect.Decal", "mindustry.entities.effect.Fire", "mindustry.entities.effect.GroundEffectEntity", "mindustry.entities.effect.GroundEffectEntity$GroundEffect", "mindustry.entities.effect.ItemTransfer", "mindustry.entities.effect.Lightning", "mindustry.entities.effect.Puddle", "mindustry.entities.effect.RubbleDecal", "mindustry.entities.effect.ScorchDecal", "mindustry.entities.traits.AbsorbTrait", "mindustry.entities.traits.BelowLiquidTrait", "mindustry.entities.traits.BuilderMinerTrait", "mindustry.entities.traits.BuilderTrait", "mindustry.entities.traits.BuilderTrait$BuildDataStatic", "mindustry.entities.traits.BuilderTrait$BuildRequest", "mindustry.entities.traits.DamageTrait", "mindustry.entities.traits.DrawTrait", "mindustry.entities.traits.Entity", "mindustry.entities.traits.HealthTrait", "mindustry.entities.traits.KillerTrait", "mindustry.entities.traits.MinerTrait", "mindustry.entities.traits.MoveTrait", "mindustry.entities.traits.SaveTrait", "mindustry.entities.traits.Saveable", "mindustry.entities.traits.ScaleTrait", "mindustry.entities.traits.ShooterTrait", "mindustry.entities.traits.SolidTrait", "mindustry.entities.traits.SpawnerTrait", "mindustry.entities.traits.SyncTrait", "mindustry.entities.traits.TargetTrait", "mindustry.entities.traits.TeamTrait", "mindustry.entities.traits.TimeTrait", "mindustry.entities.traits.TypeTrait", "mindustry.entities.traits.VelocityTrait", "mindustry.entities.type.BaseEntity", "mindustry.entities.type.BaseUnit", "mindustry.entities.type.Bullet", "mindustry.entities.type.DestructibleEntity", "mindustry.entities.type.EffectEntity", "mindustry.entities.type.Player", "mindustry.entities.type.SolidEntity", "mindustry.entities.type.TileEntity", "mindustry.entities.type.TimedEntity", "mindustry.entities.type.Unit", "mindustry.entities.type.base.BaseDrone", "mindustry.entities.type.base.BuilderDrone", "mindustry.entities.type.base.FlyingUnit", "mindustry.entities.type.base.GroundUnit", "mindustry.entities.type.base.HoverUnit", "mindustry.entities.type.base.MinerDrone", "mindustry.entities.type.base.RepairDrone", "mindustry.entities.units.StateMachine", "mindustry.entities.units.Statuses", "mindustry.entities.units.Statuses$StatusEntry", "mindustry.entities.units.UnitCommand", "mindustry.entities.units.UnitDrops", "mindustry.entities.units.UnitState", "mindustry.game.DefaultWaves", "mindustry.game.Difficulty", "mindustry.game.EventType", "mindustry.game.EventType$BlockBuildBeginEvent", "mindustry.game.EventType$BlockBuildEndEvent", "mindustry.game.EventType$BlockDestroyEvent", "mindustry.game.EventType$BlockInfoEvent", "mindustry.game.EventType$BuildSelectEvent", "mindustry.game.EventType$ClientLoadEvent", "mindustry.game.EventType$CommandIssueEvent", "mindustry.game.EventType$ContentReloadEvent", "mindustry.game.EventType$CoreItemDeliverEvent", "mindustry.game.EventType$DepositEvent", "mindustry.game.EventType$DisposeEvent", "mindustry.game.EventType$GameOverEvent", "mindustry.game.EventType$LaunchEvent", "mindustry.game.EventType$LaunchItemEvent", "mindustry.game.EventType$LineConfirmEvent", "mindustry.game.EventType$LoseEvent", "mindustry.game.EventType$MapMakeEvent", "mindustry.game.EventType$MapPublishEvent", "mindustry.game.EventType$MechChangeEvent", "mindustry.game.EventType$PlayEvent", "mindustry.game.EventType$PlayerBanEvent", "mindustry.game.EventType$PlayerChatEvent", "mindustry.game.EventType$PlayerConnect", "mindustry.game.EventType$PlayerIpBanEvent", "mindustry.game.EventType$PlayerIpUnbanEvent", "mindustry.game.EventType$PlayerJoin", "mindustry.game.EventType$PlayerLeave", "mindustry.game.EventType$PlayerUnbanEvent", "mindustry.game.EventType$ResearchEvent", "mindustry.game.EventType$ResetEvent", "mindustry.game.EventType$ResizeEvent", "mindustry.game.EventType$ServerLoadEvent", "mindustry.game.EventType$StateChangeEvent", "mindustry.game.EventType$TapConfigEvent", "mindustry.game.EventType$TapEvent", "mindustry.game.EventType$TileChangeEvent", "mindustry.game.EventType$Trigger", "mindustry.game.EventType$TurretAmmoDeliverEvent", "mindustry.game.EventType$UnitCreateEvent", "mindustry.game.EventType$UnitDestroyEvent", "mindustry.game.EventType$UnlockEvent", "mindustry.game.EventType$WaveEvent", "mindustry.game.EventType$WinEvent", "mindustry.game.EventType$WithdrawEvent", "mindustry.game.EventType$WorldLoadEvent", "mindustry.game.EventType$ZoneConfigureCompleteEvent", "mindustry.game.EventType$ZoneRequireCompleteEvent", "mindustry.game.Gamemode", "mindustry.game.GlobalData", "mindustry.game.LoopControl", "mindustry.game.MusicControl", "mindustry.game.Objective", "mindustry.game.Objectives", "mindustry.game.Objectives$Launched", "mindustry.game.Objectives$Unlock", "mindustry.game.Objectives$Wave", "mindustry.game.Objectives$ZoneObjective", "mindustry.game.Objectives$ZoneWave", "mindustry.game.Rules", "mindustry.game.Saves", "mindustry.game.Saves$SaveSlot", "mindustry.game.Schematic", "mindustry.game.Schematic$Stile", "mindustry.game.Schematics", "mindustry.game.SoundLoop", "mindustry.game.SpawnGroup", "mindustry.game.Stats", "mindustry.game.Stats$Rank", "mindustry.game.Stats$RankResult", "mindustry.game.Team", "mindustry.game.Teams", "mindustry.game.Teams$BrokenBlock", "mindustry.game.Teams$TeamData", "mindustry.game.Tutorial", "mindustry.game.Tutorial$TutorialStage", "mindustry.gen.BufferItem", "mindustry.gen.Call", "mindustry.gen.Call", "mindustry.gen.Icon", "mindustry.gen.Icon", "mindustry.gen.MethodHash", "mindustry.gen.Musics", "mindustry.gen.Musics", "mindustry.gen.PathTile", "mindustry.gen.PropCell", "mindustry.gen.RemoteReadClient", "mindustry.gen.RemoteReadServer", "mindustry.gen.Serialization", "mindustry.gen.Sounds", "mindustry.gen.Sounds", "mindustry.gen.Tex", "mindustry.gen.Tex", "mindustry.gen.TileOp", "mindustry.graphics.BlockRenderer", "mindustry.graphics.Bloom", "mindustry.graphics.CacheLayer", "mindustry.graphics.Drawf", "mindustry.graphics.FloorRenderer", "mindustry.graphics.IndexedRenderer", "mindustry.graphics.Layer", "mindustry.graphics.LightRenderer", "mindustry.graphics.MenuRenderer", "mindustry.graphics.MinimapRenderer", "mindustry.graphics.MultiPacker", "mindustry.graphics.MultiPacker$PageType", "mindustry.graphics.OverlayRenderer", "mindustry.graphics.Pal", "mindustry.graphics.Pixelator", "mindustry.graphics.Shaders", "mindustry.input.Binding", "mindustry.input.DesktopInput", "mindustry.input.InputHandler", "mindustry.input.InputHandler$PlaceLine", "mindustry.input.MobileInput", "mindustry.input.PlaceMode", "mindustry.input.Placement", "mindustry.input.Placement$DistanceHeuristic", "mindustry.input.Placement$NormalizeDrawResult", "mindustry.input.Placement$NormalizeResult", "mindustry.input.Placement$TileHueristic", "mindustry.maps.Map", "mindustry.maps.Maps", "mindustry.maps.Maps$MapProvider", "mindustry.maps.Maps$ShuffleMode", "mindustry.maps.Maps$ShuffleMode", "mindustry.maps.filters.BlendFilter", "mindustry.maps.filters.ClearFilter", "mindustry.maps.filters.DistortFilter", "mindustry.maps.filters.FilterOption", "mindustry.maps.filters.FilterOption$BlockOption", "mindustry.maps.filters.FilterOption$SliderOption", "mindustry.maps.filters.GenerateFilter", "mindustry.maps.filters.GenerateFilter$GenerateInput", "mindustry.maps.filters.GenerateFilter$GenerateInput$TileProvider", "mindustry.maps.filters.MedianFilter", "mindustry.maps.filters.MirrorFilter", "mindustry.maps.filters.NoiseFilter", "mindustry.maps.filters.OreFilter", "mindustry.maps.filters.OreMedianFilter", "mindustry.maps.filters.RiverNoiseFilter", "mindustry.maps.filters.ScatterFilter", "mindustry.maps.filters.TerrainFilter", "mindustry.maps.generators.BasicGenerator", "mindustry.maps.generators.BasicGenerator$DistanceHeuristic", "mindustry.maps.generators.BasicGenerator$TileHueristic", "mindustry.maps.generators.Generator", "mindustry.maps.generators.MapGenerator", "mindustry.maps.generators.MapGenerator$Decoration", "mindustry.maps.generators.RandomGenerator", "mindustry.maps.zonegen.DesertWastesGenerator", "mindustry.maps.zonegen.OvergrowthGenerator", "mindustry.type.Category", "mindustry.type.ErrorContent", "mindustry.type.Item", "mindustry.type.ItemStack", "mindustry.type.ItemType", "mindustry.type.Liquid", "mindustry.type.LiquidStack", "mindustry.type.Mech", "mindustry.type.Publishable", "mindustry.type.StatusEffect", "mindustry.type.StatusEffect$TransitionHandler", "mindustry.type.TypeID", "mindustry.type.UnitType", "mindustry.type.Weapon", "mindustry.type.WeatherEvent", "mindustry.type.Zone", "mindustry.ui.Bar", "mindustry.ui.BorderImage", "mindustry.ui.Cicon", "mindustry.ui.ContentDisplay", "mindustry.ui.Fonts", "mindustry.ui.GridImage", "mindustry.ui.IconSize", "mindustry.ui.IntFormat", "mindustry.ui.ItemDisplay", "mindustry.ui.ItemImage", "mindustry.ui.ItemsDisplay", "mindustry.ui.Links", "mindustry.ui.Links$LinkEntry", "mindustry.ui.LiquidDisplay", "mindustry.ui.Minimap", "mindustry.ui.MobileButton", "mindustry.ui.MultiReqImage", "mindustry.ui.ReqImage", "mindustry.ui.Styles", "mindustry.ui.dialogs.AboutDialog", "mindustry.ui.dialogs.AdminsDialog", "mindustry.ui.dialogs.BansDialog", "mindustry.ui.dialogs.ColorPicker", "mindustry.ui.dialogs.ContentInfoDialog", "mindustry.ui.dialogs.ControlsDialog", "mindustry.ui.dialogs.CustomGameDialog", "mindustry.ui.dialogs.CustomRulesDialog", "mindustry.ui.dialogs.DatabaseDialog", "mindustry.ui.dialogs.DeployDialog", "mindustry.ui.dialogs.DeployDialog$View", "mindustry.ui.dialogs.DeployDialog$ZoneNode", "mindustry.ui.dialogs.DiscordDialog", "mindustry.ui.dialogs.FileChooser", "mindustry.ui.dialogs.FileChooser$FileHistory", "mindustry.ui.dialogs.FloatingDialog", "mindustry.ui.dialogs.GameOverDialog", "mindustry.ui.dialogs.HostDialog", "mindustry.ui.dialogs.JoinDialog", "mindustry.ui.dialogs.JoinDialog$Server", "mindustry.ui.dialogs.LanguageDialog", "mindustry.ui.dialogs.LoadDialog", "mindustry.ui.dialogs.LoadoutDialog", "mindustry.ui.dialogs.MapPlayDialog", "mindustry.ui.dialogs.MapsDialog", "mindustry.ui.dialogs.MinimapDialog", "mindustry.ui.dialogs.ModsDialog", "mindustry.ui.dialogs.PaletteDialog", "mindustry.ui.dialogs.PausedDialog", "mindustry.ui.dialogs.SaveDialog", "mindustry.ui.dialogs.SchematicsDialog", "mindustry.ui.dialogs.SchematicsDialog$SchematicImage", "mindustry.ui.dialogs.SchematicsDialog$SchematicInfoDialog", "mindustry.ui.dialogs.SettingsMenuDialog", "mindustry.ui.dialogs.TechTreeDialog", "mindustry.ui.dialogs.TechTreeDialog$LayoutNode", "mindustry.ui.dialogs.TechTreeDialog$TechTreeNode", "mindustry.ui.dialogs.TechTreeDialog$View", "mindustry.ui.dialogs.TraceDialog", "mindustry.ui.dialogs.ZoneInfoDialog", "mindustry.ui.fragments.BlockConfigFragment", "mindustry.ui.fragments.BlockInventoryFragment", "mindustry.ui.fragments.ChatFragment", "mindustry.ui.fragments.FadeInFragment", "mindustry.ui.fragments.Fragment", "mindustry.ui.fragments.HudFragment", "mindustry.ui.fragments.LoadingFragment", "mindustry.ui.fragments.MenuFragment", "mindustry.ui.fragments.OverlayFragment", "mindustry.ui.fragments.PlacementFragment", "mindustry.ui.fragments.PlayerListFragment", "mindustry.ui.fragments.ScriptConsoleFragment", "mindustry.ui.layout.BranchTreeLayout", "mindustry.ui.layout.BranchTreeLayout$TreeAlignment", "mindustry.ui.layout.BranchTreeLayout$TreeLocation", "mindustry.ui.layout.RadialTreeLayout", "mindustry.ui.layout.TreeLayout", "mindustry.ui.layout.TreeLayout$TreeNode", "mindustry.world.Block", "mindustry.world.BlockStorage", "mindustry.world.Build", "mindustry.world.CachedTile", "mindustry.world.DirectionalItemBuffer", "mindustry.world.DirectionalItemBuffer$BufferItemStruct", "mindustry.world.Edges", "mindustry.world.ItemBuffer", "mindustry.world.LegacyColorMapper", "mindustry.world.LegacyColorMapper$LegacyBlock", "mindustry.world.Pos", "mindustry.world.StaticTree", "mindustry.world.Tile", "mindustry.world.WorldContext", "mindustry.world.blocks.Attributes", "mindustry.world.blocks.Autotiler", "mindustry.world.blocks.Autotiler$AutotilerHolder", "mindustry.world.blocks.BlockPart", "mindustry.world.blocks.BuildBlock", "mindustry.world.blocks.BuildBlock$BuildEntity", "mindustry.world.blocks.DoubleOverlayFloor", "mindustry.world.blocks.Floor", "mindustry.world.blocks.ItemSelection", "mindustry.world.blocks.LiquidBlock", "mindustry.world.blocks.OreBlock", "mindustry.world.blocks.OverlayFloor", "mindustry.world.blocks.PowerBlock", "mindustry.world.blocks.RespawnBlock", "mindustry.world.blocks.Rock", "mindustry.world.blocks.StaticWall", "mindustry.world.blocks.TreeBlock", "mindustry.world.blocks.defense.DeflectorWall", "mindustry.world.blocks.defense.DeflectorWall$DeflectorEntity", "mindustry.world.blocks.defense.Door", "mindustry.world.blocks.defense.Door$DoorEntity", "mindustry.world.blocks.defense.ForceProjector", "mindustry.world.blocks.defense.ForceProjector$ForceEntity", "mindustry.world.blocks.defense.ForceProjector$ShieldEntity", "mindustry.world.blocks.defense.MendProjector", "mindustry.world.blocks.defense.MendProjector$MendEntity", "mindustry.world.blocks.defense.OverdriveProjector", "mindustry.world.blocks.defense.OverdriveProjector$OverdriveEntity", "mindustry.world.blocks.defense.ShockMine", "mindustry.world.blocks.defense.SurgeWall", "mindustry.world.blocks.defense.Wall", "mindustry.world.blocks.defense.turrets.ArtilleryTurret", "mindustry.world.blocks.defense.turrets.BurstTurret", "mindustry.world.blocks.defense.turrets.ChargeTurret", "mindustry.world.blocks.defense.turrets.ChargeTurret$LaserTurretEntity", "mindustry.world.blocks.defense.turrets.CooledTurret", "mindustry.world.blocks.defense.turrets.DoubleTurret", "mindustry.world.blocks.defense.turrets.ItemTurret", "mindustry.world.blocks.defense.turrets.ItemTurret$ItemEntry", "mindustry.world.blocks.defense.turrets.ItemTurret$ItemTurretEntity", "mindustry.world.blocks.defense.turrets.LaserTurret", "mindustry.world.blocks.defense.turrets.LaserTurret$LaserTurretEntity", "mindustry.world.blocks.defense.turrets.LiquidTurret", "mindustry.world.blocks.defense.turrets.PowerTurret", "mindustry.world.blocks.defense.turrets.Turret", "mindustry.world.blocks.defense.turrets.Turret$AmmoEntry", "mindustry.world.blocks.defense.turrets.Turret$TurretEntity", "mindustry.world.blocks.distribution.ArmoredConveyor", "mindustry.world.blocks.distribution.BufferedItemBridge", "mindustry.world.blocks.distribution.BufferedItemBridge$BufferedItemBridgeEntity", "mindustry.world.blocks.distribution.Conveyor", "mindustry.world.blocks.distribution.Conveyor$ConveyorEntity", "mindustry.world.blocks.distribution.Conveyor$ItemPos", "mindustry.world.blocks.distribution.ExtendingItemBridge", "mindustry.world.blocks.distribution.ItemBridge", "mindustry.world.blocks.distribution.ItemBridge$ItemBridgeEntity", "mindustry.world.blocks.distribution.Junction", "mindustry.world.blocks.distribution.Junction$JunctionEntity", "mindustry.world.blocks.distribution.MassDriver", "mindustry.world.blocks.distribution.MassDriver$DriverBulletData", "mindustry.world.blocks.distribution.MassDriver$DriverState", "mindustry.world.blocks.distribution.MassDriver$MassDriverEntity", "mindustry.world.blocks.distribution.OverflowGate", "mindustry.world.blocks.distribution.OverflowGate$OverflowGateEntity", "mindustry.world.blocks.distribution.Router", "mindustry.world.blocks.distribution.Router$RouterEntity", "mindustry.world.blocks.distribution.Sorter", "mindustry.world.blocks.distribution.Sorter$SorterEntity", "mindustry.world.blocks.liquid.ArmoredConduit", "mindustry.world.blocks.liquid.Conduit", "mindustry.world.blocks.liquid.Conduit$ConduitEntity", "mindustry.world.blocks.liquid.LiquidBridge", "mindustry.world.blocks.liquid.LiquidExtendingBridge", "mindustry.world.blocks.liquid.LiquidJunction", "mindustry.world.blocks.liquid.LiquidOverflowGate", "mindustry.world.blocks.liquid.LiquidRouter", "mindustry.world.blocks.liquid.LiquidTank", "mindustry.world.blocks.logic.LogicBlock", "mindustry.world.blocks.logic.MessageBlock", "mindustry.world.blocks.logic.MessageBlock$MessageBlockEntity", "mindustry.world.blocks.power.Battery", "mindustry.world.blocks.power.BurnerGenerator", "mindustry.world.blocks.power.ConditionalConsumePower", "mindustry.world.blocks.power.DecayGenerator", "mindustry.world.blocks.power.ImpactReactor", "mindustry.world.blocks.power.ImpactReactor$FusionReactorEntity", "mindustry.world.blocks.power.ItemLiquidGenerator", "mindustry.world.blocks.power.ItemLiquidGenerator$ItemLiquidGeneratorEntity", "mindustry.world.blocks.power.LightBlock", "mindustry.world.blocks.power.LightBlock$LightEntity", "mindustry.world.blocks.power.NuclearReactor", "mindustry.world.blocks.power.NuclearReactor$NuclearReactorEntity", "mindustry.world.blocks.power.PowerDiode", "mindustry.world.blocks.power.PowerDistributor", "mindustry.world.blocks.power.PowerGenerator", "mindustry.world.blocks.power.PowerGenerator$GeneratorEntity", "mindustry.world.blocks.power.PowerGraph", "mindustry.world.blocks.power.PowerNode", "mindustry.world.blocks.power.SingleTypeGenerator", "mindustry.world.blocks.power.SolarGenerator", "mindustry.world.blocks.power.ThermalGenerator", "mindustry.world.blocks.production.Cultivator", "mindustry.world.blocks.production.Cultivator$CultivatorEntity", "mindustry.world.blocks.production.Drill", "mindustry.world.blocks.production.Drill$DrillEntity", "mindustry.world.blocks.production.Fracker", "mindustry.world.blocks.production.Fracker$FrackerEntity", "mindustry.world.blocks.production.GenericCrafter", "mindustry.world.blocks.production.GenericCrafter$GenericCrafterEntity", "mindustry.world.blocks.production.GenericSmelter", "mindustry.world.blocks.production.Incinerator", "mindustry.world.blocks.production.Incinerator$IncineratorEntity", "mindustry.world.blocks.production.LiquidConverter", "mindustry.world.blocks.production.Pump", "mindustry.world.blocks.production.Separator", "mindustry.world.blocks.production.SolidPump", "mindustry.world.blocks.production.SolidPump$SolidPumpEntity", "mindustry.world.blocks.sandbox.ItemSource", "mindustry.world.blocks.sandbox.ItemSource$ItemSourceEntity", "mindustry.world.blocks.sandbox.ItemVoid", "mindustry.world.blocks.sandbox.LiquidSource", "mindustry.world.blocks.sandbox.LiquidSource$LiquidSourceEntity", "mindustry.world.blocks.sandbox.PowerSource", "mindustry.world.blocks.sandbox.PowerVoid", "mindustry.world.blocks.storage.CoreBlock", "mindustry.world.blocks.storage.CoreBlock$CoreEntity", "mindustry.world.blocks.storage.LaunchPad", "mindustry.world.blocks.storage.StorageBlock", "mindustry.world.blocks.storage.StorageBlock$StorageBlockEntity", "mindustry.world.blocks.storage.Unloader", "mindustry.world.blocks.storage.Unloader$UnloaderEntity", "mindustry.world.blocks.storage.Vault", "mindustry.world.blocks.units.CommandCenter", "mindustry.world.blocks.units.CommandCenter$CommandCenterEntity", "mindustry.world.blocks.units.MechPad", "mindustry.world.blocks.units.MechPad$MechFactoryEntity", "mindustry.world.blocks.units.RallyPoint", "mindustry.world.blocks.units.RepairPoint", "mindustry.world.blocks.units.RepairPoint$RepairPointEntity", "mindustry.world.blocks.units.UnitFactory", "mindustry.world.blocks.units.UnitFactory$UnitFactoryEntity", "mindustry.world.consumers.Consume", "mindustry.world.consumers.ConsumeItemFilter", "mindustry.world.consumers.ConsumeItems", "mindustry.world.consumers.ConsumeLiquid", "mindustry.world.consumers.ConsumeLiquidBase", "mindustry.world.consumers.ConsumeLiquidFilter", "mindustry.world.consumers.ConsumePower", "mindustry.world.consumers.ConsumeType", "mindustry.world.consumers.Consumers", "mindustry.world.meta.Attribute", "mindustry.world.meta.BlockBars", "mindustry.world.meta.BlockFlag", "mindustry.world.meta.BlockGroup", "mindustry.world.meta.BlockStat", "mindustry.world.meta.BlockStats", "mindustry.world.meta.BuildVisibility", "mindustry.world.meta.PowerType", "mindustry.world.meta.Producers", "mindustry.world.meta.StatCategory", "mindustry.world.meta.StatUnit", "mindustry.world.meta.StatValue", "mindustry.world.meta.values.AmmoListValue", "mindustry.world.meta.values.BooleanValue", "mindustry.world.meta.values.BoosterListValue", "mindustry.world.meta.values.ItemFilterValue", "mindustry.world.meta.values.ItemListValue", "mindustry.world.meta.values.LiquidFilterValue", "mindustry.world.meta.values.LiquidValue", "mindustry.world.meta.values.NumberValue", "mindustry.world.meta.values.StringValue", "mindustry.world.modules.BlockModule", "mindustry.world.modules.ConsumeModule", "mindustry.world.modules.ItemModule", "mindustry.world.modules.ItemModule$ItemCalculator", "mindustry.world.modules.ItemModule$ItemConsumer", "mindustry.world.modules.LiquidModule", "mindustry.world.modules.LiquidModule$LiquidCalculator", "mindustry.world.modules.LiquidModule$LiquidConsumer", "mindustry.world.modules.PowerModule", "mindustry.world.producers.Produce", "mindustry.world.producers.ProduceItem"); } \ No newline at end of file diff --git a/tools/src/mindustry/tools/ScriptStubGenerator.java b/tools/src/mindustry/tools/ScriptStubGenerator.java index d13bbbdd49..c60b6589fa 100644 --- a/tools/src/mindustry/tools/ScriptStubGenerator.java +++ b/tools/src/mindustry/tools/ScriptStubGenerator.java @@ -26,7 +26,7 @@ public class ScriptStubGenerator{ Array nameBlacklist = Array.with("ClientLauncher", "NetClient", "NetServer", "ClassAccess"); Array> whitelist = Array.with(Draw.class, Fill.class, Lines.class, Core.class, TextureAtlas.class, TextureRegion.class, Time.class, System.class, PrintStream.class, AtlasRegion.class, String.class, Mathf.class, Angles.class, Color.class, Runnable.class, Object.class, Icon.class, Tex.class, - Sounds.class, Musics.class, Call.class, Texture.class, TextureData.class, Pixmap.class, I18NBundle.class); + Sounds.class, Musics.class, Call.class, Texture.class, TextureData.class, Pixmap.class, I18NBundle.class, Interval.class, DataInput.class, DataOutput.class, DataInputStream.class, DataOutputStream.class); Array nopackage = Array.with("java.lang", "java"); String fileTemplate = "package mindustry.mod;\n" + @@ -49,6 +49,7 @@ public class ScriptStubGenerator{ .include(FilterBuilder.prefix("arc.func")) .include(FilterBuilder.prefix("arc.struct")) .include(FilterBuilder.prefix("arc.scene")) + .include(FilterBuilder.prefix("arc.math")) )); Array> classes = Array.with(reflections.getSubTypesOf(Object.class)); From 6edcbb9120a20ba2fcdae09db069017f72c6f1c9 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Dec 2019 14:38:03 -0500 Subject: [PATCH 32/78] Bugfixes --- core/assets/bundles/bundle.properties | 1 + core/src/mindustry/entities/type/TileEntity.java | 8 ++++++++ core/src/mindustry/game/Rules.java | 2 ++ core/src/mindustry/input/DesktopInput.java | 4 ++-- core/src/mindustry/input/InputHandler.java | 4 ++-- core/src/mindustry/ui/dialogs/CustomRulesDialog.java | 1 + .../mindustry/ui/fragments/BlockInventoryFragment.java | 2 +- .../src/mindustry/ui/fragments/ScriptConsoleFragment.java | 4 ++-- .../src/mindustry/world/blocks/distribution/Junction.java | 7 +++---- core/src/mindustry/world/blocks/distribution/Sorter.java | 2 +- 10 files changed, 23 insertions(+), 12 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 73fee4471d..ca90137fbb 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -755,6 +755,7 @@ rules.enemyCheat = Infinite AI (Red Team) Resources rules.unitdrops = Unit Drops rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier rules.unithealthmultiplier = Unit Health Multiplier +rules.blockhealthmultiplier = Block Health Multiplier rules.playerhealthmultiplier = Player Health Multiplier rules.playerdamagemultiplier = Player Damage Multiplier rules.unitdamagemultiplier = Unit Damage Multiplier diff --git a/core/src/mindustry/entities/type/TileEntity.java b/core/src/mindustry/entities/type/TileEntity.java index 4a2a5aee91..cf5a2f4bdb 100644 --- a/core/src/mindustry/entities/type/TileEntity.java +++ b/core/src/mindustry/entities/type/TileEntity.java @@ -1,5 +1,6 @@ package mindustry.entities.type; +import arc.math.*; import mindustry.annotations.Annotations.*; import arc.Events; import arc.struct.Array; @@ -165,9 +166,16 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{ Call.onTileDestroyed(tile); } + @Override public void damage(float damage){ if(dead) return; + if(Mathf.zero(state.rules.blockHealthMultiplier)){ + damage = health + 1; + }else{ + damage /= state.rules.blockHealthMultiplier; + } + float preHealth = health; Call.onTileDamage(tile, health - block.handleDamage(tile, damage)); diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java index 06231e5318..0515d2ca60 100644 --- a/core/src/mindustry/game/Rules.java +++ b/core/src/mindustry/game/Rules.java @@ -34,6 +34,8 @@ public class Rules{ public float unitHealthMultiplier = 1f; /** How much health players start with. */ public float playerHealthMultiplier = 1f; + /** How much health blocks start with. */ + public float blockHealthMultiplier = 1f; /** How much damage player mechs deal. */ public float playerDamageMultiplier = 1f; /** How much damage any other units deal. */ diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java index df735999d8..b1d483df37 100644 --- a/core/src/mindustry/input/DesktopInput.java +++ b/core/src/mindustry/input/DesktopInput.java @@ -136,7 +136,7 @@ public class DesktopInput extends InputHandler{ ui.listfrag.toggle(); } - if(player.getClosestCore() == null){ + if(player.getClosestCore() == null && !ui.chatfrag.shown()){ //move camera around float camSpeed = 6f; Core.camera.position.add(Tmp.v1.setZero().add(Core.input.axis(Binding.move_x), Core.input.axis(Binding.move_y)).nor().scl(Time.delta() * camSpeed)); @@ -157,7 +157,7 @@ public class DesktopInput extends InputHandler{ if(state.is(State.menu) || Core.scene.hasDialog()) return; //zoom camera - if(!Core.scene.hasScroll() && !ui.chatfrag.shown() && Math.abs(Core.input.axisTap(Binding.zoom)) > 0 && !Core.input.keyDown(Binding.rotateplaced) && (Core.input.keyDown(Binding.diagonal_placement) || ((!isPlacing() || !block.rotate) && selectRequests.isEmpty()))){ + if((!Core.scene.hasScroll() || Core.input.keyDown(Binding.diagonal_placement)) && !ui.chatfrag.shown() && Math.abs(Core.input.axisTap(Binding.zoom)) > 0 && !Core.input.keyDown(Binding.rotateplaced) && (Core.input.keyDown(Binding.diagonal_placement) || ((!isPlacing() || !block.rotate) && selectRequests.isEmpty()))){ renderer.scaleCamera(Core.input.axisTap(Binding.zoom)); } diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index 4a6ffb575b..e56244928e 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -92,7 +92,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ @Remote(targets = Loc.both, forward = true, called = Loc.server) public static void transferInventory(Player player, Tile tile){ - if(player == null || player.timer == null || !player.timer.get(Player.timerTransfer, 40)) return; + if(player == null || player.timer == null) return; if(net.server() && (player.item().amount <= 0 || player.isTransferring|| !Units.canInteract(player, tile))){ throw new ValidateException(player, "Player cannot transfer an item."); } @@ -725,7 +725,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ } public void tryDropItems(Tile tile, float x, float y){ - if(!droppingItem || player.item().amount <= 0 || canTapPlayer(x, y) || state.isPaused() || !player.timer.check(Player.timerTransfer, 40)){ + if(!droppingItem || player.item().amount <= 0 || canTapPlayer(x, y) || state.isPaused() ){ droppingItem = false; return; } diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java index 54e4720d65..73eb5a9efa 100644 --- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java +++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java @@ -142,6 +142,7 @@ public class CustomRulesDialog extends FloatingDialog{ check("$rules.reactorexplosions", b -> rules.reactorExplosions = b, () -> rules.reactorExplosions); number("$rules.buildcostmultiplier", false, f -> rules.buildCostMultiplier = f, () -> rules.buildCostMultiplier, () -> !rules.infiniteResources); number("$rules.buildspeedmultiplier", f -> rules.buildSpeedMultiplier = f, () -> rules.buildSpeedMultiplier); + number("$rules.blockhealthmultiplier", f -> rules.blockHealthMultiplier = f, () -> rules.blockHealthMultiplier); main.addButton("$configure", () -> loadoutDialog.show(Blocks.coreShard.itemCapacity, rules.loadout, diff --git a/core/src/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/mindustry/ui/fragments/BlockInventoryFragment.java index e77a240e36..c4cc71cc5a 100644 --- a/core/src/mindustry/ui/fragments/BlockInventoryFragment.java +++ b/core/src/mindustry/ui/fragments/BlockInventoryFragment.java @@ -36,7 +36,7 @@ public class BlockInventoryFragment extends Fragment{ @Remote(called = Loc.server, targets = Loc.both, forward = true) public static void requestItem(Player player, Tile tile, Item item, int amount){ - if(player == null || tile == null || !player.timer.get(Player.timerTransfer, 20) || !tile.interactable(player.getTeam())) return; + if(player == null || tile == null || !tile.interactable(player.getTeam())) return; if(!Units.canInteract(player, tile)) return; int removed = tile.block().removeStack(tile, item, amount); diff --git a/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java b/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java index 1f667602de..15149e064a 100644 --- a/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java +++ b/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java @@ -45,7 +45,7 @@ public class ScriptConsoleFragment extends Table{ font = Fonts.def; visible(() -> { - if(input.keyTap(Binding.console) && !Vars.net.client() && (scene.getKeyboardFocus() == chatfield || scene.getKeyboardFocus() == null)){ + if(input.keyTap(Binding.console) && (scene.getKeyboardFocus() == chatfield || scene.getKeyboardFocus() == null)){ shown = !shown; if(shown && !open && enableConsole){ toggle(); @@ -53,7 +53,7 @@ public class ScriptConsoleFragment extends Table{ clearChatInput(); } - return shown && !Vars.net.active(); + return shown; }); update(() -> { diff --git a/core/src/mindustry/world/blocks/distribution/Junction.java b/core/src/mindustry/world/blocks/distribution/Junction.java index 43356ca939..99c22057e1 100644 --- a/core/src/mindustry/world/blocks/distribution/Junction.java +++ b/core/src/mindustry/world/blocks/distribution/Junction.java @@ -58,7 +58,7 @@ public class Junction extends Block{ if(dest != null) dest = dest.link(); //skip blocks that don't want the item, keep waiting until they do - if(dest == null || !dest.block().acceptItem(item, dest, tile)){ + if(dest == null || !dest.block().acceptItem(item, dest, tile) || dest.getTeam() != tile.getTeam()){ continue; } @@ -82,10 +82,9 @@ public class Junction extends Block{ JunctionEntity entity = tile.ent(); int relative = source.relativeTo(tile.x, tile.y); - if(entity == null || relative == -1 || !entity.buffer.accepts(relative)) - return false; + if(entity == null || relative == -1 || !entity.buffer.accepts(relative)) return false; Tile to = tile.getNearby(relative); - return to != null && to.link().entity != null; + return to != null && to.link().entity != null && to.getTeam() == tile.getTeam(); } class JunctionEntity extends TileEntity{ diff --git a/core/src/mindustry/world/blocks/distribution/Sorter.java b/core/src/mindustry/world/blocks/distribution/Sorter.java index 89228d02de..1df5fe75e5 100644 --- a/core/src/mindustry/world/blocks/distribution/Sorter.java +++ b/core/src/mindustry/world/blocks/distribution/Sorter.java @@ -74,7 +74,7 @@ public class Sorter extends Block{ public boolean acceptItem(Item item, Tile tile, Tile source){ Tile to = getTileTarget(item, tile, source, false); - return to != null && to.block().acceptItem(item, to, tile); + return to != null && to.block().acceptItem(item, to, tile) && to.getTeam() == tile.getTeam(); } @Override From 811c22b84eb60665600f8fb94ee258f1ba7f82ed Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Dec 2019 15:40:56 -0500 Subject: [PATCH 33/78] Added camera movement while paused --- core/src/mindustry/core/Renderer.java | 12 +++++++----- core/src/mindustry/input/DesktopInput.java | 4 ++-- .../ui/fragments/ScriptConsoleFragment.java | 2 +- gradle.properties | 2 +- server/src/mindustry/server/ServerControl.java | 4 ++-- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java index 9c284a5f06..7d5e6714b5 100644 --- a/core/src/mindustry/core/Renderer.java +++ b/core/src/mindustry/core/Renderer.java @@ -123,12 +123,14 @@ public class Renderer implements ApplicationListener{ if(player.isDead()){ TileEntity core = player.getClosestCore(); - if(core != null && player.spawner == null){ - camera.position.lerpDelta(core.x, core.y, 0.08f); - }else if(core != null){ - camera.position.lerpDelta(position, 0.08f); + if(core != null){ + if(player.spawner == null){ + camera.position.lerpDelta(core.x, core.y, 0.08f); + }else{ + camera.position.lerpDelta(position, 0.08f); + } } - }else if(control.input instanceof DesktopInput){ + }else if(control.input instanceof DesktopInput && !state.isPaused()){ camera.position.lerpDelta(position, 0.08f); } diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java index b1d483df37..e2efcac160 100644 --- a/core/src/mindustry/input/DesktopInput.java +++ b/core/src/mindustry/input/DesktopInput.java @@ -136,9 +136,9 @@ public class DesktopInput extends InputHandler{ ui.listfrag.toggle(); } - if(player.getClosestCore() == null && !ui.chatfrag.shown()){ + if((player.getClosestCore() == null || state.isPaused()) && !ui.chatfrag.shown()){ //move camera around - float camSpeed = 6f; + float camSpeed = !Core.input.keyDown(Binding.dash) ? 3f : 8f; Core.camera.position.add(Tmp.v1.setZero().add(Core.input.axis(Binding.move_x), Core.input.axis(Binding.move_y)).nor().scl(Time.delta() * camSpeed)); } diff --git a/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java b/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java index 15149e064a..378359f631 100644 --- a/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java +++ b/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java @@ -53,7 +53,7 @@ public class ScriptConsoleFragment extends Table{ clearChatInput(); } - return shown; + return shown && Vars.net.active(); }); update(() -> { diff --git a/gradle.properties b/gradle.properties index 51de1f3142..8ed0e699dd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=fe82ca9037028044764cc4b02fdbf851e3d09f78 +archash=14b6027d79cda5e02d74a7c2f85eb7e768c7abeb diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index 352331f80c..d834ecd907 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -1,11 +1,11 @@ package mindustry.server; import arc.*; +import arc.files.*; import arc.struct.*; import arc.struct.Array.*; -import arc.files.*; -import arc.util.*; import arc.util.ArcAnnotate.*; +import arc.util.*; import arc.util.Timer; import arc.util.CommandHandler.*; import arc.util.Timer.*; From 670f085f780aafd66972ed0da68ea1775f1b604e Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Dec 2019 17:56:10 -0500 Subject: [PATCH 34/78] New, improved minimap / Bugfixes --- core/assets/scripts/base.js | 2 +- core/assets/scripts/global.js | 2 +- core/src/mindustry/core/UI.java | 6 +- core/src/mindustry/entities/type/Player.java | 9 +- core/src/mindustry/game/Team.java | 2 +- .../mindustry/graphics/MinimapRenderer.java | 27 ++-- .../mindustry/graphics/OverlayRenderer.java | 2 +- core/src/mindustry/input/DesktopInput.java | 13 +- core/src/mindustry/ui/Minimap.java | 4 +- .../ui/fragments/MinimapFragment.java | 115 ++++++++++++++++++ .../blocks/distribution/OverflowGate.java | 6 +- .../world/blocks/storage/CoreBlock.java | 2 +- .../src/mindustry/server/ServerControl.java | 2 +- 13 files changed, 159 insertions(+), 33 deletions(-) create mode 100644 core/src/mindustry/ui/fragments/MinimapFragment.java diff --git a/core/assets/scripts/base.js b/core/assets/scripts/base.js index a83a66c728..6ce3070968 100755 --- a/core/assets/scripts/base.js +++ b/core/assets/scripts/base.js @@ -16,5 +16,5 @@ const boolp = method => new Boolp(){get: method} const cons = method => new Cons(){get: method} const prov = method => new Prov(){get: method} const newEffect = (lifetime, renderer) => new Effects.Effect(lifetime, new Effects.EffectRenderer({render: renderer})) -Call = Packages.io.anuke.mindustry.gen.Call +Call = Packages.mindustry.gen.Call const Calls = Call //backwards compat \ No newline at end of file diff --git a/core/assets/scripts/global.js b/core/assets/scripts/global.js index 9ba7fc5e4c..22d746b420 100755 --- a/core/assets/scripts/global.js +++ b/core/assets/scripts/global.js @@ -18,7 +18,7 @@ const boolp = method => new Boolp(){get: method} const cons = method => new Cons(){get: method} const prov = method => new Prov(){get: method} const newEffect = (lifetime, renderer) => new Effects.Effect(lifetime, new Effects.EffectRenderer({render: renderer})) -Call = Packages.io.anuke.mindustry.gen.Call +Call = Packages.mindustry.gen.Call const Calls = Call //backwards compat importPackage(Packages.arc) importPackage(Packages.arc.func) diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java index 1ce41f6e24..58cb23d802 100644 --- a/core/src/mindustry/core/UI.java +++ b/core/src/mindustry/core/UI.java @@ -43,6 +43,7 @@ public class UI implements ApplicationListener, Loadable{ public HudFragment hudfrag; public ChatFragment chatfrag; public ScriptConsoleFragment scriptfrag; + public MinimapFragment minimapfrag; public PlayerListFragment listfrag; public LoadingFragment loadfrag; @@ -68,7 +69,7 @@ public class UI implements ApplicationListener, Loadable{ public ContentInfoDialog content; public DeployDialog deploy; public TechTreeDialog tech; - public MinimapDialog minimap; + //public MinimapDialog minimap; public SchematicsDialog schematics; public ModsDialog mods; public ColorPicker picker; @@ -210,6 +211,7 @@ public class UI implements ApplicationListener, Loadable{ menufrag = new MenuFragment(); hudfrag = new HudFragment(); chatfrag = new ChatFragment(); + minimapfrag = new MinimapFragment(); listfrag = new PlayerListFragment(); loadfrag = new LoadingFragment(); scriptfrag = new ScriptConsoleFragment(); @@ -235,7 +237,6 @@ public class UI implements ApplicationListener, Loadable{ content = new ContentInfoDialog(); deploy = new DeployDialog(); tech = new TechTreeDialog(); - minimap = new MinimapDialog(); mods = new ModsDialog(); schematics = new SchematicsDialog(); @@ -254,6 +255,7 @@ public class UI implements ApplicationListener, Loadable{ hudfrag.build(hudGroup); menufrag.build(menuGroup); chatfrag.container().build(hudGroup); + minimapfrag.build(hudGroup); listfrag.build(hudGroup); scriptfrag.container().build(hudGroup); loadfrag.build(group); diff --git a/core/src/mindustry/entities/type/Player.java b/core/src/mindustry/entities/type/Player.java index af5165fc60..8366c01cc6 100644 --- a/core/src/mindustry/entities/type/Player.java +++ b/core/src/mindustry/entities/type/Player.java @@ -568,6 +568,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{ protected void updateKeyboard(){ Tile tile = world.tileWorld(x, y); + boolean canMove = !Core.scene.hasKeyboard() || ui.minimapfrag.shown(); isBoosting = Core.input.keyDown(Binding.dash) && !mech.flying; @@ -594,8 +595,8 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{ } if(Core.input.keyDown(Binding.mouse_move)){ - movement.x += Mathf.clamp((Core.input.mouseX() - Core.graphics.getWidth() / 2) * 0.005f, -1, 1) * speed; - movement.y += Mathf.clamp((Core.input.mouseY() - Core.graphics.getHeight() / 2) * 0.005f, -1, 1) * speed; + movement.x += Mathf.clamp((Core.input.mouseX() - Core.graphics.getWidth() / 2f) * 0.005f, -1, 1) * speed; + movement.y += Mathf.clamp((Core.input.mouseY() - Core.graphics.getHeight() / 2f) * 0.005f, -1, 1) * speed; } Vec2 vec = Core.input.mouseWorld(control.input.getMouseX(), control.input.getMouseY()); @@ -605,7 +606,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{ movement.limit(speed).scl(Time.delta()); - if(!Core.scene.hasKeyboard()){ + if(canMove){ velocity.add(movement.x, movement.y); }else{ isShooting = false; @@ -614,7 +615,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{ updateVelocityStatus(); moved = dst(prex, prey) > 0.001f; - if(!Core.scene.hasKeyboard()){ + if(canMove){ float baseLerp = mech.getRotationAlpha(this); if(!isShooting() || !mech.turnCursor){ if(!movement.isZero()){ diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java index a6e9d1e20a..e6c05eb6e0 100644 --- a/core/src/mindustry/game/Team.java +++ b/core/src/mindustry/game/Team.java @@ -30,7 +30,7 @@ public class Team implements Comparable{ blue = new Team(5, "blue", Color.royal.cpy()); static{ - Mathf.random.setSeed(7); + Mathf.random.setSeed(8); //create the whole 256 placeholder teams for(int i = 6; i < all.length; i++){ new Team(i, "team#" + i, Color.HSVtoRGB(360f * Mathf.random(), 100f * Mathf.random(0.6f, 1f), 100f * Mathf.random(0.8f, 1f), 1f)); diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java index 5d8af45304..36b8707490 100644 --- a/core/src/mindustry/graphics/MinimapRenderer.java +++ b/core/src/mindustry/graphics/MinimapRenderer.java @@ -9,6 +9,7 @@ import arc.math.*; import arc.math.geom.*; import arc.scene.ui.layout.*; import arc.util.*; +import arc.util.ArcAnnotate.*; import arc.util.pooling.*; import mindustry.entities.*; import mindustry.entities.type.*; @@ -42,7 +43,7 @@ public class MinimapRenderer implements Disposable{ return pixmap; } - public Texture getTexture(){ + public @Nullable Texture getTexture(){ return texture; } @@ -70,8 +71,13 @@ public class MinimapRenderer implements Disposable{ region = new TextureRegion(texture); } - public void drawEntities(float x, float y, float w, float h, boolean withLabels){ - updateUnitArray(); + public void drawEntities(float x, float y, float w, float h, float scaling, boolean withLabels){ + if(!withLabels){ + updateUnitArray(); + }else{ + units.clear(); + Units.all(units::add); + } float sz = baseSize * zoom; float dx = (Core.camera.position.x / tilesize); @@ -83,8 +89,8 @@ public class MinimapRenderer implements Disposable{ for(Unit unit : units){ if(unit.isDead()) continue; - float rx = (unit.x - rect.x) / rect.width * w; - float ry = (unit.y - rect.y) / rect.width * h; + float rx = !withLabels ? (unit.x - rect.x) / rect.width * w : unit.x / (world.width() * tilesize) * w; + float ry = !withLabels ? (unit.y - rect.y) / rect.width * h : unit.y / (world.height() * tilesize) * h; if(withLabels && unit instanceof Player){ Player pl = (Player) unit; @@ -94,18 +100,19 @@ public class MinimapRenderer implements Disposable{ } } - Draw.color(unit.getTeam().color); - Fill.rect(x + rx, y + ry, Scl.scl(baseSize / 2f), Scl.scl(baseSize / 2f)); + Draw.mixcol(unit.getTeam().color, 1f); + float scale = Scl.scl(1f) / 2f * scaling; + Draw.rect(unit.getIconRegion(), x + rx, y + ry, unit.getIconRegion().getWidth() * scale, unit.getIconRegion().getHeight() * scale, unit.rotation - 90); } - Draw.color(); + Draw.reset(); } public void drawEntities(float x, float y, float w, float h){ - drawEntities(x, y, w, h, true); + drawEntities(x, y, w, h, 1f, true); } - public TextureRegion getRegion(){ + public @Nullable TextureRegion getRegion(){ if(texture == null) return null; float sz = Mathf.clamp(baseSize * zoom, baseSize, Math.min(world.width(), world.height())); diff --git a/core/src/mindustry/graphics/OverlayRenderer.java b/core/src/mindustry/graphics/OverlayRenderer.java index c0cd917952..da8a808962 100644 --- a/core/src/mindustry/graphics/OverlayRenderer.java +++ b/core/src/mindustry/graphics/OverlayRenderer.java @@ -96,7 +96,7 @@ public class OverlayRenderer{ if(buildFadeTime > 0.005f){ state.teams.eachEnemyCore(player.getTeam(), core -> { float dst = core.dst(player); - if(dst < state.rules.enemyCoreBuildRadius * 1.5f){ + if(dst < state.rules.enemyCoreBuildRadius * 2.2f){ Draw.color(Color.darkGray); Lines.circle(core.x, core.y - 2, state.rules.enemyCoreBuildRadius); Draw.color(Pal.accent, core.getTeam().color, 0.5f + Mathf.absin(Time.time(), 10f, 0.5f)); diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java index e2efcac160..c485b49ff2 100644 --- a/core/src/mindustry/input/DesktopInput.java +++ b/core/src/mindustry/input/DesktopInput.java @@ -140,18 +140,19 @@ public class DesktopInput extends InputHandler{ //move camera around float camSpeed = !Core.input.keyDown(Binding.dash) ? 3f : 8f; Core.camera.position.add(Tmp.v1.setZero().add(Core.input.axis(Binding.move_x), Core.input.axis(Binding.move_y)).nor().scl(Time.delta() * camSpeed)); + + if(Core.input.keyDown(Binding.mouse_move)){ + Core.camera.position.x += Mathf.clamp((Core.input.mouseX() - Core.graphics.getWidth() / 2f) * 0.005f, -1, 1) * camSpeed; + Core.camera.position.y += Mathf.clamp((Core.input.mouseY() - Core.graphics.getHeight() / 2f) * 0.005f, -1, 1) * camSpeed; + } } if(Core.input.keyRelease(Binding.select)){ player.isShooting = false; } - if(!state.is(State.menu) && Core.input.keyTap(Binding.minimap) && (scene.getKeyboardFocus() == ui.minimap || !scene.hasDialog()) && !Core.scene.hasKeyboard() && !(scene.getKeyboardFocus() instanceof TextField)){ - if(!ui.minimap.isShown()){ - ui.minimap.show(); - }else{ - ui.minimap.hide(); - } + if(!state.is(State.menu) && Core.input.keyTap(Binding.minimap) && !scene.hasDialog() && !(scene.getKeyboardFocus() instanceof TextField)){ + ui.minimapfrag.toggle(); } if(state.is(State.menu) || Core.scene.hasDialog()) return; diff --git a/core/src/mindustry/ui/Minimap.java b/core/src/mindustry/ui/Minimap.java index b724f4dd39..bbb81a7f00 100644 --- a/core/src/mindustry/ui/Minimap.java +++ b/core/src/mindustry/ui/Minimap.java @@ -36,7 +36,7 @@ public class Minimap extends Table{ Draw.rect(renderer.minimap.getRegion(), x + width / 2f, y + height / 2f, width, height); if(renderer.minimap.getTexture() != null){ - renderer.minimap.drawEntities(x, y, width, height, false); + renderer.minimap.drawEntities(x, y, width, height, 0.75f, false); } } }).size(140f); @@ -83,7 +83,7 @@ public class Minimap extends Table{ @Override public void clicked(InputEvent event, float x, float y){ - ui.minimap.show(); + ui.minimapfrag.toggle(); } }); diff --git a/core/src/mindustry/ui/fragments/MinimapFragment.java b/core/src/mindustry/ui/fragments/MinimapFragment.java new file mode 100644 index 0000000000..4a938b341a --- /dev/null +++ b/core/src/mindustry/ui/fragments/MinimapFragment.java @@ -0,0 +1,115 @@ +package mindustry.ui.fragments; + +import arc.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.input.*; +import arc.math.*; +import arc.scene.*; +import arc.scene.event.*; +import arc.scene.ui.layout.*; +import mindustry.gen.*; +import mindustry.ui.*; + +import static mindustry.Vars.*; + +public class MinimapFragment extends Fragment{ + private boolean shown; + private float panx, pany, zoom = 1f, lastZoom = -1; + private float baseSize = Scl.scl(1000f); + private Element elem; + + @Override + public void build(Group parent){ + elem = parent.fill((x, y, w, h) -> { + w = Core.graphics.getWidth(); + h = Core.graphics.getHeight(); + float size = baseSize * zoom; + + Draw.color(Color.black); + Fill.crect(x, y, w, h); + + if(renderer.minimap.getTexture() != null){ + Draw.color(); + TextureRegion reg = Draw.wrap(renderer.minimap.getTexture()); + Draw.rect(reg, w/2f + panx*zoom, h/2f + pany*zoom, size, size); + renderer.minimap.drawEntities(w/2f + panx*zoom - size/2f, h/2f + pany*zoom - size/2f, size, size, zoom, true); + } + + Draw.reset(); + }); + + elem.visible(() -> shown); + elem.update(() -> { + elem.requestKeyboard(); + elem.requestScroll(); + elem.setFillParent(true); + elem.setBounds(0, 0, Core.graphics.getWidth(), Core.graphics.getHeight()); + + if(Core.input.keyTap(KeyCode.ESCAPE) || Core.input.keyTap(KeyCode.BACK)){ + shown = false; + } + }); + elem.touchable(Touchable.enabled); + + elem.addListener(new ElementGestureListener(){ + + @Override + public void zoom(InputEvent event, float initialDistance, float distance){ + if(lastZoom < 0){ + lastZoom = zoom; + } + + zoom = Mathf.clamp(distance / initialDistance * lastZoom, 0.25f, 10f); + } + + @Override + public void pan(InputEvent event, float x, float y, float deltaX, float deltaY){ + panx += deltaX / zoom; + pany += deltaY / zoom; + } + + @Override + public void touchDown(InputEvent event, float x, float y, int pointer, KeyCode button){ + super.touchDown(event, x, y, pointer, button); + } + + @Override + public void touchUp(InputEvent event, float x, float y, int pointer, KeyCode button){ + lastZoom = zoom; + } + }); + + elem.addListener(new InputListener(){ + + @Override + public boolean scrolled(InputEvent event, float x, float y, float amountX, float amountY){ + zoom = Mathf.clamp(zoom - amountY / 10f * zoom, 0.25f, 10f); + return true; + } + }); + + parent.fill(t -> { + t.setFillParent(true); + t.visible(() -> shown); + t.update(() -> t.setBounds(0, 0, Core.graphics.getWidth(), Core.graphics.getHeight())); + + t.add("$minimap").style(Styles.outlineLabel).pad(10f); + t.row(); + t.add().growY(); + t.row(); + + if(mobile){ + t.addImageTextButton("$back", Icon.backSmall, () -> shown = false).size(220f, 60f).pad(12f); + } + }); + } + + public boolean shown(){ + return shown; + } + + public void toggle(){ + shown = !shown; + } +} diff --git a/core/src/mindustry/world/blocks/distribution/OverflowGate.java b/core/src/mindustry/world/blocks/distribution/OverflowGate.java index 185fdf7834..b07ae8c7be 100644 --- a/core/src/mindustry/world/blocks/distribution/OverflowGate.java +++ b/core/src/mindustry/world/blocks/distribution/OverflowGate.java @@ -81,11 +81,11 @@ public class OverflowGate extends Block{ if(to == null) return null; Tile edge = Edges.getFacingEdge(tile, to); - if(!to.block().acceptItem(item, to, edge) || (to.block() instanceof OverflowGate)){ + if(!to.block().acceptItem(item, to, edge) || to.getTeam() != tile.getTeam() || (to.block() instanceof OverflowGate)){ Tile a = tile.getNearby(Mathf.mod(from - 1, 4)); Tile b = tile.getNearby(Mathf.mod(from + 1, 4)); - boolean ac = a != null && a.block().acceptItem(item, a, edge) && !(a.block() instanceof OverflowGate); - boolean bc = b != null && b.block().acceptItem(item, b, edge) && !(b.block() instanceof OverflowGate); + boolean ac = a != null && a.block().acceptItem(item, a, edge) && !(a.block() instanceof OverflowGate) && a.getTeam() == tile.getTeam(); + boolean bc = b != null && b.block().acceptItem(item, b, edge) && !(b.block() instanceof OverflowGate) && b.getTeam() == tile.getTeam(); if(!ac && !bc){ return null; diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java index f9a5cf6c9b..4a8f500d77 100644 --- a/core/src/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java @@ -151,7 +151,7 @@ public class CoreBlock extends StorageBlock{ @Override public void removed(Tile tile){ CoreEntity entity = tile.ent(); - int total = tile.entity.proximity().count(e -> e.entity.items == tile.entity.items); + int total = tile.entity.proximity().count(e -> e.entity != null && e.entity.items != null && e.entity.items == tile.entity.items); float fract = 1f / total / state.teams.cores(tile.getTeam()).size; tile.entity.proximity().each(e -> isContainer(e) && e.entity.items == tile.entity.items, t -> { diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index d834ecd907..f78f6fbab9 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -292,7 +292,7 @@ public class ServerControl implements ApplicationListener{ info("&ly {0} seconds until next wave.", (int)(state.wavetime / 60)); } - info(" &ly{0} FPS, {1} MB used.", (int)(60f / Time.delta()), Core.app.getJavaHeap() / 1024 / 1024); + info(" &ly{0} FPS, {1} MB used.", Core.graphics.getFramesPerSecond(), Core.app.getJavaHeap() / 1024 / 1024); if(playerGroup.size() > 0){ info(" &lyPlayers: {0}", playerGroup.size()); From b952ee0725b929167908cfccaccf4ae5658a841b Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Dec 2019 18:01:10 -0500 Subject: [PATCH 35/78] Tweaks --- core/src/mindustry/graphics/MinimapRenderer.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java index 36b8707490..01ac9ab09a 100644 --- a/core/src/mindustry/graphics/MinimapRenderer.java +++ b/core/src/mindustry/graphics/MinimapRenderer.java @@ -92,6 +92,11 @@ public class MinimapRenderer implements Disposable{ float rx = !withLabels ? (unit.x - rect.x) / rect.width * w : unit.x / (world.width() * tilesize) * w; float ry = !withLabels ? (unit.y - rect.y) / rect.width * h : unit.y / (world.height() * tilesize) * h; + Draw.mixcol(unit.getTeam().color, 1f); + float scale = Scl.scl(1f) / 2f * scaling; + Draw.rect(unit.getIconRegion(), x + rx, y + ry, unit.getIconRegion().getWidth() * scale, unit.getIconRegion().getHeight() * scale, unit.rotation - 90); + Draw.reset(); + if(withLabels && unit instanceof Player){ Player pl = (Player) unit; if(!pl.isLocal){ @@ -99,10 +104,6 @@ public class MinimapRenderer implements Disposable{ drawLabel(x + rx, y + ry, pl.name, unit.getTeam().color); } } - - Draw.mixcol(unit.getTeam().color, 1f); - float scale = Scl.scl(1f) / 2f * scaling; - Draw.rect(unit.getIconRegion(), x + rx, y + ry, unit.getIconRegion().getWidth() * scale, unit.getIconRegion().getHeight() * scale, unit.rotation - 90); } Draw.reset(); From 5af7cd1d55775a201e2eab7734c4197c17a8390b Mon Sep 17 00:00:00 2001 From: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com> Date: Mon, 30 Dec 2019 01:50:59 +0200 Subject: [PATCH 36/78] Update bundle_uk_UA.properties (#1275) --- core/assets/bundles/bundle_uk_UA.properties | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index a0c1edf720..e37aab78f7 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -12,6 +12,7 @@ link.itch.io.description = Itch.io сторінка, на якій можна з link.google-play.description = Завантажити для Android з Google Play link.f-droid.description = Перелік каталогу F-Droid link.wiki.description = Офіційна Mindustry wiki +link.feathub.description = Запропонувати нові функції linkfail = Не вдалося відкрити посилання!\nURL-адреса скопійована в буфер обміну. screenshot = Зняток мапи збережено в {0} screenshot.invalid = Мапа занадто велика, тому, мабуть, не вистачає пам’яті для знятку мапи. @@ -27,6 +28,13 @@ load.system = Система load.mod = Модифікації load.scripts = Скрипти +be.update = Доступна нова збірка Bleeding Edge: +be.update.confirm = Завантажити і перезавантажити зараз? +be.updating = Оновлення… +be.ignore = Ігнорувати +be.noupdates = Оновлень не знайдено. +be.check = Перевірити на наявність оновлень + schematic = Схема schematic.add = Зберегти схему… schematics = Схеми @@ -147,6 +155,7 @@ server.kicked.nameEmpty = Ваше ім’я має містити принай server.kicked.idInUse = Ви вже на цьому сервері! Підключення двох облікових записів не дозволяється. server.kicked.customClient = Цей сервер не підтримує користувацькі збірки. Завантажте офіційну версію. server.kicked.gameover = Гра завершена! +server.kicked.serverRestarting = Сервер перезавантажується server.versions = Ваша версія:[accent] {0}[]\nВерсія на сервері:[accent] {1}[] host.info = Кнопка [accent]Сервер[] розміщує сервер на порті [scarlet]6567[]. \nКористувачі, які знаходяться у тій же [lightgray]WiFi або локальній мережі[], повинні бачити ваш сервер у своєму списку серверів.\n\nЯкщо ви хочете, щоб люди могли приєднуватися з будь-якої точки через IP, то[accent] переадресація порту []обов’язкова.\n\n[lightgray]Примітка. Якщо у вас виникли проблеми з підключенням до вашої локальної гри, переконайтеся, що ви дозволили Mindustry доступ до вашої локальної мережі в налаштуваннях брандмауера. Зауважте, що публічні мережі іноді не дозволяють виявити сервер. join.info = Тут ви можете ввести [accent]IP сервера[] для підключення або знайти сервери у [accent]локальній мережі[] для підключення до них.\nПідтримується локальна мережа(LAN) і широкосмугова мережа(WAN).\n\n[lightgray] Примітка. Тут немає автоматичного глобального списку серверів; якщо ви хочете підключитися до когось через IP, вам доведеться попросити створювача сервера дати свій ip. @@ -317,7 +326,7 @@ waves.invalid = Недійсні хвилі у буфері обміну. waves.copied = Хвилі скопійовані. waves.none = Вороги не були встановлені.\nЗазначимо, що пусті хвилі будуть автоматично замінені звичайною хвилею. editor.default = [lightgray]<За замовчуванням> -details = Деталі… +details = Подробиці… edit = Редагувати… editor.name = Назва: editor.spawn = Створити бойову одиницю @@ -622,6 +631,7 @@ setting.screenshake.name = Тряска екрану setting.effects.name = Ефекти setting.destroyedblocks.name = Показувати зруйновані блоки setting.conveyorpathfinding.name = Пошук шляху для встановлення конвейерів +setting.coreselect.name = Дозволити схематичні ядра setting.sensitivity.name = Чутливість контролера setting.saveinterval.name = Інтервал збереження setting.seconds = {0} с @@ -732,6 +742,7 @@ rules.enemyCheat = Нескінченні ресурси для ШІ rules.unitdrops = Ресурс бойових одиниць rules.unitbuildspeedmultiplier = Множник швидкості виробництва бойових одиниць rules.unithealthmultiplier = Множник здоров’я бойових одиниць +rules.blockhealthmultiplier = Множник здоров’я блоків rules.playerhealthmultiplier = Множник здоров’я гравця rules.playerdamagemultiplier = Множник шкоди гравця rules.unitdamagemultiplier = Множник шкоди бойових одиниць @@ -1056,7 +1067,7 @@ tutorial.launch = Як тільки ви досягнете певної хви item.copper.description = Найбільш базовий будівельний матеріал. Широко використовується у всіх типах блоків. item.lead.description = Основний стартовий матеріал. Широко застосовується в електроніці та транспортуванні рідин. item.metaglass.description = Супер жорсткий склад скла. Широко застосовується для розподілу та зберігання рідини. -item.graphite.description = Мінералізований вуглець, що використовується для боєприпасів та електроізоляції. +item.graphite.description = Мінералізований вуглець, що використовується для боєприпасів та як компонент. item.sand.description = Поширений матеріал, який широко використовується при виплавці, як при сплавленні, так і в якості відходів. item.coal.description = Окам’янілі рослинні речовини, що утворюються задовго до посіву. Широко використовується для виробництва пального та ресурсів. item.titanium.description = Рідкісний надлегкий метал, який широко використовується для транспортування рідини, бурів і літаків. From 150d0bf513c6600eb72fdc1602bb6675f653a344 Mon Sep 17 00:00:00 2001 From: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com> Date: Mon, 30 Dec 2019 01:51:22 +0200 Subject: [PATCH 37/78] [WIP]Update bundle_uk_UA.properties (#1220) * Update bundle_uk_UA.properties * Update bundle_uk_UA.properties * Update bundle_uk_UA.properties * Update bundle_uk_UA.properties * 17.12.2019 --- core/assets/bundles/bundle_uk_UA.properties | 112 ++++++++++---------- 1 file changed, 57 insertions(+), 55 deletions(-) diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index e37aab78f7..8decca67f5 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -10,7 +10,7 @@ link.dev-builds.description = Нестабільні версії link.trello.description = Офіційна дошка Trello для запланованих функцій link.itch.io.description = Itch.io сторінка, на якій можна завантажити гру link.google-play.description = Завантажити для Android з Google Play -link.f-droid.description = Перелік каталогу F-Droid +link.f-droid.description = Завантажити для Android з F-Droid link.wiki.description = Офіційна Mindustry wiki link.feathub.description = Запропонувати нові функції linkfail = Не вдалося відкрити посилання!\nURL-адреса скопійована в буфер обміну. @@ -45,7 +45,7 @@ schematic.importfile = Імпортувати файл schematic.browseworkshop = Переглянути в Майстерні schematic.copy = Копіювати в буфер обміну schematic.copy.import = Імпортувати з клавіатури -schematic.shareworkshop = Поширити в Майстерні +schematic.shareworkshop = Поширити в Майстерню schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Відобразити схему schematic.saved = Схема збережена. schematic.delete.confirm = Ця схема буде повністю випалена. @@ -75,7 +75,7 @@ customgame = Користувацька гра newgame = Нова гра none = <нічого> minimap = Мінімапа -position = Позиція +position = Місцерозташування close = Закрити website = Веб-сайт quit = Вихід @@ -105,22 +105,25 @@ mod.author = [LIGHT_GRAY]Автор:[] {0} mods.alpha = [scarlet](Альфа) mods = Модифікації mods.none = [LIGHT_GRAY]Модифікацій не знайдено! -mods.guide = Посібник зі створення модифицій +mods.guide = Посібник з модифицій mods.report = Повідомити про ваду mods.openfolder = Відкрити теку модифікацій mod.enabled = [lightgray]Увімкнено mod.disabled = [scarlet]Вимкнено -mod.disable = Вимкнути +mod.disable = Вимкн. mod.delete.error = Неможливо видалити модифікацію. Файл, можливо, використовується. -mod.requiresversion = [scarlet]Необхідна версія гри: [accent]{0} +mod.requiresversion = [scarlet]Необхідна мінімальна версія гри: [accent]{0} +mod.erroredcontent = [scarlet]Помилки при завантаженнні +mod.errors = Сталася помилка при завантаження змісту. +mod.noerrorplay = [scarlet]Ви маєте модифікації з помилками.[] Або вимкніть проблемні модифікації, або виправте їх. mod.missingdependencies = [scarlet]Відсутні залежності: {0} mod.nowdisabled = [scarlet]Модифікації «{0}» не вистачає залежних модифікацій:[accent] {1}\n[lightgray]Ці модифікації потрібно завантажити спочатку.\nЦя модифікація буде автоматично вимкнена. -mod.enable = Увімкнути +mod.enable = Увімк. mod.requiresrestart = А тепер гра закриється, щоб застосувати зміни модифікацій. mod.reloadrequired = [scarlet]Потрібно перезавантаження mod.import = Імпортувати модифікацію -mod.import.github = Імпортувати модификацію з GitHub -mod.item.remove =Цей предмет є частиною модифікації [accent] '«{0}»[]. Щоб видалити його, видаліть цю модифікацію. +mod.import.github = Завантажити мод з GitHub +mod.item.remove = Цей предмет є частиною модифікації [accent] «{0}»[]. Щоб видалити його, видаліть цю модифікацію. mod.remove.confirm = Цю модифікацію буде видалено. mod.author = [LIGHT_GRAY]Автор:[] {0} mod.missing = Це збереження містить модифікації, які ви нещодавно оновили або більше не встановлювали. Збереження може зіпсуватися. Ви впевнені, що хочете завантажити його?\n[lightgray]Модифікації:\n{0} @@ -141,7 +144,7 @@ players = Гравців: {0} players.single = {0} гравець на сервері server.closing = [accent]Закриття сервера… server.kicked.kick = Ви були вигнані з сервера! -server.kicked.whitelist = Ви не в білому спискі сервері. +server.kicked.whitelist = Ви не в білому спискі сервера! server.kicked.serverClose = Сервер закрито. server.kicked.vote = Вас було вигнано із сервера за допомогою голосування. Прощавайте. server.kicked.clientOutdated = Застарілий клієнт! Оновіть свою гру! @@ -218,8 +221,8 @@ save.delete.confirm = Ви дійсно хочете видалити це зб save.delete = Видалити save.export = Експортувати збереження save.import.invalid = [accent]Це збереження недійсне! -save.import.fail = [crimson]Не вдалося імпортувати збереження: [accent]{0} -save.export.fail = [crimson]Не вдалося експортувати збереження: [accent]{0} +save.import.fail = [crimson]Не вдалося завантажити збереження: [accent]{0} +save.export.fail = [crimson]Не вдалося вивантажити збереження: [accent]{0} save.import = Імпортувати збереження save.newslot = Ім’я збереження: save.rename = Перейменувати @@ -249,12 +252,12 @@ cancel = Скасувати openlink = Відкрити посилання copylink = Скопіювати посилання back = Назад -data.export = Експортувати дані -data.import = Импортувати дані -data.exported = Дані імпортовано. +data.export = Вивантажити дані +data.import = Завантажити дані +data.exported = Дані вивантажено. data.invalid = Це не дійсні ігрові дані. -data.import.confirm = Імпорт зовнішніх даних перезапише[scarlet] ВСІ[] ваші поточні ігрові дані.\n[accent]Це неможливо скасувати![]\n\nЩойно дані імпортуються, гра негайно закриється. -classic.export = Експортувати класичні дані +data.import.confirm = Вивантаження зовнішніх даних перезапише[scarlet] ВСІ[] ваші поточні ігрові дані.\n[accent]Це неможливо скасувати![]\n\nЩойно дані імпортуються, гра негайно закриється. +classic.export = Вивантажити класичні дані classic.export.text = Класичне (версія 3.5 збірка 40) збереження або мапа були знайдені. Ви хочете експортувати ці дані в домашню теку телефону, для використання у застосунку Mindustry Classic? quit.confirm = Ви впевнені, що хочете вийти? quit.confirm.tutorial = Ви впевнені, що хочете вийти з навчання? @@ -334,7 +337,7 @@ editor.removeunit = Видалити бойову одиницю editor.teams = Команди editor.errorload = Помилка завантаження зображення:\n[accent] {0} editor.errorsave = Помилка збереження зображення:\n[accent]{0} -editor.errorimage = Це зображення, а не мапа. Не змінюйте розширення, очікуючи, що це запрацює.\n\nЯкщо Ви хочете імпортувати застарілку мапу, то використовуйте кнопку «Імпортувати застаріле зображення» у редакторі. +editor.errorimage = Це зображення, а не мапа. Не змінюйте розширення, очікуючи, що це запрацює.\n\nЯкщо ви хочете імпортувати застарілку мапу, то використовуйте кнопку «Імпортувати застаріле зображення» у редакторі. editor.errorlegacy = Ця мапа занадто стара і використовує попередній формат мапи, який більше не підтримується. editor.errornot = Це не мапа. editor.errorheader = Цей файл мапи недійсний або пошкоджений. @@ -435,8 +438,8 @@ abandon = Покинути abandon.text = Ця зона і всі її ресурси будуть втрачені. locked = Заблоковано complete = [lightgray]Досягнута: -requirement.wave = Досягніть хвилі {0} у {1} -requirement.core = Знишьте вороже ядро у {0} +requirement.wave = Досягніть хвилі {0} у зоні «{1}» +requirement.core = Знищьте вороже ядро у {0} requirement.unlock = Розблокуйте {0} resume = Відновити зону:\n[lightgray]{0} bestwave = [lightgray]Найкраща хвиля: {0} @@ -445,16 +448,16 @@ launch.title = Запуск вдалий launch.next = [lightgray]наступна можливість на {0}-тій хвилі launch.unable2 = [scarlet]ЗАПУСК неможливий.[] launch.confirm = Це видалить всі ресурси у Вашому ядрі.\nВи не зможете повернутися до цієї бази. -launch.skip.confirm = Якщо Ви пропустите зараз, Ви не зможете не запускати до більш пізніх хвиль. +launch.skip.confirm = Якщо ви пропустите зараз, Ви не зможете не запускати до більш пізніх хвиль. uncover = Розкрити configure = Вивантажити конфігурацію bannedblocks = Заборонені блоки addall = Додати все -configure.locked = [lightgray]Можливість розблокувати вивантаження ресурсів буде доступна на {0}-тій хвилі. +configure.locked = {0}[lightgray]Тільки після цього можливість розблокувати вивантаження ресурсів буде доступна. configure.invalid = Кількість повинна бути числом між 0 та {0}. zone.unlocked = Зона «[lightgray]{0}» тепер розблокована. -zone.requirement.complete = Ви досягли {0}-тої хвилі,\nВимоги до зони «{1}» виконані. -zone.config.unlocked = Loadout unlocked:[lightgray]\n{0} +zone.requirement.complete = Ви досягли {0}-тої хвилі. \nВимоги до зони «{1}» виконані. +zone.config.unlocked = Вивантаження розблоковано:[lightgray]\n{0} zone.resources = Виявлені ресурси: zone.objective = [lightgray]Мета: [accent]{0} zone.objective.survival = Вижити @@ -471,7 +474,7 @@ error.mapnotfound = Файл мапи не знайдено error.io = Мережева помилка введення-виведення error.any = Невідома мережева помилка error.bloom = Не вдалося ініціалізувати цвітіння.\nВаш пристрій, мабуть, не підтримує це. -zone.groundZero.name = Нульова земля +zone.groundZero.name = Відправний пункт zone.desertWastes.name = Пустельні відходи zone.craters.name = Кратери zone.frozenForest.name = Крижаний ліс @@ -502,7 +505,7 @@ zone.crags.description = <вставити опис тут> settings.language = Мова settings.data = Ігрові дані settings.reset = Скинути за замовчуванням -settings.rebind = Зміна +settings.rebind = Змінити settings.resetKey = Скинути settings.controls = Керування settings.game = Гра @@ -524,7 +527,7 @@ blocks.output = Вихід blocks.booster = Прискорювач block.unknown = [lightgray]??? blocks.powercapacity = Місткість енергії -blocks.powershot = Енергія/постріл +blocks.powershot = Енергія за постріл blocks.damage = Шкода blocks.targetsair = Повітряні мішені blocks.targetsground = Наземні мішені @@ -536,7 +539,7 @@ blocks.liquidcapacity = Місткість рідини blocks.powerrange = Діапазон передачі енергії blocks.powerconnections = Максимальна кількість з’єднань blocks.poweruse = Енергії використовує -blocks.powerdamage = Енергія/урон +blocks.powerdamage = Енергія/шкода blocks.itemcapacity = Місткість предметів blocks.basepowergeneration = Базова генерація енергії blocks.productiontime = Час виробництва @@ -860,7 +863,7 @@ block.core-nucleus.name = Ядро «Атом» block.deepwater.name = Глибоководдя block.water.name = Вода block.tainted-water.name = Забруднена вода -block.darksand-tainted-water.name = Темний пісок з забрудненою водою +block.darksand-tainted-water.name = Темний пісок із забрудненою водою block.tar.name = Дьоготь block.stone.name = Камінь block.sand.name = Пісок @@ -1044,26 +1047,25 @@ unit.eradicator.name = Випалювач unit.lich.name = Лич unit.reaper.name = Жнець tutorial.next = [lightgray]<Натисніть для продовження> -tutorial.intro = Ви розпочали[scarlet] навчання по Mindustry.[]\nРозпочніть з[accent] видобування міді[]. Використовуйте [[WASD] для руху.\n[accent] Утримуйте [[Ctrl] під час прокрутки миші[] для приближення і віддалення. Наблизьтесь, а потім натисність на мідну жилу біля вашого ядра, щоб зробити це.\n\n[accent]{0}/{1} міді +tutorial.intro = Ви розпочали[scarlet] навчання по Mindustry.[]\nРозпочніть з [accent]видобутку міді[]. Використовуйте [[WASD] для руху.\n[accent]Прокручуйте миш[] для приближення і віддалення. Наблизьтесь до мідної жили біля вашого ядра, а потім натисніть на неї, щоб розпочати видобуток.\n\n[accent]{0}/{1} міді tutorial.intro.mobile = Ви розпочали[scarlet] навчання по Mindustry.[]\nПроведіть екраном, щоб рухатися.\n[accent] Зведіть або розведіть 2 пальця [] для приближення і віддалення відповідно.\nз[accent] видобування міді.[] Наблизьтесь, а потім натисність на мідну жилу біля вашого ядра, щоб зробити це.\n\n[accent]{0}/{1} міді -tutorial.drill = Добування вручну неефективне.\n[accent]Бури []можуть добувати автоматично.\nНатисніть на вкладку свердла знизу зправа.\nВиберіть[accent] механічний бур[]. Розмістіть його на мідній жилі натисканням.\nВи також можете вибрати бур, натиснувши [accent][[2][], а потім натиснути [accent][[1][] швидко, незалежно від того, яка вкладка відкрита.\n[accent]Натисніть ПКМ[], щоб зупинити будування.tutorial.drill.mobile = Добування вручну неефективне.\n[accent]Бури []можуть добувати автоматично.\nНатисність на вкладку сведла знизу зправа.\nВиберіть[accent] механічний бур[]. Розмістіть його на мідній жилі натисканням, потім натисність на [accent] галочку[] нижче, щоб підтвердити розміщення .\nНатисніть[accent] клавішу X[], щоб скасувати розміщення. -tutorial.drill.mobile = Добування вручну неефективне.\n[accent]Бури []можуть добувати автоматично.\nНатисність на вкладку сведла знизу зправа.\nВиберіть[accent] механічний бур[]. Розмістіть його на мідній жилі натисканням, потім натисність на [accent] галочку[] нижче, щоб підтвердити розміщення.\nPress the[accent] X button[] to cancel placement. -tutorial.blockinfo = Кожен блок має різні характеристики. Кожний бур може видобувати тільки певні руди.\nЩоб переглянути інформацію та характеристики блока,[accent] натисність на кнопку «?», коли Ви вибрали блок у меню будування.[]\n\n[accent]Перегляньте характеристику Механічного бура прямо зараз.[] -tutorial.conveyor = [accent]Конвеєри[] використовуються для транспортування предметів до ядра.\nЗробіть лінію конвеєрів від бура до ядра.\n[accent]Утримуйте миш, щоб розмістити у лінію.[]\nУтримуйте[accent] CTRL[] під час вибору лінії для розміщення по діагоналі.\n\n[accent]{0}/{1} конвеєрів, які розміщені в лінію\n[accent]0/1 предмет доставлено -tutorial.conveyor.mobile = [accent]Конвеєри[] використовується для транспортування предметів до ядра.\nЗробіть лінію конвеєрів від бура до ядра.\n[accent] Розмістить у лінію, утримуючи палець кілька секунд[] і тягніть у напрямку, який Ви вибрали.\nВикористовуйте колесо прокрутки, щоб обертати блоки перед їх розміщенням\n[accent]{0}/{1} конвеєрів, які розміщені в лінію\n[accent]0/1 предмет доставлено -tutorial.turret = Оборонні споруди повинні бути побудовані для відбиття[lightgray] ворогів[].\nПобудуйте[accent] башточку «Подвійна»[] біля вашої бази. -tutorial.drillturret = «Подвійна» потребує [accent] мідні боєприпаси []для стрільби.\nРозмістіть бур біля башточки\nПроведіть конвеєри до башточки, щоб заповнити її боєприпасами.\n\n[accent]Доставлено боєприпасів: 0/1 -tutorial.pause = Під час бою ви можете[accent] поставити на павзу гру.[]\nВи можете зробити чергу на будування під час паузи.\n\n[accent]Натисність пробіл для павзи.tutorial.launch -tutorial.pause.mobile = Під час бою ви можете[accent] поставити на павзу гру.[]\nВи можете зробити чергу на будування під час паузи.\n\n[accent]атисніть кнопку зліва вгорі для павзи. +tutorial.drill = Добування вручну не є ефективним.\n[accent]Бури []можуть добувати автоматично.\nНатисніть на вкладку із зображенням свердла знизу праворуч.\nВиберіть[accent] механічний бур[]. Розмістіть його на мідній жилі натисканням.\nВи також можете вибрати бур, натиснувши [accent][[2][], а потім швидко натиснути [accent][[1][], незалежно від того, яка вкладка відкрита.\n[accent]Натисніть ПКМ[], щоб зупинити будування. +tutorial.drill.mobile = Добування вручну неефективне.\n[accent]Бури []можуть добувати автоматично.\nНатисність на вкладку із зображенням сведла знизу зправа.\nВиберіть[accent] механічний бур[]. Розмістіть його на мідній жилі натисканням, потім натисність на [accent]галочку[] нижче, щоб підтвердити розміщення .\nНатисніть [accent]кнопку X[], щоб скасувати розміщення. +tutorial.blockinfo = Кожен блок має різні характеристики. Кожний бур може видобувати тільки певні руди.\nЩоб переглянути інформацію та характеристики блока,[accent] натисність на кнопку «?», коли ви вибрали блок у меню будування.[]\n\n[accent]Перегляньте характеристику Механічного бура прямо зараз.[] +tutorial.conveyor = [accent]Конвеєри[] використовуються для транспортування предметів до ядра.\nЗробіть лінію конвеєрів від бура до ядра.\n[accent]Утримуйте миш, щоб розмістити у лінію.[]\nУтримуйте[accent] CTRL[] під час вибору лінії для розміщення по діагоналі.\\nПрокручуйте, щоб обертати блоки до їх установлення.\n[accent]Розмістіть 2 конвеєри у лінію, а потім доставте предмет в ядро.tutorial.conveyor.mobile = [accent]Конвеєри[] використовується для транспортування предметів до ядра.\nЗробіть лінію конвеєрів від бура до ядра.\n[accent] Розмістить у лінію, утримуючи палець кілька секунд[] і тягніть у напрямку, який Ви вибрали.\nВикористовуйте колесо прокрутки, щоб обертати блоки перед їх розміщенням\n[accent]{0}/{1} конвеєрів, які розміщені в лінію\n[accent]0/1 предмет доставлено +tutorial.turret = Оборонні споруди повинні бути побудовані для відбиття[lightgray] ворогів[].\nПобудуйте[accent] башту «Подвійна»[] біля вашої бази. +tutorial.drillturret = «Подвійна» потребує [accent]мідні боєприпаси[] для стрільби.\nРозмістіть бур біля башточки\nПроведіть конвеєри до башточки, щоб заповнити її боєприпасами.\n\n[accent]Доставлено боєприпасів: 0/1 +tutorial.pause = Під час бою ви можете[accent] поставити на павзу гру.[]\nВи можете зробити чергу на будування під час паузи.\n\n[accent]Натисність пробіл для павзи. +tutorial.pause.mobile = Під час бою ви можете[accent] поставити на павзу гру.[]\nВи можете зробити чергу на будування під час паузи.\n\n[accent]Натисніть кнопку вгорі ліворуч для павзи. tutorial.unpause = Тепер натисність пробіл, щоб зняти павзу. tutorial.unpause.mobile = Тепер натисність туди ще раз, щоб зняти павзу. -tutorial.breaking = Блоки часто повинні бути знищені.\n[accent]Утримуючи ПКМ[] Ви знищите всі виділені блоки.[]\n\n[accent]Необхідно знищити всі стіни з металобрухту ліворуч від вашого ядра використовуючи видалення у зоні. +tutorial.breaking = Блоки часто повинні бути знищені.\n[accent]Утримуючи ПКМ[] ви знищите всі виділені блоки.[]\n\n[accent]Необхідно знищити всі стіни з металобрухту ліворуч від вашого ядра використовуючи видалення у зоні. tutorial.breaking.mobile = Блоки часто повинні бути знищені.\n[accent]Виберіть режим руйнування[], потім натисніть на блок, щоб зламати його.\nЗнищіть область, утримуючи палець протягом декількох секунд [] і потягнувши в потрібному напрямку.\nНатисніть кнопку галочки, щоб підтвердити руйнування.\n\n[accent]Необхідно знищити всі стіни з металобрухту ліворуч від вашого ядра використовуючи видалення у зоні. -tutorial.withdraw = У деяких ситуаціях потрібно брати предмети безпосередньо з блоків.\nЩоб зробити це, [accent]натисність на блок[] з предметами на ньому, і потім [accent]натисніть на предмет[] в інвентарі.\nМожна вилучити кілька предметів [accent]натискаючи та утримуючи[].\n\n[accent]Вилучіть трохи міді з ядра.[] +tutorial.withdraw = У деяких ситуаціях потрібно брати предмети безпосередньо з блоків.\nЩоб зробити це, [accent]натисність на блок[] з предметами, і потім [accent]натисніть на предмет[] в інвентарі.\nМожна вилучити кілька предметів [accent]натискаючи та утримуючи[].\n\n[accent]Вилучіть трохи міді з ядра.[] tutorial.deposit = Покладіть предмети в блоки, перетягнувши з вашого корабля в потрібний блок.\n\n[accent]Покладіть мідь назад у ядро.[] -tutorial.waves = [lightgray] Ворог[] з’явився.\n\nЗахистіть ядро від двух хвиль.[accent] Натисніть[], щоб стріляти.\nСтворіть більше башточок і бурів. Добудьте більше міді. -tutorial.waves.mobile = [lightgray] Ворог[] з’явився.\n\nЗахистіть ядро від двух хвиль. Ваш корабель буде автоматично атакувати ворогів.\nСтворіть більше башточок і бурів. Добудьте більше міді. -tutorial.launch = Як тільки ви досягнете певної хвилі, Ви зможете[accent] запустити ядро[], залишивши захисні сили позаду та [accent]отримати всі ресурси у вашому ядрі.[]\nЦі отримані ресурси можуть бути використані для дослідження нових технологій.\n\n[accent]Натисніть кнопку запуску. +tutorial.waves = [lightgray] Ворог[] з’явився.\n\nЗахистіть ядро від двух хвиль.[accent] Натисніть ЛКМ[], щоб стріляти.\nСтворіть більше башт і бурів. Добудьте більше міді. +tutorial.waves.mobile = [lightgray] Ворог[] з’явився.\n\nЗахистіть ядро від двух хвиль. Ваш корабель буде автоматично атакувати ворогів.\nСтворіть більше башт і бурів. Добудьте більше міді. +tutorial.launch = Як тільки ви досягнете певної хвилі, ви зможете[accent] запустити ядро[], залишивши захисні сили позаду та [accent]отримати всі ресурси у вашому ядрі.[]\nЦі отримані ресурси можуть бути використані для дослідження нових технологій.\n\n[accent]Натисніть кнопку запуску. item.copper.description = Найбільш базовий будівельний матеріал. Широко використовується у всіх типах блоків. item.lead.description = Основний стартовий матеріал. Широко застосовується в електроніці та транспортуванні рідин. item.metaglass.description = Супер жорсткий склад скла. Широко застосовується для розподілу та зберігання рідини. @@ -1085,11 +1087,11 @@ liquid.slag.description = Різні види розплавленого мет liquid.oil.description = Рідина, яка використовується у виробництві сучасних матеріалів. Може бути перетворена в вугілля в якості палива або використана як куля. liquid.cryofluid.description = Інертна, не роз’їдаюча рідина, створена з води та титану. Володіє надзвичайно високою пропускною спроможністю. Широко використовується в якості охолоджуючої рідини. mech.alpha-mech.description = Стандартний керований мех. Заснований на бойовій одиниці «Кинджал», з оновленими бронею та можливостями будування. Наносить більше шкоди, ніж «Дротик». -mech.delta-mech.description = Швидкий, легкоброньований мех, зроблений для тактики «атакуй і біжи». Наносить мало шкоди будівлям, але може дуже швидко вбити великі групи підрозділів противника своєю дуговою блискавкою. +mech.delta-mech.description = Швидкий, легкоброньований мех, зроблений для тактики «атакуй і втікай». Наносить мало шкоди будівлям, але може дуже швидко вбити великі групи підрозділів противника своєю дуговою блискавкою. mech.tau-mech.description = Мех підтримки. Ремонтує союзні блоки, стріляючи по них. Може зцілювати союзників у радіусі його ремонтної здатності. mech.omega-mech.description = Об’ємний і добре броньований мех, зроблений для фронтових штурмів. Його броня може перекрити до 90% пошкоджень, що надходять. mech.dart-ship.description = Стандартний корабель управління. Швидко видобуває ресурси. Достатньо швидкий і легкий, але має мало наступальних можливостей. -mech.javelin-ship.description = Корабель для стратегії атакуй та біжи». Хоча спочатку він повільний, потім вже може розганятися до великих швидкостей і літати над ворожими форпостами, завдаючи великої кількості шкоди своїми блискавками та ракетами. +mech.javelin-ship.description = Корабель, який використовується для стратегії «атакуй та втікай». Хоча спочатку він повільний, потім вже може розганятися до великих швидкостей і літати над ворожими форпостами, завдаючи великої кількості шкоди своїми блискавками та ракетами. mech.trident-ship.description = Важкий бомбардувальник, побудований для будування та знищення ворожих укріплень. Дуже добре броньований. mech.glaive-ship.description = Великий, добре броньований бойовий корабель. Оснащений запальним ретранслятором. Високо маневрений. unit.draug.description = Примітивний дрон, який добуває ресурси. Дешевий для виробництва. Автоматично видобуває мідь і свинець поблизу. Доставляє видобуті ресурси до найближчого ядра. @@ -1100,7 +1102,7 @@ unit.crawler.description = Наземна одиниця, що складаєт unit.titan.description = Вдосконалений броньований наземний блок. Нападає як на наземні, так і повітряні цілі. Оснащений двома мініатюрними вогнеметами класу Випалювач. unit.fortress.description = Артилерійний мех. Оснащений двома модифікованими гарматами типу «Град» для дальнього нападу на ворожі структури та підрозділи. unit.eruptor.description = Важкий мех, призначеней для знесення конструкцій. Вистрілює потік шлаків у ворожі укріплення, розплавляючи їх і підпалюючи летючі речовини. -unit.wraith.description = Швидкий перехоплювач, який використовується для тактики «атакуй і біжи». Пріоритет — енергетичні генератори. +unit.wraith.description = Швидкий перехоплювач, який використовується для тактики «атакуй і втікай». Пріоритет — генератори енергії. unit.ghoul.description = Важкий килимовий бомбардувальник. Пробиває ворожі структури, орієнтуючись на віжливу інфраструктуру. unit.revenant.description = Важкий ракетний масив. block.message.description = Зберігає повідомлення. Використовується для комунікаціх між союзниками. @@ -1114,19 +1116,19 @@ block.alloy-smelter.description = Поєднує титан, свинець, к block.cryofluidmixer.description = Змішує воду і дрібний порошок титану титану в кріогенну рідину. Основне використання у торієвому реактору. block.blast-mixer.description = Подрібнює і змішує скупчення спор з піратитом для отримання вибухової суміші. block.pyratite-mixer.description = Змішує вугілля, свинець та пісок у легкозаймистий піратит. -block.melter.description = Розплавляє брухт у шлак для подальшої переробки або використання у башточках «Хвиля». +block.melter.description = Розплавляє брухт у шлак для подальшої переробки або використання у баштах «Хвиля». block.separator.description = Відокремлює шлак на його мінеральні компоненти. Виводить охолоджений результат. -block.spore-press.description = Стискає спорові стручки під сильним тиском для синтезу нафти +block.spore-press.description = Стискає спорові стручки під сильним тиском для синтезу нафти. block.pulverizer.description = Подрібнює брухт дрібного піску. block.coal-centrifuge.description = Нафта перетворюється у шматки вугілля. block.incinerator.description = Випаровує будь-який зайвий предмет або рідину, які він отримує. block.power-void.description = Знищує будь-яку енергію, до якої він під’єднаний. Тільки пісочниця -block.power-source.description = Нескінченно виводить енергію. Тільки пісочниця -block.item-source.description = Нескінченно виводить предмети. Тільки пісочниця -block.item-void.description = Знищує будь-які предмети. Тільки пісочниця -block.liquid-source.description = Нескінченно виводить рідини. Тільки пісочниця -block.copper-wall.description = Дешевий захисний блок.\nКорисна для захисту ядра та башточок у перші кілька хвиль. -block.copper-wall-large.description = Дешевий захисний блок.\nКорисна для захисту ядра та башточок у перші кілька хвиль.\nОхоплює кілька плиток. +block.power-source.description = Нескінченно виводить енергію. +block.item-source.description = Нескінченно виводить предмети. +block.item-void.description = Знищує будь-які предмети. +block.liquid-source.description = Нескінченно виводить рідини. +block.copper-wall.description = Дешевий захисний блок.\nКорисна для захисту ядра та башто у перші кілька хвиль. +block.copper-wall-large.description = Дешевий захисний блок.\nКорисна для захисту ядра та башт у перші кілька хвиль.\nОхоплює кілька плиток. block.titanium-wall.description = Відносно сильний захисний блок.\nЗабезпечує помірний захист від ворогів. block.titanium-wall-large.description = Відносно сильний захисний блок.\nЗабезпечує помірний захист від ворогів.\nОхоплює кілька плиток. block.plastanium-wall.description = Особливий тип стіни, який поглинає електричні дуги і блокує автоматичні з'єднання енергетичних вузлів. From 698e83a28a6a26038951c975d16edf8bbca70979 Mon Sep 17 00:00:00 2001 From: SpiffyBadGaster <58719310+SpiffyBadGaster@users.noreply.github.com> Date: Mon, 30 Dec 2019 06:51:30 +0700 Subject: [PATCH 38/78] Make translation better (#1222) * Make translation better * Make something better * Fix that javaline * Make Translate better Not finish * Make Translate better Not finish --- core/assets/bundles/bundle_th.properties | 69 ++++++++++++------------ 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties index 90b72d7312..6be91f3bad 100644 --- a/core/assets/bundles/bundle_th.properties +++ b/core/assets/bundles/bundle_th.properties @@ -29,7 +29,7 @@ load.mod = มอด schematic = Schematic schematic.add = กำลังบันทึก Schematic... schematics = Schematics -schematic.replace = มี schematic ที่ใช้ชื่อนี้แล้ว. แทนที่มัน? +schematic.replace = มี schematic ที่ใช้ชื่อนี้แล้ว. แทนที่เลยไม? schematic.import = นำเข้า Schematic... schematic.exportfile = ส่งออก File schematic.importfile = นำเข้า File @@ -60,7 +60,7 @@ level.mode = เกมโหมด: showagain = ไม่แสดงอีกในครั้งต่อไป coreattack = < Core กำลังถูกโจมตี! > nearpoint = [[ [scarlet]ออกจากดรอปพอยท์ด่วน IMMEDIATELY[] ]\nการทำลายล้างกำลังใกล้เข้ามา -database = Core Database +database = ฐานข้อมูหลัง savegame = เซฟเกม loadgame = โหลดเกม joingame = เข้าร่วมเกม @@ -116,7 +116,7 @@ noname = ใส่ชื่อ[accent] ผู้เล่น[] ก่อน. filename = ชื่อไฟล์: unlocked = content ใหม่ปลดล็อค! completed = [accent]สำเร็จ -techtree = สายวิจัย +techtree = ความคืบหน้าในการวิจัย research.list = [lightgray]วิจัย: research = วิจัย researched = [lightgray]{0} วิจัยแล้ว. @@ -126,9 +126,9 @@ server.closing = [accent]กำลังปิดเซิฟเวอร์... server.kicked.kick = คุณถูกเตะออกจากเซิฟเวอร์! server.kicked.whitelist = คุณไม่ได้อยู่ใน whitelisted server.kicked.serverClose = เซิฟเวอร์ถูกปิด. -server.kicked.vote = คุณถูกโหวตเตะออก. บายบาย. -server.kicked.clientOutdated = client ล่าสมัย! กรุณาอัปเดตเกมของคุณ! -server.kicked.serverOutdated = server ล่าสมัย! โปรดถามเจ้าของเซิฟเพื่ออัปเดต! +server.kicked.vote = คุณถูกโหวตเตะออก. บัยบาย. +server.kicked.clientOutdated = client เก่า! กรุณาอัปเดตเกมของคุณ! +server.kicked.serverOutdated = server เก่า! โปรดถามเจ้าของเซิฟเพื่ออัปเดต! server.kicked.banned = คุณถูกแบนในเซิฟเวอร์นี้ server.kicked.typeMismatch = เซิฟเวอร์นี้ไม่เข้ากับ build type ของคุณ. server.kicked.playerLimit = เซิฟเวอร์เต็ม. กรุณารอให้เซิฟเวอร์ว่างก่อน. @@ -598,7 +598,7 @@ category.items = ไอเท็ม category.crafting = นำเข้า/ส่งออก category.shooting = การยิง category.optional = การเพิ่มประสิทธิภาพทางเลือก -setting.landscape.name = ล็อค Landscape +setting.landscape.name = ล็อค Landscape แนวนอน setting.shadows.name = เงา setting.blockreplace.name = แนะนำบล็อคโดยอัตโนมัติ setting.linear.name = การกรองเชิงเส้น @@ -761,26 +761,26 @@ item.scrap.name = เศษเหล็ก liquid.water.name = น้ำ liquid.slag.name = กากแร่ liquid.oil.name = น้ำมัน -liquid.cryofluid.name = ไครโยฟลูอิด +liquid.cryofluid.name = โครโรฟิวล์ mech.alpha-mech.name = อัลฟ้า mech.alpha-mech.weapon = เฮฟวี้รีพีทเตอร์ mech.alpha-mech.ability = รีเจเนเรชั่น mech.delta-mech.name = เดลต้า mech.delta-mech.weapon = เครื่องกำเนิดประกายไฟฟ้า -mech.delta-mech.ability = ปล่อย +mech.delta-mech.ability = ปล่อยสายฟ้า mech.tau-mech.name = เทา mech.tau-mech.weapon = รีสตัคเลเซอร์ mech.tau-mech.ability = เบิสต์ซ่อมแซม mech.omega-mech.name = โอเมก้า -mech.omega-mech.weapon = ฝูงขีปนาวุธ +mech.omega-mech.weapon = ขีปนาวุธมหาปลัย mech.omega-mech.ability = ตัวเสริมเกราะ mech.dart-ship.name = ลูกดอก (Dart) mech.dart-ship.weapon = รีพีตเตอร์ -mech.javelin-ship.name = หอก (Javelin) +mech.javelin-ship.name = จาวาลีน (Javelin) mech.javelin-ship.weapon = ขีปนาวุธเบิสต์ mech.javelin-ship.ability = ดิสชาร์จบูสเตอร์ mech.trident-ship.name = ตรีศูล (Trident) -mech.trident-ship.weapon = ห้องเก็บระเบิด +mech.trident-ship.weapon = ตัวปล่อยระเบิด mech.glaive-ship.name = เกลฟว์ mech.glaive-ship.weapon = รีพีตเตอร์ไฟ item.explosiveness = [lightgray]ค่าการระเบิด: {0}% @@ -809,8 +809,8 @@ block.sandrocks.name = หินทราย block.spore-pine.name = ต้นสนสปอร์ block.sporerocks.name = หินสปอร์ block.rock.name = หิน -block.snowrock.name = หินหิมะ -block.snow-pine.name = ต้นสนหิมะ +block.snowrock.name = ก้อนหิมะ +block.snow-pine.name = ต้นสนที่คลุมหิมะ block.shale.name = หินดินดาน block.shale-boulder.name = ก้อนหินดินดาน block.moss.name = ตะไคร่น้ำ @@ -905,9 +905,8 @@ block.cryofluidmixer.name = เครื่องผสมไครโยฟล block.melter.name = เตาหลอม block.incinerator.name = เตาเผาขยะ block.spore-press.name = เครื่องอัดสปอร์ -block.separator.name = -เครื่องแยก -block.coal-centrifuge.name = เครื่องปั่นเหวี่งถ่านหิน +block.separator.name = เครื่องแยก +block.coal-centrifuge.name = เครื่องผลิตถ่านหิน block.power-node.name = โหนดพลังงาน block.power-node-large.name = โหนดพลังงานขนาดใหญ่ block.surge-tower.name = เสาเสิร์จ @@ -916,7 +915,7 @@ block.battery.name = แบตเตอรี่ block.battery-large.name = แบตเตอรี่ขนาดใหญ่ block.combustion-generator.name = เครื่องกำเนิดไฟฟ้าเผาไหม้ block.turbine-generator.name = เครื่องกำเนิดไฟฟ้าไอน้ำ -block.differential-generator.name = เครื่องกำเนิดไฟฟ้าดิฟเฟอเร่นเชี่ยว +block.differential-generator.name = เครื่องกำเนิดไฟฟ้าดิฟเฟอเร่นเตอร์ block.impact-reactor.name = เตาปฏิกรณ์อิมแพ็ค block.mechanical-drill.name = เครื่องขุดเชิงกล block.pneumatic-drill.name = เครื่องขุดนิวมาติก @@ -930,7 +929,7 @@ block.trident-ship-pad.name = ฐานปล่อยยานตรีศู block.glaive-ship-pad.name = ฐานปล่อยยานเกลฟว์ block.omega-mech-pad.name = ฐานปล่อยเม็คโอเมก้า block.tau-mech-pad.name = ฐานปล่อยเม็คเทา (Tau) -block.conduit.name = รางน้ำ +block.conduit.name = ท่อน้ำ block.mechanical-pump.name = ปั๊มเชิงกล block.item-source.name = จุดกำเนิดไอเท็ม block.item-void.name = จุดลบไอเท็ม @@ -943,8 +942,8 @@ block.wave.name = เวฟ block.swarmer.name = สวอร์มเมอร์ block.salvo.name = ซาวโว block.ripple.name = ริปเปิ้ล -block.phase-conveyor.name = สายพานเฟส -block.bridge-conveyor.name = สะพานสายพาน +block.phase-conveyor.name = สายพานความเร็วแสง +block.bridge-conveyor.name = สะพาน block.plastanium-compressor.name = เครื่องอัดพลาสตาเนียม block.pyratite-mixer.name = เครื่องผสมไพราไทต์ block.blast-mixer.name = เครื่องผสมสารประกอบระเบิด @@ -964,11 +963,11 @@ block.fortress-factory.name = โรงงานผลิตฟอร์เท block.revenant-factory.name = โรงงานผลิตยานไฟต์เตอร์เรเวแนนท์ block.repair-point.name = จุดซ่อมแซม block.pulse-conduit.name = รางน้ำโพวส์ -block.phase-conduit.name = รางน้ำเฟส +block.phase-conduit.name = ท่อน้ำความเร็วแสง block.liquid-router.name = เร้าเตอร์ของเหลว -block.liquid-tank.name = แทงค์เก็บของเหลว +block.liquid-tank.name = แทงค์น้ำ block.liquid-junction.name = ทางแยกของเหลว -block.bridge-conduit.name = สะพานรางน้ำ +block.bridge-conduit.name = ท่อน้ำยกระดับ block.rotary-pump.name = ปั๊มโรตารี้ block.thorium-reactor.name = เตาปฏิกรณ์ทอเรี่ยม block.mass-driver.name = แมสไดรฟ์เวอร์ @@ -982,8 +981,8 @@ block.surge-wall.name = กำแพงเสิร์จ block.surge-wall-large.name = กำแพงเสิร์จขนาดใหญ่ block.cyclone.name = ไซโคลน block.fuse.name = ฟิวส์ -block.shock-mine.name = กับระเบิดไฟฟ้าซ็อต -block.overdrive-projector.name = โอเวอร์ไดรฟ์โปรเจ็คเตอร์ +block.shock-mine.name = กับระเบิดไฟฟ้า +block.overdrive-projector.name = เครื่องเร่งประสิทธิภาพ block.force-projector.name = ฟอร์สโปรเจ็คเตอร์ block.arc.name = อาร์ค block.rtg-generator.name = เครื่องกำเนิดไฟฟ้า อาร์ทีจี @@ -1013,7 +1012,7 @@ unit.eruptor.name = อีรัฟเตอร์ unit.chaos-array.name = เคออสอาเรย์ unit.eradicator.name = อีเรดิเคเตอร์ unit.lich.name = ลิช -unit.reaper.name = รีฟเฟอร์ +unit.reaper.name = รีฟเปอร์ tutorial.next = [lightgray]<กดเพื่อดำเนินการต่อ> tutorial.intro = คุณได้เข้าสู่[scarlet] การสอนเล่นของ Mindustry.[]\nใช้ [[WASD] เพื่อเคลื่อนที่.\n[accent]กด [[Ctrl] ค้างระหว่างกลิ้งลูกกลิ้งเม้าส์[] เพื่อซูมเข้าและออก.\nเริ่มด้วยการ[accent] ขุดทองแดง[]. เคลื่อนที่ไปใกล้มัน, แล้วกดที่สายแร่ทองแดงใกล้ๆกับ core ของคุณ\n\n[accent]ทองแดง {0}/{1} ชิ้น tutorial.intro.mobile = คุณได้เข้าสู่[scarlet] การสอนเล่นของ Mindustry.[]\nเลื่อนหน้าจอเพื่อเคลื่อนที่.\n[accent]ใส่สองนิ้ว []เพื่อซูมเข้าและออก.\nเริ่มด้วยการ[accent] ขุดทองแดง[]. เคลื่อนที่ไปใกล้มัน, แล้วกดที่สายแร่ทองแดงใกล้ๆกับ core ของคุณ\n\n[accent]ทองแดง {0}/{1} ชิ้น @@ -1110,7 +1109,7 @@ block.phase-wall-large.description = A wall coated with special phase-based refl block.surge-wall.description = บล็อคป้องกันที่มีทนทานสูง.\nสะสมพลังงานจากกระสุน, แล้วปล่อยออกมาแบบสุ่ม. block.surge-wall-large.description = บล็อคป้องกันที่มีทนทานสูง.\nสะสมพลังงานจากกระสุน, แล้วปล่อยออกมาแบบสุ่ม.\nคลอบคลุมหลายช่อง. block.door.description = ประตูขนาดเล็ก. สามารถเปิดได้โดยการกด. -block.door-large.description = ประตูขนาดใหญ่. สามารถเปิดได้โดยการกด.\nคลอบคลุมหลายช่อง. +block.door-large.description = ประตูขนาดใหญ่. สามารถเปิดและปิดได้โดยการกด.\nคลอบคลุมหลายช่อง. block.mender.description = ซ่อมแซมบล็อคในวงของมันเป็นระยะๆ. ช่วยซ่อมแซมแนวป้องกันระหว่าง wave.\nสามารถใช้ซิลิก้อนเพื่อเพิ่มรัศมีและประสิทธิภาพได้ block.mend-projector.description = เมนเดอร์ที่ได้รับการอัปเกรด. ซ่อมแซมบล็อคในระยะของมัน.\nสามารถใช้ใยเฟสเพื่อเพิ่มระยะและประสิทธิภาพได้. block.overdrive-projector.description = เพิ่มความเร็วของสิ่งก่อสร้างรอบๆ.\nสามารถใช้ใยเฟสเพื่อเพิ่มระยะและประสิทธิภาพ. @@ -1123,7 +1122,7 @@ block.bridge-conveyor.description = บล็อคขนส่งไอเท block.phase-conveyor.description = บล็อคขนส่งไอเท็มขั้นสูง. ใช้พลังงานเพื่อส่งไอเท็มไปยังสายพานเฟสอีกอัน ข้ามได้หลายช่อง. block.sorter.description = แยกไอเท็ม. ถ้าไอเท็มตรงกับที่เลือกไว้, จะผ่านได้. แต่ถ้าไม่ตรง, ไอเท็มจะออกทางซ้ายหรือขวา (ใช้ทางที่ไอเท็มเข้าเป็นหลัก) block.inverted-sorter.description = แยกไอเท็มคล้ายเครื่องแยกธรรมดา, แต่ไอเท็มที่เลือกจะออกข้างแทน. -block.router.description = รับไอเท็มแล้วส่งออก 3 ทางเท่ากัน. มีประโยชน์สำหรับแยกไอเท็มจากแหล่งเดียวไปหลายที่.\n\n[scarlet]อย่าวางไว้ติดกับทางส่งไอเท็มเข้าเพราะของออกจะไปอุดตันได้.[] +block.router.description = รับไอเท็มแล้วส่งออก 3 ทางเท่าๆกัน. มีประโยชน์สำหรับแยกไอเท็มจากแหล่งเดียวไปหลายที่.\n\n[scarlet]อย่าวางไว้ติดกับทางส่งไอเท็มเข้าเพราะของออกจะไปอุดตันได้.[] block.distributor.description = เร้าเตอร์ขั้นสูง. แยกไอเท็มออก 7 ทางอย่างเท่าๆกัน. block.overflow-gate.description = ของจะออกจากข้างๆเมื่อทางข้างหน้ถูกบล็อคเท่านั้น. block.mass-driver.description = บล็อคขนส่งไอเท็มขั้นสุดยอด. รวบรวมไอเท็มจำนวนหนึ่งแล้วยิงไปหาแมสไดรเวอร์อีกอันที่อยู่ไกลออกไป. ต้องใช้พลังงานในการใช้งาน. @@ -1150,7 +1149,7 @@ block.differential-generator.description = ผลิตไฟฟ้าจำน block.rtg-generator.description = เครื่องกำเนิดไฟฟ้าที่ใช้ง่ายและไว้ใจได้. ใช้ความร้อนจากการสลายของสารกัมมัตภาพรังสีเพื่อใช้ผลิตพลังงานอย่างช้าๆ. block.solar-panel.description = ให้พลังงานจากแสงอาทิตย์จำนวนน้อย. block.solar-panel-large.description = เวอร์ชั่นของแผงโซล่าเซลล์ที่มีประสิทธิภาพมากขึ้นกว่าแผงโซล่าเซลล์ธรรมดา. -block.thorium-reactor.description = ผลิตพลังงานจำนวนมากจากทอเรี่ยม. ตำเป็นต้องใช้สารหล่อเย็นตลอดเวลา. จะระเบิดอย่างรุนแรงหากไม่ได้รับสารหล่อเย็นในจำนวนที่ต้องการ. จำนวนพลังงานที่ผลิตขึ้นอยู่กับความเต็ม และผลิตพลังงานเริ่มต้นที่ความสามารถสูงสุด. +block.thorium-reactor.description = ผลิตพลังงานจำนวนมากจากทอเรี่ยม. จำเป็นต้องใช้สารหล่อเย็นตลอดเวลา. จะระเบิดอย่างรุนแรงหากไม่ได้รับสารหล่อเย็นในจำนวนที่ต้องการ. จำนวนพลังงานที่ผลิตขึ้นอยู่กับความเต็ม และผลิตพลังงานเริ่มต้นที่ความสามารถสูงสุด. block.impact-reactor.description = เครื่องกำเนิดไฟฟ้าขั้นสูง, สามารถผลิตไฟฟ้าได้จำนวนมหาศาลที่ประสิทธิภาพสูงสุด. จำเป็นต้องใช้พลังงานจำนวนมากในการสตาร์ทเครื่อง. block.mechanical-drill.description = เครื่องขุดราคาถูก. เมื่อวางบนบล็อคที่ถูกต้อง, จะส่งไอเท็มของมันออกมาเรื่อยๆแบบไม่มีที่สิ้นสุด. ขุดได้แค่ทรัพยากรพื้นฐาน. block.pneumatic-drill.description = เครื่องขุดได้รับการปรับปรุง, สามารถขุดไทเทเนี่ยมได้. ขุดไวกว่าเครื่องขุดเชิงกล. @@ -1186,16 +1185,16 @@ block.draug-factory.description = ผลิตโดรนขุดเจาะ block.spirit-factory.description = ผลิตโดรนซ่อมแซมสปิริต. block.phantom-factory.description = ผลิตโดรนก่อสร้างขั้นสูง. block.wraith-factory.description = ผลิตยูนิตเร็ว โจมตีแบบ hit-and-run (จู่โจมแล้วหนี) -block.ghoul-factory.description = ผลิตยานทิ้งระเบิดปูพรมหนัก (heavy carpet bomber) +block.ghoul-factory.description = ผลิตยานทิ้งระเบิดแบบโหดๆ (heavy carpet bomber) block.revenant-factory.description = ผลิตยูนิตที่ใช้ขีปนาวุธเป็นหลัก. block.dagger-factory.description = ผลิตยูนิตภาคพื้นดินพื้นฐาน. -block.crawler-factory.description = ผลิตยูนิตพลีชีพเร็ว. +block.crawler-factory.description = ผลิตยูนิตที่ระเบิดตัวเอง. block.titan-factory.description = ผลิตยูนิตภาคพื้นดินเสริมเกราะขั้นสูง. -block.fortress-factory.description = ผลิตยูนิตหนักติดปืนใหญ่. +block.fortress-factory.description = ผลิตยูนิตที่ถึกและติดปืนใหญ่. block.repair-point.description = ซ่อมแซมยูนิตที่อยู่ในรัศมีอย่างต่อเนื่อง. block.dart-mech-pad.description = ใช้เปลี่ยนร่างเป็นเป็นเม็คโจมตีพื้นฐาน.\nใช้โดยการกดเมื่อยืนทับมัน. -block.delta-mech-pad.description = ใช้เปลี่ยนร่างเป็นเป็นเม็คเกราะบางโจมตีแบบ hit-and-run (จู่โจมแล้วหนี).\nใช้โดยการกดเมื่อยืนทับมัน. -block.tau-mech-pad.description = ใช้เปลี่ยนร่างเป็นเป็นเม็คสนับสนุนขั้นสูง.\nใช้โดยการกดเมื่อยืนทับมัน. +block.delta-mech-pad.description = ใช้เปลี่ยนร่างเป็นเป็นเม็คเกราะบางโจมตีแบบ hit-and-run (จูค).\nใช้โดยการกดเมื่อยืนทับมัน. +block.tau-mech-pad.description = ใช้เปลี่ยนร่างเป็นตัวที่ฮีลได้ดีมาก.\nใช้โดยการกดเมื่อยืนทับมัน. block.omega-mech-pad.description = ใช้เปลี่ยนร่างเป็นเป็นเม็คใช้ขีปนาวุธเกราะหนา.\nใช้โดยการกดเมื่อยืนทับมัน. block.javelin-ship-pad.description = ใช้เปลี่ยนร่างเป็นเป็นอินเทอร์เซ็ปเตอร์เร็วแบะเกราะบาง.\nใช้โดยการกดเมื่อยืนทับมัน. block.trident-ship-pad.description = ใช้เปลี่ยนร่างเป็นเป็นยานทิ้งระเบิดสนับสนุน.\nใช้โดยการกดเมื่อยืนทับมัน. From fe63b46b67b00faabaab77282ca3815f96dea07a Mon Sep 17 00:00:00 2001 From: PlayerBrasil13 <55503822+PlayerBrasil13@users.noreply.github.com> Date: Sun, 29 Dec 2019 20:51:37 -0300 Subject: [PATCH 39/78] Update bundle_pt_BR.properties (#1232) --- core/assets/bundles/bundle_pt_BR.properties | 31 +++++++++++++-------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index 1e05466d91..28ead4e5ef 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -26,6 +26,7 @@ load.image = Imagens load.content = Conteúdo load.system = Sistema load.mod = Mods +load.scripts = Scripts schematic = Esquema schematic.add = Salvar Esquema... @@ -99,19 +100,24 @@ mod.enabled = [lightgray]Ativado mod.disabled = [scarlet]Desativado mod.disable = Desati-\nvar mod.delete.error = Incapaz de deletar o Mod. O arquivo talvez esteja em uso. -mod.requiresversion = [scarlet]Requer versão [accent]{0} [scarlet]do jogo. +mod.requiresversion = [scarlet]Requer no mínimo versão [accent]{0} [scarlet]do jogo. mod.missingdependencies = [scarlet]Dependências ausentes: {0} +mod.erroredcontent = [scarlet]Erros no Conteúdo +mod.errors = Erros ocorreram ao carregar o conteúdo. +mod.noerrorplay = [scarlet]Você tem mods com erros.[] Desative os mods afetados ou conserte os erros antes de jogar. mod.nowdisabled = [scarlet]O Mod '{0}' está com dependências ausentes:[accent] {1}\n[lightgray]Esses Mods precisam ser baixados primeiro.\nEsse Mod será desativado automaticamente. mod.enable = Ativar mod.requiresrestart = O jogo irá fechar para aplicar as mudanças do Mod. mod.reloadrequired = [scarlet]Recarregamento necessário mod.import = Importar Mod mod.import.github = Importar Mod do GitHub -mod.remove.confirm = Esse Mod será deletado. +mod.item.remove = Este item é parte do mod[accent] '{0}'[]. Para removê-lo, desinstale esse mod. +mod.remove.confirm = Este mod será deletado. mod.author = [LIGHT_GRAY]Author:[] {0} -mod.missing = Esse jogo salvo foi criado antes de você atualizar ou desinstalar um mod. O jogo salvo pode se corromper. Você tem certeza que quer carregar?\n[lightgray]Mods:\n{0} +mod.missing = Esse jogo salvo foi criado antes de você atualizar ou desinstalar um mod. Pode ocorrer uma corrupção no salvamento. Você tem certeza que quer carregar?\n[lightgray]Mods:\n{0} mod.preview.missing = Antes de publicar esse mod na Oficina, você deve adicionar uma imagem de pré-visualização.\nColoque uma imagem com o nome[accent] preview.png[] na pasta do Mod e tente novamente. mod.folder.missing = Somente Mods no formato de pasta serão publicados na Oficina.\nPara converter qualquer Mod em uma pasta, Simplesmente descompacte seu arquivo numa pasta e delete a compactação antiga, então reinicie seu jogo ou recarregue os Mods. +mod.scripts.unsupported = Seu dispositivo não suporta scripts de mods. Alguns mods não funcionarão corretamente. about.button = Sobre name = Nome: @@ -189,9 +195,9 @@ disconnect.data = Falha ao abrir os dados do mundo! cantconnect = Impossível conectar ([accent]{0}[]). connecting = [accent]Conectando... connecting.data = [accent]Carregando dados do mundo... -server.port = Porte: +server.port = Port: server.addressinuse = Senha em uso! -server.invalidport = Numero de porta invalido! +server.invalidport = Numero de port inválido! server.error = [crimson]Erro ao hospedar o servidor: [accent]{0} save.new = Novo salvamento save.overwrite = Você tem certeza que quer sobrescrever este salvamento? @@ -591,12 +597,14 @@ unit.persecond = por segundo unit.timesspeed = x Velocidade unit.percent = % unit.items = itens +unit.thousands = k +unit.millions = m category.general = Geral -category.power = Poder +category.power = Energia category.liquids = Líquidos category.items = Itens -category.crafting = Construindo -category.shooting = Atirando +category.crafting = Entrada/Saída +category.shooting = Atiradores category.optional = Melhoras opcionais setting.landscape.name = Travar panorama setting.shadows.name = Sombras @@ -805,6 +813,7 @@ mech.trident-ship.name = Tridente mech.trident-ship.weapon = Carga de bombas mech.glaive-ship.name = Glaive mech.glaive-ship.weapon = Repetidor de fogo +item.corestorable = [lightgray]Armazenável no núcleo: {0} item.explosiveness = [LIGHT_GRAY]Explosibilidade: {0} item.flammability = [LIGHT_GRAY]Inflamabilidade: {0} item.radioactivity = [LIGHT_GRAY]Radioatividade: {0} @@ -1039,7 +1048,7 @@ unit.eradicator.name = Erradicador unit.lich.name = Lich unit.reaper.name = Ceifador tutorial.next = [lightgray] -tutorial.intro = Você entrou no[scarlet] Tutorial do Mindustry.[]\nComeçe[accent] minerando cobre[]. Toque em um veio de minério de cobre para fazer isso.\n\n[accent]{0}/{1} copper +tutorial.intro = Você entrou no[scarlet] Tutorial do Mindustry.[]\nUse[accent] [[WASD][] para se mover.\n[accent]Roda do mouse[] para aumentar e diminuir o zoom.\nComece[accent] minerando cobre[]. Toque em um veio de minério de cobre para fazer isso.\n\n[accent]{0}/{1} copper tutorial.intro.mobile = You have entered the[scarlet] Mindustry Tutorial.[]\nSwipe the screen to move.\n[accent]Pinch with 2 fingers [] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper tutorial.drill = Minerar manualmente é ineficiente.\n[accent]Brocas []podem minerar automaticamente.\nColoque uma num veio de cobre. tutorial.drill.mobile = Minerar manualmente é ineficiente.\n[accent]Brocas []podem minerar automaticamente.\nToque na aba de brocas no canto inferior direito.\nSelecione a[accent] broca mecânica[].\nToque em um veio de cobre para colocá-la, então pressione a[accent] marca de verificação[] abaixo para confirmar sua seleção.\nPressione o[accent] botão "X"[] para cancelar o posicionamento. @@ -1138,9 +1147,9 @@ block.door-large.description = Uma grande porta. Pode ser aberta e fechada ao to block.mender.description = Periodicamente repara blocos vizinhos. Mantem as defesas reparadas em e entre ondas.\nPode usar silício para aumentar o alcance e a eficiência. block.mend-projector.description = Uma versão melhorada do reparador. Repara blocos vizinhos.\nPode usar tecido de fase para aumentar o alcance e a eficiência. block.overdrive-projector.description = Aumenta a velocidade de construções vizinhas.\nPode usar tecido de fase para aumentar o alcance e a eficiência. -block.force-projector.description = Cria um campo de forca hexagonal em volta de si mesmo, Protegendo construções e unidades dentro de dano por balas. +block.force-projector.description = Cria um campo de força hexagonal ao redor de si, protegendo construções e unidades.\nSuperaquece se suportar muito dano. Pode usar líquidos para evitar superaquecimento. Pode-se usar tecido de fase para aumentar o tamanho do escudo. block.shock-mine.description = Danifica inimigos em cima da mina. Quase invisivel ao inimigo. -block.conveyor.description = Bloco de transporte de item basico. Move os itens a frente e os deposita automaticamente em torretas ou construtores. Rotacionavel. +block.conveyor.description = Bloco de transporte de item basico. Move os itens a frente e os deposita automaticamente em torretas ou construtores. Rotacionável. block.titanium-conveyor.description = Bloco de transporte de item avançado. Move itens mais rapidos que esteiras padrões. block.junction.description = Funciona como uma ponte Para duas esteiras que estejam se cruzando. Util em situações que tenha duas esteiras diferentes carregando materiais diferentes para lugares diferentes. block.bridge-conveyor.description = Bloco de transporte de itens avancado. Possibilita o transporte de itens acima de 3 blocos de construção ou paredes. From e200dcee33466c5000d20b8f8b029e5ec52d7268 Mon Sep 17 00:00:00 2001 From: GioIacca9 <39232448+GioIacca9@users.noreply.github.com> Date: Mon, 30 Dec 2019 00:51:45 +0100 Subject: [PATCH 40/78] Update bundle_it.properties (#1240) --- core/assets/bundles/bundle_it.properties | 211 ++++++++++++----------- 1 file changed, 109 insertions(+), 102 deletions(-) diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties index 75351ad9a8..ef97566b90 100644 --- a/core/assets/bundles/bundle_it.properties +++ b/core/assets/bundles/bundle_it.properties @@ -12,11 +12,12 @@ link.itch.io.description = Pagina di itch.io con download per PC e versione web link.google-play.description = Elenco di Google Play Store link.f-droid.description = Catalogo F-Droid link.wiki.description = Wiki ufficiale di Mindustry +link.feathub.description = Suggerisci nuove funzionalità linkfail = Impossibile aprire il link! L'URL è stato copiato. screenshot = Screenshot salvato a {0} -screenshot.invalid = Mappa troppo grossa, probabilmente non c'è abbastanza memoria libera. +screenshot.invalid = Mappa troppo pesante, probabilmente non c'è abbastanza spazio sul disco. gameover = Il Nucleo è stato distrutto. -gameover.pvp = La squadra [accent] {0}[] ha vinto! +gameover.pvp = La squadra[accent] {0}[] ha vinto! highscore = [YELLOW]Nuovo record! copied = Copiato. @@ -26,7 +27,7 @@ load.image = Immagini load.content = Contenuti load.system = Sistema load.mod = Mods -load.scripts = Testi +load.scripts = Scripts schematic = Schematica schematic.add = Salva Schematica... @@ -54,7 +55,7 @@ stat.delivered = Riorse lanciate: stat.rank = Livello finale: [accent]{0} launcheditems = [accent]Oggetti Lanciati -launchinfo = [unlaunched][[LAUNCH] il tuo Nucleo per ottenere gli oggetti indicati in blu. +launchinfo = [unlaunched][LANCIA] il tuo Nucleo per ottenere gli oggetti indicati in blu. map.delete = Sei sicuro di voler eliminare la mappa"[accent]{0}[]"? level.highscore = Miglior Punteggio: [accent]{0} level.select = Selezione del Livello @@ -68,7 +69,7 @@ loadgame = Carica joingame = Unisciti al Gioco customgame = Gioco Personalizzato newgame = Nuova partita -none = +none = < niente > minimap = Minimappa position = Posizione close = Chiuso @@ -88,30 +89,32 @@ committingchanges = Applico le modifiche done = Fatto feature.unsupported = Il tuo dispositivo non supporta questa funzione. -mods.alphainfo = Tieni a mente che queste Mod sono in alpha, e[scarlet] possono contenere molti bug[].\Segnala tutti i problemi che trovi su GitHub o Discord di Mindustry. +mods.alphainfo = Tieni a mente che queste mods sono in alpha, e[scarlet] possono contenere molti bug[].\Segnala tutti i problemi che trovi su GitHub o Discord di Mindustry. mods.alpha = [accent](Alpha) mods = Mods -mods.none = [LIGHT_GRAY]Nessuna Mod trovata! +mods.none = [LIGHT_GRAY]Nessuna mod trovata! mods.guide = Guida per il modding! mods.report = Segnala un Bug -mods.openfolder = Apri Cartella Mod +mods.openfolder = Apri Cartella Mods mod.enabled = [lightgray]Abilitato mod.disabled = [scarlet]Disabilitato mod.disable = Disabilita -mod.delete.error = Impossibile eliminare questa Mod. Il file potrebbe essere in uso. +mod.delete.error = Impossibile eliminare questa mod. Il file potrebbe essere in uso. +mod.requiresversion = [scarlet]Versione minima richiesta: [accent]{0} mod.missingdependencies = [scarlet]Dipendenze mancanti: {0} -mod.nowdisabled = [scarlet]Alla Mod '{0}' mancano delle dipendenze:[accent] {1}\n[lightgray]Queste Mod devono essere scaricate prima.\nQuesta Mod verrà disabilitata automaticamente. +mod.nowdisabled = [scarlet]Alla mod '{0}' mancano delle dipendenze:[accent] {1}\n[lightgray]Queste mods devono essere scaricate prima.\nQuesta mod verrà disabilitata automaticamente. mod.enable = Abilita mod.requiresrestart = Il gioco verrà chiuso per applicare i cambiamenti. mod.reloadrequired = [scarlet]Riavvio necessario -mod.import = Importa una Mod -mod.import.github = Importa una Mod da GitHub -mod.item.remove = Questo item fa parte della Mod[accent] '{0}'[]. Per rimuoverlo, disinstalla questa Mod. -mod.remove.confirm = Questa Mod verrà eliminata. +mod.import = Importa una mod +mod.import.github = Importa una mod da GitHub +mod.item.remove = Questo item fa parte della mod[accent] '{0}'[]. Per rimuoverlo, disinstalla questa mod. +mod.remove.confirm = Questa mod verrà eliminata. mod.author = [LIGHT_GRAY]Autore:[] {0} -mod.missing = Questo salvataggio contiene Mod che hai recentemente aggiornato o non hai più installate. Il salvataggio potrebbe corrompersi. Sei sicuro di volerlo caricare?\n[lightgray]Mods:\n{0} -mod.preview.missing = Prima di pubblicare questa Mod nel Workshop, devi aggiungere un immagine di copertina.\nMetti un immagine[accent] con nome preview.png[] nella cartella della Mod e riprova. -mod.folder.missing = Solo le Mod in una cartella possono essere pubblicate nel Workshop.\nPer convertire una Mod in una cartella, decomprimi i suoi file in una cartella ed elimina il vecchio zip, quindi riavvia il gioco o ricarica le tue mods. +mod.missing = Questo salvataggio contiene delle mods che hai recentemente aggiornato o non hai più installate. Il salvataggio potrebbe corrompersi. Sei sicuro di volerlo caricare?\n[lightgray]Mods:\n{0} +mod.preview.missing = Prima di pubblicare questa mod nel Workshop, devi aggiungere un immagine di copertina.\nMetti un immagine[accent] con nome preview.png[] nella cartella della mods e riprova. +mod.folder.missing = Solo le mods in una cartella possono essere pubblicate nel Workshop.\nPer convertire una mod in una cartella, decomprimi i suoi file in una cartella ed elimina il vecchio zip, quindi riavvia il gioco o ricarica le tue mods. +mod.scripts.unsupported = Il tuo dispositivo non supporta gli script per le mods. Alcune mods non funzioneranno correttamente. about.button = Info name = Nome: @@ -142,12 +145,12 @@ server.kicked.idInUse = Sei già su questo server! Non è permesso connettersi c server.kicked.customClient = Questo server non supporta i client personalizzati. Scarica la versione ufficiale dal sito. server.kicked.gameover = Game over! server.versions = Your version:[accent] {0}[]\nVersione server:[accent] {1}[] -host.info = Il pulsante [accent]host [] ospita un server sulla porta [scarlet]6567[].[] Chiunque sulla stessa [LIGHT_GRAY]rete wifi o locale[] dovrebbe essere in grado di vedere il server nell'elenco server.\n\n Se vuoi che le persone siano in grado di connettersi ovunque tramite il tuo IP, è richiesto il [accent]port forwarding[]. \n\n[LIGHT_GRAY]Nota: se qualcuno sta riscontrando problemi durante la connessione al gioco LAN, assicurati di aver consentito a Mindustry di accedere alla rete locale nelle impostazioni del firewall. -join.info = Qui è possibile inserire l'[accent]IP del server[] a cui connettersi, o scoprire [accent]un server sulla rete locale[] disponibile.\nSono supportati sia il multiplayer LAN che WAN. \n\n[LIGHT_GRAY]Nota: non esiste un elenco automatico dei server globali; se desideri connetterti a qualcuno tramite il suo IP, è necessario chiedere all'host il proprio IP. +host.info = Il pulsante [accent]host[] ospita un server sulla porta [scarlet]6567[].[] Chiunque sulla stessa [LIGHT_GRAY]rete wifi o locale[] dovrebbe essere in grado di vedere il server nell'elenco server.\nSe vuoi che le persone siano in grado di connettersi ovunque tramite il tuo IP, è richiesto il [accent]port forwarding[].\n\n[LIGHT_GRAY]Nota: se qualcuno sta riscontrando problemi durante la connessione al gioco LAN, assicurati di aver consentito a Mindustry di accedere alla rete locale nelle impostazioni del firewall. +join.info = Qui è possibile inserire l'[accent]IP del server[] a cui connettersi, o scoprire [accent]un server sulla rete locale[] disponibile.\nSono supportati sia il multiplayer LAN che WAN.\n\n[LIGHT_GRAY]Nota: non esiste un elenco automatico dei server globali; se desideri connetterti a qualcuno tramite il suo IP, è necessario chiedere all'host il proprio IP. hostserver = Ospita Server invitefriends = Invita amici hostserver.mobile = Ospita\nServer -host = Host +host = Ospita hosting = [accent] Apertura del server... hosts.refresh = Aggiorna hosts.discovering = Ricerca partite LAN @@ -213,7 +216,7 @@ selectslot = Seleziona un salvataggio. slot = [accent]Slot {0} editmessage = Modifica Messaggio save.corrupted = [orang]Salvataggio corrotto o non valido! -empty = +empty = < vuoto > on = On off = Off save.autosave = Salvataggio Automatico: {0} @@ -280,7 +283,7 @@ publishing = [accent]Pubblicazione... publish.confirm = Are you sure you want to publish this?\n\n[lightgray]Make sure you agree to the Workshop EULA first, or your items will not show up! publish.error = Error publishing item: {0} steam.error = Failed to initialize Steam services.\nError: {0} -editor.brush = Pennello +editor.brush = Dimensioni Pennello editor.openin = Apri nell'editor editor.oregen = Generazione dei minerali editor.oregen.info = Generazione dei minerali: @@ -297,7 +300,7 @@ editor.newmap = Nuova mappa workshop = Workshop waves.title = Ondate waves.remove = Rimuovi -waves.never = +waves.never = < mai > waves.every = sempre waves.waves = ondata/e waves.perspawn = per spawn @@ -309,14 +312,14 @@ waves.copy = Copia negli appunti waves.load = Carica dagli appunti waves.invalid = Onde dagli appunti non valide. waves.copied = Onde copiate. -waves.none = Nessun nemico definiti.\n Nota che le disposizioni di ondate vuote verranno automaticamente rimpiazzate con la disposizione predefinita. -editor.default = [LIGHT_GRAY] +waves.none = Nessun nemico definiti.\nNota che le disposizioni di ondate vuote verranno automaticamente rimpiazzate con la disposizione predefinita. +editor.default = [LIGHT_GRAY]< Predefinito > details = Dettagli... edit = Modifica... editor.name = Nome: editor.spawn = Piazza un'unità editor.removeunit = Rimuovi un'unità -editor.teams = Squadre +editor.teams = Colore Squadre editor.errorload = Errore nel caricamento di:\n[accent]{0} editor.errorsave = Errore nel salvataggio di:\n[accent]{0} editor.errorimage = Quella è un'immagine, non una mappa.\n\nSe vuoi importare una mappa vecchia clicca su "Importa una mappa vecchia" nell'editor. @@ -335,14 +338,14 @@ editor.saved = Salvato! editor.save.noname = La tua mappa non ha un nome! Impostane uno nelle informazioni della mappa. editor.save.overwrite = La tua mappa sovrascrive quelle incluse! Imposta un nome diverso nelle informazioni della mappa. editor.import.exists = [scarlet]Impossibile importare:[] esiste già una mappa chiamata '{0}' che non può essere sovrascritta! -editor.import = Importando... +editor.import = Importa editor.importmap = Importa mappa editor.importmap.description = Importa mappa preesistente editor.importfile = Importa file editor.importfile.description = Importa un file mappa esterno editor.importimage = Importa mappa terreno editor.importimage.description = Importa immagine esterna terreno -editor.export = Esportazione... +editor.export = Esporta editor.exportfile = Esporta file editor.exportfile.description = Esporta file mappa editor.exportimage = Esporta immagine @@ -437,8 +440,8 @@ launch.confirm = Questo trasporterà tutte le risorse nel tuo Nucleo.\nNon riusc launch.skip.confirm = Se salti adesso non riuscirai a decollare fino alle ondate successive uncover = Scopri configure = Configura l'equipaggiamento -bannedblocks = Blocchi banditi -addall = Aggiungi tutti +bannedblocks = Blocchi Banditi +addall = Aggiungi Tutti configure.locked = [LIGHT_GRAY]Arriva all'ondata {0}\nper configurare l'equipaggiamento. configure.invalid = Il valore dev'essere un numero compresto tra 0 e {0}. zone.unlocked = [LIGHT_GRAY]{0} sbloccata. @@ -448,14 +451,14 @@ zone.resources = Risorse Trovate: zone.objective = [lightgray]Obiettivo: [accent]{0} zone.objective.survival = Sopravvivere zone.objective.attack = Distruggere il Nucleo Nemico -add = Aggiungi... +add = Aggiungi boss.health = Vita del Boss -connectfail = [crimson] Impossibile connettersi al server: [accent] {0} +connectfail = [crimson]Impossibile connettersi al server:[accent] {0} error.unreachable = Server irraggiungibile. L'indirizzo è scritto correttamente? -error.invalidaddress = Indirizzo invalido. -error.timedout = Timeout!\n Assicurati che l'host abbia il port forwarding impostato e che l'indirizzo sia corretto! -error.mismatch = Errore pacchetti:\nPossibile discordanza della versione client / server.\n Assicurati che tu e l'host possiediate l'ultima versione di Mindustry! +error.invalidaddress = Indirizzo non valido. +error.timedout = Timeout!\nAssicurati che l'host abbia il port forwarding impostato e che l'indirizzo sia corretto! +error.mismatch = Errore pacchetti:\nPossibile discordanza della versione client/server.\nAssicurati che tu e l'host possiediate l'ultima versione di Mindustry! error.alreadyconnected = Già connesso. error.mapnotfound = Mappa non trovata error.io = Errore I/O di rete. @@ -478,7 +481,7 @@ zone.crags.name = Dirupi zone.fungalPass.name = Passaggio Fungoso zone.groundZero.description = La posizione ottimale per cominciare. Bassa minaccia nemica. Poche risorse.\nRaccogli quanto più piombo e rame possibile.\nProcedi. -zone.frozenForest.description = Anche qui, più vicino alle montagne, le spore si sono diffuse. Le temperature rigide non possono contenerle per sempre.\n Inizia la scoperta dell'energia. Costruisci generatori a combustione. Impara a usare i riparatori. +zone.frozenForest.description = Anche qui, più vicino alle montagne, le spore si sono diffuse. Le temperature rigide non possono contenerle per sempre.\nInizia la scoperta dell'energia. Costruisci generatori a combustione. Impara a usare i riparatori. zone.desertWastes.description = Questi rifiuti sono vasti, imprevedibili ed attraversati da strutture settoriali abbandonate.\n\nIl carbone è presente nella regione. Bruciatelo per ottenere energia o sintetizzate la grafite.\n\n[lightgray]Questa posizione di atterraggio non può essere garantita. zone.saltFlats.description = Alle periferie del deserto si trovano le saline. Poche risorse possono essere trovate in questa posizione.\n\nIl nemico ha eretto un complesso di archiviazione delle risorse qui. Sradicare il loro Nucleo. Non lasciare nulla in piedi. zone.craters.description = L'acqua si è accumulata in questo cratere, reliquia delle vecchie guerre. Recupera l'area. Raccogli la sabbia. Fondi il vetro metallico. Pompa l'acqua per raffreddare torrette e trivelle. @@ -487,20 +490,21 @@ zone.stainedMountains.description = Più nell'entroterra si trovano le montagne, zone.overgrowth.description = Quest'area è invasa, più vicina alla fonte delle spore.\nIl nemico ha stabilito qui un avamposto. Costruisci unità col pugnale. Distruggilo. Riprenditi ciò che è stato perso. zone.tarFields.description = La periferia di una zona di produzione di petrolio, tra le montagne e il deserto. Una delle poche aree con riserve di catrame utilizzabili.\nAnche se abbandonata, questa zona ha alcune pericolose forze nemiche nelle vicinanze. Non sottovalutarlo.\n\n[lightgray]Ricerca la tecnologia di lavorazione del petrolio, se possibile. zone.desolateRift.description = Una zona estremamente pericolosa. Risorse abbondanti, ma poco spazio. Alto rischio di distruzione. Lascia il prima possibile. Non lasciarti ingannare dalla lunga distanza tra gli attacchi nemici. -zone.nuclearComplex.description = Un ex impianto per la produzione e la lavorazione del torio, ridotto in rovina.\n[lightgray] Ricerca il torio ed i suoi numerosi usi.\n\nIl nemico è presente qui in gran numero, alla costante ricerca di aggressori. +zone.nuclearComplex.description = Un ex impianto per la produzione e la lavorazione del torio, ridotto in rovina.\n[lightgray]Ricerca il torio ed i suoi numerosi usi.\n\nIl nemico è presente qui in gran numero, alla costante ricerca di aggressori. zone.fungalPass.description = Un'area di transizione tra alte montagne e terre più basse, piene di spore. Qui si trova una piccola base di ricognizione nemica.\nDistruggila.\nUsa le unità Pugnale e Strisciatore. Elimina i due nuclei. -zone.impact0078.description = -zone.crags.description = +zone.impact0078.description = < inserisci descrizione > +zone.crags.description = < inserisci descrizione > settings.language = Lingua settings.data = Importa/Esporta salvataggio settings.reset = Ripristina Impostazioni settings.rebind = Modifica +settings.resetKey = Ripristina settings.controls = Controlli settings.game = Gioco settings.sound = Suoni settings.graphics = Grafica -settings.cleardata = Elimina Dati di Gioco... +settings.cleardata = Elimina Dati di Gioco settings.clear.confirm = Sei sicuro di voler cancellare i dati?\nQuesta operazione non può essere annullata! settings.clearall.confirm = [scarlet]ATTENZIONE![]\nQuesto cancellerà tutti i dati, inclusi salvataggi, mappe, oggetti sbloccati ed impostazioni.\nDopo aver premuto su 'ok' il gioco eliminerà i dati e si chiuderà automaticamente. paused = [accent]< In Pausa > @@ -513,7 +517,7 @@ error.title = [crimson]Si è verificato un errore error.crashtitle = Si è verificato un errore blocks.input = Ingresso blocks.output = Uscita -blocks.booster = Booster +blocks.booster = Potenziamenti block.unknown = [LIGHT_GRAY]??? blocks.powercapacity = Capacità Energetica blocks.powershot = Danno/Colpo @@ -675,23 +679,23 @@ keybind.dash.name = Scatto keybind.schematic_select.name = Seleziona Regione keybind.schematic_menu.name = Menu Schematica keybind.schematic_flip_x.name = Ruota Schematica Orizzontalmente -keybind.schematic_flip_y.name = Flip Schematic Verticalmente +keybind.schematic_flip_y.name = Ruota Schematica Verticalmente keybind.category_prev.name = Categoria Precedente keybind.category_next.name = Categoria Successiva keybind.block_select_left.name = Seleziona Blocco Sinistra keybind.block_select_right.name = Seleziona Blocco Destra keybind.block_select_up.name = Seleziona Blocco Su keybind.block_select_down.name = Seleziona Blocco Giù -keybind.block_select_01.name = Categoria/Seleziona Blocco 1 -keybind.block_select_02.name = Categoria/Seleziona Blocco 2 -keybind.block_select_03.name = Categoria/Seleziona Blocco 3 -keybind.block_select_04.name = Categoria/Seleziona Blocco 4 -keybind.block_select_05.name = Categoria/Seleziona Blocco 5 -keybind.block_select_06.name = Categoria/Seleziona Blocco 6 -keybind.block_select_07.name = Categoria/Seleziona Blocco 7 -keybind.block_select_08.name = Categoria/Seleziona Blocco 8 -keybind.block_select_09.name = Categoria/Seleziona Blocco 9 -keybind.block_select_10.name = Categoria/Seleziona Blocco 10 +keybind.block_select_01.name = Seleziona Categoria/Blocco 1 +keybind.block_select_02.name = Seleziona Categoria/Blocco 2 +keybind.block_select_03.name = Seleziona Categoria/Blocco 3 +keybind.block_select_04.name = Seleziona Categoria/Blocco 4 +keybind.block_select_05.name = Seleziona Categoria/Blocco 5 +keybind.block_select_06.name = Seleziona Categoria/Blocco 6 +keybind.block_select_07.name = Seleziona Categoria/Blocco 7 +keybind.block_select_08.name = Seleziona Categoria/Blocco 8 +keybind.block_select_09.name = Seleziona Categoria/Blocco 9 +keybind.block_select_10.name = Seleziona Categoria/Blocco 10 keybind.fullscreen.name = Schermo Intero keybind.select.name = Seleziona/Spara keybind.diagonal_placement.name = Posizionamento Diagonale @@ -708,7 +712,7 @@ keybind.chat.name = Chat keybind.player_list.name = Lista dei Giocatori keybind.console.name = Console keybind.rotate.name = Ruota -keybind.rotateplaced.name = Ruota Blocco Esistente (Premuto) +keybind.rotateplaced.name = Ruota Blocco Esistente (premuto) keybind.toggle_menus.name = Mostra/Nascondi HUD keybind.chat_history_prev.name = Scorri Chat vero l'alto keybind.chat_history_next.name = Scorri Chat verso il basso @@ -987,12 +991,13 @@ block.titan-factory.name = Fabbrica Mech Titano block.fortress-factory.name = Fabbrica Mech Fortezza block.revenant-factory.name = Fabbrica Combattenti Superstiti block.repair-point.name = Punto di Riparazione -block.pulse-conduit.name = Condotto Attiva -block.phase-conduit.name = Condotta di Fase +block.pulse-conduit.name = Condotto a Impulsi +block.plated-conduit.name = Condotto Placcato +block.phase-conduit.name = Condotto di Fase block.liquid-router.name = Distributore di Liquidi block.liquid-tank.name = Serbatoio block.liquid-junction.name = Giunzione Liquida -block.bridge-conduit.name = Condotta Sopraelevata +block.bridge-conduit.name = Condotto Sopraelevato block.rotary-pump.name = Pompa a Turbina block.thorium-reactor.name = Reattore al Torio block.mass-driver.name = Lancia Materiali @@ -1038,31 +1043,31 @@ unit.chaos-array.name = Matrice del Caos unit.eradicator.name = Estirpatore unit.lich.name = Lich unit.reaper.name = Mietitore -tutorial.next = [lightgray] -tutorial.intro = Sei entrato nel[scarlet] Tutorial di Mindustry.[]\nInizia[accent] scavando rame[]. Clicca un minerale di rame vicino al tuo Nucleo per farlo.\n\n[accent]{0}/{1} rame -tutorial.intro.mobile = You have entered the[scarlet] Mindustry Tutorial.[]\nSwipe the screen to move.\n[accent]Pinch with 2 fingers [] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper +tutorial.next = [lightgray]< Clicca per continuare > +tutorial.intro = Sei entrato nel[scarlet] Tutorial di Mindustry.[]\nInizia[accent] scavando del rame[]. Clicca un minerale di rame vicino al tuo Nucleo per farlo.\n\n[accent]{0}/{1} rame +tutorial.intro.mobile = Sei entrato nel[scarlet] Tutorial di Mindustry.[]\nScorri sullo schermo per muoverti.\n[accent]Avvicina due dita[] per eseguire lo zoom in/out.\nInizia [accent] scavando del rame[]. Clicca un minerale di rame vicino al tuo Nucleo per farlo.\n\n[accent]{0}/{1} rame tutorial.drill = Ora crea una trivella.\n[accent]Le trivelle []scavano da sole e sono più efficienti. Piazzane una su un minerale di rame. -tutorial.drill.mobile = Ora crea una trivella. \n[accent] Le trivelle []scavano da sole e sono più efficienti. \n Toccare la scheda della trivella in basso a destra. \n Selezionare la trivella meccanica [accent] []. \n Posizionarlo su una vena di rame toccando, quindi premere il segno di spunta [accent] [] in basso per confermare la selezione. \n Premere il tasto X [accent] [] per annullare il posizionamento. +tutorial.drill.mobile = Ora crea una trivella.\n[accent] Le trivelle []scavano da sole e sono più efficienti.\nTocca la scheda della trivella in basso a destra.\nSeleziona la [accent]Trivella Meccanica[].\nPiazzala su una vena di rame toccando, quindi premi il [accent]segno di spunta[] in basso per confermare la selezione.\nCon il tasto [accent]X[] puoi annullare il posizionamento. tutorial.blockinfo = Ogni blocco ha statistiche diverse. Alcuni minerali richiedono trivelle specifiche.\nPer controllare le informazioni e le statistiche di un blocco, [accent] tocca "?" mentre lo selezioni nel database. []\n\n[accent]Accedi ora alle statistiche della trivella meccanica. [] -tutorial.conveyor = [accent]I nastri trasportatori []sono usati per trasportare oggetti al Nucleo. \nCrea una linea di nastri dalla trivella al Nucleo. -tutorial.conveyor.mobile = [accent] I nastri trasportatori [] sono usati per trasportare oggetti nel nocciolo. \nCrea una linea di nastri trasportatori dalla trivella al nocciolo. \n[accent] Posizionati in una linea tenendo premuto il dito per alcuni secondi [] e trascinando in una direzione. \n\n [accent] {0} / {1} nastri trasportatori disposti in linea \n [accent] 0/1 oggetti consegnati -tutorial.turret = Costruisci delle torrette per respingere il nemico [LIGHT_GRAY] []. \nCostruisci una torretta Duo vicino alla tua base. +tutorial.conveyor = [accent]I nastri trasportatori []sono usati per trasportare oggetti al Nucleo.\nCrea una linea di nastri dalla trivella al Nucleo. +tutorial.conveyor.mobile = [accent]I nastri trasportatori[] sono usati per trasportare oggetti nel Nucleo.\nCrea una linea di nastri trasportatori dalla trivella al Nucleo.\n[accent]Piazzali in linea tenendo premuto per qualche secondo e trascinando il dito in una direzione.\n\n[accent]Piazza 2 nastri trasportatori con lo strumento linea, quindi trasporta un oggetto fino al Nucleo. +tutorial.turret = Costruisci delle torrette per respingere il nemico [LIGHT_GRAY] [].\nCostruisci una torretta Duo vicino alla tua base. tutorial.drillturret = La Torretta Duo richiede[accent] munizioni di rame[] per sparare.\nPosiziona una trivella e collega un nastro alla torretta per rifornirla di munizioni con il rame estratto. -tutorial.pause = Durante la battaglia, puoi mettere in pausa il gioco [accent]. []\nPuoi disporre gli edifici mentre sei in pausa. \n\n[accent]Premi spazio per mettere in pausa. -tutorial.pause.mobile = Durante la battaglia, puoi mettere in pausa il gioco [accent]. []\nPuoi disporre gli edifici mentre sei in pausa. \n\n[accent] Premi questo pulsante in alto a sinistra per mettere in pausa. +tutorial.pause = Durante la battaglia puoi[accent] mettere in pausa il gioco.[]\nPuoi disporre gli edifici mentre il gioco è in pausa.\n\nPer mettere in pausa, premi [accent]spazio[]. +tutorial.pause.mobile = Durante la battaglia puoi[accent] mettere in pausa il gioco.[]\nPuoi disporre gli edifici mentre il gioco è in pausa.\n\nPer mettere in pausa, premi il bottone in alto a sinistra. tutorial.unpause = Ora premi di nuovo spazio per annullare la pausa. tutorial.unpause.mobile = Ora premilo di nuovo per annullare la pausa. -tutorial.breaking = I blocchi spesso devono essere distrutti. \n [accent]Tieni premuto il tasto destro del mouse [] per distruggere tutti i blocchi in una selezione. []\n[accent]Distruggi tutti i blocchi di scarto a sinistra del tuo Nucleo usando la selezione dell'area . -tutorial.breaking.mobile = I blocchi spesso devono essere distrutti. \n [accent] Seleziona la modalità di decostruzione [], quindi tocca un blocco per iniziare a smantellarlo. \n Distruggi un'area tenendo premuto il dito per alcuni secondi [] e trascinando in una direzione.\nPremi il pulsante con il segno di spunta per confermare la rimozione. \n\n [accent] Distruggi tutti i blocchi di scarto a sinistra del tuo Nucleo usando la selezione dell'area. -tutorial.withdraw = In alcune situazioni, è necessario prendere gli oggetti direttamente dai blocchi.\nPer fare ciò, [accent] tocca un blocco []con oggetti al suo interno, quindi [accent] tocca l'oggetto [] nell'inventario. \nPuoi prelevare più oggetti insieme[accent]tenendo premuto il tasto sinistro del mouse[].\n[accent]Preleva un po' di rame dal Nucleo. [] -tutorial.deposit = Deposita tutti gli oggetti che trasporti trascinandoli dalla tua nave al blocco di destinazione. \n[accent]Rimetti il rame nel Nucleo. [] +tutorial.breaking = I blocchi spesso devono essere distrutti.\n[accent]Tieni premuto il tasto destro del mouse [] per distruggere tutti i blocchi in una selezione.[]\n[accent]Distruggi tutti i blocchi di scarto a sinistra del tuo Nucleo usando la selezione dell'area. +tutorial.breaking.mobile = I blocchi spesso devono essere distrutti.\n[accent]Seleziona la modalità di decostruzione[], quindi tocca un blocco per iniziare a smantellarlo.\nDistruggi un'area tenendo premuto il dito per alcuni secondi[] e trascinando in una direzione.\nPremi il pulsante con il segno di spunta per confermare la rimozione.\n\n[accent]Distruggi tutti i blocchi di scarto a sinistra del tuo Nucleo usando la selezione dell'area. +tutorial.withdraw = In alcune situazioni, è necessario prendere gli oggetti direttamente dai blocchi.\nPer fare ciò, [accent] tocca un blocco []con oggetti al suo interno, quindi [accent] tocca l'oggetto [] nell'inventario.\nPuoi prelevare più oggetti insieme[accent]tenendo premuto il tasto sinistro del mouse[].\n[accent]Preleva un po' di rame dal Nucleo. [] +tutorial.deposit = Deposita tutti gli oggetti che trasporti trascinandoli dalla tua nave al blocco di destinazione.\n[accent]Rimetti il rame nel Nucleo. [] tutorial.waves = Il nemico [LIGHT_GRAY] si avvicina.\nDifendi il tuo Nucleo per 2 ondate. Costruisci più torrette. Puoi sparare tenendo premuto il tasto sinistro del mouse. -tutorial.waves.mobile = Il [lightgray] nemico si avvicina.\n\n Difendi il Nucleo per 2 ondate. La tua nave sparerà automaticamente contro i nemici.\nCostruisci più torrette. -tutorial.launch = Una volta raggiunta un'ondata specifica, sarai in grado di [accent] decollare con il Nucleo [], lasciando la zona e abbandonando le tue difese e le tue strutture\nOtterrai [accent]tutte le risorse nel tuo Nucleo[] e potrai quindi usarle per ricercare nuove tecnologie.\n\n [accent]Decolla e conferma per terminare il tutorial. +tutorial.waves.mobile = Il [lightgray]nemico si avvicina.\n\nDifendi il Nucleo per 2 ondate. La tua nave sparerà automaticamente contro i nemici.\nCostruisci più torrette. +tutorial.launch = Una volta raggiunta un'ondata specifica, sarai in grado di [accent] decollare con il Nucleo [], lasciando la zona e abbandonando le tue difese e le tue strutture\nOtterrai [accent]tutte le risorse nel tuo Nucleo[] e potrai quindi usarle per ricercare nuove tecnologie.\n\n[accent]Decolla e conferma per terminare il tutorial. -item.copper.description = Un utile materiale, usato dappertutto -item.lead.description = Un materiale di base, molto usato nei blocchi di trasporto. -item.metaglass.description = Un durissimo composto di vetro. Estensivamente usato per trasporto di liquidi ed immagazzinamento. +item.copper.description = Un materiale utile, usato dappertutto. +item.lead.description = Un materiale di base, molto usato nei blocchi per il trasporto. +item.metaglass.description = Un durissimo composto di vetro. Ampiamente usato per trasporto di liquidi ed immagazzinamento. item.graphite.description = Carbone mineralizzato, utilizzato per munizioni ed isolamento elettrico. item.sand.description = Un materiale di base che viene usato molto nei processi di fusione, sia come lega che come reagente. item.coal.description = Un combustibile comune facilmente ottenibile. @@ -1079,7 +1084,7 @@ item.pyratite.description = Una sostanza molto infiammabile che viene utilizzata liquid.water.description = Il liquido più utile. Comunemente usato per il raffreddamento di macchinari ed il trattamento dei rifiuti. liquid.slag.description = Diversi tipi di metalli fusi, mescolati insieme. Può essere separato nei suoi minerali costituenti o spruzzato sulle unità nemiche come un'arma. liquid.oil.description = Un liquido usato nella produzione avanzata.\nPuò essere convertito in carbone per uso combustibile o spruzzato ed incendiato come arma. -liquid.cryofluid.description = Un liquido inerte e non corrosivo creato da acqua e titanio.\nIl liquido più efficiente per il raffreddamento. +liquid.cryofluid.description = Un liquido inerte e non corrosivo creato da acqua e titanio.\nÈ il liquido più efficiente per il raffreddamento. mech.alpha-mech.description = Il mech standard. È abbastanza veloce e produce abbastanza danni, può anche generare 3 droni per aumentare il suo danno complessivo. mech.delta-mech.description = Un mech veloce, poco armato fatto per giocare a tocca e fuga con il nemico. Fa poco danno alle strutture, ma può uccidere un gran nummero di nemici grazie alle sue armi ad alto voltaggio. mech.tau-mech.description = Un mech di supporto. Cura i blocchi danneggiati sparandogli contro. Può spegnere fuochi e curare i compagni di squadra. @@ -1099,7 +1104,7 @@ unit.eruptor.description = Un mech pesante progettato per abbattere le strutture unit.wraith.description = Un'unità d'intercezione rapida ed efficiente. unit.ghoul.description = Un bombardiere pesante. Utilizza composti esplosivi o pirite come munizioni. unit.revenant.description = Un pesante lanciamissili volante. -block.message.description = Stores a message. Used for communication between allies. +block.message.description = Memorizza un messaggio. Utilizzato per la comunicazione tra alleati. block.graphite-press.description = Comprime pezzi di carbone in fogli di grafite puri. block.multi-press.description = Una versione aggiornata della pressa per grafite. Impiega acqua ed energia per elaborare il carbone in modo rapido ed efficiente. block.silicon-smelter.description = Fonde sabbia e carbone riscaldati per ottenere silicio. @@ -1108,7 +1113,7 @@ block.plastanium-compressor.description = Produce plastanio da petrolio e titani block.phase-weaver.description = Produce tessuto di fase da torio radioattivo ed elevate quantità di sabbia. block.alloy-smelter.description = Produce leghe di sovratensione da titanio, piombo, silicio e rame. block.cryofluidmixer.description = Combina acqua e titanio in criofluido che è molto più efficiente per il raffreddamento. -block.blast-mixer.description = Frantuma e mescola le spore con la pirite per produrre Composto Esplosivo. +block.blast-mixer.description = Frantuma e mescola le spore con la pirite per produrre composto esplosivo. block.pyratite-mixer.description = Mescola carbone, piombo e sabbia in pirite altamente infiammabile. block.melter.description = Riscalda la pietra a temperature molto elevate per ottenere scoria liquida. block.separator.description = Sottopone le scoria a centrifugazione per ottenere i vari minerali contenuti. @@ -1122,23 +1127,23 @@ block.item-source.description = Produce oggetti infiniti, esiste solo nella moda block.item-void.description = Elimina gli oggetti che vi entrano senza bisogno di energia, esiste solo nella modalità creativa. block.liquid-source.description = Emette continuamente liquidi. Esiste solo nella modalità creativa. block.copper-wall.description = Un blocco difensivo economico.\nUtile per proteggere il Nucleo e le torrette nelle prime ondate. -block.copper-wall-large.description = Un blocco difensivo economico.\nUtile per proteggere il Nucleo e le torrette nelle prime ondate. \nOccupa più tessere. +block.copper-wall-large.description = Un blocco difensivo economico.\nUtile per proteggere il Nucleo e le torrette nelle prime ondate.\nOccupa più tessere. block.titanium-wall.description = Un blocco difensivo moderatamente forte.\nFornisce una protezione moderata dai nemici. -block.titanium-wall-large.description = Un blocco difensivo moderatamente forte.\nFornisce una protezione moderata dai nemici. \nOccupa più blocchi +block.titanium-wall-large.description = Un blocco difensivo moderatamente forte.\nFornisce una protezione moderata dai nemici.\nOccupa più tessere block.plastanium-wall.description = Un tipo speciale di muro che assorbe gli archi elettrici e blocca le connessioni automatiche del nodo d'energia. -block.plastanium-wall-large.description = Un tipo speciale di muro che assorbe gli archi elettrici e blocca le connessioni automatiche dei nodi d'energia.\nSi estende su più blocchi. +block.plastanium-wall-large.description = Un tipo speciale di muro che assorbe gli archi elettrici e blocca le connessioni automatiche dei nodi d'energia.\nSi estende su più tessere. block.thorium-wall.description = Un forte blocco difensivo.\nBuona protezione dai nemici. -block.thorium-wall-large.description = Un forte blocco difensivo.\nBuona protezione dai nemici.\nOccupa più blocchi +block.thorium-wall-large.description = Un forte blocco difensivo.\nBuona protezione dai nemici.\nOccupa più tessere. block.phase-wall.description = Non è forte come un muro di torio, ma devia i proiettili a meno che non siano troppo potenti. -block.phase-wall-large.description = Non è forte come un muro di torio, ma devia i proiettili a meno che non siano troppo potenti.\nOccupa più blocchi -block.surge-wall.description = Il blocco difensivo più forte. \nHa una piccola possibilità di innescare un fulmine verso l'attaccante. -block.surge-wall-large.description = Il blocco difensivo più forte. \n Ha una piccola possibilità di innescare un fulmine verso l'attaccante.\nOccupa più blocchi -block.door.description = Una piccola porta che può essere aperta e chiusa toccandola. \nSe aperta, i nemici possono sparare ed attraversare. -block.door-large.description = Una grande porta che può essere aperta e chiusa toccandola. \nSe aperta, i nemici possono sparare ed attraversare. \nOccupa più blocchi +block.phase-wall-large.description = Non è forte come un muro di torio, ma devia i proiettili a meno che non siano troppo potenti.\nOccupa più tessere. +block.surge-wall.description = Il blocco difensivo più forte.\nHa una piccola possibilità di innescare un fulmine verso l'attaccante. +block.surge-wall-large.description = Il blocco difensivo più forte.\nHa una piccola possibilità di innescare un fulmine verso l'attaccante.\nOccupa più tessere. +block.door.description = Una piccola porta che può essere aperta e chiusa toccandola.\nSe aperta, i nemici possono sparare ed attraversare. +block.door-large.description = Una grande porta che può essere aperta e chiusa toccandola.\nSe aperta, i nemici possono sparare ed attraversare.\nOccupa più tessere. block.mender.description = Ripara periodicamente blocchi nelle vicinanze.\nUtilizza del silicio per aumentarne portata ed efficienza. block.mend-projector.description = Ripara periodicamente blocchi nelle vicinanze.\nUtilizza del tessuto di fase per aumentarne portata ed efficienza. block.overdrive-projector.description = Aumenta la velocità di edifici vicini come trivelle e nastri trasportatori. -block.force-projector.description = Crea un campo di forza esagonale attorno a sé, proteggendo gli edifici e le unità all'interno da danni causati da proiettili +block.force-projector.description = Crea un campo di forza esagonale attorno a sé, proteggendo gli edifici e le unità all'interno da danni causati da proiettili. block.shock-mine.description = Danneggia i nemici che la calpestano. Quasi invisibile al nemico. block.conveyor.description = Nastro di base. Sposta gli oggetti in avanti e li deposita automaticamente in altri blocchi. Ruotabile. block.titanium-conveyor.description = Nastro avanzato. Sposta gli oggetti più velocemente dei nastri standard. @@ -1149,22 +1154,24 @@ block.sorter.description = Divide gli oggetti. Se l'oggetto corrisponde a quello block.inverted-sorter.description = Elabora gli oggetti come uno smistatore standard, ma in uscita dà gli elementi selezionati ai lati. block.router.description = Accetta gli elementi da una direzione e li emette fino a 3 altre direzioni allo stesso modo. Utile per suddividere i materiali da una fonte a più destinazioni. block.distributor.description = Un distributore avanzato che divide gli oggetti in altre 7 direzioni allo stesso modo. -block.overflow-gate.description = Una combinazione di un incrocio e di un distributore , che distribuisce sui suoi lati se in nastro difronte si satura. -block.mass-driver.description = Ultimo blocco di trasporto di oggetti. Raccoglie diversi oggetti e poi li spara su un'altra Lancia Materiali a lungo raggio. -block.mechanical-pump.description = Una pompa economica con potenza lenta, ma nessun consumo di energia. +block.overflow-gate.description = Una combinazione di un incrocio e di un distributore, che distribuisce sui suoi lati se in nastro difronte si satura. +block.mass-driver.description = Ultimo blocco di trasporto di oggetti. Raccoglie diversi oggetti e poi li spara su un'altra Lìlancia materiali a lungo raggio. +block.mechanical-pump.description = Una pompa economica a bassa efficienza, ma nessun consumo di energia. block.rotary-pump.description = Una pompa avanzata che raddoppia la velocità consumando energia. block.thermal-pump.description = La pompa migliore. Tre volte più veloce di una pompa meccanica e l'unica pompa in grado di recuperare la lava. block.conduit.description = Condotto di base. Funziona come un nastro trasportatore, ma per i liquidi. Ideale per estrattori, pompe o altri condotti. block.pulse-conduit.description = Condotto avanzato. Trasporta più liquido e più velocemente dei condotti standard. +block.plated-conduit.description = Trasferisce i liquidi alla stessa velocità del Condotto a Impulsi, ma è più resistente. Non accetta liquidi dai lati da parte di condotti diversi.\nMeno perdite. block.liquid-router.description = Accetta i liquidi da una direzione e li emette fino a 3 altre direzioni allo stesso modo. Può anche immagazzinare una certa quantità di liquido. Utile per suddividere i liquidi da una fonte verso più destinazioni. block.liquid-tank.description = Conserva una grande quantità di liquidi. Usalo per creare zone cuscinetto quando c'è una domanda non costante di materiali o come protezione per il raffreddamento di blocchi vitali. block.liquid-junction.description = Permette di incrociare condotti che trasportano liquidi diversi in posizioni diverse. block.bridge-conduit.description = Consente il trasporto di liquidi fino a 3 tessere da un altro condotto sopraelevato.\nPuò passare sopra ad altri blocchi od edifici. block.phase-conduit.description = Condotto avanzato. Consuma energia per teletrasportare i liquidi in un altro condotto di fase collegato. block.power-node.description = Trasmette energia tra i nodi collegati. È possibile creare fino a quattro collegamenti.\nClicca sul nodo per configurare i collegamenti. -block.power-node-large.description = Ha un raggio maggiore rispetto al nodo energetico e si possono creare un massimo di sei collegamenti.\nClicca sul nodo per configurare i collegamenti. +block.power-node-large.description = Ha un raggio maggiore rispetto al Nodo Energetico e si possono creare un massimo di sei collegamenti.\nClicca sul nodo per configurare i collegamenti. block.surge-tower.description = Un nodo di alimentazione a lungo raggio solo due connessioni disponibili.\nClicca sul nodo per configurare i collegamenti. -block.battery.description = Accumula energia ogni volta che c'è abbondanza e fornisce energia ogni volta che c'è carenza, purché rimanga carica. +block.diode.description = L'energia della batteria può attraversare questo blocco in una sola direzione, ma solo se l'altra parte ha meno energia. +block.battery.description = Accumula energia ogni volta che c'è abbondanza e fornisce energia ogni volta che c'è carenza, purché sia carica. block.battery-large.description = Immagazzina molta più energia di una normale batteria. block.combustion-generator.description = Genera energia bruciando combustibile. block.thermal-generator.description = Genera una grande quantità di energia dalla lava. @@ -1172,10 +1179,10 @@ block.turbine-generator.description = Più efficiente di un generatore a combust block.differential-generator.description = Genera grandi quantità di energia. Utilizza la differenza di temperatura tra criofluido e pirite in combustione. block.rtg-generator.description = Un generatore che sfrutta il calore del decadimento di materiale radioattivo per produrre energia.\nNon richiede raffreddamento ma fornisce meno energia di un reattore al torio. block.solar-panel.description = Fornisce una piccola quantità di energia dal sole. -block.solar-panel-large.description = Fornisce un'alimentazione molto migliore rispetto a un pannello solare standard, ma è anche molto più costoso da costruire. +block.solar-panel-large.description = Fornisce un'alimentazione migliore rispetto a un pannello solare standard, ma è anche molto più costoso da costruire. block.thorium-reactor.description = Genera enormi quantità di energia dal torio altamente radioattivo. Richiede un raffreddamento costante. Esploderà violentemente se vengono fornite quantità insufficienti di refrigerante. block.impact-reactor.description = Un generatore avanzato, in grado di creare enormi quantità di energia alla massima efficienza. Richiede un significativo apporto di energia per avviare il processo. -block.mechanical-drill.description = Una trivella economica. Se posizionato su riquadri appropriati, estrae minerali a un ritmo lento e costante. +block.mechanical-drill.description = Una trivella economica. Se posizionata su slot appropriati, estrae minerali a un ritmo lento e costante. block.pneumatic-drill.description = Una trivella migliorata più veloce ed in grado di elaborare materiali più duri sfruttando la pressione dell'aria. block.laser-drill.description = Consente di perforare ancora più velocemente attraverso la tecnologia laser, ma richiede energia. Inoltre, con questa trivella è possibile recuperare il torio radioattivo. block.blast-drill.description = La trivella migliore. Richiede grandi quantità di energia. @@ -1187,7 +1194,7 @@ block.core-foundation.description = La seconda versione del Nucleo. Meglio coraz block.core-nucleus.description = La terza ed ultima versione del Nucleo. Estremamente ben corazzato. Immagazzina enormi quantità di risorse. block.vault.description = Immagazzina una grande quantità di oggetti. Usalo per creare zone cuscinetto quando c'è una domanda non costante di materiali. Uno [LIGHT_GRAY]scaricatore[] può essere utilizzato per recuperare elementi dal deposito. block.container.description = Immagazzina una piccola quantità di oggetti. Usalo per creare zone cuscinetto quando c'è una domanda non costante di materiali. Uno [LIGHT_GRAY]scaricatore[] può essere utilizzato per recuperare elementi dal contenitore. -block.unloader.description = Scarica gli oggetti da un contenitore, caveau o Nucleo su un trasportatore o direttamente in un blocco adiacente. L'oggetto da scaricare può essere scelto toccando lo scaricatore. +block.unloader.description = Scarica gli oggetti da un contenitore, deposito o Nucleo su un nastro trasportatore o direttamente in un blocco adiacente. L'oggetto da scaricare può essere scelto toccando lo scaricatore. block.launch-pad.description = Lancia oggetti nel tuo Nucleo senza necessità di un lasciare la zona. block.launch-pad-large.description = Una versione migliore dell'Ascensore Spaziale, immagazzina più oggetti. Lancia oggetti più frequentemente. block.duo.description = Una torretta piccola ed economica. @@ -1204,7 +1211,7 @@ block.ripple.description = Una grande torretta di artiglieria che spara più col block.cyclone.description = Una grande torretta a fuoco rapido. block.spectre.description = Una grande torretta che spara due potenti proiettili contemporaneamente. block.meltdown.description = Una grande torretta che spara un potente laser a lungo raggio. -block.command-center.description = Da istruzioni alle unità alleate nella mappa. Comanda la ricongizione, l'attacco del Nucleo nemico o la ritirata verso il proprio Nucleo o fabbrica.\nQuando non è presente un Nucleo nemico, le unità pattuglieranno anche se viene ordinato un attacco. +block.command-center.description = Dà istruzioni alle unità alleate nella mappa. Comanda la ricongizione, l'attacco del Nucleo nemico o la ritirata verso il proprio Nucleo o fabbrica.\nQuando non è presente un Nucleo nemico, le unità pattuglieranno anche se viene ordinato un attacco. block.draug-factory.description = Produce droni per la raccolta mineraria. block.spirit-factory.description = Produce droni che riparano blocchi. block.phantom-factory.description = Produce droni avanzati che seguono il giocatore e lo assistono nella costruzione. @@ -1216,10 +1223,10 @@ block.crawler-factory.description = Produce unità di sciame veloci ed autodistr block.titan-factory.description = Produce unità terrestri avanzate e corazzate. block.fortress-factory.description = Produce unità di terra di artiglieria pesante. block.repair-point.description = Cura continuamente l'unità danneggiata più vicina. -block.dart-mech-pad.description = Trasforma la tua nave in un mech di attacco di base. \nUsa il blocco toccando due volte mentre ti trovi su di esso. -block.delta-mech-pad.description = Trasforma la tua nave in un mech veloce e leggermente corazzato, ideale per colpire e scappare. \nUsa il blocco toccando due volte mentre ti ci trovi sopra. -block.tau-mech-pad.description = Trasforma la tua nave in un mech di supporto in grado di curare edifici ed unità alleate. \n Usa il blocco toccando due volte mentre sei in piedi su di esso. -block.omega-mech-pad.description = Trasforma la tua nave in un mech voluminoso e ben corazzato, creato per gli assalti in prima linea. \nUsa il blocco toccando due volte mentre sei in piedi su di esso. +block.dart-mech-pad.description = Trasforma la tua nave in un mech di attacco di base.\nUsa il blocco toccando due volte mentre ti trovi su di esso. +block.delta-mech-pad.description = Trasforma la tua nave in un mech veloce e leggermente corazzato, ideale per colpire e scappare.\nUsa il blocco toccando due volte mentre ti trovi su di esso. +block.tau-mech-pad.description = Trasforma la tua nave in un mech di supporto in grado di curare edifici ed unità alleate.\nUsa il blocco toccando due volte mentre ti trovi su di esso. +block.omega-mech-pad.description = Trasforma la tua nave in un mech voluminoso e ben corazzato, creato per gli assalti in prima linea.\nUsa il blocco toccando due volte mentre ti trovi su di esso. block.javelin-ship-pad.description = Trasforma la tua nave in un intercettore forte e veloce con armi elettriche.\nUsa il blocco toccando due volte mentre ti trovi su di esso. -block.trident-ship-pad.description = Trasforma la tua nave in un bombardiere pesante e ben corazzato. \nUsa il blocco toccando due volte mentre ti trovi su di esso. -block.glaive-ship-pad.description = Trasforma la tua nave in una nave grande e ben corazzata. \nUsa il blocco toccando due volte mentre ti trovi su di esso. +block.trident-ship-pad.description = Trasforma la tua nave in un bombardiere pesante e ben corazzato.\nUsa il blocco toccando due volte mentre ti trovi su di esso. +block.glaive-ship-pad.description = Trasforma la tua nave in una nave grande e ben corazzata.\nUsa il blocco toccando due volte mentre ti trovi su di esso. From 2b46b0e38e8a69d979dd95570a2bcdc1b0eebca0 Mon Sep 17 00:00:00 2001 From: Predator127 <41844491+Predator127@users.noreply.github.com> Date: Sun, 29 Dec 2019 20:51:52 -0300 Subject: [PATCH 41/78] Update bundle_pt_BR.properties (#1253) * Update bundle_pt_BR.properties Hi there! my name is Zero! also known as Hanko, I've translated for a long time since then. I've been lookin through the new translations since i've been out for quite a long time, but dont think i forgot that i was a translator! * Update bundle_pt_BR.properties --- core/assets/bundles/bundle_pt_BR.properties | 46 ++++++++++----------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index 28ead4e5ef..49d4681ea2 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -10,11 +10,11 @@ link.dev-builds.description = Desenvolvimentos instáveis link.trello.description = Trello oficial para atualizações planejadas link.itch.io.description = Página da Itch.io com os downloads link.google-play.description = Página da google play store -link.f-droid.description = F-Droid catalogue listing +link.f-droid.description = Listamento de catalogo do F-Droide link.wiki.description = Wiki oficial do Mindustry linkfail = Falha ao abrir o link\nO Url foi copiado para a área de transferência. screenshot = Screenshot salvo para {0} -screenshot.invalid = Mapa grande demais, Potencialmente sem memória suficiente para captura de tela. +screenshot.invalid = Mapa grande demais, Voce pode estar potencialmente sem memória suficiente para captura de tela. gameover = O núcleo foi destruído. gameover.pvp = O time[accent] {0}[] ganhou! highscore = [YELLOW]Novo recorde! @@ -42,8 +42,8 @@ schematic.shareworkshop = Compartilhar na Oficina schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Virar o Esquema schematic.saved = Esquema salvo. schematic.delete.confirm = Esse Esquema será totalmente erradicado. -schematic.rename = Rename Schematic -schematic.info = {0}x{1}, {2} blocks +schematic.rename = Renomear esquema +schematic.info = {0}x{1}, {2} blocos stat.wave = Hordas derrotadas:[accent] {0} stat.enemiesDestroyed = Inimigos Destruídos:[accent] {0} @@ -279,11 +279,11 @@ workshop.error = Erro buscando os detalhes da Oficina: {0} map.publish.confirm = Você tem certeza de que quer publicar este mapa?\n\n[lightgray]Tenha certeza de que você concorda com o EULA da oficina primeiro, ou seus mapas não serão mostrados! workshop.menu = Selecione oquê você gostaria de fazer com esse Item. workshop.info = Informação do Item -changelog = Changelog (optional): +changelog = Mudanças (opcional): eula = EULA da Steam -missing = This item has been deleted or moved.\n[lightgray]The workshop listing has now been automatically un-linked. -publishing = [accent]Publishing... -publish.confirm = você tem certeza de que quer publicar isso?\n\n[lightgray]Primeiramente tenha certeza de que você concorda com o EULA da Oficina, ou seus itens não irão aparecer! +missing = Este item foi deletado ou movido.\n[lightgray]O listamento da oficina foi automaticamente des-ligado. +publishing = [accent]Publicando... +publish.confirm = Você tem certeza de que quer publicar isso?\n\n[lightgray]Primeiramente tenha certeza de que você concorda com o EULA da Oficina, ou seus itens não irão aparecer! publish.error = Erro publicando o Item: {0} steam.error = Falha em iniciar os serviços da Steam.\nError: {0} @@ -370,11 +370,11 @@ toolmode.replaceall = Substituir tudo toolmode.replaceall.description = Substituir todos os blocos no mapa toolmode.orthogonal = Linha reta toolmode.orthogonal.description = Desenha apenas linhas retas. -toolmode.square = Square +toolmode.square = Quadrado toolmode.square.description = Pincel quadrado. toolmode.eraseores = Apagar minérios toolmode.eraseores.description = Apaga apenas minérios. -toolmode.fillteams = Encher times +toolmode.fillteams = Preencher times toolmode.fillteams.description = Muda o time do qual todos os blocos pertencem. toolmode.drawteams = Desenhar times toolmode.drawteams.description = Muda o time do qual o bloco pertence. @@ -496,8 +496,8 @@ zone.tarFields.description = Nos arredores de uma zona de produção de petróle zone.desolateRift.description = Uma zona extremamente perigosa. Recursos abundantes, porém pouco espaço. Alto risco de destruição. Saia o mais rápido possível. Não seja enganado pelo longo espaço de tempo entre os ataques inimigos. zone.nuclearComplex.description = Uma antiga instalação para produção e processamento de tório, reduzido a ruínas.\n[lightgray]Pesquise o tório e seus muitos usos.\n\nO inimigo está presente aqui em grandes números, constantemente à procura de atacantes. zone.fungalPass.description = Uma area de transição entre montanhas altas e baixas, terras cheias de esporos. Uma pequena base de reconhecimento inimiga está localizada aqui.\nDestrua-a.\nUse as unidades crawler e dagger. Destrua os dois núcleos. -zone.impact0078.description = -zone.crags.description = +zone.impact0078.description = +zone.crags.description = settings.language = Idioma settings.data = Dados do jogo @@ -512,7 +512,7 @@ settings.cleardata = Apagar dados... settings.clear.confirm = Certeza que quer limpar a os dados?\nOque é feito não pode ser desfeito! settings.clearall.confirm = [scarlet]Aviso![]\nIsso vai limpar todo os arquivos, incluindo jogos salvos, mapas, teclas personalizadas e desbloqueados.\nQuando apertar 'ok' todos os arquivos serão apagados e o jogo irá sair automaticamente. paused = Pausado -clear = Clear +clear = Limpo banned = [scarlet]Banido yes = Sim no = Não @@ -521,7 +521,7 @@ error.title = [crimson]Ocorreu um Erro. error.crashtitle = Ocorreu um Erro blocks.input = Entrada blocks.output = Saída -blocks.booster = Booster +blocks.booster = Apoio block.unknown = [LIGHT_GRAY]??? blocks.powercapacity = Capacidade de Energia blocks.powershot = Energia/tiro @@ -659,7 +659,7 @@ setting.chatopacity.name = Opacidade do chat setting.lasersopacity.name = Opacidade do laser setting.playerchat.name = Mostrar chat em jogo public.confirm = Você quer fazer sua partida pública?\n[accent]Qualquer um será capaz de entrar na sua partida.\n[lightgray]Isso pode ser mudado depois em Configurações->Jogo->Visibilidade da partida pública. -public.beta = Note that beta versions of the game cannot make public lobbies. +public.beta = Note que as versões beta do jogo não podem fazer salas publicas. uiscale.reset = A escala da IU foi mudada.\nPressione "OK" para confirmar esta escala.\n[scarlet]Revertendo e saindo em[accent] {0}[] settings... uiscale.cancel = Cancelar e sair setting.bloom.name = Bloom @@ -727,10 +727,10 @@ keybind.zoom_minimap.name = Zoom do minimapa mode.help.title = Descrição dos modos mode.survival.name = Sobrevivência mode.survival.description = O modo normal. Recursos limitados e hordas automáticas. -mode.sandbox.name = Sandbox +mode.sandbox.name = Caixa de areia mode.sandbox.description = Recursos infinitos e sem tempo para ataques. mode.editor.name = Editor -mode.pvp.name = JXJ +mode.pvp.name = JxJ mode.pvp.description = Lutar contra outros jogadores locais. mode.attack.name = Ataque mode.attack.description = Sem hordas, com o objetivo de destruir a base inimiga. @@ -989,9 +989,9 @@ block.spirit-factory.name = Fábrica de drone de reparo Spirit block.phantom-factory.name = Fábrica de drone de construção Phantom block.wraith-factory.name = Fábrica de lutadores Wraith block.ghoul-factory.name = Fábrica de Bombardeiros Ghoul -block.dagger-factory.name = Fábrica de mech Dagger -block.crawler-factory.name = Fábrica de mech Crawler -block.titan-factory.name = Fábrica de mech titan +block.dagger-factory.name = Fábrica de Mecas Dagger +block.crawler-factory.name = Fábrica de Mecas Crawler +block.titan-factory.name = Fábrica de Mecas Titan block.fortress-factory.name = Fábrica de mech Fortress block.revenant-factory.name = Fábrica de lutadores Revenant block.repair-point.name = Ponto de Reparo @@ -1056,7 +1056,7 @@ tutorial.blockinfo = Cada bloco tem diferentes status. Cada broca pode extrair c tutorial.conveyor = [accent]Esteiras[] São usadas para transportar itens até o núcleo.\nFaça uma linha de Esteiras da mineradora até o núcleo. tutorial.conveyor.mobile = [accent]Esteiras[] são usadas para transportar itens até o núcleo.\nFaça uma linha de esteiras da broca até o núcleo.\n[accent] Coloque uma linha segurando por alguns segundos[] e arrastando em uma direção.\n\n[accent]{0}/{1} esteiras colocadas em linha\n[accent]0/1 itens entregues tutorial.turret = Estruturas defensivas devem ser construidas para repelir[LIGHT_GRAY] o inimigo[].\nConstrua uma torre dupla perto de sua base. -tutorial.drillturret = Torretas duplas precisam de[accent] cobre[] como munição para atirar.\nColoque uma broca próxima à torre para carregá-la com o cobre minerado. +tutorial.drillturret = Torres duplas precisam de[accent] cobre[] como munição para atirar.\nColoque uma broca próxima à torre para carregá-la com o cobre minerado. tutorial.pause = Durante uma batalha, você pode[accent] pausar o jogo.[]\nVocê pode enfileirar construções enquanto o jogo está pausado.\n\n[accent]Pressione a barra de espaço para pausar. tutorial.pause.mobile = Durante uma batalha, você pode[accent] pausar o jogo.[]\nVocê pode enfileirar construções enquanto o jogo está pausado.\n\n[accent]Pressione este botão no canto superior direito para pausar. tutorial.unpause = Agora pressione novamente a barra de espaço para despausar. @@ -1111,7 +1111,7 @@ unit.revenant.description = Uma matriz de mísseis pesada e flutuante. block.message.description = Armazena uma mensagem. Usado para comunicação entre aliados. block.graphite-press.description = Comprime pedaços de carvão em lâminas de grafite puro. block.multi-press.description = Uma versão melhorada da prensa de grafite. Usa água e energia para processar carvão rápida e eficientemente. -block.silicon-smelter.description = Reduz areia com carvão puro. Produz silício silicio. +block.silicon-smelter.description = Reduz areia a silicio usando carvão puro. Produz silício. block.kiln.description = Derrete chumbo e areia no composto conhecido como metavidro. Requer pequenas quantidades de energia. block.plastanium-compressor.description = Produz plastânio usando petróleo e titânio. block.phase-weaver.description = Produz tecido de fase usando tório radioativo e areia. Requer massivas quantidades de energia para funcionar. @@ -1185,7 +1185,7 @@ block.rtg-generator.description = Um Gerador termoelétrico de radioisótopos qu block.solar-panel.description = Gera pequenas quantidades de energia do sol. block.solar-panel-large.description = Uma versão significantemente mais eficiente que o painel solar padrão. block.thorium-reactor.description = Gera altas quantidades de energia do torio radioativo. Requer resfriamento constante. Vai explodir violentamente Se resfriamento insuficiente for fornecido. -block.impact-reactor.description = An advanced generator, capable of creating massive amounts of power at peak efficiency. Requires a significant power input to kickstart the process. +block.impact-reactor.description = Um gerador avançado, capaz de criar quantidades enormes de energia em seu poder total. Requer uma entrada significativa de energia ao iniciar. block.mechanical-drill.description = Uma broca barata. Quando colocado em blocos apropriados, retira itens em um ritmo lento e indefinitavamente. block.pneumatic-drill.description = Uma broca improvisada que é mais rápida e capaz de processar materiais mais duros usando a pressão do ar block.laser-drill.description = Possibilita a mineração ainda mais rapida usando tecnologia a laser, Mas requer poder adcionalmente torio radioativo pode ser recuperado com essa mineradora From ae5685ae46121539cec4bc513bb4e8e1e38e7458 Mon Sep 17 00:00:00 2001 From: Ali-C-Ila <56729449+Ali-C-Ila@users.noreply.github.com> Date: Mon, 30 Dec 2019 07:51:58 +0800 Subject: [PATCH 42/78] Update bundle_zh_TW.properties (#1263) * Update bundle_zh_TW.properties * Update bundle_zh_TW.properties * Update bundle_zh_TW.properties --- core/assets/bundles/bundle_zh_TW.properties | 33 +++++++++++---------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index 1a50de946d..de6c8c12e1 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -89,6 +89,7 @@ uploadingpreviewfile = 上傳預覽文件 committingchanges = 提交變更 done = 完成 feature.unsupported = 您的設備不支持此功能。 + mods.alphainfo = 請記住，模組仍處於Alpha狀態，[scarlet]可能會有很多BUG[].\n向Mindustry GitHub或Discord報告發現的任何問題。 mods.alpha = [accent](Alpha) mods = 模組 @@ -98,7 +99,6 @@ mods.report = 回報錯誤 mods.openfolder = 開啟模組資料夾 mod.enabled = [lightgray]已啟用 mod.disabled = [scarlet]已禁用 -mod.enable = 啟用 mod.disable = 禁用 mod.delete.error = 無法刪除模組，檔案可能在使用中。 mod.requiresversion = [scarlet]最低遊戲版本要求：[accent]{0} @@ -107,6 +107,7 @@ mod.erroredcontent = [scarlet]內容錯誤 mod.errors = 載入內容時發生錯誤 mod.noerrorplay = [scarlet]你使用了有錯誤的模組。[] 遊戲前請先禁用相關模組或修正錯誤。 mod.nowdisabled = [scarlet]「{0}」模組缺少必須項目:[accent] {1}\n[lightgray]必須先下載這些模組。\n此模組將被自動禁用。 +mod.enable = 啟用 mod.requiresrestart = 遊戲將立即關閉以套用模組變更。 mod.reloadrequired = [scarlet]需要重新載入 mod.import = 匯入模組 @@ -286,6 +287,7 @@ publishing = [accent]發佈中... publish.confirm = 您確定要發布嗎？\n\n[lightgray]首先確定您同意Workshop EULA，否則您的項目將不會顯示！ publish.error = 發佈項目時出錯: {0} steam.error = Steam 服務初始化失敗.\n錯誤： {0} + editor.brush = 粉刷 editor.openin = 在編輯器中開啟 editor.oregen = 礦石生成 @@ -605,7 +607,6 @@ category.items = 物品 category.crafting = 需求 category.shooting = 射擊 category.optional = 可選的強化 - setting.landscape.name = 鎖定水平畫面 setting.shadows.name = 陰影 setting.blockreplace.name = 方塊建造建議 @@ -671,6 +672,7 @@ category.multiplayer.name = 多人 command.attack = 攻擊 command.rally = 集結 command.retreat = 撤退 +placement.blockselectkeys = \n[lightgray]按鍵：[{0}, keybind.clear_building.name = 清除建築指令 keybind.press = 按一下按鍵... keybind.press.axis = 按一下軸向或按鍵... @@ -678,6 +680,8 @@ keybind.screenshot.name = 地圖截圖 keybind.toggle_power_lines.name = 顯示能量激光 keybind.move_x.name = 水平移動 keybind.move_y.name = 垂直移動 +keybind.mouse_move.name = 跟隨滑鼠 +keybind.dash.name = 衝刺 keybind.schematic_select.name = 選擇區域 keybind.schematic_menu.name = 藍圖目錄 keybind.schematic_flip_x.name = X軸翻轉 @@ -710,7 +714,6 @@ keybind.menu.name = 主選單 keybind.pause.name = 暫停遊戲 keybind.pause_building.name = 暫停/恢復建造 keybind.minimap.name = 小地圖 -keybind.dash.name = 衝刺 keybind.chat.name = 聊天 keybind.player_list.name = 玩家列表 keybind.console.name = 終端機 @@ -724,7 +727,7 @@ keybind.drop_unit.name = 放下單位 keybind.zoom_minimap.name = 縮放小地圖 mode.help.title = 模式說明 mode.survival.name = 生存 -mode.survival.description = 一般模式。有限的資源與自動來襲的波次。 +mode.survival.description = 一般模式。有限的資源與自動來襲的波次。\n[gray]地圖中需要敵人生成點。 mode.sandbox.name = 沙盒 mode.sandbox.description = 無限的資源與不倒數計時的波次。 mode.editor.name = 編輯 @@ -742,11 +745,11 @@ rules.attack = 攻擊模式 rules.enemyCheat = 電腦無限資源 rules.unitdrops = 單位掉落物 rules.unitbuildspeedmultiplier = 單位建設速度倍數 -rules.unithealthmultiplier = 單位耐久度倍數 -rules.playerhealthmultiplier = 玩家耐久度倍數 +rules.unithealthmultiplier = 單位生命值倍數 +rules.playerhealthmultiplier = 玩家生命值倍數 rules.playerdamagemultiplier = 玩家傷害倍數 rules.unitdamagemultiplier = 單位傷害倍數 -rules.enemycorebuildradius = 敵人核心無建設半徑︰[lightgray]（格） +rules.enemycorebuildradius = 敵人核心禁止建設半徑︰[lightgray]（格） rules.respawntime = 重生時間︰[lightgray]（秒） rules.wavespacing = 波次間距︰[lightgray]（秒） rules.buildcostmultiplier = 建設成本倍數 @@ -790,7 +793,6 @@ liquid.water.name = 水 liquid.slag.name = 熔渣 liquid.oil.name = 原油 liquid.cryofluid.name = 冷凍液 - mech.alpha-mech.name = 阿爾法 mech.alpha-mech.weapon = 重型機關槍 mech.alpha-mech.ability = 自修復 @@ -813,21 +815,22 @@ mech.trident-ship.weapon = 轟炸艙 mech.glaive-ship.name = 偃月刀 mech.glaive-ship.weapon = 火焰機關槍 item.corestorable = [lightgray]核心可儲存: {0} -item.explosiveness = [lightgray]爆炸性：{0} -item.flammability = [lightgray]易燃性：{0} -item.radioactivity = [lightgray]放射性：{0} -unit.health = [lightgray]耐久度：{0} +item.explosiveness = [lightgray]爆炸性：{0}% +item.flammability = [lightgray]易燃性：{0}% +item.radioactivity = [lightgray]放射性：{0}% +unit.health = [lightgray]生命值：{0} unit.speed = [lightgray]速度：{0} mech.weapon = [lightgray]武器：{0} mech.health = [lightgray]血量：{0} mech.itemcapacity = [lightgray]物品容量：{0} -mech.minespeed = [lightgray]採礦速度：{0} +mech.minespeed = [lightgray]採礦速度：{0}% mech.minepower = [lightgray]採礦能力：{0} mech.ability = [lightgray]能力：{0} mech.buildspeed = [lightgray]建造速度: {0}% liquid.heatcapacity = [lightgray]熱容量：{0} liquid.viscosity = [lightgray]粘性：{0} liquid.temperature = [lightgray]溫度：{0} + block.sand-boulder.name = 沙礫 block.grass.name = 草 block.salt.name = 鹽 @@ -1048,7 +1051,7 @@ unit.reaper.name = 收掠者 tutorial.next = [lightgray]<按下以繼續> tutorial.intro = 您已進入[scarlet] Mindustry 教學。[]\n使用[[WASD鍵]來移動.\n滾動滾輪來放大縮小畫面.\n從[accent]開採銅礦[]開始吧靠近它，然後在靠近核心的位置點擊銅礦。\n\n[accent]{0}/{1}銅礦 tutorial.intro.mobile = 您已進入[scarlet] Mindustry 教學。[]\n滑動螢幕即可移動。\n[accent]用兩指捏[]來縮放畫面。\n從[accent]開採銅礦[]開始吧。靠近它，然後在靠近核心的位置點擊銅礦。\n\n[accent]{0}/{1}銅礦 -tutorial.drill = 手動挖掘礦石的效率很低。\n[accent]鑽頭[]能夠自動挖掘礦石。\n在銅礦脈上放置一個鑽頭。 +tutorial.drill = 手動挖掘礦石的效率很低。\n[accent]鑽頭[]能夠自動挖掘礦石。\n在銅礦脈上放置一個鑽頭。\n不論在哪個選單，您也可以用快速按下按鍵[accent][[2][]然後[accent][[1][]來選擇鑽頭。\n[accent]滑鼠右擊[]停止建造。 tutorial.drill.mobile = 手動挖掘礦石的效率很低。\n[accent]鑽頭[]能夠自動挖掘礦石。\n點選右下角的鑽頭選項\n選擇[accent]機械鑽頭[].\n通過點擊將其放置在銅礦上，然後按下下方的[accent]確認標誌[]確認您的選擇\n按下[accent] X 按鈕[] 取消放置. tutorial.blockinfo = 每個方塊都有不同的屬性。每個鑽頭只能開採特定的礦石。\n查看方塊的資訊和屬性，[accent]在建造目錄時按下"?"鈕。[]\n\n[accent]立即訪問機械鑽頭的屬性資料。[] tutorial.conveyor = [accent]輸送帶[]能夠將物品運輸到核心。\n製作一條從鑽頭開始到核心的輸送帶。 @@ -1068,7 +1071,7 @@ tutorial.launch = 一旦您達到特定的波數， 您就可以[accent] 發射 item.copper.description = 最基本的結構材料。在各種類型的方塊中廣泛使用。 item.lead.description = 一種基本的起始材料。被廣泛用於電子設備和液體運輸方塊。 item.metaglass.description = 一種超高強度的玻璃。廣泛用於液體分配和存儲。 -item.graphite.description = 礦化的碳，用於彈藥和電氣絕緣。 +item.graphite.description = 礦化的碳，用於彈藥和電氣元件。 item.sand.description = 一種常見的材料，廣泛用於冶煉，包括製作合金和作為助熔劑。 item.coal.description = 遠在「播種」事件前就形成的植物化石。一種常見並容易獲得的燃料。 item.titanium.description = 一種罕見的超輕金屬，被廣泛運用於運輸液體、鑽頭和飛行載具。 From 9d2e3569960a3a771eeb45f501a93e36c3e96737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Ga=C5=A1par=C3=ADk?= Date: Mon, 30 Dec 2019 00:52:06 +0100 Subject: [PATCH 43/78] Update bundle_cs.properties (#1267) Rewamping Czech translation. First part. --- core/assets/bundles/bundle_cs.properties | 350 ++++++++++++----------- 1 file changed, 183 insertions(+), 167 deletions(-) diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index 2160901318..1161de677c 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -1,241 +1,257 @@ credits.text = Vytvořil [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[] -credits = Kredity -contributors = Překladatelé a Sponzoři -discord = Připoj se k Mindustry na Discordu! -link.discord.description = Oficiální Mindustry chatroom na Discordu! -link.reddit.description = The Mindustry subreddit +credits = Titulky +contributors = Překladatelé a sponzoři +discord = Připoj se k Mindustry na Discord serveru! +link.discord.description = Oficiální kanál Mindustry na serveru Discord +link.reddit.description = Mindustry na Redditu link.github.description = Zdrojový kód hry link.changelog.description = Seznam úprav -link.dev-builds.description = Nestabilní verze vývoje hry -link.trello.description = Oficiální Trello board pro plánované funkce -link.itch.io.description = itch.io stránka pro stažení PC nebo webové verze -link.google-play.description = Google Play store -link.wiki.description = Oficiální Mindustry wiki -linkfail = Nepodařilo se otevřít odkaz!\nURL byla zkopírována do schránky. +link.dev-builds.description = Nestabilní vývojová verze hry +link.trello.description = Oficiální nástěnka na Trello s plány rozvoje hry +link.itch.io.description = Stránka na itch.io s odkazy na stažení hry +link.google-play.description = Obchod Google Play +link.f-droid.description = Katalog F-Droid +link.wiki.description = Oficiální Wiki Mindustry +link.feathub.description = Navrhni něco nového do hry! +linkfail = Nepodařilo se otevřít odkaz!\nAdresa URL byla zkopírována do schránky. screenshot = Snímek obrazovky uložen {0} -screenshot.invalid = Mapa je moc velká, nemusí být dost paměti pro snímek obrazovky. +screenshot.invalid = Mapa je moc velká, nemusí být dost paměti pro získání snímku obrazovky. gameover = Konec hry -gameover.pvp = [accent] {0}[] Tým Vyhrál! +gameover.pvp = [accent]{0}[] tým vyhrál! highscore = [accent]Nový rekord! -copied = Copied. +copied = Zkopírováno. + load.sound = Zvuky load.map = Mapy load.image = Obrázky load.content = Obsah -load.system = System -load.mod = Módy -schematic = Schematic -schematic.add = Save Schematic... -schematics = Schematics -schematic.replace = A schematic by that name already exists. Replace it? -schematic.import = Import Schematic... -schematic.exportfile = Export File -schematic.importfile = Import File -schematic.browseworkshop = Browse Workshop -schematic.copy = Copy to Clipboard -schematic.copy.import = Import from Clipboard -schematic.shareworkshop = Share on Workshop -schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Flip Schematic -schematic.saved = Schematic saved. -schematic.delete.confirm = This schematic will be utterly eradicated. -schematic.rename = Rename Schematic -schematic.info = {0}x{1}, {2} blocks -stat.wave = Vln poraženo:[accent] {0} -stat.enemiesDestroyed = Nepřátel zničeno:[accent] {0} -stat.built = Budov postaveno:[accent] {0} -stat.destroyed = Budov zničeno:[accent] {0} -stat.deconstructed = Budov rozebráno:[accent] {0} -stat.delivered = Materiálu odesláno: -stat.rank = Závěrečné hodnocení: [accent]{0} -launcheditems = [accent]Odeslané předměty -launchinfo = [unlaunched][[LAUNCH] your core to obtain the items indicated in blue. -map.delete = Jsi si jistý že chceš smazat mapu "[accent]{0}[]"? -level.highscore = Nejvyšší skóre: [accent]{0} -level.select = Výběr levelu +load.system = Systém +load.mod = Modifikace +load.scripts = Skripty + +schematic = Šablona +schematic.add = Uložit šablonu... +schematics = Šablony +schematic.replace = Šablona tohoto jména již exisruje. Přeješ si ji nahradit? +schematic.import = Importovat šablonu... +schematic.exportfile = Exportovat soubor +schematic.importfile = Importovat soubor +schematic.browseworkshop = Procházet dílnu +schematic.copy = Zkopírovat do schránky +schematic.copy.import = Importovat ze schránky +schematic.shareworkshop = Sdílet v dílně +schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Obrátit šablonu +schematic.saved = Šablona byla uložena. +schematic.delete.confirm = Tato šablona bude beze zbytku smazána. +schematic.rename = Přejmenovat šablonu +schematic.info = {0}x{1}, {2} bloků + +stat.wave = Vln poraženo :[accent]{0} +stat.enemiesDestroyed = Nepřátel zničeno :[accent]{0}[] +stat.built = Budov postaveno: [accent]{0}[] +stat.destroyed = Budov zničeno: [accent]{0}[] +stat.deconstructed = Budov rozebráno: [accent]{0}[] +stat.delivered = Materiálu vysláno: +stat.rank = Závěrečné hodnocení: [accent]{0}[] + +launcheditems = [accent]Vyslané předměty[] +launchinfo = [unlaunched][Je třeba [LAUNCH] Tvé jádro, abys získal věci vyznačené modře. +map.delete = Jsi si jistý, že chceš smazat mapu "[accent]{0}[]"? +level.highscore = Nejvyšší skóre: [accent]{0}[] +level.select = Výběr úrovně level.mode = Herní mód: -showagain = Znovu neukazovat ! +showagain = Znovu neukazovat coreattack = < Jádro je pod útokem! > -nearpoint = [[ [scarlet]IHNED OPUSŤTE PROSTOR VÝSADKŮ[] ]\nNebezpečí okamžité smrti -database = Databáze objektů +nearpoint = [ [scarlet]IHNED OPUSŤTE PROSTOR VÝSADKU[] ]\nNebezpečí okamžité smrti! +database = Databáze objektů ve hře savegame = Uložit hru loadgame = Načíst hru joingame = Připojit se ke hře customgame = Vlastní hra newgame = Nová hra none = <žádný> -minimap = Minimapa -position = Position +minimap = Mapička +position = Pozice close = Zavřít -website = Web. stránky +website = Webové stránky quit = Ukončit save.quit = Uložit a ukončit maps = Mapy maps.browse = Procházet mapy continue = Pokračovat -maps.none = [LIGHT_GRAY]Žádné mapy nebyly nalezeny! +maps.none = [LIGHT_GRAY]Mapy nebyly nalezeny. invalid = Neplatné -preparingconfig = Připravuji Config -preparingcontent = Připravuji obsah -uploadingcontent = Nahrávám obsah -uploadingpreviewfile = Nahrávám prohlížecí soubor +pickcolor = Vyber barvu +preparingconfig = Připravuji konfiguraci +preparingcontent = Připravuji obsah hry +uploadingcontent = Nahrávám obsah hry +uploadingpreviewfile = Nahrávám soubor s náhledem committingchanges = Provádím změny done = Hotovo -feature.unsupported = Your device does not support this feature. -mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry GitHub or Discord. -mods.alpha = [accent](Alpha) -mods = Mods -mods.none = [LIGHT_GRAY]No mods found! -mods.guide = Modding Guide -mods.report = Report Bug -mods.openfolder = Open Mod Folder -mod.enabled = [lightgray]Enabled -mod.disabled = [scarlet]Disabled -mod.disable = Disable -mod.delete.error = Unable to delete mod. File may be in use. -mod.missingdependencies = [scarlet]Missing dependencies: {0} -mod.nowdisabled = [scarlet]Mod '{0}' is missing dependencies:[accent] {1}\n[lightgray]These mods need to be downloaded first.\nThis mod will be automatically disabled. -mod.enable = Enable -mod.requiresrestart = The game will now close to apply the mod changes. -mod.reloadrequired = [scarlet]Reload Required -mod.import = Import Mod -mod.import.github = Import GitHub Mod -mod.remove.confirm = This mod will be deleted. -mod.author = [LIGHT_GRAY]Author:[] {0} -mod.missing = This save contains mods that you have recently updated or no longer have installed. Save corruption may occur. Are you sure you want to load it?\n[lightgray]Mods:\n{0} -mod.preview.missing = Before publishing this mod in the workshop, you must add an image preview.\nPlace an image named[accent] preview.png[] into the mod's folder and try again. -mod.folder.missing = Only mods in folder form can be published on the workshop.\nTo convert any mod into a folder, simply unzip its file into a folder and delete the old zip, then restart your game or reload your mods. +feature.unsupported = Tvoje zařízení nepodporuje tuto vlastnost hry. + +mods.alphainfo = Měj na paměti, že modifikace jsou stále v alfa fázi vývoje a mohou být [scarlet]velmi chybové[].\nNahlaš, prosím, jakékoliv závady na GitHub nebo Discord serveru Mindustry. Děkujeme! +mods.alpha = [accent](Alfa)[] +mods = Modifikace +mods.none = [LIGHT_GRAY]Modifikace nebyly nalezeny.[] +mods.guide = Průvodce modifikacemi +mods.report = Nahlásit závadu +mods.openfolder = Otevřít složku s modifikacemi +mod.enabled = [lightgray]Povoleno[] +mod.disabled = [scarlet]Zakázáno[] +mod.disable = Zakázat +mod.delete.error = Nebylo možnost smazat modifikaci. Soubor může být používán. +mod.requiresversion = [scarlet]Minimální požadovaná verze hry:: [accent]{0}[] +mod.missingdependencies = [scarlet]Chybějící závislosti: {0} +mod.erroredcontent = [scarlet]Chyby v obsahu +mod.errors = Při načítání obsahu hry se vyskytly problémy. +mod.noerrorplay = [scarlet]Máš modifikace s chybami.[] Buď zakaž dotčené modifikace, nebo oprav chyby před tím, než začneš hrát. +mod.nowdisabled = [scarlet]Modifikaci '{0}' chybí tyto závislosti: [accent]{1}\n[lightgray]Tyto modifikace je třeba nejprve stáhnout.\nTato modifikace bude nyní automaticky zakázána. +mod.enable = Povolit +mod.requiresrestart = Hra bude ukončena, aby bylo možné nasadit modifikace. +mod.reloadrequired = [scarlet]Je vyžadováno znovuspuštění hry. +mod.import = Importovat modifikaci +mod.import.github = Import modifikaci z GitHubu +mod.item.remove = Tato položka je součástí [accent]'{0}'[] modifikace. Pokud ji chcete odstranit, odinstalujte tuto modifikaci. +mod.remove.confirm = Tato modifikace bude odstraněna. +mod.author = [LIGHT_GRAY]Autor:[] {0} +mod.missing = Toto uložení hra obsahuje modifikace, které byly nedávno aktualizovány, nebo již nejsou nainstalovány. Použití tohoto uložení může vést k chybám. Jsi si jist, že chceš nahrát toto uložení hry?\n[lightgray]Modifikace:\n{0} +mod.preview.missing = Než vystavíš svou modifikaci v dílně, musíš přidat obrázek pro náhled.\nUmísti obrázek pojmenovaný [accent]preview.png[] do složky modifikace a zkus to znovu. +mod.folder.missing = V dílně mohou být publikovány pouze modifikace ve formě složky.\nAbys převedl modifikaci na formu složky, jednoduše rozbal zip soubor do složky a smaž starý zip soubor. Potom znovu spusť hru nebo znovu načti modifikace. +mod.scripts.unsupported = Tvoje zařízení nepodporuje skripty. Některé modifikace nemusí správně fungovat. + about.button = O hře name = Jméno: -noname = Nejdřív si vyber[accent] herní jméno[]. -filename = Jméno složky: -unlocked = Nový blok odemčen! +noname = Nejdřív si vyber [accent]jméno ve hře[]. +filename = Název souboru: +unlocked = Byl odemmknut nový blok! completed = [accent]Dokončeno techtree = Technologie research.list = [LIGHT_GRAY]Výzkum: research = Výzkum -researched = [LIGHT_GRAY]{0} vyzkoumán(o). -players = {0} hráčů online -players.single = {0} hráč online -server.closing = [accent]Zavírám server... +researched = Výzkumu dokončeno: [LIGHT_GRAY]{0}[]. +players = Hráčů: {0} +players.single = Hráč: {0} +server.closing = [accent]Ukončuji server... server.kicked.kick = Byl jsi vykopnut ze serveru! -server.kicked.whitelist = Na server ti nebyl udělen přístup. -server.kicked.serverClose = Server je zavřený. -server.kicked.vote = Byl jsi odhlasován a vykopnut. Sbohem. -server.kicked.clientOutdated = Zastaralý klient hry! Aktualizuj si hru! -server.kicked.serverOutdated = Zastaralý server! Řekni hostiteli o aktualizaci! -server.kicked.banned = Jsi zabanován na tomto serveru. -server.kicked.typeMismatch = Tento server není kompatibilní s verzí tvého klienta -server.kicked.playerLimit = Tento server je plný, vyčkej na volné místo. -server.kicked.recentKick = Před nedávnem jsi byl vykopnut.\nPočkej než se znovu připojíš. -server.kicked.nameInUse = Někdo se stejným jménem\nje aktuálně na serveru. -server.kicked.nameEmpty = Tvé jméno je neplatné. -server.kicked.idInUse = Již jsi na tomhle serveru připojen! Připojování se dvěma účty není povoleno. -server.kicked.customClient = Tento server nepodporuje vlastní verze hry. Stáhni si oficiální verzi. +server.kicked.whitelist = Na server Ti nebyl udělen přístup. +server.kicked.serverClose = Server není otevřený. +server.kicked.vote = Bylo odhlasováno, že budeš vykopnut ze serveru. Tak čau. +server.kicked.clientOutdated = Byl detekována zastaralá verze klienta hry. Aktualizuj si hru! +server.kicked.serverOutdated = Byl detekována zastaralá verze serveru. Požádej hostitele o aktualizaci! +server.kicked.banned = Byl Ti zakázán přístup na tento server. +server.kicked.typeMismatch = Tento server není kompatibilní s verzí Tvého klienta. +server.kicked.playerLimit = Tento server je plný, vyčkej prosím, až se uvolní místo. +server.kicked.recentKick = Před nedávnem jsi byl vykopnut z tohoto serveru.\nPočkej proto chvíli, než se zkusíš znovu připojit. +server.kicked.nameInUse = Někdo se stejným jménem jako Ty\nje aktuálně přihlášen na serveru. +server.kicked.nameEmpty = Tvé jméno není platné. Možná je prostě jen není nastaveno? +server.kicked.idInUse = Na tomhle serveru jsi již připojen. Připojování se pod dvěma účty není dovoleno! +server.kicked.customClient = Tento server nepodporuje upravené verze hry. Stáhni si, prosím. oficiální verzi. server.kicked.gameover = Konec hry! -server.versions = Verze klienta:[accent] {0}[]\nVerze serveru:[accent] {1}[] -host.info = [accent]hostitel[] hostuje server na portu [scarlet]6567[]. \nKdokoliv na stejné [LIGHT_GRAY]wifi nebo místní síti[] by měl vidět server ve svém listu serverů.\n\nJestli chcete aby se uživatelé připojovali odkudkoliv pomocí IP, [accent]přesměrování portů[] je nutné.\n\n[LIGHT_GRAY]Poznámka: Jestli někdo má problém s připojením ke své LAN hře, ujistěte se že má Mindustry povolený přístup k místní síti v nastavení Firewallu. -join.info = Tady můžeš vložit [accent]IP serveru[] ke kterému se chceš připojit, nebo objevit [accent]Servery Místní sítě[] ke kterým se chceš připojit.\nLAN i Multiplayer jsou podporovány.\n\n[LIGHT_GRAY]Poznámka: Není žádný globální seznam serverů; Pokud se budeš chtít připojit k někomu pomocí IP, budeš jí muset znát od hostitele. -hostserver = Hostovat hru +server.versions = Verze klienta: [accent]{0}[]\nVerze serveru: [accent]{1}[] +host.info = Tento [accent]hostitel[] hostuje server na portu [scarlet]6567[]. \nKdokoliv na stejné [LIGHT_GRAY]síti Wifi nebo LAN (místní)[] by měl vidět server ve svém listu serverů.\n\nJestliže chcete, aby se uživatelé připojovali odkudkoliv pomocí adresy IP, může být nezbytné nastavit [accent]přesměrování portů[].\n\n[LIGHT_GRAY]Poznámka: Jestliže má někdo problém s připojením k LAN hře, ujisti se, že má program Mindustry povolený přístup k místní síti v nastavení místního firewallu. +join.info = Zde můžeš vložit [accent]adresu IP serveru[], ke kterému se chceš připojit, nebo zkusit nalézt [accent]servery v místní síti[], ke kterým se můžeš připojit.\nJsou podporovány režimy hry více hráčů přes LAN i WAN.\n\n[LIGHT_GRAY]Poznámka: Neexistuje automatický globální seznam serverů Mindustry. Pokud se chceš k někomu připojit pomocí adresy IP, budeš ji muset znát od hostitele. +hostserver = Hostovat hru více hráčů invitefriends = Pozvat přátele -hostserver.mobile = Hostovat\nHru +hostserver.mobile = Hostovat\nhru host = Hostitel hosting = [accent]Otevírám server... hosts.refresh = Obnovit -hosts.discovering = Hledám hry LAN +hosts.discovering = Hledám hry v místní síti (LAN) hosts.discovering.any = Hledám hry -server.refreshing = Obnovuji servery -hosts.none = [lightgray]Žádné místní hry nebyly nalezeny! -host.invalid = [scarlet]Nejde se připojit k hostiteli. +server.refreshing = Aktualizuji stav serverů +hosts.none = [lightgray]Žádné místní hry nebyly nalezeny![] +host.invalid = [scarlet]Nejde se připojit k hostiteli.[] trace = Vystopovat hráče -trace.playername = Jméno hráče: [accent]{0} -trace.ip = IP: [accent]{0} -trace.id = Unikátní ID: [accent]{0} -trace.mobile = Mobilní klient: [accent]{0} -trace.modclient = Vlastní Klient: [accent]{0} -invalidid = Neplatná IP klienta! Poslat zprávu o chybě. -server.bans = Bany. -server.bans.none = Žádní hráči s banem nebyli nalezeni. -server.admins = Admini -server.admins.none = Žádní admini nebyli nalezeni. +trace.playername = Jméno hráče: [accent]{0}[] +trace.ip = Adresa IP: [accent]{0}[] +trace.id = Unikátní ID: [accent]{0}[] +trace.mobile = Mobilní klient hry: [accent]{0}[] +trace.modclient = Upravený klient hry: [accent]{0}[] +invalidid = Neplatná adresa IP klienta! Zašli prosím zprávu o chybě. +server.bans = Zákazy +server.bans.none = Žádní hráči se zákazem nebyli nalezeni. +server.admins = Správci +server.admins.none = Žádní správci nebyli nalezeni. server.add = Přidat server -server.delete = Jsi si jistý že chceš smazat tento server? +server.delete = Jsi si jistý, že chceš smazat tento server? server.edit = Upravit server -server.outdated = [crimson]Zastaralý server![] -server.outdated.client = [crimson]Zastaralý klient![] -server.version = [lightgray]Verze: {0} {1} -server.custombuild = [yellow]Vlastní verze -confirmban = Jsi si jistý že chceš zabanovat tohoto hráče? -confirmkick = Jsi si jistý že chceš vykopnout tohoto hráče? -confirmvotekick = Jsi si jistý že chceš hlasovat pro vykopnutí tohoto hráče? -confirmunban = Jsi si jistý že chceš odbanovat tohoto hráče -confirmadmin = Jsi si jistý že chceš tohoto hráče pasovat na admina? -confirmunadmin = Jsi si jistý že chceš odebrat práva tomuto hráči? +server.outdated = [crimson]Zastaralá verze serveru![] +server.outdated.client = [crimson]Zastaralá verze klienta![] +server.version = [lightgray]Verze: {0} {1}[] +server.custombuild = [yellow]Upravená verze hry[] +confirmban = Jsi si jistý, že chceš zakázat tohoto hráče? +confirmkick = Jsi si jistý, že chceš vykopnout tohoto hráče? +confirmvotekick = Jsi si jistý, že chceš hlasovat pro vykopnutí tohoto hráče? +confirmunban = Jsi si jistý, že chceš zrušit zákaz pro tohoto hráče? +confirmadmin = Jsi si jistý, že chceš tohoto hráče povýšit na admina? +confirmunadmin = Jsi si jistý, že chceš odebrat správcovská práva tomuto hráči? joingame.title = Připojit se ke hře -joingame.ip = Adresa: -disconnect = Odpojen. +joingame.ip = Adresa IP: +disconnect = Odpojeno. disconnect.error = Chyba připojení. disconnect.closed = Připojení bylo uzavřeno. disconnect.timeout = Vypršel čas pro připojení. -disconnect.data = Chyba načtení dat světa! -cantconnect = Není možno připojit se ke hře ([accent]{0}[]). +disconnect.data = Chyba načtení dat ze serveru! +cantconnect = Není možno se připojit ke hře ([accent]{0}[]). connecting = [accent]Připojuji se... -connecting.data = [accent]Načítám data světa... +connecting.data = [accent]Načítám data ze serveru... server.port = Port: server.addressinuse = Adresu již někdo používá! server.invalidport = Neplatné číslo portu! -server.error = [crimson]Chyba při hostování serveru: [accent]{0} -save.new = Nové uložení -save.overwrite = Jsi si jistý že chceš přepsat\ntento ukládaci slot? +server.error = [crimson]Chyba při hostování serveru.[] +save.new = Nové uložení hry +save.overwrite = Jsi si jistý, že chceš přepsat\ntuto pozici pro uložení hry? overwrite = Přepsat -save.none = Žádné uložené pozice nebyly nalezeny -saveload = [accent]Ukládám... +save.none = Žádné uložené pozice nebyly nalezeny. +saveload = [accent]Ukládám...[] savefail = Nepodařilo se uložit hru! -save.delete.confirm = Jsi si jistý že chceš smazat toto uložení? +save.delete.confirm = Jsi si jistý, že chceš smazat toto uložení hry? save.delete = Smazat -save.export = Exportovat uložení -save.import.invalid = [accent]Toto uložení je neplatné! -save.import.fail = [crimson]Nepodařilo se importovat uložení: [accent]{0} -save.export.fail = [crimson]Nepodařilo se exportovat uložení: [accent]{0} -save.import = Importovat uložení +save.export = Exportovat uložení hry +save.import.invalid = [accent]Toto uložení není v pořádku![] +save.import.fail = [crimson]Nepodařilo se importovat uložení hry: [accent]{0}[] +save.export.fail = [crimson]Nepodařilo se exportovat uložení hry: [accent]{0}[] +save.import = Importovat uložení hry save.newslot = Uložit hru: save.rename = Přejmenovat save.rename.text = Nové jméno: -selectslot = Vyber uložení. -slot = [accent]Slot {0} +selectslot = Vyber pozici pro uložení hry. +slot = [accent]Pozice {0}[] editmessage = Upravit zprávu -save.corrupted = [accent]Uložení je poškozené nebo neplatné\nPokud jsi právě aktualizoval svou hru, je to možná změnou formátu pro ukládání a [scarlet]NE[] chyba hry. +save.corrupted = [accent]Uložení je poškozené nebo neplatné. empty = on = On off = Off save.autosave = Automatické uložení: {0} save.map = Mapa: {0} -save.wave = Vlna {0} +save.wave = Vlna: {0} save.mode = Herní mod: {0} save.date = Naposledy uloženo: {0} save.playtime = Herní čas: {0} warning = Varování. confirm = Potvrdit delete = Smazat -view.workshop = Prohlédnout ve workshopu -workshop.listing = Edit Workshop Listing +view.workshop = Prohlédnout v dílně +workshop.listing = Upravit popis v dílně ok = OK open = Otevřít -customize = Přizpůsobit +customize = Přizpůsobit pravidla cancel = Zrušit -openlink = Otevřít Odkaz -copylink = Zkopírovat Odkaz +openlink = Otevřít odkaz +copylink = Zkopírovat odkaz back = Zpět -data.export = Exportuj Data -data.import = Importuj Data +data.export = Exportuj data +data.import = Importuj data data.exported = Data exportována. -data.invalid = Neplatná herní data. -data.import.confirm = Import externích dat smaže[scarlet] všechna[] vaše současná herní data.\n[accent]To nelze vrátit zpět![]\n\nPo importu data se hra ukončí. -classic.export = Exportovat klasická data -classic.export.text = [accent]Mindustry[] právě mělo významně velkou aktualizaci.\nKlasické (v3.5 build 40) uložení nebo mapa byly detekovány. Chtěl by jsi exportovat toto uložení do domácího adresáře tvého zařízení , pro pozdější použití v klasické verzi Mindustry ? -quit.confirm = Jsi si jistý že chceš ukončit ? -quit.confirm.tutorial = Jste si vážně jist?\nTutoriál se dá znovu spustit v[accent] Nastavení->Hra->Spusť Tutoriál.[] +data.invalid = Herní data nejsou v pořádku. +data.import.confirm = Import externích dat smaže [scarlet]všechna[] Tvoje současná herní data.\n[accent]Toto nelze vrátit zpět![]\n\nPo importu dat se hra bezprostředně sama ukončí. +classic.export = Exportovat data pro verzi Classic +classic.export.text = [accent]Mindustry[] mělo významnou aktualizaci.\nByly detekovány uložení hry nebo mapy pro předchozí verzi Classic (v3.5 build 40). Chtěl bys exportovat tato uložení do domovského zařízení Tvého telefonu, pro pozdější použití v této verzi Mindustry Classic? +quit.confirm = Jsi si jistý, že chceš ukončit hru? +quit.confirm.tutorial = Jste si vážně jistý?\Výuka se dá znovu spustit v [accent]Nastavení->Hra->Spusť výuku[]. loading = [accent]Načítám... -reloading = [accent]načítám módy ... +reloading = [accent]Načítám modifikace... saving = [accent]Ukládám... cancelbuilding = [accent][[{0}][] to clear plan selectschematic = [accent][[{0}][] to select+copy @@ -642,9 +658,9 @@ keybind.screenshot.name = Sníměk mapy keybind.move_x.name = Pohyb na X keybind.move_y.name = Pohyb na Y keybind.schematic_select.name = Select Region -keybind.schematic_menu.name = Schematic Menu -keybind.schematic_flip_x.name = Flip Schematic X -keybind.schematic_flip_y.name = Flip Schematic Y +keybind.schematic_menu.name = Šablona Menu +keybind.schematic_flip_x.name = Flip Šablona X +keybind.schematic_flip_y.name = Flip Šablona Y keybind.fullscreen.name = Toggle Fullscreen keybind.select.name = Vybrat/Střílet keybind.diagonal_placement.name = Diagonal Placement @@ -1152,7 +1168,7 @@ block.phantom-factory.description = Produkuje pokročilé drony kteří jsou pod block.wraith-factory.description = Produkuje rychlé, udeř a uteč stíhače. block.ghoul-factory.description = Produkuje těžké kobercové bombardéry. block.revenant-factory.description = Produkuje vzdušné, težké laserové stíhače.. -block.dagger-factory.description = Produkuje standartní pozemní jednotky. +block.dagger-factory.description = Produkuje standardní pozemní jednotky. block.crawler-factory.description = Produces fast self-destructing swarm units. block.titan-factory.description = Produkuje pokročilé, orněné pozemní jednotky. block.fortress-factory.description = Produkuje těžké artilérní, pozmení jednotky. From 565064cd64a1eaf84b4e27699abc90d57ddae3ce Mon Sep 17 00:00:00 2001 From: FarmerThanos <59265546+FarmerThanos@users.noreply.github.com> Date: Mon, 30 Dec 2019 00:52:44 +0100 Subject: [PATCH 44/78] Updated bundle_pl.properties (#1273) * Updated bundle_pl.properties Corrected some translations, translated some options and added a description to the Battery Diode. * Update bundle_pl.properties Reverted some changes --- core/assets/bundles/bundle_pl.properties | 64 ++++++++++++------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index fd97dca25f..8c17577654 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -624,7 +624,7 @@ setting.difficulty.name = Poziom trudności setting.screenshake.name = Wstrząsy ekranu setting.effects.name = Wyświetlanie efektów setting.destroyedblocks.name = Wyświetl zniszczone bloki -setting.conveyorpathfinding.name = Conveyor Placement Pathfinding +setting.conveyorpathfinding.name = Znajdowanie Ścieżki Stawianych Taśmociągów setting.sensitivity.name = Czułość kontrolera setting.saveinterval.name = Interwał automatycznego zapisywania setting.seconds = {0} sekund @@ -633,7 +633,7 @@ setting.milliseconds = {0} millisekund setting.fullscreen.name = Pełny ekran setting.borderlesswindow.name = Bezramkowe okno[lightgray] (może wymagać restartu) setting.fps.name = Pokazuj FPS oraz ping -setting.blockselectkeys.name = Show Block Select Keys +setting.blockselectkeys.name = Pokazuj Klawisze Wyboru Bloków setting.vsync.name = Synchronizacja pionowa setting.pixelate.name = Pikselacja [lightgray](wyłącza animacje) setting.minimap.name = Pokaż Minimapę @@ -653,7 +653,7 @@ public.confirm = Czy chcesz ustawić swoją grę jako publiczną?\n[accent]Każd public.beta = Wersje beta gry nie mogą tworzyć publicznych pokoi. uiscale.reset = Skala interfejsu uległa zmianie.\nNaciśnij "OK" by potwierdzić zmiany.\n[scarlet]Cofanie zmian i wyjście z gry za[accent] {0}[] uiscale.cancel = Anuluj i Wyjdź -setting.bloom.name = Bloom +setting.bloom.name = Rozproszenie keybind.title = Zmień keybinds.mobile = [scarlet]Większość skrótów klawiszowych nie funkcjonuje w wersji mobilnej. Tylko podstawowe poruszanie się jest wspierane. category.general.name = Ogólne @@ -667,10 +667,10 @@ keybind.clear_building.name = Wyczyść budynek keybind.press = Naciśnij wybrany klawisz... keybind.press.axis = Naciśnij oś lub klawisz... keybind.screenshot.name = Zrzut ekranu mapy -keybind.toggle_power_lines.name = Toggle Power Lines +keybind.toggle_power_lines.name = Przełącz Linie Energetyczne keybind.move_x.name = Poruszanie w poziomie keybind.move_y.name = Poruszanie w pionie -keybind.mouse_move.name = Follow Mouse +keybind.mouse_move.name = Podążaj Za Myszką keybind.dash.name = Dash keybind.schematic_select.name = Wybierz region keybind.schematic_menu.name = Menu schematów @@ -678,20 +678,20 @@ keybind.schematic_flip_x.name = Obróć schemat horyzontalnie keybind.schematic_flip_y.name = Obróć schemat wertykalnie keybind.category_prev.name = Poprzednia kategoria keybind.category_next.name = Następna kategoria -keybind.block_select_left.name = Block Select Left -keybind.block_select_right.name = Block Select Right -keybind.block_select_up.name = Block Select Up -keybind.block_select_down.name = Block Select Down -keybind.block_select_01.name = Category/Block Select 1 -keybind.block_select_02.name = Category/Block Select 2 -keybind.block_select_03.name = Category/Block Select 3 -keybind.block_select_04.name = Category/Block Select 4 -keybind.block_select_05.name = Category/Block Select 5 -keybind.block_select_06.name = Category/Block Select 6 -keybind.block_select_07.name = Category/Block Select 7 -keybind.block_select_08.name = Category/Block Select 8 -keybind.block_select_09.name = Category/Block Select 9 -keybind.block_select_10.name = Category/Block Select 10 +keybind.block_select_left.name = Wybór Bloku Lewo +keybind.block_select_right.name = Wybór Bloku Prawo +keybind.block_select_up.name = Wybór Bloku Góra +keybind.block_select_down.name = Wybór Bloku Dół +keybind.block_select_01.name = Kategoria/Wybór Bloku 1 +keybind.block_select_02.name = Kategoria/Wybór Bloku 2 +keybind.block_select_03.name = Kategoria/Wybór Bloku 3 +keybind.block_select_04.name = Kategoria/Wybór Bloku 4 +keybind.block_select_05.name = Kategoria/Wybór Bloku 5 +keybind.block_select_06.name = Kategoria/Wybór Bloku 6 +keybind.block_select_07.name = Kategoria/Wybór Bloku 7 +keybind.block_select_08.name = Kategoria/Wybór Bloku 8 +keybind.block_select_09.name = Kategoria/Wybór Bloku 9 +keybind.block_select_10.name = Kategoria/Wybór Bloku 10 keybind.fullscreen.name = Przełącz Pełny Ekran keybind.select.name = Zaznacz keybind.diagonal_placement.name = Budowa po skosie @@ -708,7 +708,7 @@ keybind.chat.name = Czat keybind.player_list.name = Lista graczy keybind.console.name = Konsola keybind.rotate.name = Obracanie -keybind.rotateplaced.name = Rotate Existing (Hold) +keybind.rotateplaced.name = Obróć istniejące (Trzymaj) keybind.toggle_menus.name = Zmiana widoczności menu keybind.chat_history_prev.name = Przewiń wiadomości w górę keybind.chat_history_next.name = Przewiń wiadomości w dół @@ -908,11 +908,11 @@ block.scorch.name = Płomień block.scatter.name = Flak block.hail.name = Grad block.lancer.name = Lansjer -block.conveyor.name = Przenośnik -block.titanium-conveyor.name = Przenośnik Tytanowy -block.armored-conveyor.name = Przenośnik Opancerzony +block.conveyor.name = Taśmociąg +block.titanium-conveyor.name = Taśmociąg Tytanowy +block.armored-conveyor.name = Opancerzony Taśmociąg block.armored-conveyor.description = Przesyła przedmioty z taką samą szybkością jak Przenośnik Tytanowy, ale jest bardziej odporny. Wejściami bocznymi mogą być tylko inne przenośniki. -block.junction.name = Węzeł +block.junction.name = Skrzyżowanie block.router.name = Rozdzielacz block.distributor.name = Dystrybutor block.sorter.name = Sortownik @@ -930,8 +930,8 @@ block.incinerator.name = Spalacz block.spore-press.name = Prasa Zarodników block.separator.name = Rozdzielacz block.coal-centrifuge.name = Wirówka węglowa -block.power-node.name = Węzeł Prądu -block.power-node-large.name = Duży Węzeł Prądu +block.power-node.name = Węzeł Prądowy +block.power-node-large.name = Duży Węzeł Prądowy block.surge-tower.name = Wieża Energetyczna block.diode.name = Dioda baterii block.battery.name = Bateria @@ -958,8 +958,8 @@ block.item-source.name = Źródło przedmiotów block.item-void.name = Próżnia przedmiotów block.liquid-source.name = Źródło płynów block.power-void.name = Próżnia prądu -block.power-source.name = Nieskończony Prąd -block.unloader.name = Ekstraktor +block.power-source.name = Węzeł Nieskończonego Prądu +block.unloader.name = Wyładowywacz block.vault.name = Magazyn block.wave.name = Strumień block.swarmer.name = Działo Rojowe @@ -990,11 +990,11 @@ block.plated-conduit.name = Opancerzona rura block.phase-conduit.name = Rura Fazowa block.liquid-router.name = Rozdzielacz Płynów block.liquid-tank.name = Zbiornik Płynów -block.liquid-junction.name = Łącznik Płynów -block.bridge-conduit.name = Most Płynów +block.liquid-junction.name = Skrzyżowanie Rurowe +block.bridge-conduit.name = Most Rurowy block.rotary-pump.name = Wirowa Pompa block.thorium-reactor.name = Reaktor Torowy -block.mass-driver.name = Katapulta Masy +block.mass-driver.name = Katapulta Masowa block.blast-drill.name = Wiertło Wybuchowe block.thermal-pump.name = Pompa Termalna block.thermal-generator.name = Generator Termalny @@ -1164,7 +1164,7 @@ block.phase-conduit.description = Zaawansowany blok do przenoszenia cieczy. Uży block.power-node.description = Przesyła moc do połączonych węzłów. Można podłączyć do czterech źródeł zasilania, zlewów lub węzłów. Zasila też bloki które go dotykają. block.power-node-large.description = Posiada większy zasięg niż zwykły węzeł prądu. Można podłączyć do sześciu źródeł zasilania, zlewów lub węzłów. block.surge-tower.description = Węzęł prądu z bardzo dużym zasięgiem, posiadający mniej możliwych podłączeń. -block.diode.description = Battery power can flow through this block in only one direction, but only if the other side has less power stored. +block.diode.description = Prąd baterii może tylko przepłynąc przez ten blok w jedną strone, jeśli druga strona ma mniej prądu. block.battery.description = Przechowuje energię przy nadwyżce produkcji oraz dostarcza energię kiedy jest jej brak, dopóki jest w niej miejsce. block.battery-large.description = Przechowuje o wiele wiecej prądu niż standardowa bateria. block.combustion-generator.description = Wytwarza energię poprzez spalanie łatwopalnych materiałów. From ec59b0436324c56f41ab5feb5d8275834e359988 Mon Sep 17 00:00:00 2001 From: Wina <58987087+ActualWina@users.noreply.github.com> Date: Sun, 29 Dec 2019 20:55:51 -0300 Subject: [PATCH 45/78] Full SPA translation for Steam (Achievements included) (#1229) * Full description translated * Create achievements.vdf * Create short-description.txt --- .../metadata/steam/spanish/achievements.vdf | 109 ++++++++++++++++++ .../metadata/steam/spanish/description.txt | 61 ++++++++++ .../steam/spanish/short-description.txt | 1 + 3 files changed, 171 insertions(+) create mode 100644 fastlane/metadata/steam/spanish/achievements.vdf create mode 100644 fastlane/metadata/steam/spanish/description.txt create mode 100644 fastlane/metadata/steam/spanish/short-description.txt diff --git a/fastlane/metadata/steam/spanish/achievements.vdf b/fastlane/metadata/steam/spanish/achievements.vdf new file mode 100644 index 0000000000..fb67d82c9d --- /dev/null +++ b/fastlane/metadata/steam/spanish/achievements.vdf @@ -0,0 +1,109 @@ +"lang" +{ + "Language" "spanish" + "Tokens" + { + "NEW_ACHIEVEMENT_20_0_NAME" "Verificado" + "NEW_ACHIEVEMENT_20_0_DESC" "Completa el tutorial." + "NEW_ACHIEVEMENT_20_1_NAME" "Scrapper" + "NEW_ACHIEVEMENT_20_1_DESC" "Destruye 1,000 unidades enemigas." + "NEW_ACHIEVEMENT_20_2_NAME" "Purga" + "NEW_ACHIEVEMENT_20_2_DESC" "Destruye 100,000 unidades enemigas." + "NEW_ACHIEVEMENT_20_3_NAME" "Transporte Atmosférico" + "NEW_ACHIEVEMENT_20_3_DESC" "Lanza 10,000 items en total." + "NEW_ACHIEVEMENT_20_5_NAME" "Envíos Sin Fin" + "NEW_ACHIEVEMENT_20_5_DESC" "Lanza un total de 1,000,000 ítems." + "NEW_ACHIEVEMENT_20_6_NAME" "Conquistador" + "NEW_ACHIEVEMENT_20_6_DESC" "Gana 10 partidas en modo Invasión" + "NEW_ACHIEVEMENT_20_7_NAME" "Campeón" + "NEW_ACHIEVEMENT_20_7_DESC" "Gana 10 partidas PvP Multijugador." + "NEW_ACHIEVEMENT_20_8_NAME" "Rápido" + "NEW_ACHIEVEMENT_20_8_DESC" "Destruye el núcleo enemigo en 5 oleadas o menos." + "NEW_ACHIEVEMENT_20_9_NAME" "Lluvia de núcleos" + "NEW_ACHIEVEMENT_20_9_DESC" "Lanza tu núcleo a una zona 30 veces." + "NEW_ACHIEVEMENT_20_10_NAME" "Tenaz" + "NEW_ACHIEVEMENT_20_10_DESC" "Sobrevive 100 oleadas." + "NEW_ACHIEVEMENT_20_11_NAME" "Unvanquished" + "NEW_ACHIEVEMENT_20_11_DESC" "Sobrevive 500 oleadas." + "NEW_ACHIEVEMENT_20_12_NAME" "Investigador" + "NEW_ACHIEVEMENT_20_12_DESC" "Investiga todo el árbol de tecnologías." + "NEW_ACHIEVEMENT_20_13_NAME" "Cambiaformas" + "NEW_ACHIEVEMENT_20_13_DESC" "Desbloquea y transformate en todos los mecanoides del juego." + "NEW_ACHIEVEMENT_20_14_NAME" "Sobrecarga" + "NEW_ACHIEVEMENT_20_14_DESC" "Ataca a un enemigo con electricidad mientras este recibe agua." + "NEW_ACHIEVEMENT_20_15_NAME" "Desviación" + "NEW_ACHIEVEMENT_20_15_DESC" "Destruye una unidad haciendo rebotar su propia bala." + "NEW_ACHIEVEMENT_20_17_NAME" "Un grave, grave error" + "NEW_ACHIEVEMENT_20_17_DESC" "Investiga el enrutador." + "NEW_ACHIEVEMENT_20_18_NAME" "Creador" + "NEW_ACHIEVEMENT_20_18_DESC" "Coloca 10,000 bloques." + "NEW_ACHIEVEMENT_20_19_NAME" "Raze" + "NEW_ACHIEVEMENT_20_19_DESC" "Destruye 1,000 bloques enemigos." + "NEW_ACHIEVEMENT_20_20_NAME" "Un desastre espectacular" + "NEW_ACHIEVEMENT_20_20_DESC" "Causa que un reactor de torio se sobre caliente y explote." + "NEW_ACHIEVEMENT_20_21_NAME" "Mapper" + "NEW_ACHIEVEMENT_20_21_DESC" "Crea un nuevo mapa 10 veces." + "NEW_ACHIEVEMENT_20_22_NAME" "Buscador" + "NEW_ACHIEVEMENT_20_22_DESC" "Descarga un mapa de la Workshop." + "NEW_ACHIEVEMENT_20_23_NAME" "Creador" + "NEW_ACHIEVEMENT_20_23_DESC" "Publca un mapa en la Workshop." + "NEW_ACHIEVEMENT_20_24_NAME" "Slayer" + "NEW_ACHIEVEMENT_20_24_DESC" "Derrota un boss." + "NEW_ACHIEVEMENT_20_25_NAME" "Explorador" + "NEW_ACHIEVEMENT_20_25_DESC" "Desbloquea todas las zonas de la campaña." + "NEW_ACHIEVEMENT_20_26_NAME" "Minucioso" + "NEW_ACHIEVEMENT_20_26_DESC" "Alcanza el requisito de configuración en todas las zonas." + "NEW_ACHIEVEMENT_20_29_NAME" "Material II" + "NEW_ACHIEVEMENT_20_29_DESC" "Desbloquea el Torio." + "NEW_ACHIEVEMENT_20_31_NAME" "Material I" + "NEW_ACHIEVEMENT_20_31_DESC" "Desbloquea el Titanio." + "NEW_ACHIEVEMENT_21_0_NAME" "Kamikaze" + "NEW_ACHIEVEMENT_21_0_DESC" "LLena tu mecanoide de explosivos y muere, creando una explosión." + "NEW_ACHIEVEMENT_21_1_NAME" "Así comienza" + "NEW_ACHIEVEMENT_21_1_DESC" "Construye una fábrica de drones Daga." + "NEW_ACHIEVEMENT_21_2_NAME" "Asalto Directo" + "NEW_ACHIEVEMENT_21_2_DESC" "Utiliza el comando ataque desde el centro de comando." + "NEW_ACHIEVEMENT_21_3_NAME" "Swarm" + "NEW_ACHIEVEMENT_21_3_DESC" "Consigue 100 unidades activas al mismo tiempo." + "NEW_ACHIEVEMENT_21_4_NAME" "Flock" + "NEW_ACHIEVEMENT_21_4_DESC" "Consigue 10 drones fantasmales activos al mismo tiempo." + "NEW_ACHIEVEMENT_21_5_NAME" "Ejército volátil" + "NEW_ACHIEVEMENT_21_5_DESC" "Consigue 50 Crawlers activos al mismo tiempo." + "NEW_ACHIEVEMENT_21_6_NAME" "Legiones" + "NEW_ACHIEVEMENT_21_6_DESC" "Construye 1,000 unidades en total." + "NEW_ACHIEVEMENT_21_7_NAME" "Super" + "NEW_ACHIEVEMENT_21_7_DESC" "Consigue el rango S en cualquier zona." + "NEW_ACHIEVEMENT_21_8_NAME" "Super Super" + "NEW_ACHIEVEMENT_21_8_DESC" "Consigue el rango SS en cualquier zona." + "NEW_ACHIEVEMENT_21_9_NAME" "Deberías haber hecho caso" + "NEW_ACHIEVEMENT_21_9_DESC" "Muere en la zona del punto de exclusión." + "NEW_ACHIEVEMENT_21_10_NAME" "Solo aprieta Shift" + "NEW_ACHIEVEMENT_21_10_DESC" "Muere ahogado, como sea." + "NEW_ACHIEVEMENT_21_11_NAME" "Coleccionista" + "NEW_ACHIEVEMENT_21_11_DESC" "Llena el núcleo con la máxima cantidad de todos los recursos." + "NEW_ACHIEVEMENT_21_12_NAME" "10 son multitud" + "NEW_ACHIEVEMENT_21_12_DESC" "Hostea un servidor con 10 jugadores." + "NEW_ACHIEVEMENT_21_13_NAME" "Invencible" + "NEW_ACHIEVEMENT_21_13_DESC" "Construye el Meltdown y el Espectro." + "NEW_ACHIEVEMENT_21_14_NAME" "Liftoff" + "NEW_ACHIEVEMENT_21_14_DESC" "Use the Launch Pad." + "NEW_ACHIEVEMENT_21_15_NAME" "Complacencia" + "NEW_ACHIEVEMENT_21_15_DESC" "Saltea lanzar dos veces, luego deja que los enemigos destruyan tu núcleo." + "NEW_ACHIEVEMENT_21_16_NAME" "Herejía" + "NEW_ACHIEVEMENT_21_16_DESC" "Construye dos enrutadores, uno al lado del otro." + "NEW_ACHIEVEMENT_21_17_NAME" "Guardián solitario" + "NEW_ACHIEVEMENT_21_17_DESC" "Sobrevive 10 oleadas sin colocar ni un solo bloque." + "NEW_ACHIEVEMENT_21_18_NAME" "Incinerador" + "NEW_ACHIEVEMENT_21_18_DESC" "Usa pirotita para cargar una torreta." + "NEW_ACHIEVEMENT_21_19_NAME" "Eficiente" + "NEW_ACHIEVEMENT_21_19_DESC" "Refrigera una torreta con líquido criogénico." + "NEW_ACHIEVEMENT_21_20_NAME" "Modo Clásico" + "NEW_ACHIEVEMENT_21_20_DESC" "Activa el modo pixelado." + "NEW_ACHIEVEMENT_21_21_NAME" "Estudiante" + "NEW_ACHIEVEMENT_21_21_DESC" "Abre la wiki desde el juego." + "NEW_ACHIEVEMENT_21_22_NAME" "Comienzo a lo grande" + "NEW_ACHIEVEMENT_21_22_DESC" "Lanzate a una zona con mas de 10.000 recursos configurados." + "NEW_ACHIEVEMENT_21_23_NAME" "Ignición" + "NEW_ACHIEVEMENT_21_23_DESC" "Alimenta con energía un generador de impacto." + } +} diff --git a/fastlane/metadata/steam/spanish/description.txt b/fastlane/metadata/steam/spanish/description.txt new file mode 100644 index 0000000000..979f2ad430 --- /dev/null +++ b/fastlane/metadata/steam/spanish/description.txt @@ -0,0 +1,61 @@ +Crea elaboradas cadenas de suministros para cargar tus torretas, produce materiales para crear estructuras y defiendelas de oleadas de enemigos. Juega con tus amigos en un multijugador cooperativo multiplataforma, o pelea contra ellos en batallas PvP por equipos. + +[img]{STEAM_APP_IMAGE}/extras/ezgif-4-0e70c282f775.gif[/img] + +[h2]Gameplay[/h2] + +[list] +[*] Crea taladros y cintas transportadoras para enviar recursos a tu núcleo +[*] Usa bloques de producción para crear materiales avanzados +[*] Construye drones para minar recursos automaticamente, construir y defender tu base de forma eficiente +[*] Distribuye liquidos y apaga posibles incendios +[*] Potencia la producción refrigerando y lubricando tus defensas y bloques de construcción +[/list] + +[h2]Campaña[/h2] + +[list] +[*] Avanza a través de 12 zonas completamente rejugables con puntos de aparición randomizados +[*] Obtén y lanza recursos para investigar nuevas tecnologías +[*] Investiga nuevos bloques para facilitar tu progreso +[*] Configura los recursos iniciales de cada área a tus necesidades +[*] Gran variedad de misiones y objetivos +[*] Juega con tus amigos y completa niveles con ellos +[*] Mas de 120 bloques por investigar y descubrir +[*] 19 tipos de drones, mecanoides y naves +[*] Mas de 50 logros para completar +[/list] + +[h2][h2]Modos de juego[/h2][/h2] + +[list] +[*] [b]Supervivencia[/b]: Construye torretas para defenderte de tus enemigos con un estilo de Tower Defense. Sobrevive tanto como puedas, lanzando tu núcleo (opcionalmente) para utilizar los recursos con propósitos de investigación. Prepara tu base para el ataque de intermitentes bosses áereos. +[*] [b]Invasión[/b]: Construye fábricas de unidades para destruir el núcleo enemigo, mientras resistes oleadas periódicamente. Utiliza distintos tipos de unidades de ataque y soporte para ayudarte en la conquista. +[*] [b]PvP[/b]: Compite contra otros jugadores en hasta 4 equipos diferentes para destruir el núcleo de los demás. Crea unidades o ataca directamente con mecanoides la base de tus enemigos. +[*] [b]Sandbox[/b]: Juega libremente con recursos infinitos y sin enemigos molestando. Usa bloques exclusivos de sandbox para facilitar la prueba de diseños. Crea oleadas a gusto. +[/list] + +[h2]Partidas personalizadas y multijugador multiplataforma[/h2] + +[list] +[*] 12 mapas integrados para partidas personalizadas, además de los de la campaña +[*] Juega en cooperativo, Sandbox o PvP +[*] Únete a un servidor dedicado, o invita amigos a tu partida privada +[*] Reglas personalizadas: Cambia costos y tiempos de tus estructuras. Regula la fuerza de tus enemigos y cada cuanto aparecen, entre otras opciones +[*] Modos de juego combinados: Juega PvP y PvE al mismo tiempo +[/list] + +[h2]Editor de mapas[/h2] + +[list] +[*] Dibuja terreno con una interfaz completa de editor +[*] Edita y visualiza estructuras in-game +[*] Configura los modos de las herramientas +[*] Poderoso algoritmo de generacion, aplica filtros de terreno. +[*] Aplica distorsión, simetria, suavidad, generación de terreno y más a tus mapas +[*] Randomiza la generacion de ores y terreno, para que cada partida sea distinta +[*] Configura las oleadas a tu gusto +[*] Comparte mapas en la Steam Workshop +[*] Personaliza las reglas de los mapas +[*] Usa mas de 75 bloques ambientales, para darle un estilo único a tus mapas +[/list] diff --git a/fastlane/metadata/steam/spanish/short-description.txt b/fastlane/metadata/steam/spanish/short-description.txt new file mode 100644 index 0000000000..0966131f11 --- /dev/null +++ b/fastlane/metadata/steam/spanish/short-description.txt @@ -0,0 +1 @@ +Un Tower Defense abierto centrado en la gestión de recursos. From 39db62e3a5dab87adecc7593a1cf811509874896 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Dec 2019 18:56:29 -0500 Subject: [PATCH 46/78] Minimap tweaks --- core/src/mindustry/core/Control.java | 2 +- core/src/mindustry/ui/fragments/MinimapFragment.java | 8 +++----- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index 458cb313ae..7c86601bb3 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -456,7 +456,7 @@ public class Control implements ApplicationListener, Loadable{ state.set(state.is(State.playing) ? State.paused : State.playing); } - if(Core.input.keyTap(Binding.menu) && !ui.restart.isShown()){ + if(Core.input.keyTap(Binding.menu) && !ui.restart.isShown() && !ui.minimapfrag.shown()){ if(ui.chatfrag.shown()){ ui.chatfrag.hide(); }else if(!ui.paused.isShown() && !scene.hasDialog()){ diff --git a/core/src/mindustry/ui/fragments/MinimapFragment.java b/core/src/mindustry/ui/fragments/MinimapFragment.java index 4a938b341a..7e93832cb4 100644 --- a/core/src/mindustry/ui/fragments/MinimapFragment.java +++ b/core/src/mindustry/ui/fragments/MinimapFragment.java @@ -9,6 +9,7 @@ import arc.scene.*; import arc.scene.event.*; import arc.scene.ui.layout.*; import mindustry.gen.*; +import mindustry.input.*; import mindustry.ui.*; import static mindustry.Vars.*; @@ -46,7 +47,7 @@ public class MinimapFragment extends Fragment{ elem.setFillParent(true); elem.setBounds(0, 0, Core.graphics.getWidth(), Core.graphics.getHeight()); - if(Core.input.keyTap(KeyCode.ESCAPE) || Core.input.keyTap(KeyCode.BACK)){ + if(Core.input.keyTap(Binding.menu)){ shown = false; } }); @@ -98,10 +99,7 @@ public class MinimapFragment extends Fragment{ t.row(); t.add().growY(); t.row(); - - if(mobile){ - t.addImageTextButton("$back", Icon.backSmall, () -> shown = false).size(220f, 60f).pad(12f); - } + t.addImageTextButton("$back", Icon.backSmall, () -> shown = false).size(220f, 60f).pad(10f); }); } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6ce793f21e..5028f28f8e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 689b0b8c6101f9b0933cfdbcfab8da43a222f81e Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Dec 2019 20:04:08 -0500 Subject: [PATCH 47/78] Fixed games never ending --- core/src/mindustry/core/Logic.java | 2 +- fastlane/metadata/android/en-US/changelogs/102.1.txt | 5 +++++ fastlane/metadata/android/en-US/changelogs/102.txt | 5 +++++ fastlane/metadata/android/en-US/changelogs/29561.txt | 5 +++++ fastlane/metadata/android/en-US/changelogs/29564.txt | 5 +++++ fastlane/metadata/android/en-US/changelogs/29567.txt | 5 +++++ 6 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/102.1.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/102.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/29561.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/29564.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/29567.txt diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index 12761439b7..e7c84adbc8 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -261,7 +261,7 @@ public class Logic implements ApplicationListener{ } } - if(!net.client() && !world.isInvalidMap() && !state.isEditor() && !state.rules.canGameOver){ + if(!net.client() && !world.isInvalidMap() && !state.isEditor() && state.rules.canGameOver){ checkGameOver(); } } diff --git a/fastlane/metadata/android/en-US/changelogs/102.1.txt b/fastlane/metadata/android/en-US/changelogs/102.1.txt new file mode 100644 index 0000000000..f8244a4b0b --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/102.1.txt @@ -0,0 +1,5 @@ +- Added new map view w/ panning and scrolling +- Added block health rule +- Added more internal teams for alternative gamemodes +- Added features for improved server modding +- Major internal change: package is now "mindustry" instead of "io.anuke.mindustry" (will break plugins) diff --git a/fastlane/metadata/android/en-US/changelogs/102.txt b/fastlane/metadata/android/en-US/changelogs/102.txt new file mode 100644 index 0000000000..f8244a4b0b --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/102.txt @@ -0,0 +1,5 @@ +- Added new map view w/ panning and scrolling +- Added block health rule +- Added more internal teams for alternative gamemodes +- Added features for improved server modding +- Major internal change: package is now "mindustry" instead of "io.anuke.mindustry" (will break plugins) diff --git a/fastlane/metadata/android/en-US/changelogs/29561.txt b/fastlane/metadata/android/en-US/changelogs/29561.txt new file mode 100644 index 0000000000..f8244a4b0b --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29561.txt @@ -0,0 +1,5 @@ +- Added new map view w/ panning and scrolling +- Added block health rule +- Added more internal teams for alternative gamemodes +- Added features for improved server modding +- Major internal change: package is now "mindustry" instead of "io.anuke.mindustry" (will break plugins) diff --git a/fastlane/metadata/android/en-US/changelogs/29564.txt b/fastlane/metadata/android/en-US/changelogs/29564.txt new file mode 100644 index 0000000000..f8244a4b0b --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29564.txt @@ -0,0 +1,5 @@ +- Added new map view w/ panning and scrolling +- Added block health rule +- Added more internal teams for alternative gamemodes +- Added features for improved server modding +- Major internal change: package is now "mindustry" instead of "io.anuke.mindustry" (will break plugins) diff --git a/fastlane/metadata/android/en-US/changelogs/29567.txt b/fastlane/metadata/android/en-US/changelogs/29567.txt new file mode 100644 index 0000000000..f8244a4b0b --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29567.txt @@ -0,0 +1,5 @@ +- Added new map view w/ panning and scrolling +- Added block health rule +- Added more internal teams for alternative gamemodes +- Added features for improved server modding +- Major internal change: package is now "mindustry" instead of "io.anuke.mindustry" (will break plugins) From bcd5b811bb7772240d8281a4b45593084029fa3f Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Dec 2019 21:05:02 -0500 Subject: [PATCH 48/78] a brief experiment --- servers.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/servers.json b/servers.json index 0637a088a0..81ea4bf021 100644 --- a/servers.json +++ b/servers.json @@ -1 +1,5 @@ -[] \ No newline at end of file +[ + { + "address": "mindustry.us.to" + } +] From ee4f06a9c217c1b8f45c6e4b4b77d759841bdfdf Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Dec 2019 21:45:59 -0500 Subject: [PATCH 49/78] Bugfixes --- core/src/mindustry/ai/BlockIndexer.java | 34 ++++++++++++++----- core/src/mindustry/entities/Units.java | 8 +---- .../mindustry/graphics/MinimapRenderer.java | 4 +-- core/src/mindustry/input/DesktopInput.java | 2 +- .../ui/fragments/MinimapFragment.java | 9 ++--- .../android/en-US/changelogs/29570.txt | 5 +++ 6 files changed, 39 insertions(+), 23 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/29570.txt diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java index b010562595..9e72b7ef86 100644 --- a/core/src/mindustry/ai/BlockIndexer.java +++ b/core/src/mindustry/ai/BlockIndexer.java @@ -5,11 +5,11 @@ import arc.func.*; import arc.math.*; import arc.math.geom.*; import arc.struct.*; +import arc.util.*; import mindustry.content.*; import mindustry.entities.type.*; import mindustry.game.EventType.*; import mindustry.game.*; -import mindustry.game.Teams.*; import mindustry.type.*; import mindustry.world.*; import mindustry.world.blocks.*; @@ -34,6 +34,8 @@ public class BlockIndexer{ private ObjectSet[] damagedTiles = new ObjectSet[Team.all().length]; /**All ores available on this map.*/ private ObjectSet allOres = new ObjectSet<>(); + /**Stores teams that are present here as tiles.*/ + private ObjectSet activeTeams = new ObjectSet<>(); /** Maps teams to a map of flagged tiles by type. */ private ObjectSet[][] flagMap = new ObjectSet[Team.all().length][BlockFlag.all.length]; @@ -104,10 +106,11 @@ public class BlockIndexer{ } private GridBits structQuadrant(Team t){ - if(structQuadrants[t.id] == null){ - structQuadrants[t.id] = new GridBits(Mathf.ceil(world.width() / (float)quadrantSize), Mathf.ceil(world.height() / (float)quadrantSize)); + int id = Pack.u(t.id); + if(structQuadrants[id] == null){ + structQuadrants[id] = new GridBits(Mathf.ceil(world.width() / (float)quadrantSize), Mathf.ceil(world.height() / (float)quadrantSize)); } - return structQuadrants[t.id]; + return structQuadrants[id]; } /** Updates all the structure quadrants for a newly activated team. */ @@ -184,6 +187,19 @@ public class BlockIndexer{ set.add(entity.tile); } + public TileEntity findEnemyTile(Team team, float x, float y, float range, Boolf pred){ + for(Team enemy : activeTeams){ + if(!team.isEnemy(enemy)) continue; + + TileEntity entity = indexer.findTile(enemy, x, y, range, pred, true); + if(entity != null){ + return entity; + } + } + + return null; + } + public TileEntity findTile(Team team, float x, float y, float range, Boolf pred){ return findTile(team, x, y, range, pred, false); } @@ -263,6 +279,7 @@ public class BlockIndexer{ } typeMap.put(tile.pos(), new TileIndex(tile.block().flags, tile.getTeam())); } + activeTeams.add(tile.getTeam()); if(ores == null) return; @@ -301,13 +318,12 @@ public class BlockIndexer{ //this quadrant is now 'dirty', re-scan the whole thing int quadrantX = tile.x / quadrantSize; int quadrantY = tile.y / quadrantSize; - int index = quadrantX + quadrantY * quadWidth(); - for(TeamData data : state.teams.getActive()){ - GridBits bits = structQuadrant(data.team); + for(Team team : activeTeams){ + GridBits bits = structQuadrant(team); //fast-set this quadrant to 'occupied' if the tile just placed is already of this team - if(tile.getTeam() == data.team && tile.entity != null && tile.block().targetable){ + if(tile.getTeam() == team && tile.entity != null && tile.block().targetable){ bits.set(quadrantX, quadrantY); continue; //no need to process futher } @@ -319,7 +335,7 @@ public class BlockIndexer{ for(int y = quadrantY * quadrantSize; y < world.height() && y < (quadrantY + 1) * quadrantSize; y++){ Tile result = world.ltile(x, y); //when a targetable block is found, mark this quadrant as occupied and stop searching - if(result.entity != null && result.getTeam() == data.team){ + if(result.entity != null && result.getTeam() == team){ bits.set(quadrantX, quadrantY); break outer; } diff --git a/core/src/mindustry/entities/Units.java b/core/src/mindustry/entities/Units.java index fac56dcc0e..67fe01dc9e 100644 --- a/core/src/mindustry/entities/Units.java +++ b/core/src/mindustry/entities/Units.java @@ -83,13 +83,7 @@ public class Units{ public static TileEntity findEnemyTile(Team team, float x, float y, float range, Boolf pred){ if(team == Team.derelict) return null; - for(Team enemy : team.enemies()){ - TileEntity entity = indexer.findTile(enemy, x, y, range, pred, true); - if(entity != null){ - return entity; - } - } - return null; + return indexer.findEnemyTile(team, x, y, range, pred); } /** Returns the closest target enemy. First, units are checked, then tile entities. */ diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java index 01ac9ab09a..c34bb246ec 100644 --- a/core/src/mindustry/graphics/MinimapRenderer.java +++ b/core/src/mindustry/graphics/MinimapRenderer.java @@ -93,8 +93,8 @@ public class MinimapRenderer implements Disposable{ float ry = !withLabels ? (unit.y - rect.y) / rect.width * h : unit.y / (world.height() * tilesize) * h; Draw.mixcol(unit.getTeam().color, 1f); - float scale = Scl.scl(1f) / 2f * scaling; - Draw.rect(unit.getIconRegion(), x + rx, y + ry, unit.getIconRegion().getWidth() * scale, unit.getIconRegion().getHeight() * scale, unit.rotation - 90); + float scale = Scl.scl(1f) / 2f * scaling * 32f; + Draw.rect(unit.getIconRegion(), x + rx, y + ry, scale, scale, unit.rotation - 90); Draw.reset(); if(withLabels && unit instanceof Player){ diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java index c485b49ff2..8838dee9c9 100644 --- a/core/src/mindustry/input/DesktopInput.java +++ b/core/src/mindustry/input/DesktopInput.java @@ -136,7 +136,7 @@ public class DesktopInput extends InputHandler{ ui.listfrag.toggle(); } - if((player.getClosestCore() == null || state.isPaused()) && !ui.chatfrag.shown()){ + if(((player.getClosestCore() == null && player.isDead()) || state.isPaused()) && !ui.chatfrag.shown()){ //move camera around float camSpeed = !Core.input.keyDown(Binding.dash) ? 3f : 8f; Core.camera.position.add(Tmp.v1.setZero().add(Core.input.axis(Binding.move_x), Core.input.axis(Binding.move_y)).nor().scl(Time.delta() * camSpeed)); diff --git a/core/src/mindustry/ui/fragments/MinimapFragment.java b/core/src/mindustry/ui/fragments/MinimapFragment.java index 7e93832cb4..d13fed8936 100644 --- a/core/src/mindustry/ui/fragments/MinimapFragment.java +++ b/core/src/mindustry/ui/fragments/MinimapFragment.java @@ -17,7 +17,7 @@ import static mindustry.Vars.*; public class MinimapFragment extends Fragment{ private boolean shown; private float panx, pany, zoom = 1f, lastZoom = -1; - private float baseSize = Scl.scl(1000f); + private float baseSize = Scl.scl(5f); private Element elem; @Override @@ -25,16 +25,17 @@ public class MinimapFragment extends Fragment{ elem = parent.fill((x, y, w, h) -> { w = Core.graphics.getWidth(); h = Core.graphics.getHeight(); - float size = baseSize * zoom; + float size = baseSize * zoom * world.width(); Draw.color(Color.black); Fill.crect(x, y, w, h); if(renderer.minimap.getTexture() != null){ Draw.color(); + float ratio = (float)renderer.minimap.getTexture().getHeight() / renderer.minimap.getTexture().getWidth(); TextureRegion reg = Draw.wrap(renderer.minimap.getTexture()); - Draw.rect(reg, w/2f + panx*zoom, h/2f + pany*zoom, size, size); - renderer.minimap.drawEntities(w/2f + panx*zoom - size/2f, h/2f + pany*zoom - size/2f, size, size, zoom, true); + Draw.rect(reg, w/2f + panx*zoom, h/2f + pany*zoom, size, size * ratio); + renderer.minimap.drawEntities(w/2f + panx*zoom - size/2f, h/2f + pany*zoom - size/2f * ratio, size, size * ratio, zoom, true); } Draw.reset(); diff --git a/fastlane/metadata/android/en-US/changelogs/29570.txt b/fastlane/metadata/android/en-US/changelogs/29570.txt new file mode 100644 index 0000000000..f8244a4b0b --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29570.txt @@ -0,0 +1,5 @@ +- Added new map view w/ panning and scrolling +- Added block health rule +- Added more internal teams for alternative gamemodes +- Added features for improved server modding +- Major internal change: package is now "mindustry" instead of "io.anuke.mindustry" (will break plugins) From 6f6166539056151a3f2248fc9fad8cce0ba5bbf7 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Dec 2019 21:51:44 -0500 Subject: [PATCH 50/78] Fixed some block indexing --- core/src/mindustry/ai/BlockIndexer.java | 2 +- fastlane/metadata/android/en-US/changelogs/102.2.txt | 5 +++++ fastlane/metadata/android/en-US/changelogs/29573.txt | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/102.2.txt create mode 100644 fastlane/metadata/android/en-US/changelogs/29573.txt diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java index 9e72b7ef86..7a100b7778 100644 --- a/core/src/mindustry/ai/BlockIndexer.java +++ b/core/src/mindustry/ai/BlockIndexer.java @@ -225,7 +225,7 @@ public class BlockIndexer{ TileEntity e = other.entity; float ndst = Mathf.dst(x, y, e.x, e.y); - if(ndst < range && (closest == null || ndst < dst || (usePriority && closest.block.priority.ordinal() < e.block.priority.ordinal()))){ + if(ndst < range && (closest == null || ndst < dst || (usePriority && closest.block.priority.ordinal() <= e.block.priority.ordinal()))){ dst = ndst; closest = e; } diff --git a/fastlane/metadata/android/en-US/changelogs/102.2.txt b/fastlane/metadata/android/en-US/changelogs/102.2.txt new file mode 100644 index 0000000000..f8244a4b0b --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/102.2.txt @@ -0,0 +1,5 @@ +- Added new map view w/ panning and scrolling +- Added block health rule +- Added more internal teams for alternative gamemodes +- Added features for improved server modding +- Major internal change: package is now "mindustry" instead of "io.anuke.mindustry" (will break plugins) diff --git a/fastlane/metadata/android/en-US/changelogs/29573.txt b/fastlane/metadata/android/en-US/changelogs/29573.txt new file mode 100644 index 0000000000..f8244a4b0b --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29573.txt @@ -0,0 +1,5 @@ +- Added new map view w/ panning and scrolling +- Added block health rule +- Added more internal teams for alternative gamemodes +- Added features for improved server modding +- Major internal change: package is now "mindustry" instead of "io.anuke.mindustry" (will break plugins) From 905d7abadbb823f06bec3d71e726a189f0b73d3f Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Dec 2019 23:49:09 -0500 Subject: [PATCH 51/78] Bugfixes --- core/src/mindustry/ui/fragments/PlayerListFragment.java | 2 +- core/src/mindustry/world/blocks/RespawnBlock.java | 3 ++- core/src/mindustry/world/blocks/units/MechPad.java | 2 +- fastlane/metadata/android/en-US/video.txt | 0 fastlane/metadata/android/es-ES/video.txt | 1 - fastlane/metadata/android/ja-JP/video.txt | 0 fastlane/metadata/android/ru-RU/video.txt | 0 fastlane/metadata/android/uk/video.txt | 0 8 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 fastlane/metadata/android/en-US/video.txt delete mode 100644 fastlane/metadata/android/es-ES/video.txt delete mode 100644 fastlane/metadata/android/ja-JP/video.txt delete mode 100644 fastlane/metadata/android/ru-RU/video.txt delete mode 100644 fastlane/metadata/android/uk/video.txt diff --git a/core/src/mindustry/ui/fragments/PlayerListFragment.java b/core/src/mindustry/ui/fragments/PlayerListFragment.java index a9cca9fb85..ea6f6087c1 100644 --- a/core/src/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/mindustry/ui/fragments/PlayerListFragment.java @@ -130,7 +130,7 @@ public class PlayerListFragment extends Fragment{ t.addImageButton(Icon.zoomSmall, Styles.clearPartiali, () -> Call.onAdminRequest(user, AdminAction.trace)); }).padRight(12).size(bs + 10f, bs); - }else if((!user.isLocal && !user.isAdmin) && net.client() && playerGroup.size() >= 3){ //votekick + }else if((!user.isLocal && !user.isAdmin) && net.client() && playerGroup.size() >= 3 && player.getTeam() != user.getTeam()){ //votekick button.add().growY(); button.addImageButton(Icon.banSmall, Styles.clearPartiali, diff --git a/core/src/mindustry/world/blocks/RespawnBlock.java b/core/src/mindustry/world/blocks/RespawnBlock.java index 581dec8b21..b27b0af621 100644 --- a/core/src/mindustry/world/blocks/RespawnBlock.java +++ b/core/src/mindustry/world/blocks/RespawnBlock.java @@ -5,6 +5,7 @@ import arc.math.*; import mindustry.entities.type.*; import mindustry.graphics.*; import mindustry.type.*; +import mindustry.ui.*; import mindustry.world.*; import static mindustry.Vars.net; @@ -20,7 +21,7 @@ public class RespawnBlock{ Draw.reset(); if(player != null){ - TextureRegion region = player.getIconRegion(); + TextureRegion region = to.icon(Cicon.full); Draw.color(0f, 0f, 0f, 0.4f * progress); Draw.rect("circle-shadow", tile.drawx(), tile.drawy(), region.getWidth() / 3f, region.getWidth() / 3f); diff --git a/core/src/mindustry/world/blocks/units/MechPad.java b/core/src/mindustry/world/blocks/units/MechPad.java index 9ff7223dc6..0dadebc018 100644 --- a/core/src/mindustry/world/blocks/units/MechPad.java +++ b/core/src/mindustry/world/blocks/units/MechPad.java @@ -112,7 +112,7 @@ public class MechPad extends Block{ MechFactoryEntity entity = tile.ent(); if(entity.player != null){ - RespawnBlock.drawRespawn(tile, entity.heat, entity.progress, entity.time, entity.player, (!entity.sameMech && entity.player.mech == mech ? mech : Mechs.starter)); + RespawnBlock.drawRespawn(tile, entity.heat, entity.progress, entity.time, entity.player, (!entity.sameMech && entity.player.mech == mech ? Mechs.starter : mech)); } } diff --git a/fastlane/metadata/android/en-US/video.txt b/fastlane/metadata/android/en-US/video.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/fastlane/metadata/android/es-ES/video.txt b/fastlane/metadata/android/es-ES/video.txt deleted file mode 100644 index 8b13789179..0000000000 --- a/fastlane/metadata/android/es-ES/video.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/fastlane/metadata/android/ja-JP/video.txt b/fastlane/metadata/android/ja-JP/video.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/fastlane/metadata/android/ru-RU/video.txt b/fastlane/metadata/android/ru-RU/video.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/fastlane/metadata/android/uk/video.txt b/fastlane/metadata/android/uk/video.txt deleted file mode 100644 index e69de29bb2..0000000000 From 73461e03648c78a1ab137adcd3086de3b5eede9b Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 30 Dec 2019 11:36:50 -0500 Subject: [PATCH 52/78] Added config for showing connect/disconnect messages --- core/src/mindustry/core/NetServer.java | 4 ++-- core/src/mindustry/net/Administration.java | 1 + core/src/mindustry/world/blocks/BuildBlock.java | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index b37ab7a57a..4880ad242d 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -443,7 +443,7 @@ public class NetServer implements ApplicationListener{ if(!player.con.hasDisconnected){ if(player.con.hasConnected){ Events.fire(new PlayerLeave(player)); - Call.sendMessage("[accent]" + player.name + "[accent] has disconnected."); + if(Config.showConnectMessages.bool()) Call.sendMessage("[accent]" + player.name + "[accent] has disconnected."); Call.onPlayerDisconnect(player.id); } @@ -581,7 +581,7 @@ public class NetServer implements ApplicationListener{ player.add(); player.con.hasConnected = true; - Call.sendMessage("[accent]" + player.name + "[accent] has connected."); + if(Config.showConnectMessages.bool()) Call.sendMessage("[accent]" + player.name + "[accent] has connected."); Log.info("&lm[{1}] &y{0} has connected. ", player.name, player.uuid); Events.fire(new PlayerJoin(player)); diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java index 57a728a020..cdec5b81fd 100644 --- a/core/src/mindustry/net/Administration.java +++ b/core/src/mindustry/net/Administration.java @@ -320,6 +320,7 @@ public class Administration{ name("The server name as displayed on clients.", "Server", "servername"), port("The port to host on.", Vars.port), autoUpdate("Whether to auto-update and exit when a new bleeding-edge update arrives.", false), + showConnectMessages("Whether to display connect/disconnect messages.", true), startCommands("Commands run at startup. This should be a comma-separated list.", ""), crashReport("Whether to send crash reports.", false, "crashreport"), logging("Whether to log everything to files.", true), diff --git a/core/src/mindustry/world/blocks/BuildBlock.java b/core/src/mindustry/world/blocks/BuildBlock.java index 79061db553..bb1ea11468 100644 --- a/core/src/mindustry/world/blocks/BuildBlock.java +++ b/core/src/mindustry/world/blocks/BuildBlock.java @@ -257,7 +257,7 @@ public class BuildBlock extends Block{ if(cblock != null){ ItemStack[] requirements = cblock.requirements; if(requirements.length != accumulator.length || totalAccumulator.length != requirements.length){ - setDeconstruct(previous); + setDeconstruct(cblock); } //make sure you take into account that you can't deconstruct more than there is deconstructed @@ -342,12 +342,12 @@ public class BuildBlock extends Block{ this.progress = 1f; if(previous.buildCost >= 0.01f){ this.cblock = previous; - this.accumulator = new float[previous.requirements.length]; - this.totalAccumulator = new float[previous.requirements.length]; this.buildCost = previous.buildCost * state.rules.buildCostMultiplier; }else{ this.buildCost = 20f; //default no-requirement build cost is 20 } + this.accumulator = new float[previous.requirements.length]; + this.totalAccumulator = new float[previous.requirements.length]; } @Override From 44ef5148b477756d4c5ae39ff006126b979adb24 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 30 Dec 2019 12:47:40 -0500 Subject: [PATCH 53/78] Reduced drone lag --- .../entities/effect/ItemTransfer.java | 2 +- .../mindustry/entities/traits/MinerTrait.java | 21 +++++++++++++++++-- core/src/mindustry/entities/type/Player.java | 5 +++++ core/src/mindustry/world/Tile.java | 2 +- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/entities/effect/ItemTransfer.java b/core/src/mindustry/entities/effect/ItemTransfer.java index ea8366c812..2018d15a69 100644 --- a/core/src/mindustry/entities/effect/ItemTransfer.java +++ b/core/src/mindustry/entities/effect/ItemTransfer.java @@ -44,7 +44,7 @@ public class ItemTransfer extends TimedEntity implements DrawTrait{ create(item, x, y, to, () -> to.addItem(item)); } - @Remote(called = Loc.server) + @Remote(called = Loc.server, unreliable = true) public static void transferItemTo(Item item, int amount, float x, float y, Tile tile){ if(tile == null || tile.entity == null || tile.entity.items == null) return; for(int i = 0; i < Mathf.clamp(amount / 3, 1, 8); i++){ diff --git a/core/src/mindustry/entities/traits/MinerTrait.java b/core/src/mindustry/entities/traits/MinerTrait.java index 4881d3720a..5b3d51c21d 100644 --- a/core/src/mindustry/entities/traits/MinerTrait.java +++ b/core/src/mindustry/entities/traits/MinerTrait.java @@ -7,6 +7,7 @@ import arc.math.*; import arc.util.Time; import mindustry.content.*; import mindustry.entities.Effects; +import mindustry.entities.effect.*; import mindustry.entities.type.*; import mindustry.gen.Call; import mindustry.graphics.*; @@ -38,11 +39,26 @@ public interface MinerTrait extends Entity{ /** Returns whether or not this builder can mine a specific item type. */ boolean canMine(Item item); + /** @return whether to offload mined items immediately at the core. if false, items are collected and dropped in a burst. */ + default boolean offloadImmediately(){ + return false; + } + default void updateMining(){ Unit unit = (Unit)this; Tile tile = getMineTile(); TileEntity core = unit.getClosestCore(); + if(core != null && tile != null && tile.drop() != null && !unit.acceptsItem(tile.drop()) && unit.dst(core) < mineTransferRange){ + int accepted = core.tile.block().acceptStack(unit.item().item, unit.item().amount, core.tile, unit); + if(accepted > 0){ + Call.transferItemTo(unit.item().item, accepted, + tile.worldx() + Mathf.range(tilesize / 2f), + tile.worldy() + Mathf.range(tilesize / 2f), core.tile); + unit.clearItem(); + } + } + if(tile == null || core == null || tile.block() != Blocks.air || dst(tile.worldx(), tile.worldy()) > getMiningRange() || tile.drop() == null || !unit.acceptsItem(tile.drop()) || !canMine(tile.drop())){ setMineTile(null); @@ -52,12 +68,13 @@ public interface MinerTrait extends Entity{ if(Mathf.chance(Time.delta() * (0.06 - item.hardness * 0.01) * getMinePower())){ - if(unit.dst(core) < mineTransferRange && core.tile.block().acceptStack(item, 1, core.tile, unit) == 1){ + if(unit.dst(core) < mineTransferRange && core.tile.block().acceptStack(item, 1, core.tile, unit) == 1 && offloadImmediately()){ Call.transferItemTo(item, 1, tile.worldx() + Mathf.range(tilesize / 2f), tile.worldy() + Mathf.range(tilesize / 2f), core.tile); }else if(unit.acceptsItem(item)){ - Call.transferItemToUnit(item, + //this is clientside, since items are synced anyway + ItemTransfer.transferItemToUnit(item, tile.worldx() + Mathf.range(tilesize / 2f), tile.worldy() + Mathf.range(tilesize / 2f), unit); diff --git a/core/src/mindustry/entities/type/Player.java b/core/src/mindustry/entities/type/Player.java index 8366c01cc6..4077da0e4e 100644 --- a/core/src/mindustry/entities/type/Player.java +++ b/core/src/mindustry/entities/type/Player.java @@ -119,6 +119,11 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{ heal(); } + @Override + public boolean offloadImmediately(){ + return true; + } + @Override public TypeID getTypeID(){ return TypeIDs.player; diff --git a/core/src/mindustry/world/Tile.java b/core/src/mindustry/world/Tile.java index 119af5b8df..fe319fd02e 100644 --- a/core/src/mindustry/world/Tile.java +++ b/core/src/mindustry/world/Tile.java @@ -376,7 +376,7 @@ public class Tile implements Position, TargetTrait{ return state.teams.canInteract(team, getTeam()); } - public Item drop(){ + public @Nullable Item drop(){ return overlay == Blocks.air || overlay.itemDrop == null ? floor.itemDrop : overlay.itemDrop; } From f2e1d17ce9f58d2e98e4adc1bc738bf53d0782fc Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 30 Dec 2019 12:49:27 -0500 Subject: [PATCH 54/78] Made junction harder to spam --- core/src/mindustry/content/Blocks.java | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 58ff4a7c35..9eec1f928b 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -902,6 +902,7 @@ public class Blocks implements ContentList{ speed = 26; capacity = 12; health = 30; + buildCostMultiplier = 4f; }}; itemBridge = new BufferedItemBridge("bridge-conveyor"){{ @@ -930,7 +931,6 @@ public class Blocks implements ContentList{ router = new Router("router"){{ requirements(Category.distribution, ItemStack.with(Items.copper, 3)); - }}; distributor = new Router("distributor"){{ diff --git a/gradle.properties b/gradle.properties index 8ed0e699dd..40485198b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=14b6027d79cda5e02d74a7c2f85eb7e768c7abeb +archash=4882a25c74ada2c0aff9dbcf2cef0ab1b7936b67 From 51bd74fcc1599552929f9717b6e8bc936a6edd66 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 30 Dec 2019 12:55:35 -0500 Subject: [PATCH 55/78] Build time increase of basic blocks --- core/src/mindustry/content/Blocks.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 9eec1f928b..f0fc54314d 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -898,11 +898,11 @@ public class Blocks implements ContentList{ }}; junction = new Junction("junction"){{ - requirements(Category.distribution, ItemStack.with(Items.copper, 1), true); + requirements(Category.distribution, ItemStack.with(Items.copper, 2), true); speed = 26; capacity = 12; health = 30; - buildCostMultiplier = 4f; + buildCostMultiplier = 6f; }}; itemBridge = new BufferedItemBridge("bridge-conveyor"){{ @@ -922,15 +922,18 @@ public class Blocks implements ContentList{ sorter = new Sorter("sorter"){{ requirements(Category.distribution, ItemStack.with(Items.lead, 2, Items.copper, 2)); + buildCostMultiplier = 3f; }}; invertedSorter = new Sorter("inverted-sorter"){{ requirements(Category.distribution, ItemStack.with(Items.lead, 2, Items.copper, 2)); + buildCostMultiplier = 3f; invert = true; }}; router = new Router("router"){{ requirements(Category.distribution, ItemStack.with(Items.copper, 3)); + buildCostMultiplier = 2f; }}; distributor = new Router("distributor"){{ @@ -940,6 +943,7 @@ public class Blocks implements ContentList{ overflowGate = new OverflowGate("overflow-gate"){{ requirements(Category.distribution, ItemStack.with(Items.lead, 2, Items.copper, 4)); + buildCostMultiplier = 3f; }}; massDriver = new MassDriver("mass-driver"){{ From 1de294cae553de957684af7659ef35dcb712ef37 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 30 Dec 2019 13:00:28 -0500 Subject: [PATCH 56/78] Bugfixes --- core/src/mindustry/world/blocks/BuildBlock.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/BuildBlock.java b/core/src/mindustry/world/blocks/BuildBlock.java index bb1ea11468..345300343f 100644 --- a/core/src/mindustry/world/blocks/BuildBlock.java +++ b/core/src/mindustry/world/blocks/BuildBlock.java @@ -171,7 +171,7 @@ public class BuildBlock extends Block{ return; } - if(entity.previous == null) return; + if(entity.previous == null || entity.cblock == null) return; if(Core.atlas.isFound(entity.previous.icon(mindustry.ui.Cicon.full))){ Draw.rect(entity.previous.icon(Cicon.full), tile.drawx(), tile.drawy(), entity.previous.rotate ? tile.rotation() * 90 : 0); From e7d813ab5b340d3e982d837be884008610ee7ca2 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 30 Dec 2019 13:03:29 -0500 Subject: [PATCH 57/78] Votekick config --- core/src/mindustry/core/NetServer.java | 5 +++++ core/src/mindustry/net/Administration.java | 1 + 2 files changed, 6 insertions(+) diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index 4880ad242d..27e1ed1198 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -321,6 +321,11 @@ public class NetServer implements ApplicationListener{ VoteSession[] currentlyKicking = {null}; clientCommands.register("votekick", "[player...]", "Vote to kick a player, with a cooldown.", (args, player) -> { + if(!Config.enableVotekick.bool()){ + player.sendMessage("[scarlet]Vote-kick is disabled on this server."); + return; + } + if(playerGroup.size() < 3){ player.sendMessage("[scarlet]At least 3 players are needed to start a votekick."); return; diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java index cdec5b81fd..8d037b99dd 100644 --- a/core/src/mindustry/net/Administration.java +++ b/core/src/mindustry/net/Administration.java @@ -321,6 +321,7 @@ public class Administration{ port("The port to host on.", Vars.port), autoUpdate("Whether to auto-update and exit when a new bleeding-edge update arrives.", false), showConnectMessages("Whether to display connect/disconnect messages.", true), + enableVotekick("Whether votekick is enabled.", true), startCommands("Commands run at startup. This should be a comma-separated list.", ""), crashReport("Whether to send crash reports.", false, "crashreport"), logging("Whether to log everything to files.", true), From 62947b9417286064c426d22152bc07f96e505057 Mon Sep 17 00:00:00 2001 From: CinExPL <41754972+CinExPL@users.noreply.github.com> Date: Tue, 31 Dec 2019 05:03:46 +0100 Subject: [PATCH 58/78] Update bundle_pl.properties (#1285) - reverted back some changes made by @FarmerThanos, - fixed some errors, - compared to english file. --- core/assets/bundles/bundle_pl.properties | 123 +++++++++++++---------- 1 file changed, 72 insertions(+), 51 deletions(-) diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index 8c17577654..ceef56533a 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -12,13 +12,14 @@ link.itch.io.description = Strona itch.io z oficjanymi wersjami do pobrania link.google-play.description = Strona na sklepie Google Play link.f-droid.description = F-Droid catalogue listing link.wiki.description = Oficjana Wiki Mindustry +link.feathub.description = Zaproponuj nowe funkcje linkfail = Nie udało się otworzyć linku!\nURL został skopiowany. screenshot = Zapisano zdjęcie w {0} screenshot.invalid = Zrzut ekranu jest zbyt duży. Najprawdopodobniej brakuje miejsca w pamięci urządzenia. gameover = Koniec Gry gameover.pvp = Zwyciężyła drużyna [accent]{0}[]! highscore = [YELLOW] Nowy rekord! -copied = Copied. +copied = Skopiowano. load.sound = Dźwięki load.map = Mapy @@ -26,6 +27,14 @@ load.image = Obrazy load.content = Treść load.system = System load.mod = Mody +load.scripts = Skrypty + +be.update = Nowa wersja Bleeding Edge jest dostępna: +be.update.confirm = Pobrać i zainstalować teraz? +be.updating = Aktualizowanie... +be.ignore = Zignoruj +be.noupdates = Nie znaleziono aktualizacji. +be.check = Sprawdź aktualizacje schematic = Schemat schematic.add = Zapisz schemat... @@ -80,7 +89,6 @@ continue = Kontynuuj maps.none = [lightgray]Nie znaleziono żadnych map! invalid = Nieprawidłowy pickcolor = Wybierz kolor - preparingconfig = Przygotowywanie Konfiguracji preparingcontent = Przygotowywanie Zawartości uploadingcontent = Przesyłanie Zawartości @@ -100,22 +108,28 @@ mod.enabled = [lightgray]Włączony mod.disabled = [scarlet]Wyłączony mod.disable = Wyłącz mod.delete.error = Nie udało się usunąć moda. Plik może być w użyciu. +mod.requiresversion = [scarlet]Wymaga gry w wersji co najmniej: [accent]{0} mod.missingdependencies = [scarlet]Brakujące zależności: {0} +mod.erroredcontent = [scarlet]Content Errors +mod.errors = Wystąpił błąd podczas ładowania treści. +mod.noerrorplay = [scarlet]Twoje mody zawierają błędy.[] Wyłącz je lub napraw błędy przed rozpoczęciem gry. mod.nowdisabled = [scarlet]Brakuje zależności dla moda '{0}':[accent] {1}\n[lightgray]Najpierw trzeba ściągnąć te mody.\nMod zostanie automatycznie wyłączony. mod.enable = Włącz mod.requiresrestart = Gra się wyłączy aby wprowadzić zmiany moda. mod.reloadrequired = [scarlet]Wymagany restart mod.import = Importuj Mod mod.import.github = Importuj mod z GitHuba +mod.item.remove = Ten przedmiot jest częścią moda[accent] '{0}'[]. Aby usunąć go, odinstaluj modyfikację. mod.remove.confirm = Ten mod zostanie usunięty. mod.author = [LIGHT_GRAY]Autor:[] {0} mod.missing = Ten zapis zawiera mody, które zostały niedawno zaktualizowane, bądź nie są już zainstalowane. Zapis może zostać uszkodzony. Czy jesteś pewien, że chcesz go załadować?\n[lightgray]Mody:\n{0} mod.preview.missing = Przed opublikowaniem tego moda na Warsztacie musisz dodać zdjęcie podglądowe.\nDodaj zdjęcie o nazwie[accent] preview.png[] do folderu moda i spróbuj jeszcze raz. -mod.folder.missing = Jedynie mody w formie folderów mogą się znaleźć na Warsztacie.\nBy zamienić moda w folder, wyciągnij go z archiwum, umieść w folderze i usuń archiwum. Później uruchom ponownie grę bądź załaduj ponownie mody. +mod.folder.missing = Jedynie mody w formie folderów mogą się znaleźć na Warsztacie.\nBy zamienić moda w folder, wyciągnij go z archiwum, umieść w folderze i usuń archiwum. Później uruchom ponownie grę lub załaduj ponownie mody. +mod.scripts.unsupported = Twoje urządzenie nie wspiera skryptów. Niektóre mody mogą nie działać poprawnie. about.button = O Grze name = Nazwa: -noname = Najpierw wybierz[accent] nazwę gracza[] +noname = Najpierw wybierz[accent] nazwę gracza[]. filename = Nazwa Pliku: unlocked = Odblokowano nową zawartość! completed = [accent]Ukończony @@ -123,8 +137,8 @@ techtree = Drzewo Technologiczne research.list = [lightgray]Badania: research = Badaj researched = [lightgray]{0} zbadane. -players = {0} graczy online -players.single = {0} gracz online +players = {0} graczy +players.single = {0} gracz server.closing = [accent] Zamykanie serwera... server.kicked.kick = Zostałeś wyrzucony z serwera! server.kicked.whitelist = Nie ma cię tu na białej liście. @@ -141,6 +155,7 @@ server.kicked.nameEmpty = Wybrana przez Ciebie nazwa jest nieprawidłowa. server.kicked.idInUse = Jesteś już na serwerze! Łączenie się z dwóch kont nie jest dozwolone. server.kicked.customClient = Ten serwer nie wspomaga wersji deweloperskich. Pobierz oficjalną wersję. server.kicked.gameover = Koniec gry! +server.kicked.serverRestarting = Restart serwera. server.versions = Twoja wersja gry:[accent] {0}[]\nWersja gry serwera:[accent] {1}[] host.info = Przycisk [accent]host[] hostuje serwer na porcie [scarlet]6567[]. \nKażdy w tej samej sieci [lightgray]wifi lub hotspocie[] powinien zobaczyć twój serwer.\n\nJeśli chcesz, aby każdy z twoim IP mógł dołączyć, musisz wykonać [accent]przekierowywanie portów[].\n\n[lightgray]Notka: Jeśli ktokolwiek ma problem z dołączeniem do gry lokalnej, upewnij się, że udostępniłeś Mindustry dostęp do sieci w ustawieniach zapory (firewall). Zauważ, że niektóre sieci publiczne mogą nie zezwalać na wykrycie serwerów. join.info = Tutaj możesz wpisać [accent]adres IP serwera[], aby dołączyć lub wyszukać [accent]serwerów w lokalnej sieci[], do których możesz dołączyć .\nGra wieloosobowa na LAN i WAN jest wspomagana.\n\n[lightgray]Notka: Nie ma automatycznej listy wszystkich serwerów; jeśli chcesz dołączyć przez IP, musisz zapytać hosta o IP. @@ -240,7 +255,7 @@ data.exported = Dane wyeksportowane. data.invalid = Nieprawidłowe dane gry. data.import.confirm = Zaimportowanie zewnętrznych danych usunie[scarlet] wszystkie[] obecne dane gry.\n[accent]Nie można tego cofnąć![]\n\nGdy dane zostaną zimportowane, gra automatycznie się wyłączy. classic.export = Eksportuj Dane Wersji Klasycznej -classic.export.text = [accent]Mindustry[] otrzymało ostatnio ważną aktualizację.\nWykryto zapis lub mapę z wersji classic (v3.5 build 40) - czy chciałbyś eksportować te zapisy do katalogu domowego swojego telefonu, do użycia w aplikacji Mindustry Classic? +classic.export.text = [accent]Mindustry[] otrzymało ostatnio ważną aktualizację.\nWykryto zapis lub mapę z wersji classic (v3.5 build 40) - czy chciałbyś eksportować te zapisy do katalogu domowego swojego telefonu, aby móc używać ich w Mindustry Classic? quit.confirm = Czy na pewno chcesz wyjść? quit.confirm.tutorial = Czy jesteś pewien tego co robisz?\nSamouczek może zostać powtórzony w[accent] Ustawienia->Gra->Ponów samouczek.[] loading = [accent]Ładowanie... @@ -248,7 +263,7 @@ reloading = [accent]Przeładowywanie Modów... saving = [accent]Zapisywanie... cancelbuilding = [accent][[{0}][] by wyczyścić plan selectschematic = [accent][[{0}][] by wybrać+skopiować -pausebuilding = [accent][[{0}][] by wtrzymać budowę +pausebuilding = [accent][[{0}][] by wstrzymać budowę resumebuilding = [scarlet][[{0}][] by kontynuować budowę wave = [accent]Fala {0} wave.waiting = Fala za {0} @@ -414,7 +429,6 @@ load = Wczytaj save = Zapisz fps = FPS: {0} ping = Ping: {0}ms - language.restart = Uruchom grę ponownie, aby ustawiony język zaczął funkcjonować. settings = Ustawienia tutorial = Poradnik @@ -456,7 +470,7 @@ boss.health = Zdrowie Bossa connectfail = [crimson]Nie można połączyć się z serwerem:\n\n[accent]{0} error.unreachable = Serwer niedostępny.\nCzy adres jest wpisany poprawnie? error.invalidaddress = Niepoprawny adres. -error.timedout = Przekroczono limit czasu!/nUpewnij się, że host ma ustawione przekierowanie portu oraz poprawność wpisanego adresu! +error.timedout = Przekroczono limit czasu!\nUpewnij się, że host ma ustawione przekierowanie portu oraz poprawność wpisanego adresu! error.mismatch = Błąd pakietu:\nprawdopodobne niedopasowanie klienta/serwera.\nUpewnij się, że ty i host macie najnowszą wersję Mindustry! error.alreadyconnected = Jesteś już połączony. error.mapnotfound = Plik mapy nie został znaleziony! @@ -493,10 +507,12 @@ zone.nuclearComplex.description = Dawny zakład produkcji i przetwarzania toru, zone.fungalPass.description = Przejściowy obszar pomiędzy wysokimi górami a nisko znajdującymi się, ogarniętymi przez zarodniki równinami. Znajduje się tu mała postawiona przez wrogów baza zwiadowcza.\nZniszcz ją.\nUżyj jednostek Nóż i Pełzak. Zniszcz oba rdzenie. zone.impact0078.description = zone.crags.description = + settings.language = Język settings.data = Dane Gry settings.reset = Przywróć Domyślne settings.rebind = Zmień +settings.resetKey = Resetuj settings.controls = Sterowanie settings.game = Gra settings.sound = Dźwięk @@ -563,8 +579,8 @@ bar.heat = Ciepło bar.power = Prąd bar.progress = Postęp Budowy bar.spawned = Jednostki: {0}/{1} -bar.input = Input -bar.output = Output +bar.input = Wejście +bar.output = Wyjście bullet.damage = [stat]{0}[lightgray] Obrażenia bullet.splashdamage = [stat]{0}[lightgray] Obrażenia obszarowe ~[stat] {1}[lightgray] kratki @@ -590,6 +606,8 @@ unit.persecond = /sekundę unit.timesspeed = x prędkość unit.percent = % unit.items = przedmioty +unit.thousands = tys. +unit.millions = mln category.general = Główne category.power = Prąd category.liquids = Płyny @@ -621,19 +639,20 @@ setting.difficulty.normal = Normalny setting.difficulty.hard = Trudny setting.difficulty.insane = Szalony setting.difficulty.name = Poziom trudności -setting.screenshake.name = Wstrząsy ekranu +setting.screenshake.name = Siła wstrząsów ekranu setting.effects.name = Wyświetlanie efektów setting.destroyedblocks.name = Wyświetl zniszczone bloki -setting.conveyorpathfinding.name = Znajdowanie Ścieżki Stawianych Taśmociągów +setting.conveyorpathfinding.name = Ustalanie ścieżki przenośników +setting.coreselect.name = Zezwalaj na schematyczne rdzenie setting.sensitivity.name = Czułość kontrolera setting.saveinterval.name = Interwał automatycznego zapisywania setting.seconds = {0} sekund setting.blockselecttimeout.name = Block Select Timeout -setting.milliseconds = {0} millisekund +setting.milliseconds = {0} milisekund setting.fullscreen.name = Pełny ekran setting.borderlesswindow.name = Bezramkowe okno[lightgray] (może wymagać restartu) setting.fps.name = Pokazuj FPS oraz ping -setting.blockselectkeys.name = Pokazuj Klawisze Wyboru Bloków +setting.blockselectkeys.name = Pokazuj skróty klawiszowe bloków setting.vsync.name = Synchronizacja pionowa setting.pixelate.name = Pikselacja [lightgray](wyłącza animacje) setting.minimap.name = Pokaż Minimapę @@ -653,7 +672,7 @@ public.confirm = Czy chcesz ustawić swoją grę jako publiczną?\n[accent]Każd public.beta = Wersje beta gry nie mogą tworzyć publicznych pokoi. uiscale.reset = Skala interfejsu uległa zmianie.\nNaciśnij "OK" by potwierdzić zmiany.\n[scarlet]Cofanie zmian i wyjście z gry za[accent] {0}[] uiscale.cancel = Anuluj i Wyjdź -setting.bloom.name = Rozproszenie +setting.bloom.name = Efekt Bloom keybind.title = Zmień keybinds.mobile = [scarlet]Większość skrótów klawiszowych nie funkcjonuje w wersji mobilnej. Tylko podstawowe poruszanie się jest wspierane. category.general.name = Ogólne @@ -662,15 +681,15 @@ category.multiplayer.name = Wielu graczy command.attack = Atakuj command.rally = Zbierz command.retreat = Wycofaj -placement.blockselectkeys = \n[lightgray]Key: [{0}, +placement.blockselectkeys = \n[lightgray]Klawisz: [{0}, keybind.clear_building.name = Wyczyść budynek keybind.press = Naciśnij wybrany klawisz... keybind.press.axis = Naciśnij oś lub klawisz... keybind.screenshot.name = Zrzut ekranu mapy -keybind.toggle_power_lines.name = Przełącz Linie Energetyczne +keybind.toggle_power_lines.name = Zmień widoczność linii energetycznych keybind.move_x.name = Poruszanie w poziomie keybind.move_y.name = Poruszanie w pionie -keybind.mouse_move.name = Podążaj Za Myszką +keybind.mouse_move.name = Podążaj Za Myszą keybind.dash.name = Dash keybind.schematic_select.name = Wybierz region keybind.schematic_menu.name = Menu schematów @@ -678,20 +697,20 @@ keybind.schematic_flip_x.name = Obróć schemat horyzontalnie keybind.schematic_flip_y.name = Obróć schemat wertykalnie keybind.category_prev.name = Poprzednia kategoria keybind.category_next.name = Następna kategoria -keybind.block_select_left.name = Wybór Bloku Lewo -keybind.block_select_right.name = Wybór Bloku Prawo -keybind.block_select_up.name = Wybór Bloku Góra -keybind.block_select_down.name = Wybór Bloku Dół -keybind.block_select_01.name = Kategoria/Wybór Bloku 1 -keybind.block_select_02.name = Kategoria/Wybór Bloku 2 -keybind.block_select_03.name = Kategoria/Wybór Bloku 3 -keybind.block_select_04.name = Kategoria/Wybór Bloku 4 -keybind.block_select_05.name = Kategoria/Wybór Bloku 5 -keybind.block_select_06.name = Kategoria/Wybór Bloku 6 -keybind.block_select_07.name = Kategoria/Wybór Bloku 7 -keybind.block_select_08.name = Kategoria/Wybór Bloku 8 -keybind.block_select_09.name = Kategoria/Wybór Bloku 9 -keybind.block_select_10.name = Kategoria/Wybór Bloku 10 +keybind.block_select_left.name = Block Select Left +keybind.block_select_right.name = Block Select Right +keybind.block_select_up.name = Block Select Up +keybind.block_select_down.name = Block Select Down +keybind.block_select_01.name = Wybór bloku/kategorii 1 +keybind.block_select_02.name = Wybór bloku/kategorii 2 +keybind.block_select_03.name = Wybór bloku/kategorii 3 +keybind.block_select_04.name = Wybór bloku/kategorii 4 +keybind.block_select_05.name = Wybór bloku/kategorii 5 +keybind.block_select_06.name = Wybór bloku/kategorii 6 +keybind.block_select_07.name = Wybór bloku/kategorii 7 +keybind.block_select_08.name = Wybór bloku/kategorii 8 +keybind.block_select_09.name = Wybór bloku/kategorii 9 +keybind.block_select_10.name = Wybór bloku/kategorii 10 keybind.fullscreen.name = Przełącz Pełny Ekran keybind.select.name = Zaznacz keybind.diagonal_placement.name = Budowa po skosie @@ -708,7 +727,7 @@ keybind.chat.name = Czat keybind.player_list.name = Lista graczy keybind.console.name = Konsola keybind.rotate.name = Obracanie -keybind.rotateplaced.name = Obróć istniejące (Trzymaj) +keybind.rotateplaced.name = Rotate Existing (Hold) keybind.toggle_menus.name = Zmiana widoczności menu keybind.chat_history_prev.name = Przewiń wiadomości w górę keybind.chat_history_next.name = Przewiń wiadomości w dół @@ -736,6 +755,7 @@ rules.enemyCheat = Nieskończone zasoby komputera-przeciwnika (czerwonego zespo rules.unitdrops = Surowce ze zniszczonych jednostek rules.unitbuildspeedmultiplier = Mnożnik prędkości tworzenia jednostek rules.unithealthmultiplier = Mnożnik życia jednostek +rules.blockhealthmultiplier = Mnożnik życia bloków rules.playerhealthmultiplier = Mnożnik życia gracza rules.playerdamagemultiplier = Mnożnik obrażeń gracza rules.unitdamagemultiplier = Mnożnik obrażeń jednostek @@ -804,6 +824,7 @@ mech.trident-ship.name = Trójząb mech.trident-ship.weapon = Wnęka bombowa mech.glaive-ship.name = Glewia mech.glaive-ship.weapon = Zapalający Karabin +item.corestorable = [lightgray]Przechowywalne w rdzeniu: {0} item.explosiveness = [lightgray]Wybuchowość: {0} item.flammability = [lightgray]Palność: {0} item.radioactivity = [lightgray]Promieniotwórczość: {0} @@ -908,11 +929,11 @@ block.scorch.name = Płomień block.scatter.name = Flak block.hail.name = Grad block.lancer.name = Lansjer -block.conveyor.name = Taśmociąg -block.titanium-conveyor.name = Taśmociąg Tytanowy -block.armored-conveyor.name = Opancerzony Taśmociąg +block.conveyor.name = Przenośnik +block.titanium-conveyor.name = Przenośnik Tytanowy +block.armored-conveyor.name = Przenośnik Opancerzony block.armored-conveyor.description = Przesyła przedmioty z taką samą szybkością jak Przenośnik Tytanowy, ale jest bardziej odporny. Wejściami bocznymi mogą być tylko inne przenośniki. -block.junction.name = Skrzyżowanie +block.junction.name = Węzeł block.router.name = Rozdzielacz block.distributor.name = Dystrybutor block.sorter.name = Sortownik @@ -930,8 +951,8 @@ block.incinerator.name = Spalacz block.spore-press.name = Prasa Zarodników block.separator.name = Rozdzielacz block.coal-centrifuge.name = Wirówka węglowa -block.power-node.name = Węzeł Prądowy -block.power-node-large.name = Duży Węzeł Prądowy +block.power-node.name = Węzeł Prądu +block.power-node-large.name = Duży Węzeł Prądu block.surge-tower.name = Wieża Energetyczna block.diode.name = Dioda baterii block.battery.name = Bateria @@ -958,8 +979,8 @@ block.item-source.name = Źródło przedmiotów block.item-void.name = Próżnia przedmiotów block.liquid-source.name = Źródło płynów block.power-void.name = Próżnia prądu -block.power-source.name = Węzeł Nieskończonego Prądu -block.unloader.name = Wyładowywacz +block.power-source.name = Nieskończony Prąd +block.unloader.name = Ekstraktor block.vault.name = Magazyn block.wave.name = Strumień block.swarmer.name = Działo Rojowe @@ -990,11 +1011,11 @@ block.plated-conduit.name = Opancerzona rura block.phase-conduit.name = Rura Fazowa block.liquid-router.name = Rozdzielacz Płynów block.liquid-tank.name = Zbiornik Płynów -block.liquid-junction.name = Skrzyżowanie Rurowe -block.bridge-conduit.name = Most Rurowy +block.liquid-junction.name = Łącznik Płynów +block.bridge-conduit.name = Most Płynów block.rotary-pump.name = Wirowa Pompa block.thorium-reactor.name = Reaktor Torowy -block.mass-driver.name = Katapulta Masowa +block.mass-driver.name = Katapulta Masy block.blast-drill.name = Wiertło Wybuchowe block.thermal-pump.name = Pompa Termalna block.thermal-generator.name = Generator Termalny @@ -1124,8 +1145,8 @@ block.copper-wall.description = Tani blok obronny.\nPrzydatny do ochrony rdzenia block.copper-wall-large.description = Tani blok obronny.\nPrzydatny do ochrony rdzenia i wieżyczek w pierwszych kilku falach.\nObejmuje wiele kratek. block.titanium-wall.description = Umiarkowanie silny blok obronny.\nZapewnia umiarkowaną ochronę przed wrogami. block.titanium-wall-large.description = Umiarkowanie silny blok obronny.\nZapewnia umiarkowaną ochronę przed wrogami.\nObejmuje wiele kratek. -block.plastanium-wall.description = A special type of wall that absorbs electric arcs and blocks automatic power node connections. -block.plastanium-wall-large.description = A special type of wall that absorbs electric arcs and blocks automatic power node connections.\nSpans multiple tiles. +block.plastanium-wall.description = Specjajny typ ściany, który pochłania łuki elektryczne oraz blokuje automatyczne łączenie węzłów. +block.plastanium-wall-large.description = Specjajny typ ściany, który pochłania łuki elektryczne oraz blokuje automatyczne łączenie węzłów.\nObejmuje wiele kratek. block.thorium-wall.description = Silny blok obronny.\nDobra ochrona przed wrogami. block.thorium-wall-large.description = Silny blok obronny.\nDobra ochrona przed wrogami.\nObejmuje wiele kratek. block.phase-wall.description = Ściana pokryta specjalną mieszanką opartą o Włókna Fazowe, która odbija większość pocisków. @@ -1164,7 +1185,7 @@ block.phase-conduit.description = Zaawansowany blok do przenoszenia cieczy. Uży block.power-node.description = Przesyła moc do połączonych węzłów. Można podłączyć do czterech źródeł zasilania, zlewów lub węzłów. Zasila też bloki które go dotykają. block.power-node-large.description = Posiada większy zasięg niż zwykły węzeł prądu. Można podłączyć do sześciu źródeł zasilania, zlewów lub węzłów. block.surge-tower.description = Węzęł prądu z bardzo dużym zasięgiem, posiadający mniej możliwych podłączeń. -block.diode.description = Prąd baterii może tylko przepłynąc przez ten blok w jedną strone, jeśli druga strona ma mniej prądu. +block.diode.description = Energia może przepływać przez ten blok tylko w jednym kierunku, ale tylko kiedy inne strony mają zmagazynowane mniej energii. block.battery.description = Przechowuje energię przy nadwyżce produkcji oraz dostarcza energię kiedy jest jej brak, dopóki jest w niej miejsce. block.battery-large.description = Przechowuje o wiele wiecej prądu niż standardowa bateria. block.combustion-generator.description = Wytwarza energię poprzez spalanie łatwopalnych materiałów. @@ -1205,7 +1226,7 @@ block.ripple.description = Duża wieża artyleryjska, która strzela jednocześn block.cyclone.description = Duża szybkostrzelna wieża. block.spectre.description = Duże działo dwulufowe, które strzela potężnymi pociskami przebijającymi pancerz w jednostki naziemne i powietrzne. block.meltdown.description = Duże działo laserowe, które strzela potężnymi wiązkami dalekiego zasięgu. Wymaga chłodzenia. -block.command-center.description = Wydaje polecenia ruchu sojuszniczym jednostkom na całej mapie.\nPowoduje patrolowanie jednostek, atakowanie wrogiego rdzenia lub wycofanie się do rdzenia / fabryki. Gdy nie ma rdzenia wroga, jednostki będą domyślnie patrolować pod dowództwem ataku. +block.command-center.description = Wydaje polecenia ruchu sojuszniczym jednostkom na całej mapie.\nPowoduje patrolowanie jednostek, atakowanie wrogiego rdzenia lub wycofanie się do rdzenia/fabryki. Gdy nie ma rdzenia wroga, jednostki będą domyślnie patrolować pod dowództwem ataku. block.draug-factory.description = Produkuje drony wydobywcze Draug. block.spirit-factory.description = Produkuje lekkie drony, które naprawiają bloki. block.phantom-factory.description = Produkuje zaawansowane drony które pomagają przy budowie. @@ -1217,7 +1238,7 @@ block.crawler-factory.description = Produkuje szybkie jednostki lądowe typu "ka block.titan-factory.description = Produkuje zaawansowane, opancerzone jednostki lądowe. block.fortress-factory.description = Produkuje naziemne jednostki ciężkiej artylerii. block.repair-point.description = Bez przerw ulecza najbliższą zniszczoną jednostkę w jego zasięgu. -block.dart-mech-pad.description = Umożliwia transformacje w podstawowego mecha bojowego.\nUżyj klikając podczas stania na nim. +block.dart-mech-pad.description = Umożliwia transformację w podstawowego mecha bojowego.\nUżyj klikając podczas stania na nim. block.delta-mech-pad.description = Opuść swój obecny statek i zamień go na szybki, lekko opancerzony mech stworzony do ataków typu uderz-uciekaj.\nUżyj, klikając dwukrotnie podczas stania na lądowisku. block.tau-mech-pad.description = Opuść swój obecny statek i zamień go na mech wsparcia który może leczyć sojusznicze struktury i jednostki.\nUżyj, klikając dwukrotnie podczas stania na lądowisku. block.omega-mech-pad.description = Opuść swój obecny statek i zamień go na masywny, dobrze opancerzony mech, przeznaczony do ataków na froncie.\nUżyj, klikając dwukrotnie podczas stania na lądowisku. From a78c0defc77f41fff883babc35b74a0062231604 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 31 Dec 2019 10:29:18 -0500 Subject: [PATCH 59/78] Fixed #1289 --- core/src/mindustry/core/Logic.java | 4 ++-- server/src/mindustry/server/ServerControl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index e7c84adbc8..7d5419a912 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -47,8 +47,8 @@ public class Logic implements ApplicationListener{ //blocks that get broken are appended to the team's broken block queue Tile tile = event.tile; Block block = tile.block(); - //skip null entities or nukes, for obvious reasons - if(tile.entity == null || tile.block() instanceof NuclearReactor) return; + //skip null entities or nukes, for obvious reasons; also skip client since they can't modify these requests + if(tile.entity == null || tile.block() instanceof NuclearReactor || net.client()) return; if(block instanceof BuildBlock){ diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index f78f6fbab9..8d2feb74b0 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -190,7 +190,7 @@ public class ServerControl implements ApplicationListener{ }); handler.register("version", "Displays server version info.", arg -> { - info("&lmVersion: &lyMindustry {0}-{1} {2} / build {3}", Version.number, Version.modifier, Version.type, Version.build); + info("&lmVersion: &lyMindustry {0}-{1} {2} / build {3}", Version.number, Version.modifier, Version.type, Version.build + (Version.revision == 0 ? "" : "." + Version.revision)); info("&lmJava Version: &ly{0}", System.getProperty("java.version")); }); From 7a29877a2d7f154195ef1ea9d352dfadc2073a15 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 31 Dec 2019 19:19:04 -0500 Subject: [PATCH 60/78] Bugfixes --- core/src/mindustry/entities/type/Unit.java | 2 +- .../mindustry/world/blocks/production/GenericCrafter.java | 8 -------- gradle.properties | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/core/src/mindustry/entities/type/Unit.java b/core/src/mindustry/entities/type/Unit.java index ab02f24c83..6a037d6f36 100644 --- a/core/src/mindustry/entities/type/Unit.java +++ b/core/src/mindustry/entities/type/Unit.java @@ -226,7 +226,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ float radScl = 1.5f; for(Unit en : arr){ - if(en.isFlying() != isFlying() || (en instanceof Player && en.getTeam() != getTeam())) continue; + if(en.isFlying() != isFlying() || (en instanceof Player && en.getTeam() != getTeam()) || (this instanceof Player && en.isFlying())) continue; float dst = dst(en); float scl = Mathf.clamp(1f - dst / (getSize()/(radScl*2f) + en.getSize()/(radScl*2f))); moveVector.add(Tmp.v1.set((x - en.x) * scl, (y - en.y) * scl).limit(0.4f)); diff --git a/core/src/mindustry/world/blocks/production/GenericCrafter.java b/core/src/mindustry/world/blocks/production/GenericCrafter.java index 7261effb4c..ee0e9a3c30 100644 --- a/core/src/mindustry/world/blocks/production/GenericCrafter.java +++ b/core/src/mindustry/world/blocks/production/GenericCrafter.java @@ -149,14 +149,6 @@ public class GenericCrafter extends Block{ return itemCapacity; } - public Item outputItem(){ - return outputItem == null ? null : outputItem.item; - } - - public Liquid outputLiquid(){ - return outputLiquid == null ? null : outputLiquid.liquid; - } - public static class GenericCrafterEntity extends TileEntity{ public float progress; public float totalProgress; diff --git a/gradle.properties b/gradle.properties index 40485198b7..aa36264bb8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=4882a25c74ada2c0aff9dbcf2cef0ab1b7936b67 +archash=7bfc46fe8c7810fbef1b6f6bbb19c8b999856813 From fdee9c7b50d4dd7880d0b4a26e7daec341f9b9d3 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 1 Jan 2020 10:45:02 -0500 Subject: [PATCH 61/78] Update README.md --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 555f3b3e09..0dbca644f0 100644 --- a/README.md +++ b/README.md @@ -49,11 +49,6 @@ If the terminal returns `Permission denied` or `Command not found` on Mac/Linux, Gradle may take up to several minutes to download files. Be patient.
After building, the output .JAR file should be in `/desktop/build/libs/Mindustry.jar` for desktop builds, and in `/server/build/libs/server-release.jar` for server builds. -### Feature Requests - -[![Feature Requests](https://feathub.com/Anuken/Mindustry?format=svg)](https://feathub.com/Anuken/Mindustry) - - ### Downloads [Get it on F-Droid](https://f-droid.org/packages/io.anuke.mindustry/) + +### Feature Requests + +[![Feature Requests](https://feathub.com/Anuken/Mindustry?format=svg)](https://feathub.com/Anuken/Mindustry) From ddb0d7eff2127da55cc80013fc80dad11751015c Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 1 Jan 2020 12:16:23 -0500 Subject: [PATCH 62/78] Fixed #1304 --- core/src/mindustry/mod/ContentParser.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index 3ea54d6160..aa6048d833 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -333,8 +333,8 @@ public class ContentParser{ } private void readBundle(ContentType type, String name, JsonValue value){ - UnlockableContent cont = Vars.content.getByName(type, name) instanceof UnlockableContent ? - Vars.content.getByName(type, name) : null; + UnlockableContent cont = locate(type, name) instanceof UnlockableContent ? + locate(type, name) : null; String entryName = cont == null ? type + "." + currentMod.name + "-" + name + "." : type + "." + cont.name + "."; I18NBundle bundle = Core.bundle; From 70e6e52eba4ac61adc5d2ad48e08c8890d5a3965 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 2 Jan 2020 14:04:12 -0500 Subject: [PATCH 63/78] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0dbca644f0..2f0cab8ff3 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ See [CONTRIBUTING](CONTRIBUTING.md). Bleeding-edge live builds are generated automatically for every commit. You can see them [here](https://github.com/Anuken/MindustryBuilds/releases). Old builds might still be on [jenkins](https://jenkins.hellomouse.net/job/mindustry/). If you'd rather compile on your own, follow these instructions. -First, make sure you have [Java 8](https://www.java.com/en/download/) and [JDK 8](https://adoptopenjdk.net/) installed. Open a terminal in the root directory, `cd` to the Mindustry folder and run the following commands: +First, make sure you have [JDK 8](https://adoptopenjdk.net/) installed. Open a terminal in the root directory, `cd` to the Mindustry folder and run the following commands: #### Windows From d161ba442f5fb3262acca1431e3d12bed76cde01 Mon Sep 17 00:00:00 2001 From: KSean222 <44050761+KSean222@users.noreply.github.com> Date: Fri, 3 Jan 2020 05:07:38 +1000 Subject: [PATCH 64/78] Set primitive wrapping to false for scripts (#1302) * Set primitive wrapping to false for scripts * Added one newline cause why not --- core/src/mindustry/mod/Scripts.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java index 7a39b774a7..5ac96fbb0a 100644 --- a/core/src/mindustry/mod/Scripts.java +++ b/core/src/mindustry/mod/Scripts.java @@ -21,7 +21,8 @@ public class Scripts implements Disposable{ context.setClassShutter(type -> (ClassAccess.allowedClassNames.contains(type) || type.startsWith("$Proxy") || type.startsWith("adapter") || type.contains("PrintStream") || type.startsWith("mindustry")) && !type.equals("mindustry.mod.ClassAccess")); - + context.getWrapFactory().setJavaPrimitiveWrap(false); + scope = new ImporterTopLevel(context); wrapper = Core.files.internal("scripts/wrapper.js").readString(); From cb76e8083635545ddf999fd71069f292f46c8166 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 2 Jan 2020 14:08:41 -0500 Subject: [PATCH 65/78] Bugfixes --- core/src/mindustry/input/MobileInput.java | 4 +++- core/src/mindustry/mod/ClassAccess.java | 2 +- core/src/mindustry/world/blocks/BuildBlock.java | 2 +- gradle.properties | 2 +- tools/src/mindustry/tools/ScriptStubGenerator.java | 3 ++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java index 81f657c876..3b8e881085 100644 --- a/core/src/mindustry/input/MobileInput.java +++ b/core/src/mindustry/input/MobileInput.java @@ -439,10 +439,12 @@ public class MobileInput extends InputHandler implements GestureListener{ @Override public boolean touchDown(int screenX, int screenY, int pointer, KeyCode button){ - if(state.is(State.menu) || player.isDead()) return false; + if(state.is(State.menu)) return false; down = true; + if(player.isDead()) return false; + //get tile on cursor Tile cursor = tileAt(screenX, screenY); diff --git a/core/src/mindustry/mod/ClassAccess.java b/core/src/mindustry/mod/ClassAccess.java index 2d1e32cfad..7046227686 100644 --- a/core/src/mindustry/mod/ClassAccess.java +++ b/core/src/mindustry/mod/ClassAccess.java @@ -3,5 +3,5 @@ package mindustry.mod; import arc.struct.*; //obviously autogenerated, do not touch public class ClassAccess{ - public static final ObjectSet allowedClassNames = ObjectSet.with("arc.Core", "arc.func.Boolc", "arc.func.Boolf", "arc.func.Boolf2", "arc.func.Boolp", "arc.func.Cons", "arc.func.Cons2", "arc.func.Floatc", "arc.func.Floatc2", "arc.func.Floatc4", "arc.func.Floatf", "arc.func.Floatp", "arc.func.Func", "arc.func.Func2", "arc.func.Func3", "arc.func.Intc", "arc.func.Intc2", "arc.func.Intc4", "arc.func.Intf", "arc.func.Intp", "arc.func.Prov", "arc.graphics.Color", "arc.graphics.Pixmap", "arc.graphics.Texture", "arc.graphics.TextureData", "arc.graphics.g2d.Draw", "arc.graphics.g2d.Fill", "arc.graphics.g2d.Lines", "arc.graphics.g2d.TextureAtlas", "arc.graphics.g2d.TextureAtlas$AtlasRegion", "arc.graphics.g2d.TextureRegion", "arc.math.Affine2", "arc.math.Angles", "arc.math.Angles", "arc.math.Angles$ParticleConsumer", "arc.math.CumulativeDistribution", "arc.math.CumulativeDistribution$CumulativeValue", "arc.math.DelaunayTriangulator", "arc.math.EarClippingTriangulator", "arc.math.Extrapolator", "arc.math.FloatCounter", "arc.math.Interpolation", "arc.math.Interpolation$Bounce", "arc.math.Interpolation$BounceIn", "arc.math.Interpolation$BounceOut", "arc.math.Interpolation$Elastic", "arc.math.Interpolation$ElasticIn", "arc.math.Interpolation$ElasticOut", "arc.math.Interpolation$Exp", "arc.math.Interpolation$ExpIn", "arc.math.Interpolation$ExpOut", "arc.math.Interpolation$Pow", "arc.math.Interpolation$PowIn", "arc.math.Interpolation$PowOut", "arc.math.Interpolation$Swing", "arc.math.Interpolation$SwingIn", "arc.math.Interpolation$SwingOut", "arc.math.Mathf", "arc.math.Mathf", "arc.math.Matrix3", "arc.math.WindowedMean", "arc.math.geom.BSpline", "arc.math.geom.Bezier", "arc.math.geom.Bresenham2", "arc.math.geom.CatmullRomSpline", "arc.math.geom.Circle", "arc.math.geom.ConvexHull", "arc.math.geom.Ellipse", "arc.math.geom.FixedPosition", "arc.math.geom.Geometry", "arc.math.geom.Geometry$Raycaster", "arc.math.geom.Geometry$SolidChecker", "arc.math.geom.Intersector", "arc.math.geom.Intersector$MinimumTranslationVector", "arc.math.geom.Path", "arc.math.geom.Point2", "arc.math.geom.Point3", "arc.math.geom.Polygon", "arc.math.geom.Polyline", "arc.math.geom.Position", "arc.math.geom.QuadTree", "arc.math.geom.QuadTree$QuadTreeObject", "arc.math.geom.Rect", "arc.math.geom.Shape2D", "arc.math.geom.Spring1D", "arc.math.geom.Spring2D", "arc.math.geom.Vec2", "arc.math.geom.Vec3", "arc.math.geom.Vector", "arc.scene.Action", "arc.scene.Element", "arc.scene.Group", "arc.scene.Scene", "arc.scene.actions.Actions", "arc.scene.actions.AddAction", "arc.scene.actions.AddListenerAction", "arc.scene.actions.AfterAction", "arc.scene.actions.AlphaAction", "arc.scene.actions.ColorAction", "arc.scene.actions.DelayAction", "arc.scene.actions.DelegateAction", "arc.scene.actions.FloatAction", "arc.scene.actions.IntAction", "arc.scene.actions.LayoutAction", "arc.scene.actions.MoveByAction", "arc.scene.actions.MoveToAction", "arc.scene.actions.OriginAction", "arc.scene.actions.ParallelAction", "arc.scene.actions.RelativeTemporalAction", "arc.scene.actions.RemoveAction", "arc.scene.actions.RemoveActorAction", "arc.scene.actions.RemoveListenerAction", "arc.scene.actions.RepeatAction", "arc.scene.actions.RotateByAction", "arc.scene.actions.RotateToAction", "arc.scene.actions.RunnableAction", "arc.scene.actions.ScaleByAction", "arc.scene.actions.ScaleToAction", "arc.scene.actions.SequenceAction", "arc.scene.actions.SizeByAction", "arc.scene.actions.SizeToAction", "arc.scene.actions.TemporalAction", "arc.scene.actions.TimeScaleAction", "arc.scene.actions.TouchableAction", "arc.scene.actions.TranslateByAction", "arc.scene.actions.VisibleAction", "arc.scene.event.ChangeListener", "arc.scene.event.ChangeListener$ChangeEvent", "arc.scene.event.ClickListener", "arc.scene.event.DragListener", "arc.scene.event.DragScrollListener", "arc.scene.event.ElementGestureListener", "arc.scene.event.EventListener", "arc.scene.event.FocusListener", "arc.scene.event.FocusListener$FocusEvent", "arc.scene.event.FocusListener$FocusEvent$Type", "arc.scene.event.HandCursorListener", "arc.scene.event.IbeamCursorListener", "arc.scene.event.InputEvent", "arc.scene.event.InputEvent$Type", "arc.scene.event.InputListener", "arc.scene.event.SceneEvent", "arc.scene.event.Touchable", "arc.scene.event.VisibilityEvent", "arc.scene.event.VisibilityListener", "arc.scene.style.BaseDrawable", "arc.scene.style.Drawable", "arc.scene.style.NinePatchDrawable", "arc.scene.style.ScaledNinePatchDrawable", "arc.scene.style.Style", "arc.scene.style.TextureRegionDrawable", "arc.scene.style.TiledDrawable", "arc.scene.style.TransformDrawable", "arc.scene.ui.Button", "arc.scene.ui.Button$ButtonStyle", "arc.scene.ui.ButtonGroup", "arc.scene.ui.CheckBox", "arc.scene.ui.CheckBox$CheckBoxStyle", "arc.scene.ui.ColorImage", "arc.scene.ui.Dialog", "arc.scene.ui.Dialog$DialogStyle", "arc.scene.ui.Image", "arc.scene.ui.ImageButton", "arc.scene.ui.ImageButton$ImageButtonStyle", "arc.scene.ui.KeybindDialog", "arc.scene.ui.KeybindDialog$KeybindDialogStyle", "arc.scene.ui.Label", "arc.scene.ui.Label$LabelStyle", "arc.scene.ui.ProgressBar", "arc.scene.ui.ProgressBar$ProgressBarStyle", "arc.scene.ui.ScrollPane", "arc.scene.ui.ScrollPane$ScrollPaneStyle", "arc.scene.ui.SettingsDialog", "arc.scene.ui.SettingsDialog$SettingsTable", "arc.scene.ui.SettingsDialog$SettingsTable$CheckSetting", "arc.scene.ui.SettingsDialog$SettingsTable$Setting", "arc.scene.ui.SettingsDialog$SettingsTable$SliderSetting", "arc.scene.ui.SettingsDialog$StringProcessor", "arc.scene.ui.Slider", "arc.scene.ui.Slider$SliderStyle", "arc.scene.ui.TextArea", "arc.scene.ui.TextArea$TextAreaListener", "arc.scene.ui.TextButton", "arc.scene.ui.TextButton$TextButtonStyle", "arc.scene.ui.TextField", "arc.scene.ui.TextField$DefaultOnscreenKeyboard", "arc.scene.ui.TextField$OnscreenKeyboard", "arc.scene.ui.TextField$TextFieldClickListener", "arc.scene.ui.TextField$TextFieldFilter", "arc.scene.ui.TextField$TextFieldListener", "arc.scene.ui.TextField$TextFieldStyle", "arc.scene.ui.TextField$TextFieldValidator", "arc.scene.ui.Tooltip", "arc.scene.ui.Tooltip$Tooltips", "arc.scene.ui.Touchpad", "arc.scene.ui.Touchpad$TouchpadStyle", "arc.scene.ui.TreeElement", "arc.scene.ui.TreeElement$Node", "arc.scene.ui.TreeElement$TreeStyle", "arc.scene.ui.layout.Cell", "arc.scene.ui.layout.Collapser", "arc.scene.ui.layout.HorizontalGroup", "arc.scene.ui.layout.Scl", "arc.scene.ui.layout.Stack", "arc.scene.ui.layout.Table", "arc.scene.ui.layout.Table$DrawRect", "arc.scene.ui.layout.VerticalGroup", "arc.scene.ui.layout.WidgetGroup", "arc.scene.utils.ArraySelection", "arc.scene.utils.Cullable", "arc.scene.utils.Disableable", "arc.scene.utils.DragAndDrop", "arc.scene.utils.DragAndDrop$Payload", "arc.scene.utils.DragAndDrop$Source", "arc.scene.utils.DragAndDrop$Target", "arc.scene.utils.Elements", "arc.scene.utils.Layout", "arc.scene.utils.Selection", "arc.struct.Array", "arc.struct.Array$ArrayIterable", "arc.struct.ArrayMap", "arc.struct.ArrayMap$Entries", "arc.struct.ArrayMap$Keys", "arc.struct.ArrayMap$Values", "arc.struct.AtomicQueue", "arc.struct.BinaryHeap", "arc.struct.BinaryHeap$Node", "arc.struct.Bits", "arc.struct.BooleanArray", "arc.struct.ByteArray", "arc.struct.CharArray", "arc.struct.ComparableTimSort", "arc.struct.DelayedRemovalArray", "arc.struct.EnumSet", "arc.struct.EnumSet$EnumSetIterator", "arc.struct.FloatArray", "arc.struct.GridBits", "arc.struct.GridMap", "arc.struct.IdentityMap", "arc.struct.IdentityMap$Entries", "arc.struct.IdentityMap$Entry", "arc.struct.IdentityMap$Keys", "arc.struct.IdentityMap$Values", "arc.struct.IntArray", "arc.struct.IntFloatMap", "arc.struct.IntFloatMap$Entries", "arc.struct.IntFloatMap$Entry", "arc.struct.IntFloatMap$Keys", "arc.struct.IntFloatMap$Values", "arc.struct.IntIntMap", "arc.struct.IntIntMap$Entries", "arc.struct.IntIntMap$Entry", "arc.struct.IntIntMap$Keys", "arc.struct.IntIntMap$Values", "arc.struct.IntMap", "arc.struct.IntMap$Entries", "arc.struct.IntMap$Entry", "arc.struct.IntMap$Keys", "arc.struct.IntMap$Values", "arc.struct.IntQueue", "arc.struct.IntSet", "arc.struct.IntSet$IntSetIterator", "arc.struct.LongArray", "arc.struct.LongMap", "arc.struct.LongMap$Entries", "arc.struct.LongMap$Entry", "arc.struct.LongMap$Keys", "arc.struct.LongMap$Values", "arc.struct.LongQueue", "arc.struct.ObjectFloatMap", "arc.struct.ObjectFloatMap$Entries", "arc.struct.ObjectFloatMap$Entry", "arc.struct.ObjectFloatMap$Keys", "arc.struct.ObjectFloatMap$Values", "arc.struct.ObjectIntMap", "arc.struct.ObjectIntMap$Entries", "arc.struct.ObjectIntMap$Entry", "arc.struct.ObjectIntMap$Keys", "arc.struct.ObjectIntMap$Values", "arc.struct.ObjectMap", "arc.struct.ObjectMap$Entries", "arc.struct.ObjectMap$Entry", "arc.struct.ObjectMap$Keys", "arc.struct.ObjectMap$Values", "arc.struct.ObjectSet", "arc.struct.ObjectSet$ObjectSetIterator", "arc.struct.OrderedMap", "arc.struct.OrderedMap$OrderedMapEntries", "arc.struct.OrderedMap$OrderedMapKeys", "arc.struct.OrderedMap$OrderedMapValues", "arc.struct.OrderedSet", "arc.struct.OrderedSet$OrderedSetIterator", "arc.struct.PooledLinkedList", "arc.struct.PooledLinkedList$Item", "arc.struct.Queue", "arc.struct.Queue$QueueIterable", "arc.struct.ShortArray", "arc.struct.SnapshotArray", "arc.struct.Sort", "arc.struct.SortedIntList", "arc.struct.SortedIntList$Iterator", "arc.struct.SortedIntList$Node", "arc.struct.StringMap", "arc.struct.TimSort", "arc.util.I18NBundle", "arc.util.Interval", "arc.util.Time", "java.io.DataInput", "java.io.DataInputStream", "java.io.DataOutput", "java.io.DataOutputStream", "java.io.PrintStream", "java.lang.Object", "java.lang.Runnable", "java.lang.String", "java.lang.System", "mindustry.Vars", "mindustry.ai.BlockIndexer", "mindustry.ai.Pathfinder", "mindustry.ai.Pathfinder$PathData", "mindustry.ai.Pathfinder$PathTarget", "mindustry.ai.Pathfinder$PathTileStruct", "mindustry.ai.WaveSpawner", "mindustry.content.Blocks", "mindustry.content.Bullets", "mindustry.content.Fx", "mindustry.content.Items", "mindustry.content.Liquids", "mindustry.content.Loadouts", "mindustry.content.Mechs", "mindustry.content.StatusEffects", "mindustry.content.TechTree", "mindustry.content.TechTree$TechNode", "mindustry.content.TypeIDs", "mindustry.content.UnitTypes", "mindustry.content.Zones", "mindustry.core.ContentLoader", "mindustry.core.Control", "mindustry.core.FileTree", "mindustry.core.GameState", "mindustry.core.GameState$State", "mindustry.core.Logic", "mindustry.core.NetServer$TeamAssigner", "mindustry.core.Platform", "mindustry.core.Renderer", "mindustry.core.UI", "mindustry.core.Version", "mindustry.core.World", "mindustry.core.World$Raycaster", "mindustry.ctype.Content", "mindustry.ctype.Content$ModContentInfo", "mindustry.ctype.ContentList", "mindustry.ctype.ContentType", "mindustry.ctype.MappableContent", "mindustry.ctype.UnlockableContent", "mindustry.editor.DrawOperation", "mindustry.editor.DrawOperation$OpType", "mindustry.editor.DrawOperation$TileOpStruct", "mindustry.editor.EditorTile", "mindustry.editor.EditorTool", "mindustry.editor.MapEditor", "mindustry.editor.MapEditor$Context", "mindustry.editor.MapEditorDialog", "mindustry.editor.MapGenerateDialog", "mindustry.editor.MapInfoDialog", "mindustry.editor.MapLoadDialog", "mindustry.editor.MapRenderer", "mindustry.editor.MapResizeDialog", "mindustry.editor.MapSaveDialog", "mindustry.editor.MapView", "mindustry.editor.OperationStack", "mindustry.editor.WaveInfoDialog", "mindustry.entities.Damage", "mindustry.entities.Damage$PropCellStruct", "mindustry.entities.Effects", "mindustry.entities.Effects$Effect", "mindustry.entities.Effects$EffectContainer", "mindustry.entities.Effects$EffectProvider", "mindustry.entities.Effects$EffectRenderer", "mindustry.entities.Effects$ScreenshakeProvider", "mindustry.entities.Entities", "mindustry.entities.EntityCollisions", "mindustry.entities.EntityGroup", "mindustry.entities.Predict", "mindustry.entities.TargetPriority", "mindustry.entities.Units", "mindustry.entities.bullet.ArtilleryBulletType", "mindustry.entities.bullet.BasicBulletType", "mindustry.entities.bullet.BombBulletType", "mindustry.entities.bullet.BulletType", "mindustry.entities.bullet.FlakBulletType", "mindustry.entities.bullet.HealBulletType", "mindustry.entities.bullet.LiquidBulletType", "mindustry.entities.bullet.MassDriverBolt", "mindustry.entities.bullet.MissileBulletType", "mindustry.entities.effect.Decal", "mindustry.entities.effect.Fire", "mindustry.entities.effect.GroundEffectEntity", "mindustry.entities.effect.GroundEffectEntity$GroundEffect", "mindustry.entities.effect.ItemTransfer", "mindustry.entities.effect.Lightning", "mindustry.entities.effect.Puddle", "mindustry.entities.effect.RubbleDecal", "mindustry.entities.effect.ScorchDecal", "mindustry.entities.traits.AbsorbTrait", "mindustry.entities.traits.BelowLiquidTrait", "mindustry.entities.traits.BuilderMinerTrait", "mindustry.entities.traits.BuilderTrait", "mindustry.entities.traits.BuilderTrait$BuildDataStatic", "mindustry.entities.traits.BuilderTrait$BuildRequest", "mindustry.entities.traits.DamageTrait", "mindustry.entities.traits.DrawTrait", "mindustry.entities.traits.Entity", "mindustry.entities.traits.HealthTrait", "mindustry.entities.traits.KillerTrait", "mindustry.entities.traits.MinerTrait", "mindustry.entities.traits.MoveTrait", "mindustry.entities.traits.SaveTrait", "mindustry.entities.traits.Saveable", "mindustry.entities.traits.ScaleTrait", "mindustry.entities.traits.ShooterTrait", "mindustry.entities.traits.SolidTrait", "mindustry.entities.traits.SpawnerTrait", "mindustry.entities.traits.SyncTrait", "mindustry.entities.traits.TargetTrait", "mindustry.entities.traits.TeamTrait", "mindustry.entities.traits.TimeTrait", "mindustry.entities.traits.TypeTrait", "mindustry.entities.traits.VelocityTrait", "mindustry.entities.type.BaseEntity", "mindustry.entities.type.BaseUnit", "mindustry.entities.type.Bullet", "mindustry.entities.type.DestructibleEntity", "mindustry.entities.type.EffectEntity", "mindustry.entities.type.Player", "mindustry.entities.type.SolidEntity", "mindustry.entities.type.TileEntity", "mindustry.entities.type.TimedEntity", "mindustry.entities.type.Unit", "mindustry.entities.type.base.BaseDrone", "mindustry.entities.type.base.BuilderDrone", "mindustry.entities.type.base.FlyingUnit", "mindustry.entities.type.base.GroundUnit", "mindustry.entities.type.base.HoverUnit", "mindustry.entities.type.base.MinerDrone", "mindustry.entities.type.base.RepairDrone", "mindustry.entities.units.StateMachine", "mindustry.entities.units.Statuses", "mindustry.entities.units.Statuses$StatusEntry", "mindustry.entities.units.UnitCommand", "mindustry.entities.units.UnitDrops", "mindustry.entities.units.UnitState", "mindustry.game.DefaultWaves", "mindustry.game.Difficulty", "mindustry.game.EventType", "mindustry.game.EventType$BlockBuildBeginEvent", "mindustry.game.EventType$BlockBuildEndEvent", "mindustry.game.EventType$BlockDestroyEvent", "mindustry.game.EventType$BlockInfoEvent", "mindustry.game.EventType$BuildSelectEvent", "mindustry.game.EventType$ClientLoadEvent", "mindustry.game.EventType$CommandIssueEvent", "mindustry.game.EventType$ContentReloadEvent", "mindustry.game.EventType$CoreItemDeliverEvent", "mindustry.game.EventType$DepositEvent", "mindustry.game.EventType$DisposeEvent", "mindustry.game.EventType$GameOverEvent", "mindustry.game.EventType$LaunchEvent", "mindustry.game.EventType$LaunchItemEvent", "mindustry.game.EventType$LineConfirmEvent", "mindustry.game.EventType$LoseEvent", "mindustry.game.EventType$MapMakeEvent", "mindustry.game.EventType$MapPublishEvent", "mindustry.game.EventType$MechChangeEvent", "mindustry.game.EventType$PlayEvent", "mindustry.game.EventType$PlayerBanEvent", "mindustry.game.EventType$PlayerChatEvent", "mindustry.game.EventType$PlayerConnect", "mindustry.game.EventType$PlayerIpBanEvent", "mindustry.game.EventType$PlayerIpUnbanEvent", "mindustry.game.EventType$PlayerJoin", "mindustry.game.EventType$PlayerLeave", "mindustry.game.EventType$PlayerUnbanEvent", "mindustry.game.EventType$ResearchEvent", "mindustry.game.EventType$ResetEvent", "mindustry.game.EventType$ResizeEvent", "mindustry.game.EventType$ServerLoadEvent", "mindustry.game.EventType$StateChangeEvent", "mindustry.game.EventType$TapConfigEvent", "mindustry.game.EventType$TapEvent", "mindustry.game.EventType$TileChangeEvent", "mindustry.game.EventType$Trigger", "mindustry.game.EventType$TurretAmmoDeliverEvent", "mindustry.game.EventType$UnitCreateEvent", "mindustry.game.EventType$UnitDestroyEvent", "mindustry.game.EventType$UnlockEvent", "mindustry.game.EventType$WaveEvent", "mindustry.game.EventType$WinEvent", "mindustry.game.EventType$WithdrawEvent", "mindustry.game.EventType$WorldLoadEvent", "mindustry.game.EventType$ZoneConfigureCompleteEvent", "mindustry.game.EventType$ZoneRequireCompleteEvent", "mindustry.game.Gamemode", "mindustry.game.GlobalData", "mindustry.game.LoopControl", "mindustry.game.MusicControl", "mindustry.game.Objective", "mindustry.game.Objectives", "mindustry.game.Objectives$Launched", "mindustry.game.Objectives$Unlock", "mindustry.game.Objectives$Wave", "mindustry.game.Objectives$ZoneObjective", "mindustry.game.Objectives$ZoneWave", "mindustry.game.Rules", "mindustry.game.Saves", "mindustry.game.Saves$SaveSlot", "mindustry.game.Schematic", "mindustry.game.Schematic$Stile", "mindustry.game.Schematics", "mindustry.game.SoundLoop", "mindustry.game.SpawnGroup", "mindustry.game.Stats", "mindustry.game.Stats$Rank", "mindustry.game.Stats$RankResult", "mindustry.game.Team", "mindustry.game.Teams", "mindustry.game.Teams$BrokenBlock", "mindustry.game.Teams$TeamData", "mindustry.game.Tutorial", "mindustry.game.Tutorial$TutorialStage", "mindustry.gen.BufferItem", "mindustry.gen.Call", "mindustry.gen.Call", "mindustry.gen.Icon", "mindustry.gen.Icon", "mindustry.gen.MethodHash", "mindustry.gen.Musics", "mindustry.gen.Musics", "mindustry.gen.PathTile", "mindustry.gen.PropCell", "mindustry.gen.RemoteReadClient", "mindustry.gen.RemoteReadServer", "mindustry.gen.Serialization", "mindustry.gen.Sounds", "mindustry.gen.Sounds", "mindustry.gen.Tex", "mindustry.gen.Tex", "mindustry.gen.TileOp", "mindustry.graphics.BlockRenderer", "mindustry.graphics.Bloom", "mindustry.graphics.CacheLayer", "mindustry.graphics.Drawf", "mindustry.graphics.FloorRenderer", "mindustry.graphics.IndexedRenderer", "mindustry.graphics.Layer", "mindustry.graphics.LightRenderer", "mindustry.graphics.MenuRenderer", "mindustry.graphics.MinimapRenderer", "mindustry.graphics.MultiPacker", "mindustry.graphics.MultiPacker$PageType", "mindustry.graphics.OverlayRenderer", "mindustry.graphics.Pal", "mindustry.graphics.Pixelator", "mindustry.graphics.Shaders", "mindustry.input.Binding", "mindustry.input.DesktopInput", "mindustry.input.InputHandler", "mindustry.input.InputHandler$PlaceLine", "mindustry.input.MobileInput", "mindustry.input.PlaceMode", "mindustry.input.Placement", "mindustry.input.Placement$DistanceHeuristic", "mindustry.input.Placement$NormalizeDrawResult", "mindustry.input.Placement$NormalizeResult", "mindustry.input.Placement$TileHueristic", "mindustry.maps.Map", "mindustry.maps.Maps", "mindustry.maps.Maps$MapProvider", "mindustry.maps.Maps$ShuffleMode", "mindustry.maps.Maps$ShuffleMode", "mindustry.maps.filters.BlendFilter", "mindustry.maps.filters.ClearFilter", "mindustry.maps.filters.DistortFilter", "mindustry.maps.filters.FilterOption", "mindustry.maps.filters.FilterOption$BlockOption", "mindustry.maps.filters.FilterOption$SliderOption", "mindustry.maps.filters.GenerateFilter", "mindustry.maps.filters.GenerateFilter$GenerateInput", "mindustry.maps.filters.GenerateFilter$GenerateInput$TileProvider", "mindustry.maps.filters.MedianFilter", "mindustry.maps.filters.MirrorFilter", "mindustry.maps.filters.NoiseFilter", "mindustry.maps.filters.OreFilter", "mindustry.maps.filters.OreMedianFilter", "mindustry.maps.filters.RiverNoiseFilter", "mindustry.maps.filters.ScatterFilter", "mindustry.maps.filters.TerrainFilter", "mindustry.maps.generators.BasicGenerator", "mindustry.maps.generators.BasicGenerator$DistanceHeuristic", "mindustry.maps.generators.BasicGenerator$TileHueristic", "mindustry.maps.generators.Generator", "mindustry.maps.generators.MapGenerator", "mindustry.maps.generators.MapGenerator$Decoration", "mindustry.maps.generators.RandomGenerator", "mindustry.maps.zonegen.DesertWastesGenerator", "mindustry.maps.zonegen.OvergrowthGenerator", "mindustry.type.Category", "mindustry.type.ErrorContent", "mindustry.type.Item", "mindustry.type.ItemStack", "mindustry.type.ItemType", "mindustry.type.Liquid", "mindustry.type.LiquidStack", "mindustry.type.Mech", "mindustry.type.Publishable", "mindustry.type.StatusEffect", "mindustry.type.StatusEffect$TransitionHandler", "mindustry.type.TypeID", "mindustry.type.UnitType", "mindustry.type.Weapon", "mindustry.type.WeatherEvent", "mindustry.type.Zone", "mindustry.ui.Bar", "mindustry.ui.BorderImage", "mindustry.ui.Cicon", "mindustry.ui.ContentDisplay", "mindustry.ui.Fonts", "mindustry.ui.GridImage", "mindustry.ui.IconSize", "mindustry.ui.IntFormat", "mindustry.ui.ItemDisplay", "mindustry.ui.ItemImage", "mindustry.ui.ItemsDisplay", "mindustry.ui.Links", "mindustry.ui.Links$LinkEntry", "mindustry.ui.LiquidDisplay", "mindustry.ui.Minimap", "mindustry.ui.MobileButton", "mindustry.ui.MultiReqImage", "mindustry.ui.ReqImage", "mindustry.ui.Styles", "mindustry.ui.dialogs.AboutDialog", "mindustry.ui.dialogs.AdminsDialog", "mindustry.ui.dialogs.BansDialog", "mindustry.ui.dialogs.ColorPicker", "mindustry.ui.dialogs.ContentInfoDialog", "mindustry.ui.dialogs.ControlsDialog", "mindustry.ui.dialogs.CustomGameDialog", "mindustry.ui.dialogs.CustomRulesDialog", "mindustry.ui.dialogs.DatabaseDialog", "mindustry.ui.dialogs.DeployDialog", "mindustry.ui.dialogs.DeployDialog$View", "mindustry.ui.dialogs.DeployDialog$ZoneNode", "mindustry.ui.dialogs.DiscordDialog", "mindustry.ui.dialogs.FileChooser", "mindustry.ui.dialogs.FileChooser$FileHistory", "mindustry.ui.dialogs.FloatingDialog", "mindustry.ui.dialogs.GameOverDialog", "mindustry.ui.dialogs.HostDialog", "mindustry.ui.dialogs.JoinDialog", "mindustry.ui.dialogs.JoinDialog$Server", "mindustry.ui.dialogs.LanguageDialog", "mindustry.ui.dialogs.LoadDialog", "mindustry.ui.dialogs.LoadoutDialog", "mindustry.ui.dialogs.MapPlayDialog", "mindustry.ui.dialogs.MapsDialog", "mindustry.ui.dialogs.MinimapDialog", "mindustry.ui.dialogs.ModsDialog", "mindustry.ui.dialogs.PaletteDialog", "mindustry.ui.dialogs.PausedDialog", "mindustry.ui.dialogs.SaveDialog", "mindustry.ui.dialogs.SchematicsDialog", "mindustry.ui.dialogs.SchematicsDialog$SchematicImage", "mindustry.ui.dialogs.SchematicsDialog$SchematicInfoDialog", "mindustry.ui.dialogs.SettingsMenuDialog", "mindustry.ui.dialogs.TechTreeDialog", "mindustry.ui.dialogs.TechTreeDialog$LayoutNode", "mindustry.ui.dialogs.TechTreeDialog$TechTreeNode", "mindustry.ui.dialogs.TechTreeDialog$View", "mindustry.ui.dialogs.TraceDialog", "mindustry.ui.dialogs.ZoneInfoDialog", "mindustry.ui.fragments.BlockConfigFragment", "mindustry.ui.fragments.BlockInventoryFragment", "mindustry.ui.fragments.ChatFragment", "mindustry.ui.fragments.FadeInFragment", "mindustry.ui.fragments.Fragment", "mindustry.ui.fragments.HudFragment", "mindustry.ui.fragments.LoadingFragment", "mindustry.ui.fragments.MenuFragment", "mindustry.ui.fragments.OverlayFragment", "mindustry.ui.fragments.PlacementFragment", "mindustry.ui.fragments.PlayerListFragment", "mindustry.ui.fragments.ScriptConsoleFragment", "mindustry.ui.layout.BranchTreeLayout", "mindustry.ui.layout.BranchTreeLayout$TreeAlignment", "mindustry.ui.layout.BranchTreeLayout$TreeLocation", "mindustry.ui.layout.RadialTreeLayout", "mindustry.ui.layout.TreeLayout", "mindustry.ui.layout.TreeLayout$TreeNode", "mindustry.world.Block", "mindustry.world.BlockStorage", "mindustry.world.Build", "mindustry.world.CachedTile", "mindustry.world.DirectionalItemBuffer", "mindustry.world.DirectionalItemBuffer$BufferItemStruct", "mindustry.world.Edges", "mindustry.world.ItemBuffer", "mindustry.world.LegacyColorMapper", "mindustry.world.LegacyColorMapper$LegacyBlock", "mindustry.world.Pos", "mindustry.world.StaticTree", "mindustry.world.Tile", "mindustry.world.WorldContext", "mindustry.world.blocks.Attributes", "mindustry.world.blocks.Autotiler", "mindustry.world.blocks.Autotiler$AutotilerHolder", "mindustry.world.blocks.BlockPart", "mindustry.world.blocks.BuildBlock", "mindustry.world.blocks.BuildBlock$BuildEntity", "mindustry.world.blocks.DoubleOverlayFloor", "mindustry.world.blocks.Floor", "mindustry.world.blocks.ItemSelection", "mindustry.world.blocks.LiquidBlock", "mindustry.world.blocks.OreBlock", "mindustry.world.blocks.OverlayFloor", "mindustry.world.blocks.PowerBlock", "mindustry.world.blocks.RespawnBlock", "mindustry.world.blocks.Rock", "mindustry.world.blocks.StaticWall", "mindustry.world.blocks.TreeBlock", "mindustry.world.blocks.defense.DeflectorWall", "mindustry.world.blocks.defense.DeflectorWall$DeflectorEntity", "mindustry.world.blocks.defense.Door", "mindustry.world.blocks.defense.Door$DoorEntity", "mindustry.world.blocks.defense.ForceProjector", "mindustry.world.blocks.defense.ForceProjector$ForceEntity", "mindustry.world.blocks.defense.ForceProjector$ShieldEntity", "mindustry.world.blocks.defense.MendProjector", "mindustry.world.blocks.defense.MendProjector$MendEntity", "mindustry.world.blocks.defense.OverdriveProjector", "mindustry.world.blocks.defense.OverdriveProjector$OverdriveEntity", "mindustry.world.blocks.defense.ShockMine", "mindustry.world.blocks.defense.SurgeWall", "mindustry.world.blocks.defense.Wall", "mindustry.world.blocks.defense.turrets.ArtilleryTurret", "mindustry.world.blocks.defense.turrets.BurstTurret", "mindustry.world.blocks.defense.turrets.ChargeTurret", "mindustry.world.blocks.defense.turrets.ChargeTurret$LaserTurretEntity", "mindustry.world.blocks.defense.turrets.CooledTurret", "mindustry.world.blocks.defense.turrets.DoubleTurret", "mindustry.world.blocks.defense.turrets.ItemTurret", "mindustry.world.blocks.defense.turrets.ItemTurret$ItemEntry", "mindustry.world.blocks.defense.turrets.ItemTurret$ItemTurretEntity", "mindustry.world.blocks.defense.turrets.LaserTurret", "mindustry.world.blocks.defense.turrets.LaserTurret$LaserTurretEntity", "mindustry.world.blocks.defense.turrets.LiquidTurret", "mindustry.world.blocks.defense.turrets.PowerTurret", "mindustry.world.blocks.defense.turrets.Turret", "mindustry.world.blocks.defense.turrets.Turret$AmmoEntry", "mindustry.world.blocks.defense.turrets.Turret$TurretEntity", "mindustry.world.blocks.distribution.ArmoredConveyor", "mindustry.world.blocks.distribution.BufferedItemBridge", "mindustry.world.blocks.distribution.BufferedItemBridge$BufferedItemBridgeEntity", "mindustry.world.blocks.distribution.Conveyor", "mindustry.world.blocks.distribution.Conveyor$ConveyorEntity", "mindustry.world.blocks.distribution.Conveyor$ItemPos", "mindustry.world.blocks.distribution.ExtendingItemBridge", "mindustry.world.blocks.distribution.ItemBridge", "mindustry.world.blocks.distribution.ItemBridge$ItemBridgeEntity", "mindustry.world.blocks.distribution.Junction", "mindustry.world.blocks.distribution.Junction$JunctionEntity", "mindustry.world.blocks.distribution.MassDriver", "mindustry.world.blocks.distribution.MassDriver$DriverBulletData", "mindustry.world.blocks.distribution.MassDriver$DriverState", "mindustry.world.blocks.distribution.MassDriver$MassDriverEntity", "mindustry.world.blocks.distribution.OverflowGate", "mindustry.world.blocks.distribution.OverflowGate$OverflowGateEntity", "mindustry.world.blocks.distribution.Router", "mindustry.world.blocks.distribution.Router$RouterEntity", "mindustry.world.blocks.distribution.Sorter", "mindustry.world.blocks.distribution.Sorter$SorterEntity", "mindustry.world.blocks.liquid.ArmoredConduit", "mindustry.world.blocks.liquid.Conduit", "mindustry.world.blocks.liquid.Conduit$ConduitEntity", "mindustry.world.blocks.liquid.LiquidBridge", "mindustry.world.blocks.liquid.LiquidExtendingBridge", "mindustry.world.blocks.liquid.LiquidJunction", "mindustry.world.blocks.liquid.LiquidOverflowGate", "mindustry.world.blocks.liquid.LiquidRouter", "mindustry.world.blocks.liquid.LiquidTank", "mindustry.world.blocks.logic.LogicBlock", "mindustry.world.blocks.logic.MessageBlock", "mindustry.world.blocks.logic.MessageBlock$MessageBlockEntity", "mindustry.world.blocks.power.Battery", "mindustry.world.blocks.power.BurnerGenerator", "mindustry.world.blocks.power.ConditionalConsumePower", "mindustry.world.blocks.power.DecayGenerator", "mindustry.world.blocks.power.ImpactReactor", "mindustry.world.blocks.power.ImpactReactor$FusionReactorEntity", "mindustry.world.blocks.power.ItemLiquidGenerator", "mindustry.world.blocks.power.ItemLiquidGenerator$ItemLiquidGeneratorEntity", "mindustry.world.blocks.power.LightBlock", "mindustry.world.blocks.power.LightBlock$LightEntity", "mindustry.world.blocks.power.NuclearReactor", "mindustry.world.blocks.power.NuclearReactor$NuclearReactorEntity", "mindustry.world.blocks.power.PowerDiode", "mindustry.world.blocks.power.PowerDistributor", "mindustry.world.blocks.power.PowerGenerator", "mindustry.world.blocks.power.PowerGenerator$GeneratorEntity", "mindustry.world.blocks.power.PowerGraph", "mindustry.world.blocks.power.PowerNode", "mindustry.world.blocks.power.SingleTypeGenerator", "mindustry.world.blocks.power.SolarGenerator", "mindustry.world.blocks.power.ThermalGenerator", "mindustry.world.blocks.production.Cultivator", "mindustry.world.blocks.production.Cultivator$CultivatorEntity", "mindustry.world.blocks.production.Drill", "mindustry.world.blocks.production.Drill$DrillEntity", "mindustry.world.blocks.production.Fracker", "mindustry.world.blocks.production.Fracker$FrackerEntity", "mindustry.world.blocks.production.GenericCrafter", "mindustry.world.blocks.production.GenericCrafter$GenericCrafterEntity", "mindustry.world.blocks.production.GenericSmelter", "mindustry.world.blocks.production.Incinerator", "mindustry.world.blocks.production.Incinerator$IncineratorEntity", "mindustry.world.blocks.production.LiquidConverter", "mindustry.world.blocks.production.Pump", "mindustry.world.blocks.production.Separator", "mindustry.world.blocks.production.SolidPump", "mindustry.world.blocks.production.SolidPump$SolidPumpEntity", "mindustry.world.blocks.sandbox.ItemSource", "mindustry.world.blocks.sandbox.ItemSource$ItemSourceEntity", "mindustry.world.blocks.sandbox.ItemVoid", "mindustry.world.blocks.sandbox.LiquidSource", "mindustry.world.blocks.sandbox.LiquidSource$LiquidSourceEntity", "mindustry.world.blocks.sandbox.PowerSource", "mindustry.world.blocks.sandbox.PowerVoid", "mindustry.world.blocks.storage.CoreBlock", "mindustry.world.blocks.storage.CoreBlock$CoreEntity", "mindustry.world.blocks.storage.LaunchPad", "mindustry.world.blocks.storage.StorageBlock", "mindustry.world.blocks.storage.StorageBlock$StorageBlockEntity", "mindustry.world.blocks.storage.Unloader", "mindustry.world.blocks.storage.Unloader$UnloaderEntity", "mindustry.world.blocks.storage.Vault", "mindustry.world.blocks.units.CommandCenter", "mindustry.world.blocks.units.CommandCenter$CommandCenterEntity", "mindustry.world.blocks.units.MechPad", "mindustry.world.blocks.units.MechPad$MechFactoryEntity", "mindustry.world.blocks.units.RallyPoint", "mindustry.world.blocks.units.RepairPoint", "mindustry.world.blocks.units.RepairPoint$RepairPointEntity", "mindustry.world.blocks.units.UnitFactory", "mindustry.world.blocks.units.UnitFactory$UnitFactoryEntity", "mindustry.world.consumers.Consume", "mindustry.world.consumers.ConsumeItemFilter", "mindustry.world.consumers.ConsumeItems", "mindustry.world.consumers.ConsumeLiquid", "mindustry.world.consumers.ConsumeLiquidBase", "mindustry.world.consumers.ConsumeLiquidFilter", "mindustry.world.consumers.ConsumePower", "mindustry.world.consumers.ConsumeType", "mindustry.world.consumers.Consumers", "mindustry.world.meta.Attribute", "mindustry.world.meta.BlockBars", "mindustry.world.meta.BlockFlag", "mindustry.world.meta.BlockGroup", "mindustry.world.meta.BlockStat", "mindustry.world.meta.BlockStats", "mindustry.world.meta.BuildVisibility", "mindustry.world.meta.PowerType", "mindustry.world.meta.Producers", "mindustry.world.meta.StatCategory", "mindustry.world.meta.StatUnit", "mindustry.world.meta.StatValue", "mindustry.world.meta.values.AmmoListValue", "mindustry.world.meta.values.BooleanValue", "mindustry.world.meta.values.BoosterListValue", "mindustry.world.meta.values.ItemFilterValue", "mindustry.world.meta.values.ItemListValue", "mindustry.world.meta.values.LiquidFilterValue", "mindustry.world.meta.values.LiquidValue", "mindustry.world.meta.values.NumberValue", "mindustry.world.meta.values.StringValue", "mindustry.world.modules.BlockModule", "mindustry.world.modules.ConsumeModule", "mindustry.world.modules.ItemModule", "mindustry.world.modules.ItemModule$ItemCalculator", "mindustry.world.modules.ItemModule$ItemConsumer", "mindustry.world.modules.LiquidModule", "mindustry.world.modules.LiquidModule$LiquidCalculator", "mindustry.world.modules.LiquidModule$LiquidConsumer", "mindustry.world.modules.PowerModule", "mindustry.world.producers.Produce", "mindustry.world.producers.ProduceItem"); + public static final ObjectSet allowedClassNames = ObjectSet.with("arc.Core", "arc.func.Boolc", "arc.func.Boolf", "arc.func.Boolf2", "arc.func.Boolp", "arc.func.Cons", "arc.func.Cons2", "arc.func.Floatc", "arc.func.Floatc2", "arc.func.Floatc4", "arc.func.Floatf", "arc.func.Floatp", "arc.func.Func", "arc.func.Func2", "arc.func.Func3", "arc.func.Intc", "arc.func.Intc2", "arc.func.Intc4", "arc.func.Intf", "arc.func.Intp", "arc.func.Prov", "arc.graphics.Color", "arc.graphics.Pixmap", "arc.graphics.Texture", "arc.graphics.TextureData", "arc.graphics.g2d.Draw", "arc.graphics.g2d.Fill", "arc.graphics.g2d.Lines", "arc.graphics.g2d.TextureAtlas", "arc.graphics.g2d.TextureAtlas$AtlasRegion", "arc.graphics.g2d.TextureRegion", "arc.math.Affine2", "arc.math.Angles", "arc.math.Angles", "arc.math.Angles$ParticleConsumer", "arc.math.CumulativeDistribution", "arc.math.CumulativeDistribution$CumulativeValue", "arc.math.DelaunayTriangulator", "arc.math.EarClippingTriangulator", "arc.math.Extrapolator", "arc.math.FloatCounter", "arc.math.Interpolation", "arc.math.Interpolation$Bounce", "arc.math.Interpolation$BounceIn", "arc.math.Interpolation$BounceOut", "arc.math.Interpolation$Elastic", "arc.math.Interpolation$ElasticIn", "arc.math.Interpolation$ElasticOut", "arc.math.Interpolation$Exp", "arc.math.Interpolation$ExpIn", "arc.math.Interpolation$ExpOut", "arc.math.Interpolation$Pow", "arc.math.Interpolation$PowIn", "arc.math.Interpolation$PowOut", "arc.math.Interpolation$Swing", "arc.math.Interpolation$SwingIn", "arc.math.Interpolation$SwingOut", "arc.math.Mathf", "arc.math.Mathf", "arc.math.Matrix3", "arc.math.WindowedMean", "arc.math.geom.BSpline", "arc.math.geom.Bezier", "arc.math.geom.Bresenham2", "arc.math.geom.CatmullRomSpline", "arc.math.geom.Circle", "arc.math.geom.ConvexHull", "arc.math.geom.Ellipse", "arc.math.geom.FixedPosition", "arc.math.geom.Geometry", "arc.math.geom.Geometry$Raycaster", "arc.math.geom.Geometry$SolidChecker", "arc.math.geom.Intersector", "arc.math.geom.Intersector$MinimumTranslationVector", "arc.math.geom.Path", "arc.math.geom.Point2", "arc.math.geom.Point3", "arc.math.geom.Polygon", "arc.math.geom.Polyline", "arc.math.geom.Position", "arc.math.geom.QuadTree", "arc.math.geom.QuadTree$QuadTreeObject", "arc.math.geom.Rect", "arc.math.geom.Shape2D", "arc.math.geom.Spring1D", "arc.math.geom.Spring2D", "arc.math.geom.Vec2", "arc.math.geom.Vec3", "arc.math.geom.Vector", "arc.scene.Action", "arc.scene.Element", "arc.scene.Group", "arc.scene.Scene", "arc.scene.actions.Actions", "arc.scene.actions.AddAction", "arc.scene.actions.AddListenerAction", "arc.scene.actions.AfterAction", "arc.scene.actions.AlphaAction", "arc.scene.actions.ColorAction", "arc.scene.actions.DelayAction", "arc.scene.actions.DelegateAction", "arc.scene.actions.FloatAction", "arc.scene.actions.IntAction", "arc.scene.actions.LayoutAction", "arc.scene.actions.MoveByAction", "arc.scene.actions.MoveToAction", "arc.scene.actions.OriginAction", "arc.scene.actions.ParallelAction", "arc.scene.actions.RelativeTemporalAction", "arc.scene.actions.RemoveAction", "arc.scene.actions.RemoveActorAction", "arc.scene.actions.RemoveListenerAction", "arc.scene.actions.RepeatAction", "arc.scene.actions.RotateByAction", "arc.scene.actions.RotateToAction", "arc.scene.actions.RunnableAction", "arc.scene.actions.ScaleByAction", "arc.scene.actions.ScaleToAction", "arc.scene.actions.SequenceAction", "arc.scene.actions.SizeByAction", "arc.scene.actions.SizeToAction", "arc.scene.actions.TemporalAction", "arc.scene.actions.TimeScaleAction", "arc.scene.actions.TouchableAction", "arc.scene.actions.TranslateByAction", "arc.scene.actions.VisibleAction", "arc.scene.event.ChangeListener", "arc.scene.event.ChangeListener$ChangeEvent", "arc.scene.event.ClickListener", "arc.scene.event.DragListener", "arc.scene.event.DragScrollListener", "arc.scene.event.ElementGestureListener", "arc.scene.event.EventListener", "arc.scene.event.FocusListener", "arc.scene.event.FocusListener$FocusEvent", "arc.scene.event.FocusListener$FocusEvent$Type", "arc.scene.event.HandCursorListener", "arc.scene.event.IbeamCursorListener", "arc.scene.event.InputEvent", "arc.scene.event.InputEvent$Type", "arc.scene.event.InputListener", "arc.scene.event.SceneEvent", "arc.scene.event.Touchable", "arc.scene.event.VisibilityEvent", "arc.scene.event.VisibilityListener", "arc.scene.style.BaseDrawable", "arc.scene.style.Drawable", "arc.scene.style.NinePatchDrawable", "arc.scene.style.ScaledNinePatchDrawable", "arc.scene.style.Style", "arc.scene.style.TextureRegionDrawable", "arc.scene.style.TiledDrawable", "arc.scene.style.TransformDrawable", "arc.scene.ui.Button", "arc.scene.ui.Button$ButtonStyle", "arc.scene.ui.ButtonGroup", "arc.scene.ui.CheckBox", "arc.scene.ui.CheckBox$CheckBoxStyle", "arc.scene.ui.ColorImage", "arc.scene.ui.Dialog", "arc.scene.ui.Dialog$DialogStyle", "arc.scene.ui.Image", "arc.scene.ui.ImageButton", "arc.scene.ui.ImageButton$ImageButtonStyle", "arc.scene.ui.KeybindDialog", "arc.scene.ui.KeybindDialog$KeybindDialogStyle", "arc.scene.ui.Label", "arc.scene.ui.Label$LabelStyle", "arc.scene.ui.ProgressBar", "arc.scene.ui.ProgressBar$ProgressBarStyle", "arc.scene.ui.ScrollPane", "arc.scene.ui.ScrollPane$ScrollPaneStyle", "arc.scene.ui.SettingsDialog", "arc.scene.ui.SettingsDialog$SettingsTable", "arc.scene.ui.SettingsDialog$SettingsTable$CheckSetting", "arc.scene.ui.SettingsDialog$SettingsTable$Setting", "arc.scene.ui.SettingsDialog$SettingsTable$SliderSetting", "arc.scene.ui.SettingsDialog$StringProcessor", "arc.scene.ui.Slider", "arc.scene.ui.Slider$SliderStyle", "arc.scene.ui.TextArea", "arc.scene.ui.TextArea$TextAreaListener", "arc.scene.ui.TextButton", "arc.scene.ui.TextButton$TextButtonStyle", "arc.scene.ui.TextField", "arc.scene.ui.TextField$DefaultOnscreenKeyboard", "arc.scene.ui.TextField$OnscreenKeyboard", "arc.scene.ui.TextField$TextFieldClickListener", "arc.scene.ui.TextField$TextFieldFilter", "arc.scene.ui.TextField$TextFieldListener", "arc.scene.ui.TextField$TextFieldStyle", "arc.scene.ui.TextField$TextFieldValidator", "arc.scene.ui.Tooltip", "arc.scene.ui.Tooltip$Tooltips", "arc.scene.ui.Touchpad", "arc.scene.ui.Touchpad$TouchpadStyle", "arc.scene.ui.TreeElement", "arc.scene.ui.TreeElement$Node", "arc.scene.ui.TreeElement$TreeStyle", "arc.scene.ui.layout.Cell", "arc.scene.ui.layout.Collapser", "arc.scene.ui.layout.HorizontalGroup", "arc.scene.ui.layout.Scl", "arc.scene.ui.layout.Stack", "arc.scene.ui.layout.Table", "arc.scene.ui.layout.Table$DrawRect", "arc.scene.ui.layout.VerticalGroup", "arc.scene.ui.layout.WidgetGroup", "arc.scene.utils.ArraySelection", "arc.scene.utils.Cullable", "arc.scene.utils.Disableable", "arc.scene.utils.DragAndDrop", "arc.scene.utils.DragAndDrop$Payload", "arc.scene.utils.DragAndDrop$Source", "arc.scene.utils.DragAndDrop$Target", "arc.scene.utils.Elements", "arc.scene.utils.Layout", "arc.scene.utils.Selection", "arc.struct.Array", "arc.struct.Array$ArrayIterable", "arc.struct.ArrayMap", "arc.struct.ArrayMap$Entries", "arc.struct.ArrayMap$Keys", "arc.struct.ArrayMap$Values", "arc.struct.AtomicQueue", "arc.struct.BinaryHeap", "arc.struct.BinaryHeap$Node", "arc.struct.Bits", "arc.struct.BooleanArray", "arc.struct.ByteArray", "arc.struct.CharArray", "arc.struct.ComparableTimSort", "arc.struct.DelayedRemovalArray", "arc.struct.EnumSet", "arc.struct.EnumSet$EnumSetIterator", "arc.struct.FloatArray", "arc.struct.GridBits", "arc.struct.GridMap", "arc.struct.IdentityMap", "arc.struct.IdentityMap$Entries", "arc.struct.IdentityMap$Entry", "arc.struct.IdentityMap$Keys", "arc.struct.IdentityMap$Values", "arc.struct.IntArray", "arc.struct.IntFloatMap", "arc.struct.IntFloatMap$Entries", "arc.struct.IntFloatMap$Entry", "arc.struct.IntFloatMap$Keys", "arc.struct.IntFloatMap$Values", "arc.struct.IntIntMap", "arc.struct.IntIntMap$Entries", "arc.struct.IntIntMap$Entry", "arc.struct.IntIntMap$Keys", "arc.struct.IntIntMap$Values", "arc.struct.IntMap", "arc.struct.IntMap$Entries", "arc.struct.IntMap$Entry", "arc.struct.IntMap$Keys", "arc.struct.IntMap$Values", "arc.struct.IntQueue", "arc.struct.IntSet", "arc.struct.IntSet$IntSetIterator", "arc.struct.LongArray", "arc.struct.LongMap", "arc.struct.LongMap$Entries", "arc.struct.LongMap$Entry", "arc.struct.LongMap$Keys", "arc.struct.LongMap$Values", "arc.struct.LongQueue", "arc.struct.ObjectFloatMap", "arc.struct.ObjectFloatMap$Entries", "arc.struct.ObjectFloatMap$Entry", "arc.struct.ObjectFloatMap$Keys", "arc.struct.ObjectFloatMap$Values", "arc.struct.ObjectIntMap", "arc.struct.ObjectIntMap$Entries", "arc.struct.ObjectIntMap$Entry", "arc.struct.ObjectIntMap$Keys", "arc.struct.ObjectIntMap$Values", "arc.struct.ObjectMap", "arc.struct.ObjectMap$Entries", "arc.struct.ObjectMap$Entry", "arc.struct.ObjectMap$Keys", "arc.struct.ObjectMap$Values", "arc.struct.ObjectSet", "arc.struct.ObjectSet$ObjectSetIterator", "arc.struct.OrderedMap", "arc.struct.OrderedMap$OrderedMapEntries", "arc.struct.OrderedMap$OrderedMapKeys", "arc.struct.OrderedMap$OrderedMapValues", "arc.struct.OrderedSet", "arc.struct.OrderedSet$OrderedSetIterator", "arc.struct.PooledLinkedList", "arc.struct.PooledLinkedList$Item", "arc.struct.Queue", "arc.struct.Queue$QueueIterable", "arc.struct.ShortArray", "arc.struct.SnapshotArray", "arc.struct.Sort", "arc.struct.SortedIntList", "arc.struct.SortedIntList$Iterator", "arc.struct.SortedIntList$Node", "arc.struct.StringMap", "arc.struct.TimSort", "arc.util.I18NBundle", "arc.util.Interval", "arc.util.Time", "java.io.DataInput", "java.io.DataInputStream", "java.io.DataOutput", "java.io.DataOutputStream", "java.io.PrintStream", "java.lang.Boolean", "java.lang.Byte", "java.lang.Character", "java.lang.Double", "java.lang.Float", "java.lang.Integer", "java.lang.Long", "java.lang.Object", "java.lang.Runnable", "java.lang.Short", "java.lang.String", "java.lang.System", "mindustry.Vars", "mindustry.ai.BlockIndexer", "mindustry.ai.Pathfinder", "mindustry.ai.Pathfinder$PathData", "mindustry.ai.Pathfinder$PathTarget", "mindustry.ai.Pathfinder$PathTileStruct", "mindustry.ai.WaveSpawner", "mindustry.content.Blocks", "mindustry.content.Bullets", "mindustry.content.Fx", "mindustry.content.Items", "mindustry.content.Liquids", "mindustry.content.Loadouts", "mindustry.content.Mechs", "mindustry.content.StatusEffects", "mindustry.content.TechTree", "mindustry.content.TechTree$TechNode", "mindustry.content.TypeIDs", "mindustry.content.UnitTypes", "mindustry.content.Zones", "mindustry.core.ContentLoader", "mindustry.core.Control", "mindustry.core.FileTree", "mindustry.core.GameState", "mindustry.core.GameState$State", "mindustry.core.Logic", "mindustry.core.NetServer$TeamAssigner", "mindustry.core.Platform", "mindustry.core.Renderer", "mindustry.core.UI", "mindustry.core.Version", "mindustry.core.World", "mindustry.core.World$Raycaster", "mindustry.ctype.Content", "mindustry.ctype.Content$ModContentInfo", "mindustry.ctype.ContentList", "mindustry.ctype.ContentType", "mindustry.ctype.MappableContent", "mindustry.ctype.UnlockableContent", "mindustry.editor.DrawOperation", "mindustry.editor.DrawOperation$OpType", "mindustry.editor.DrawOperation$TileOpStruct", "mindustry.editor.EditorTile", "mindustry.editor.EditorTool", "mindustry.editor.MapEditor", "mindustry.editor.MapEditor$Context", "mindustry.editor.MapEditorDialog", "mindustry.editor.MapGenerateDialog", "mindustry.editor.MapInfoDialog", "mindustry.editor.MapLoadDialog", "mindustry.editor.MapRenderer", "mindustry.editor.MapResizeDialog", "mindustry.editor.MapSaveDialog", "mindustry.editor.MapView", "mindustry.editor.OperationStack", "mindustry.editor.WaveInfoDialog", "mindustry.entities.Damage", "mindustry.entities.Damage$PropCellStruct", "mindustry.entities.Effects", "mindustry.entities.Effects$Effect", "mindustry.entities.Effects$EffectContainer", "mindustry.entities.Effects$EffectProvider", "mindustry.entities.Effects$EffectRenderer", "mindustry.entities.Effects$ScreenshakeProvider", "mindustry.entities.Entities", "mindustry.entities.EntityCollisions", "mindustry.entities.EntityGroup", "mindustry.entities.Predict", "mindustry.entities.TargetPriority", "mindustry.entities.Units", "mindustry.entities.bullet.ArtilleryBulletType", "mindustry.entities.bullet.BasicBulletType", "mindustry.entities.bullet.BombBulletType", "mindustry.entities.bullet.BulletType", "mindustry.entities.bullet.FlakBulletType", "mindustry.entities.bullet.HealBulletType", "mindustry.entities.bullet.LiquidBulletType", "mindustry.entities.bullet.MassDriverBolt", "mindustry.entities.bullet.MissileBulletType", "mindustry.entities.effect.Decal", "mindustry.entities.effect.Fire", "mindustry.entities.effect.GroundEffectEntity", "mindustry.entities.effect.GroundEffectEntity$GroundEffect", "mindustry.entities.effect.ItemTransfer", "mindustry.entities.effect.Lightning", "mindustry.entities.effect.Puddle", "mindustry.entities.effect.RubbleDecal", "mindustry.entities.effect.ScorchDecal", "mindustry.entities.traits.AbsorbTrait", "mindustry.entities.traits.BelowLiquidTrait", "mindustry.entities.traits.BuilderMinerTrait", "mindustry.entities.traits.BuilderTrait", "mindustry.entities.traits.BuilderTrait$BuildDataStatic", "mindustry.entities.traits.BuilderTrait$BuildRequest", "mindustry.entities.traits.DamageTrait", "mindustry.entities.traits.DrawTrait", "mindustry.entities.traits.Entity", "mindustry.entities.traits.HealthTrait", "mindustry.entities.traits.KillerTrait", "mindustry.entities.traits.MinerTrait", "mindustry.entities.traits.MoveTrait", "mindustry.entities.traits.SaveTrait", "mindustry.entities.traits.Saveable", "mindustry.entities.traits.ScaleTrait", "mindustry.entities.traits.ShooterTrait", "mindustry.entities.traits.SolidTrait", "mindustry.entities.traits.SpawnerTrait", "mindustry.entities.traits.SyncTrait", "mindustry.entities.traits.TargetTrait", "mindustry.entities.traits.TeamTrait", "mindustry.entities.traits.TimeTrait", "mindustry.entities.traits.TypeTrait", "mindustry.entities.traits.VelocityTrait", "mindustry.entities.type.BaseEntity", "mindustry.entities.type.BaseUnit", "mindustry.entities.type.Bullet", "mindustry.entities.type.DestructibleEntity", "mindustry.entities.type.EffectEntity", "mindustry.entities.type.Player", "mindustry.entities.type.SolidEntity", "mindustry.entities.type.TileEntity", "mindustry.entities.type.TimedEntity", "mindustry.entities.type.Unit", "mindustry.entities.type.base.BaseDrone", "mindustry.entities.type.base.BuilderDrone", "mindustry.entities.type.base.FlyingUnit", "mindustry.entities.type.base.GroundUnit", "mindustry.entities.type.base.HoverUnit", "mindustry.entities.type.base.MinerDrone", "mindustry.entities.type.base.RepairDrone", "mindustry.entities.units.StateMachine", "mindustry.entities.units.Statuses", "mindustry.entities.units.Statuses$StatusEntry", "mindustry.entities.units.UnitCommand", "mindustry.entities.units.UnitDrops", "mindustry.entities.units.UnitState", "mindustry.game.DefaultWaves", "mindustry.game.Difficulty", "mindustry.game.EventType", "mindustry.game.EventType$BlockBuildBeginEvent", "mindustry.game.EventType$BlockBuildEndEvent", "mindustry.game.EventType$BlockDestroyEvent", "mindustry.game.EventType$BlockInfoEvent", "mindustry.game.EventType$BuildSelectEvent", "mindustry.game.EventType$ClientLoadEvent", "mindustry.game.EventType$CommandIssueEvent", "mindustry.game.EventType$ContentReloadEvent", "mindustry.game.EventType$CoreItemDeliverEvent", "mindustry.game.EventType$DepositEvent", "mindustry.game.EventType$DisposeEvent", "mindustry.game.EventType$GameOverEvent", "mindustry.game.EventType$LaunchEvent", "mindustry.game.EventType$LaunchItemEvent", "mindustry.game.EventType$LineConfirmEvent", "mindustry.game.EventType$LoseEvent", "mindustry.game.EventType$MapMakeEvent", "mindustry.game.EventType$MapPublishEvent", "mindustry.game.EventType$MechChangeEvent", "mindustry.game.EventType$PlayEvent", "mindustry.game.EventType$PlayerBanEvent", "mindustry.game.EventType$PlayerChatEvent", "mindustry.game.EventType$PlayerConnect", "mindustry.game.EventType$PlayerIpBanEvent", "mindustry.game.EventType$PlayerIpUnbanEvent", "mindustry.game.EventType$PlayerJoin", "mindustry.game.EventType$PlayerLeave", "mindustry.game.EventType$PlayerUnbanEvent", "mindustry.game.EventType$ResearchEvent", "mindustry.game.EventType$ResetEvent", "mindustry.game.EventType$ResizeEvent", "mindustry.game.EventType$ServerLoadEvent", "mindustry.game.EventType$StateChangeEvent", "mindustry.game.EventType$TapConfigEvent", "mindustry.game.EventType$TapEvent", "mindustry.game.EventType$TileChangeEvent", "mindustry.game.EventType$Trigger", "mindustry.game.EventType$TurretAmmoDeliverEvent", "mindustry.game.EventType$UnitCreateEvent", "mindustry.game.EventType$UnitDestroyEvent", "mindustry.game.EventType$UnlockEvent", "mindustry.game.EventType$WaveEvent", "mindustry.game.EventType$WinEvent", "mindustry.game.EventType$WithdrawEvent", "mindustry.game.EventType$WorldLoadEvent", "mindustry.game.EventType$ZoneConfigureCompleteEvent", "mindustry.game.EventType$ZoneRequireCompleteEvent", "mindustry.game.Gamemode", "mindustry.game.GlobalData", "mindustry.game.LoopControl", "mindustry.game.MusicControl", "mindustry.game.Objective", "mindustry.game.Objectives", "mindustry.game.Objectives$Launched", "mindustry.game.Objectives$Unlock", "mindustry.game.Objectives$Wave", "mindustry.game.Objectives$ZoneObjective", "mindustry.game.Objectives$ZoneWave", "mindustry.game.Rules", "mindustry.game.Saves", "mindustry.game.Saves$SaveSlot", "mindustry.game.Schematic", "mindustry.game.Schematic$Stile", "mindustry.game.Schematics", "mindustry.game.SoundLoop", "mindustry.game.SpawnGroup", "mindustry.game.Stats", "mindustry.game.Stats$Rank", "mindustry.game.Stats$RankResult", "mindustry.game.Team", "mindustry.game.Teams", "mindustry.game.Teams$BrokenBlock", "mindustry.game.Teams$TeamData", "mindustry.game.Tutorial", "mindustry.game.Tutorial$TutorialStage", "mindustry.gen.BufferItem", "mindustry.gen.Call", "mindustry.gen.Call", "mindustry.gen.Icon", "mindustry.gen.Icon", "mindustry.gen.MethodHash", "mindustry.gen.Musics", "mindustry.gen.Musics", "mindustry.gen.PathTile", "mindustry.gen.PropCell", "mindustry.gen.RemoteReadClient", "mindustry.gen.RemoteReadServer", "mindustry.gen.Serialization", "mindustry.gen.Sounds", "mindustry.gen.Sounds", "mindustry.gen.Tex", "mindustry.gen.Tex", "mindustry.gen.TileOp", "mindustry.graphics.BlockRenderer", "mindustry.graphics.Bloom", "mindustry.graphics.CacheLayer", "mindustry.graphics.Drawf", "mindustry.graphics.FloorRenderer", "mindustry.graphics.IndexedRenderer", "mindustry.graphics.Layer", "mindustry.graphics.LightRenderer", "mindustry.graphics.MenuRenderer", "mindustry.graphics.MinimapRenderer", "mindustry.graphics.MultiPacker", "mindustry.graphics.MultiPacker$PageType", "mindustry.graphics.OverlayRenderer", "mindustry.graphics.Pal", "mindustry.graphics.Pixelator", "mindustry.graphics.Shaders", "mindustry.input.Binding", "mindustry.input.DesktopInput", "mindustry.input.InputHandler", "mindustry.input.InputHandler$PlaceLine", "mindustry.input.MobileInput", "mindustry.input.PlaceMode", "mindustry.input.Placement", "mindustry.input.Placement$DistanceHeuristic", "mindustry.input.Placement$NormalizeDrawResult", "mindustry.input.Placement$NormalizeResult", "mindustry.input.Placement$TileHueristic", "mindustry.maps.Map", "mindustry.maps.Maps", "mindustry.maps.Maps$MapProvider", "mindustry.maps.Maps$ShuffleMode", "mindustry.maps.Maps$ShuffleMode", "mindustry.maps.filters.BlendFilter", "mindustry.maps.filters.ClearFilter", "mindustry.maps.filters.DistortFilter", "mindustry.maps.filters.FilterOption", "mindustry.maps.filters.FilterOption$BlockOption", "mindustry.maps.filters.FilterOption$SliderOption", "mindustry.maps.filters.GenerateFilter", "mindustry.maps.filters.GenerateFilter$GenerateInput", "mindustry.maps.filters.GenerateFilter$GenerateInput$TileProvider", "mindustry.maps.filters.MedianFilter", "mindustry.maps.filters.MirrorFilter", "mindustry.maps.filters.NoiseFilter", "mindustry.maps.filters.OreFilter", "mindustry.maps.filters.OreMedianFilter", "mindustry.maps.filters.RiverNoiseFilter", "mindustry.maps.filters.ScatterFilter", "mindustry.maps.filters.TerrainFilter", "mindustry.maps.generators.BasicGenerator", "mindustry.maps.generators.BasicGenerator$DistanceHeuristic", "mindustry.maps.generators.BasicGenerator$TileHueristic", "mindustry.maps.generators.Generator", "mindustry.maps.generators.MapGenerator", "mindustry.maps.generators.MapGenerator$Decoration", "mindustry.maps.generators.RandomGenerator", "mindustry.maps.zonegen.DesertWastesGenerator", "mindustry.maps.zonegen.OvergrowthGenerator", "mindustry.type.Category", "mindustry.type.ErrorContent", "mindustry.type.Item", "mindustry.type.ItemStack", "mindustry.type.ItemType", "mindustry.type.Liquid", "mindustry.type.LiquidStack", "mindustry.type.Mech", "mindustry.type.Publishable", "mindustry.type.StatusEffect", "mindustry.type.StatusEffect$TransitionHandler", "mindustry.type.TypeID", "mindustry.type.UnitType", "mindustry.type.Weapon", "mindustry.type.WeatherEvent", "mindustry.type.Zone", "mindustry.ui.Bar", "mindustry.ui.BorderImage", "mindustry.ui.Cicon", "mindustry.ui.ContentDisplay", "mindustry.ui.Fonts", "mindustry.ui.GridImage", "mindustry.ui.IconSize", "mindustry.ui.IntFormat", "mindustry.ui.ItemDisplay", "mindustry.ui.ItemImage", "mindustry.ui.ItemsDisplay", "mindustry.ui.Links", "mindustry.ui.Links$LinkEntry", "mindustry.ui.LiquidDisplay", "mindustry.ui.Minimap", "mindustry.ui.MobileButton", "mindustry.ui.MultiReqImage", "mindustry.ui.ReqImage", "mindustry.ui.Styles", "mindustry.ui.dialogs.AboutDialog", "mindustry.ui.dialogs.AdminsDialog", "mindustry.ui.dialogs.BansDialog", "mindustry.ui.dialogs.ColorPicker", "mindustry.ui.dialogs.ContentInfoDialog", "mindustry.ui.dialogs.ControlsDialog", "mindustry.ui.dialogs.CustomGameDialog", "mindustry.ui.dialogs.CustomRulesDialog", "mindustry.ui.dialogs.DatabaseDialog", "mindustry.ui.dialogs.DeployDialog", "mindustry.ui.dialogs.DeployDialog$View", "mindustry.ui.dialogs.DeployDialog$ZoneNode", "mindustry.ui.dialogs.DiscordDialog", "mindustry.ui.dialogs.FileChooser", "mindustry.ui.dialogs.FileChooser$FileHistory", "mindustry.ui.dialogs.FloatingDialog", "mindustry.ui.dialogs.GameOverDialog", "mindustry.ui.dialogs.HostDialog", "mindustry.ui.dialogs.JoinDialog", "mindustry.ui.dialogs.JoinDialog$Server", "mindustry.ui.dialogs.LanguageDialog", "mindustry.ui.dialogs.LoadDialog", "mindustry.ui.dialogs.LoadoutDialog", "mindustry.ui.dialogs.MapPlayDialog", "mindustry.ui.dialogs.MapsDialog", "mindustry.ui.dialogs.MinimapDialog", "mindustry.ui.dialogs.ModsDialog", "mindustry.ui.dialogs.PaletteDialog", "mindustry.ui.dialogs.PausedDialog", "mindustry.ui.dialogs.SaveDialog", "mindustry.ui.dialogs.SchematicsDialog", "mindustry.ui.dialogs.SchematicsDialog$SchematicImage", "mindustry.ui.dialogs.SchematicsDialog$SchematicInfoDialog", "mindustry.ui.dialogs.SettingsMenuDialog", "mindustry.ui.dialogs.TechTreeDialog", "mindustry.ui.dialogs.TechTreeDialog$LayoutNode", "mindustry.ui.dialogs.TechTreeDialog$TechTreeNode", "mindustry.ui.dialogs.TechTreeDialog$View", "mindustry.ui.dialogs.TraceDialog", "mindustry.ui.dialogs.ZoneInfoDialog", "mindustry.ui.fragments.BlockConfigFragment", "mindustry.ui.fragments.BlockInventoryFragment", "mindustry.ui.fragments.ChatFragment", "mindustry.ui.fragments.FadeInFragment", "mindustry.ui.fragments.Fragment", "mindustry.ui.fragments.HudFragment", "mindustry.ui.fragments.LoadingFragment", "mindustry.ui.fragments.MenuFragment", "mindustry.ui.fragments.MinimapFragment", "mindustry.ui.fragments.OverlayFragment", "mindustry.ui.fragments.PlacementFragment", "mindustry.ui.fragments.PlayerListFragment", "mindustry.ui.fragments.ScriptConsoleFragment", "mindustry.ui.layout.BranchTreeLayout", "mindustry.ui.layout.BranchTreeLayout$TreeAlignment", "mindustry.ui.layout.BranchTreeLayout$TreeLocation", "mindustry.ui.layout.RadialTreeLayout", "mindustry.ui.layout.TreeLayout", "mindustry.ui.layout.TreeLayout$TreeNode", "mindustry.world.Block", "mindustry.world.BlockStorage", "mindustry.world.Build", "mindustry.world.CachedTile", "mindustry.world.DirectionalItemBuffer", "mindustry.world.DirectionalItemBuffer$BufferItemStruct", "mindustry.world.Edges", "mindustry.world.ItemBuffer", "mindustry.world.LegacyColorMapper", "mindustry.world.LegacyColorMapper$LegacyBlock", "mindustry.world.Pos", "mindustry.world.StaticTree", "mindustry.world.Tile", "mindustry.world.WorldContext", "mindustry.world.blocks.Attributes", "mindustry.world.blocks.Autotiler", "mindustry.world.blocks.Autotiler$AutotilerHolder", "mindustry.world.blocks.BlockPart", "mindustry.world.blocks.BuildBlock", "mindustry.world.blocks.BuildBlock$BuildEntity", "mindustry.world.blocks.DoubleOverlayFloor", "mindustry.world.blocks.Floor", "mindustry.world.blocks.ItemSelection", "mindustry.world.blocks.LiquidBlock", "mindustry.world.blocks.OreBlock", "mindustry.world.blocks.OverlayFloor", "mindustry.world.blocks.PowerBlock", "mindustry.world.blocks.RespawnBlock", "mindustry.world.blocks.Rock", "mindustry.world.blocks.StaticWall", "mindustry.world.blocks.TreeBlock", "mindustry.world.blocks.defense.DeflectorWall", "mindustry.world.blocks.defense.DeflectorWall$DeflectorEntity", "mindustry.world.blocks.defense.Door", "mindustry.world.blocks.defense.Door$DoorEntity", "mindustry.world.blocks.defense.ForceProjector", "mindustry.world.blocks.defense.ForceProjector$ForceEntity", "mindustry.world.blocks.defense.ForceProjector$ShieldEntity", "mindustry.world.blocks.defense.MendProjector", "mindustry.world.blocks.defense.MendProjector$MendEntity", "mindustry.world.blocks.defense.OverdriveProjector", "mindustry.world.blocks.defense.OverdriveProjector$OverdriveEntity", "mindustry.world.blocks.defense.ShockMine", "mindustry.world.blocks.defense.SurgeWall", "mindustry.world.blocks.defense.Wall", "mindustry.world.blocks.defense.turrets.ArtilleryTurret", "mindustry.world.blocks.defense.turrets.BurstTurret", "mindustry.world.blocks.defense.turrets.ChargeTurret", "mindustry.world.blocks.defense.turrets.ChargeTurret$LaserTurretEntity", "mindustry.world.blocks.defense.turrets.CooledTurret", "mindustry.world.blocks.defense.turrets.DoubleTurret", "mindustry.world.blocks.defense.turrets.ItemTurret", "mindustry.world.blocks.defense.turrets.ItemTurret$ItemEntry", "mindustry.world.blocks.defense.turrets.ItemTurret$ItemTurretEntity", "mindustry.world.blocks.defense.turrets.LaserTurret", "mindustry.world.blocks.defense.turrets.LaserTurret$LaserTurretEntity", "mindustry.world.blocks.defense.turrets.LiquidTurret", "mindustry.world.blocks.defense.turrets.PowerTurret", "mindustry.world.blocks.defense.turrets.Turret", "mindustry.world.blocks.defense.turrets.Turret$AmmoEntry", "mindustry.world.blocks.defense.turrets.Turret$TurretEntity", "mindustry.world.blocks.distribution.ArmoredConveyor", "mindustry.world.blocks.distribution.BufferedItemBridge", "mindustry.world.blocks.distribution.BufferedItemBridge$BufferedItemBridgeEntity", "mindustry.world.blocks.distribution.Conveyor", "mindustry.world.blocks.distribution.Conveyor$ConveyorEntity", "mindustry.world.blocks.distribution.Conveyor$ItemPos", "mindustry.world.blocks.distribution.ExtendingItemBridge", "mindustry.world.blocks.distribution.ItemBridge", "mindustry.world.blocks.distribution.ItemBridge$ItemBridgeEntity", "mindustry.world.blocks.distribution.Junction", "mindustry.world.blocks.distribution.Junction$JunctionEntity", "mindustry.world.blocks.distribution.MassDriver", "mindustry.world.blocks.distribution.MassDriver$DriverBulletData", "mindustry.world.blocks.distribution.MassDriver$DriverState", "mindustry.world.blocks.distribution.MassDriver$MassDriverEntity", "mindustry.world.blocks.distribution.OverflowGate", "mindustry.world.blocks.distribution.OverflowGate$OverflowGateEntity", "mindustry.world.blocks.distribution.Router", "mindustry.world.blocks.distribution.Router$RouterEntity", "mindustry.world.blocks.distribution.Sorter", "mindustry.world.blocks.distribution.Sorter$SorterEntity", "mindustry.world.blocks.liquid.ArmoredConduit", "mindustry.world.blocks.liquid.Conduit", "mindustry.world.blocks.liquid.Conduit$ConduitEntity", "mindustry.world.blocks.liquid.LiquidBridge", "mindustry.world.blocks.liquid.LiquidExtendingBridge", "mindustry.world.blocks.liquid.LiquidJunction", "mindustry.world.blocks.liquid.LiquidOverflowGate", "mindustry.world.blocks.liquid.LiquidRouter", "mindustry.world.blocks.liquid.LiquidTank", "mindustry.world.blocks.logic.LogicBlock", "mindustry.world.blocks.logic.MessageBlock", "mindustry.world.blocks.logic.MessageBlock$MessageBlockEntity", "mindustry.world.blocks.power.Battery", "mindustry.world.blocks.power.BurnerGenerator", "mindustry.world.blocks.power.ConditionalConsumePower", "mindustry.world.blocks.power.DecayGenerator", "mindustry.world.blocks.power.ImpactReactor", "mindustry.world.blocks.power.ImpactReactor$FusionReactorEntity", "mindustry.world.blocks.power.ItemLiquidGenerator", "mindustry.world.blocks.power.ItemLiquidGenerator$ItemLiquidGeneratorEntity", "mindustry.world.blocks.power.LightBlock", "mindustry.world.blocks.power.LightBlock$LightEntity", "mindustry.world.blocks.power.NuclearReactor", "mindustry.world.blocks.power.NuclearReactor$NuclearReactorEntity", "mindustry.world.blocks.power.PowerDiode", "mindustry.world.blocks.power.PowerDistributor", "mindustry.world.blocks.power.PowerGenerator", "mindustry.world.blocks.power.PowerGenerator$GeneratorEntity", "mindustry.world.blocks.power.PowerGraph", "mindustry.world.blocks.power.PowerNode", "mindustry.world.blocks.power.SingleTypeGenerator", "mindustry.world.blocks.power.SolarGenerator", "mindustry.world.blocks.power.ThermalGenerator", "mindustry.world.blocks.production.Cultivator", "mindustry.world.blocks.production.Cultivator$CultivatorEntity", "mindustry.world.blocks.production.Drill", "mindustry.world.blocks.production.Drill$DrillEntity", "mindustry.world.blocks.production.Fracker", "mindustry.world.blocks.production.Fracker$FrackerEntity", "mindustry.world.blocks.production.GenericCrafter", "mindustry.world.blocks.production.GenericCrafter$GenericCrafterEntity", "mindustry.world.blocks.production.GenericSmelter", "mindustry.world.blocks.production.Incinerator", "mindustry.world.blocks.production.Incinerator$IncineratorEntity", "mindustry.world.blocks.production.LiquidConverter", "mindustry.world.blocks.production.Pump", "mindustry.world.blocks.production.Separator", "mindustry.world.blocks.production.SolidPump", "mindustry.world.blocks.production.SolidPump$SolidPumpEntity", "mindustry.world.blocks.sandbox.ItemSource", "mindustry.world.blocks.sandbox.ItemSource$ItemSourceEntity", "mindustry.world.blocks.sandbox.ItemVoid", "mindustry.world.blocks.sandbox.LiquidSource", "mindustry.world.blocks.sandbox.LiquidSource$LiquidSourceEntity", "mindustry.world.blocks.sandbox.PowerSource", "mindustry.world.blocks.sandbox.PowerVoid", "mindustry.world.blocks.storage.CoreBlock", "mindustry.world.blocks.storage.CoreBlock$CoreEntity", "mindustry.world.blocks.storage.LaunchPad", "mindustry.world.blocks.storage.StorageBlock", "mindustry.world.blocks.storage.StorageBlock$StorageBlockEntity", "mindustry.world.blocks.storage.Unloader", "mindustry.world.blocks.storage.Unloader$UnloaderEntity", "mindustry.world.blocks.storage.Vault", "mindustry.world.blocks.units.CommandCenter", "mindustry.world.blocks.units.CommandCenter$CommandCenterEntity", "mindustry.world.blocks.units.MechPad", "mindustry.world.blocks.units.MechPad$MechFactoryEntity", "mindustry.world.blocks.units.RallyPoint", "mindustry.world.blocks.units.RepairPoint", "mindustry.world.blocks.units.RepairPoint$RepairPointEntity", "mindustry.world.blocks.units.UnitFactory", "mindustry.world.blocks.units.UnitFactory$UnitFactoryEntity", "mindustry.world.consumers.Consume", "mindustry.world.consumers.ConsumeItemFilter", "mindustry.world.consumers.ConsumeItems", "mindustry.world.consumers.ConsumeLiquid", "mindustry.world.consumers.ConsumeLiquidBase", "mindustry.world.consumers.ConsumeLiquidFilter", "mindustry.world.consumers.ConsumePower", "mindustry.world.consumers.ConsumeType", "mindustry.world.consumers.Consumers", "mindustry.world.meta.Attribute", "mindustry.world.meta.BlockBars", "mindustry.world.meta.BlockFlag", "mindustry.world.meta.BlockGroup", "mindustry.world.meta.BlockStat", "mindustry.world.meta.BlockStats", "mindustry.world.meta.BuildVisibility", "mindustry.world.meta.PowerType", "mindustry.world.meta.Producers", "mindustry.world.meta.StatCategory", "mindustry.world.meta.StatUnit", "mindustry.world.meta.StatValue", "mindustry.world.meta.values.AmmoListValue", "mindustry.world.meta.values.BooleanValue", "mindustry.world.meta.values.BoosterListValue", "mindustry.world.meta.values.ItemFilterValue", "mindustry.world.meta.values.ItemListValue", "mindustry.world.meta.values.LiquidFilterValue", "mindustry.world.meta.values.LiquidValue", "mindustry.world.meta.values.NumberValue", "mindustry.world.meta.values.StringValue", "mindustry.world.modules.BlockModule", "mindustry.world.modules.ConsumeModule", "mindustry.world.modules.ItemModule", "mindustry.world.modules.ItemModule$ItemCalculator", "mindustry.world.modules.ItemModule$ItemConsumer", "mindustry.world.modules.LiquidModule", "mindustry.world.modules.LiquidModule$LiquidCalculator", "mindustry.world.modules.LiquidModule$LiquidConsumer", "mindustry.world.modules.PowerModule", "mindustry.world.producers.Produce", "mindustry.world.producers.ProduceItem"); } \ No newline at end of file diff --git a/core/src/mindustry/world/blocks/BuildBlock.java b/core/src/mindustry/world/blocks/BuildBlock.java index 345300343f..14187850ba 100644 --- a/core/src/mindustry/world/blocks/BuildBlock.java +++ b/core/src/mindustry/world/blocks/BuildBlock.java @@ -173,7 +173,7 @@ public class BuildBlock extends Block{ if(entity.previous == null || entity.cblock == null) return; - if(Core.atlas.isFound(entity.previous.icon(mindustry.ui.Cicon.full))){ + if(Core.atlas.isFound(entity.previous.icon(Cicon.full))){ Draw.rect(entity.previous.icon(Cicon.full), tile.drawx(), tile.drawy(), entity.previous.rotate ? tile.rotation() * 90 : 0); } } diff --git a/gradle.properties b/gradle.properties index aa36264bb8..1456cfdefc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=7bfc46fe8c7810fbef1b6f6bbb19c8b999856813 +archash=e151bac7925323f24932ff3ae3f9eacfd6d3a268 diff --git a/tools/src/mindustry/tools/ScriptStubGenerator.java b/tools/src/mindustry/tools/ScriptStubGenerator.java index c60b6589fa..aadb1309bc 100644 --- a/tools/src/mindustry/tools/ScriptStubGenerator.java +++ b/tools/src/mindustry/tools/ScriptStubGenerator.java @@ -26,7 +26,8 @@ public class ScriptStubGenerator{ Array nameBlacklist = Array.with("ClientLauncher", "NetClient", "NetServer", "ClassAccess"); Array> whitelist = Array.with(Draw.class, Fill.class, Lines.class, Core.class, TextureAtlas.class, TextureRegion.class, Time.class, System.class, PrintStream.class, AtlasRegion.class, String.class, Mathf.class, Angles.class, Color.class, Runnable.class, Object.class, Icon.class, Tex.class, - Sounds.class, Musics.class, Call.class, Texture.class, TextureData.class, Pixmap.class, I18NBundle.class, Interval.class, DataInput.class, DataOutput.class, DataInputStream.class, DataOutputStream.class); + Sounds.class, Musics.class, Call.class, Texture.class, TextureData.class, Pixmap.class, I18NBundle.class, Interval.class, DataInput.class, DataOutput.class, + DataInputStream.class, DataOutputStream.class, Integer.class, Float.class, Double.class, Long.class, Boolean.class, Short.class, Byte.class, Character.class); Array nopackage = Array.with("java.lang", "java"); String fileTemplate = "package mindustry.mod;\n" + From 5f3c10e3978de22a1392d09468c9ec32db0085e4 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 2 Jan 2020 14:33:21 -0500 Subject: [PATCH 66/78] arc --- gradle.properties | 2 +- tools/src/mindustry/tools/ScriptStubGenerator.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1456cfdefc..13b714378d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=e151bac7925323f24932ff3ae3f9eacfd6d3a268 +archash=b3d3fc19560148f16b58ac7e04903f9db4f56912 diff --git a/tools/src/mindustry/tools/ScriptStubGenerator.java b/tools/src/mindustry/tools/ScriptStubGenerator.java index aadb1309bc..be1d9dd27d 100644 --- a/tools/src/mindustry/tools/ScriptStubGenerator.java +++ b/tools/src/mindustry/tools/ScriptStubGenerator.java @@ -31,8 +31,7 @@ public class ScriptStubGenerator{ Array nopackage = Array.with("java.lang", "java"); String fileTemplate = "package mindustry.mod;\n" + - "\n" + - "import arc.struct.*;\n" + + "\nimport arc.struct.*;\n" + "//obviously autogenerated, do not touch\n" + "public class ClassAccess{\n" + "\tpublic static final ObjectSet allowedClassNames = ObjectSet.with($ALLOWED_CLASS_NAMES$);\n" + From 7fa61eaf3ba0572dc9a408685de12e22a5976228 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 2 Jan 2020 22:09:33 -0500 Subject: [PATCH 67/78] Added server MOTD --- core/src/mindustry/core/NetServer.java | 4 ++++ core/src/mindustry/net/Administration.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index 27e1ed1198..774489a4a5 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -589,6 +589,10 @@ public class NetServer implements ApplicationListener{ if(Config.showConnectMessages.bool()) Call.sendMessage("[accent]" + player.name + "[accent] has connected."); Log.info("&lm[{1}] &y{0} has connected. ", player.name, player.uuid); + if(!Config.motd.string().equalsIgnoreCase("off")){ + player.sendMessage(Config.motd.string()); + } + Events.fire(new PlayerJoin(player)); } diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java index 8d037b99dd..9f068095d9 100644 --- a/core/src/mindustry/net/Administration.java +++ b/core/src/mindustry/net/Administration.java @@ -330,7 +330,8 @@ public class Administration{ socketInputPort("The port for socket input.", 6859, () -> Events.fire(Trigger.socketConfigChanged)), socketInputAddress("The bind address for socket input.", "localhost", () -> Events.fire(Trigger.socketConfigChanged)), allowCustomClients("Whether custom clients are allowed to connect.", !headless, "allow-custom"), - whitelist("Whether the whitelist is used.", false); + whitelist("Whether the whitelist is used.", false), + motd("The message displayed to people on connection.", "off"); public static final Config[] all = values(); From 439605f6e828e33f4a3afaec98b274dca10107d1 Mon Sep 17 00:00:00 2001 From: Simon Woodburry-Forget Date: Sat, 4 Jan 2020 00:32:03 -0500 Subject: [PATCH 68/78] use findAll to iterate through mod content (#1313) --- core/src/mindustry/mod/Mods.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java index e4907ed26c..ef4af6a8ec 100644 --- a/core/src/mindustry/mod/Mods.java +++ b/core/src/mindustry/mod/Mods.java @@ -512,10 +512,8 @@ public class Mods implements Loadable{ for(ContentType type : ContentType.all){ Fi folder = contentRoot.child(type.name().toLowerCase() + "s"); if(folder.exists()){ - for(Fi file : folder.list()){ - if(file.extension().equals("json") || file.extension().equals("hjson")){ - runs.add(new LoadRun(type, file, mod)); - } + for(Fi file : folder.findAll(f -> f.extension().equals("json") || f.extension().equals("hjson"))){ + runs.add(new LoadRun(type, file, mod)); } } } From 197769a9feb48be93c5998b2c0317abdf8c4a3b7 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 4 Jan 2020 12:10:03 -0500 Subject: [PATCH 69/78] Fixed #1319 --- core/src/mindustry/game/Schematics.java | 3 +++ core/src/mindustry/world/blocks/distribution/MassDriver.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/game/Schematics.java b/core/src/mindustry/game/Schematics.java index fd6e10022d..7a96ed672b 100644 --- a/core/src/mindustry/game/Schematics.java +++ b/core/src/mindustry/game/Schematics.java @@ -142,6 +142,7 @@ public class Schematics implements Loadable{ ui.showException(e); } } + all.sort(); } public void savePreview(Schematic schematic, Fi file){ @@ -280,6 +281,7 @@ public class Schematics implements Loadable{ ui.showException(e); Log.err(e); } + all.sort(); } public void remove(Schematic s){ @@ -292,6 +294,7 @@ public class Schematics implements Loadable{ previews.get(s).dispose(); previews.remove(s); } + all.sort(); } /** Creates a schematic from a world selection. */ diff --git a/core/src/mindustry/world/blocks/distribution/MassDriver.java b/core/src/mindustry/world/blocks/distribution/MassDriver.java index 1156857289..2974fe457f 100644 --- a/core/src/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/mindustry/world/blocks/distribution/MassDriver.java @@ -262,6 +262,7 @@ public class MassDriver extends Block{ } protected boolean shooterValid(Tile tile, Tile other){ + if(other == null) return true; if(!(other.block() instanceof MassDriver)) return false; MassDriverEntity entity = other.ent(); @@ -274,7 +275,7 @@ public class MassDriver extends Block{ if(entity == null || entity.link == -1) return false; Tile link = world.tile(entity.link); - return link != null && link.block() instanceof MassDriver && tile.dst(link) <= range; + return link != null && link.block() instanceof MassDriver && link.getTeam() == tile.getTeam() && tile.dst(link) <= range; } public static class DriverBulletData implements Poolable{ From 1dd0295c45e6ea6f0967f291b41ff3a58ab7202c Mon Sep 17 00:00:00 2001 From: DeltaNedas <39013340+DeltaNedas@users.noreply.github.com> Date: Sat, 4 Jan 2020 17:15:43 +0000 Subject: [PATCH 70/78] make turnCursor: false mechs not cross eyed (#1301) * create new branch * add targetDistance to weapons for mechs players will use if turnCursor is false --- core/src/mindustry/entities/type/Player.java | 2 +- core/src/mindustry/type/Weapon.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/entities/type/Player.java b/core/src/mindustry/entities/type/Player.java index 4077da0e4e..6f28acb17c 100644 --- a/core/src/mindustry/entities/type/Player.java +++ b/core/src/mindustry/entities/type/Player.java @@ -637,7 +637,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{ if(!state.isEditor() && isShooting() && mech.canShoot(this)){ if(!mech.turnCursor){ //shoot forward ignoring cursor - mech.weapon.update(this, x + Angles.trnsx(rotation, 1f), y + Angles.trnsy(rotation, 1f)); + mech.weapon.update(this, x + Angles.trnsx(rotation, mech.weapon.targetDistance), y + Angles.trnsy(rotation, mech.weapon.targetDistance)); }else{ mech.weapon.update(this, pointerX, pointerY); } diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java index 0e3583a552..175abd1d24 100644 --- a/core/src/mindustry/type/Weapon.java +++ b/core/src/mindustry/type/Weapon.java @@ -55,6 +55,8 @@ public class Weapon{ public float shotDelay = 0; /** whether shooter rotation is ignored when shooting. */ public boolean ignoreRotation = false; + /** if turnCursor is false for a mech, how far away will the weapon target. */ + public float targetDistance = 1f; public Sound shootSound = Sounds.pew; From 5f1ea4b098b4158388acb143a47bfc63643e52a1 Mon Sep 17 00:00:00 2001 From: Dave <16521341+davidmfritz@users.noreply.github.com> Date: Sat, 4 Jan 2020 18:39:57 +0100 Subject: [PATCH 71/78] UX improvements for showTextInput (#1290) * Added keyDown support for showTextInput (Enter, Escape, Back) * Removed unnecessary "this" * Added cursor autofocus on showTextInput --- core/src/mindustry/core/UI.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java index 58cb23d802..f1b578cc9c 100644 --- a/core/src/mindustry/core/UI.java +++ b/core/src/mindustry/core/UI.java @@ -307,7 +307,19 @@ public class UI implements ApplicationListener, Loadable{ hide(); }).disabled(b -> field.getText().isEmpty()); buttons.addButton("$cancel", this::hide); - }}.show(); + keyDown(KeyCode.ENTER, () -> { + String text = field.getText(); + if(!text.isEmpty()){ + confirmed.get(text); + hide(); + } + }); + keyDown(KeyCode.ESCAPE, this::hide); + keyDown(KeyCode.BACK, this::hide); + show(); + Core.scene.setKeyboardFocus(field); + field.setCursorPosition(def.length()); + }}; } } From eb70283355101fb1a5b832ac051e35e0742b0f02 Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Sat, 4 Jan 2020 18:40:12 +0100 Subject: [PATCH 72/78] Use current directory explicitly for bundle updator (#1316) --- tools/src/mindustry/tools/BundleLauncher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/src/mindustry/tools/BundleLauncher.java b/tools/src/mindustry/tools/BundleLauncher.java index 668d4665fe..1f73b26f28 100644 --- a/tools/src/mindustry/tools/BundleLauncher.java +++ b/tools/src/mindustry/tools/BundleLauncher.java @@ -15,7 +15,7 @@ public class BundleLauncher{ OrderedMap base = new OrderedMap<>(); PropertiesUtils.load(base, new InputStreamReader(new FileInputStream(file))); Array removals = new Array<>(); - Fi.get("").walk(child -> { + Fi.get(".").walk(child -> { if(child.name().equals("bundle.properties") || child.isDirectory() || child.toString().contains("output")) return; From 8af3b877b58e55800f59866b52f0e90b279aeb8a Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 4 Jan 2020 15:12:29 -0500 Subject: [PATCH 73/78] Fixed #1320 --- core/src/mindustry/game/Teams.java | 4 ++-- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java index dc44d47240..e4fa1f1ef3 100644 --- a/core/src/mindustry/game/Teams.java +++ b/core/src/mindustry/game/Teams.java @@ -80,7 +80,7 @@ public class Teams{ /** Returns whether a team is active, e.g. whether it has any cores remaining. */ public boolean isActive(Team team){ //the enemy wave team is always active - return team == state.rules.waveTeam || get(team).cores.size > 0; + return get(team).active(); } /** Returns whether {@param other} is an enemy of {@param #team}. */ @@ -150,7 +150,7 @@ public class Teams{ } public boolean active(){ - return team == state.rules.waveTeam || cores.size > 0; + return (team == state.rules.waveTeam && state.rules.waves) || cores.size > 0; } public boolean hasCore(){ diff --git a/gradle.properties b/gradle.properties index 13b714378d..015c89b285 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=b3d3fc19560148f16b58ac7e04903f9db4f56912 +archash=919a8f30e16d6b3d8fa96d438c5ff621899b4368 From 71da1f1135930e468f2262d8640be81253509dde Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 5 Jan 2020 00:08:48 -0500 Subject: [PATCH 74/78] Added mod listing data class --- core/src/mindustry/mod/ModListing.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 core/src/mindustry/mod/ModListing.java diff --git a/core/src/mindustry/mod/ModListing.java b/core/src/mindustry/mod/ModListing.java new file mode 100644 index 0000000000..d0c1d80094 --- /dev/null +++ b/core/src/mindustry/mod/ModListing.java @@ -0,0 +1,19 @@ +package mindustry.mod; + +/** Mod listing as a data class. */ +public class ModListing{ + public String repo, name, author, lastUpdated, description; + public int stars; + + @Override + public String toString(){ + return "ModListing{" + + "repo='" + repo + '\'' + + ", name='" + name + '\'' + + ", author='" + author + '\'' + + ", lastUpdated='" + lastUpdated + '\'' + + ", description='" + description + '\'' + + ", stars=" + stars + + '}'; + } +} From 9d9e31948d57011c0e48eaf8e589e9243917081a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Du=C5=A1ek?= Date: Sun, 5 Jan 2020 23:41:41 +0100 Subject: [PATCH 75/78] Add - tutorial localized, description coverage++, fix broken translations (#1327) --- core/assets/bundles/bundle_cs.properties | 263 ++++++++++++----------- core/assets/contributors | 1 + 2 files changed, 133 insertions(+), 131 deletions(-) diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index 1161de677c..e2154fc185 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -7,7 +7,7 @@ link.reddit.description = Mindustry na Redditu link.github.description = Zdrojový kód hry link.changelog.description = Seznam úprav link.dev-builds.description = Nestabilní vývojová verze hry -link.trello.description = Oficiální nástěnka na Trello s plány rozvoje hry +link.trello.description = Oficiální Trello nástěnka s plánovanými novinkami link.itch.io.description = Stránka na itch.io s odkazy na stažení hry link.google-play.description = Obchod Google Play link.f-droid.description = Katalog F-Droid @@ -32,27 +32,27 @@ load.scripts = Skripty schematic = Šablona schematic.add = Uložit šablonu... schematics = Šablony -schematic.replace = Šablona tohoto jména již exisruje. Přeješ si ji nahradit? +schematic.replace = Šablona tohoto jména již existuje. Chceš ji nahradit? schematic.import = Importovat šablonu... schematic.exportfile = Exportovat soubor schematic.importfile = Importovat soubor schematic.browseworkshop = Procházet dílnu schematic.copy = Zkopírovat do schránky schematic.copy.import = Importovat ze schránky -schematic.shareworkshop = Sdílet v dílně -schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Obrátit šablonu +schematic.shareworkshop = Sdílet skrze Steam Workshop +schematic.flip = [accent][[{0}][]/[accent][[{1}][]: Převrátit šablonu schematic.saved = Šablona byla uložena. -schematic.delete.confirm = Tato šablona bude beze zbytku smazána. +schematic.delete.confirm = Šablona bude kompletně vyhlazena. schematic.rename = Přejmenovat šablonu schematic.info = {0}x{1}, {2} bloků -stat.wave = Vln poraženo :[accent]{0} -stat.enemiesDestroyed = Nepřátel zničeno :[accent]{0}[] -stat.built = Budov postaveno: [accent]{0}[] -stat.destroyed = Budov zničeno: [accent]{0}[] -stat.deconstructed = Budov rozebráno: [accent]{0}[] +stat.wave = Vln poraženo:[accent] {0} +stat.enemiesDestroyed = Nepřátel zničeno:[accent] {0} +stat.built = Budov postaveno:[accent] {0} +stat.destroyed = Budov zničeno:[accent] {0} +stat.deconstructed = Budov rozebráno:[accent] {0} stat.delivered = Materiálu vysláno: -stat.rank = Závěrečné hodnocení: [accent]{0}[] +stat.rank = Celková známka: [accent]{0} launcheditems = [accent]Vyslané předměty[] launchinfo = [unlaunched][Je třeba [LAUNCH] Tvé jádro, abys získal věci vyznačené modře. @@ -249,7 +249,7 @@ data.import.confirm = Import externích dat smaže [scarlet]všechna[] Tvoje sou classic.export = Exportovat data pro verzi Classic classic.export.text = [accent]Mindustry[] mělo významnou aktualizaci.\nByly detekovány uložení hry nebo mapy pro předchozí verzi Classic (v3.5 build 40). Chtěl bys exportovat tato uložení do domovského zařízení Tvého telefonu, pro pozdější použití v této verzi Mindustry Classic? quit.confirm = Jsi si jistý, že chceš ukončit hru? -quit.confirm.tutorial = Jste si vážně jistý?\Výuka se dá znovu spustit v [accent]Nastavení->Hra->Spusť výuku[]. +quit.confirm.tutorial = Jsi si jistý?\nTutoriál je možné znovu spustit v [accent]Nastavení->Hra->Zopáknout si výuku[]. loading = [accent]Načítám... reloading = [accent]Načítám modifikace... saving = [accent]Ukládám... @@ -262,8 +262,8 @@ wave.waiting = [LIGHT_GRAY]Vlna za {0} wave.waveInProgress = [LIGHT_GRAY]Vlna v pohybu waiting = [LIGHT_GRAY]Čekám... waiting.players = Čekání na hráče... -wave.enemies = [LIGHT_GRAY]{0} Nepřátel zbývá -wave.enemy = [LIGHT_GRAY]{0} Nepřítel zbývá +wave.enemies = [LIGHT_GRAY]{0} zbývajících nepřátel +wave.enemy = [LIGHT_GRAY]{0} zbývající nepřítel loadimage = Nahrát obrázek saveimage = Uložit obrázek unknown = Neznámý @@ -436,12 +436,12 @@ launch = Vyslat launch.title = Vyslání úspěšné launch.next = [LIGHT_GRAY]další možnost až ve vlně {0} launch.unable2 = [scarlet]Není možno vyslat.[] -launch.confirm = Toto vyšle veškeré suroviny ve tvém jádru .\nJiž se na tuto základnu nebudeš moci vrátit. -launch.skip.confirm = Jestli teď zůstaneš, budeš moci odejít až v pozdější fázi. +launch.confirm = Chystáš se opustit tuto základnu. Kliknutím na OK vyšleš veškeré suroviny ve tvém jádře.\nJiž se na tuto základnu nebudeš moci vrátit. +launch.skip.confirm = Jestli teď zůstaneš, budeš moci odejít až v pozdější vlně. uncover = Odkrýt configure = Přizpůsobit vybavení -bannedblocks = Banned Blocks -addall = Add All +bannedblocks = Zakázané bloky +addall = Přidat vše configure.locked = [LIGHT_GRAY]Dosáhni vlny {0}\nk nastavení svého vybavení. configure.invalid = Hodnota musí být mezi 0 a{0}. zone.unlocked = [LIGHT_GRAY]{0} odemčeno. @@ -687,18 +687,18 @@ keybind.drop_unit.name = Zahodit jednotku keybind.zoom_minimap.name = Přiblížit minimapu mode.help.title = Popis módů mode.survival.name = Survival -mode.survival.description = Normální mód .Limitované suroviny a automatické přepínání vln. +mode.survival.description = Normální mód. Limitované suroviny a automatické přepínání vln. mode.sandbox.name = Sandbox mode.sandbox.description = Nekonečné zdroje a žádný čas pro vlny nepřátel. mode.editor.name = Editor mode.pvp.name = PvP mode.pvp.description = Bojuj proti ostatním hráčům v lokální síti. mode.attack.name = Útok -mode.attack.description = Bez vln znič nepř@telsou základnu. +mode.attack.description = Bez vln znič nepřátelskou základnu. mode.custom = Custom Rules rules.infiniteresources = Nekonečno surovin rules.wavetimer = Časovač vln -rules.waves = Wlny +rules.waves = Vlny rules.attack = Attack Mode rules.enemyCheat = Infinite AI Resources rules.unitdrops = Unit Drops @@ -724,7 +724,7 @@ rules.title.enemy = Nepřátelé rules.title.unit = Jednotky content.item.name = Předměty content.liquid.name = Tekutiny -content.unit.name = jednotky +content.unit.name = Jednotky content.block.name = Blocks content.mech.name = Mechy item.copper.name = Měď @@ -742,7 +742,7 @@ item.sand.name = Písek item.blast-compound.name = Výbušná směs item.pyratite.name = Pyratite item.metaglass.name = Tvrzené sklo -item.scrap.name = Scrap +item.scrap.name = Šrot liquid.water.name = Voda liquid.slag.name = Rostavené železo liquid.oil.name = Ropa @@ -754,20 +754,20 @@ mech.delta-mech.name = Delta mech.delta-mech.weapon = Obloukový generátor mech.delta-mech.ability = Průtok mech.tau-mech.name = Tau -mech.tau-mech.weapon = Restruktní Laser +mech.tau-mech.weapon = Restruktní laser mech.tau-mech.ability = Opravná dávka mech.omega-mech.name = Omega mech.omega-mech.weapon = Rojové střely -mech.omega-mech.ability = Obrněná Konfigurace +mech.omega-mech.ability = Obrněná konfigurace mech.dart-ship.name = Šipka mech.dart-ship.weapon = Opakovač mech.javelin-ship.name = Oštěp -mech.javelin-ship.weapon = Dávka Raket -mech.javelin-ship.ability = Výbojový Posilovač +mech.javelin-ship.weapon = Dávka raket +mech.javelin-ship.ability = Výbojový posilovač mech.trident-ship.name = Trojzubec mech.trident-ship.weapon = Bombová zátoka mech.glaive-ship.name = Glaiva -mech.glaive-ship.weapon = Plamenný Opakovač +mech.glaive-ship.weapon = Plamenný opakovač item.explosiveness = [LIGHT_GRAY]Výbušnost: {0}% item.flammability = [LIGHT_GRAY]Zápalnost: {0}% item.radioactivity = [LIGHT_GRAY]Radioaktivita: {0}% @@ -783,34 +783,35 @@ mech.buildspeed = [LIGHT_GRAY]Rychlost stavění: {0}% liquid.heatcapacity = [LIGHT_GRAY]Kapacita teploty: {0} liquid.viscosity = [LIGHT_GRAY]Viskozita: {0} liquid.temperature = [LIGHT_GRAY]Teplota: {0} -block.sand-boulder.name = Sand Boulder + +block.sand-boulder.name = Balvan písku block.grass.name = Tráva -block.salt.name = sůl +block.salt.name = Sůl block.saltrocks.name = Solný kámen -block.pebbles.name = Pebbles +block.pebbles.name = Oblázky block.tendrils.name = Tendrils block.sandrocks.name = Písečný kámen -block.spore-pine.name = Spore Pine -block.sporerocks.name = Spore Rocks -block.rock.name = Rock +block.spore-pine.name = Spórová borovice +block.sporerocks.name = Spórové kamení +block.rock.name = Kámen block.snowrock.name = Sněhový kámen -block.snow-pine.name = Snow Pine -block.shale.name = Shale -block.shale-boulder.name = Shale Boulder +block.snow-pine.name = Sněžná borovice +block.shale.name = Břidlice +block.shale-boulder.name = Břidličný balvan block.moss.name = Mech -block.shrubs.name = Shrubs -block.spore-moss.name = Spore Moss -block.shalerocks.name = Shale Rocks +block.shrubs.name = Křoví +block.spore-moss.name = Spórový mech +block.shalerocks.name = Břidlicové kamení block.scrap-wall.name = Stará zeď block.scrap-wall-large.name = Velá stará zeď -block.scrap-wall-huge.name = obří stará zeď +block.scrap-wall-huge.name = Obří stará zeď block.scrap-wall-gigantic.name = Gigantická stará zeď block.thruster.name = Thruster -block.kiln.name = Kiln +block.kiln.name = Pec block.graphite-press.name = Graphitový lis -block.multi-press.name = Všětraný lys -block.constructing = {0} [LIGHT_GRAY](Constructing) -block.spawn.name = Nepřátelský Spawn +block.multi-press.name = Všětraný lis +block.constructing = {0} [LIGHT_GRAY](Ve výstavbě) +block.spawn.name = Nepřátelský spawn block.core-shard.name = Core: Shard block.core-foundation.name = Core: Foundation block.core-nucleus.name = Core: Nucleus @@ -852,14 +853,14 @@ block.dark-panel-6.name = Dark Panel 6 block.dark-metal.name = Dark Metal block.ignarock.name = Igna Rock block.hotrock.name = Hot Rock -block.magmarock.name = Magma Rock -block.cliffs.name = Cliffs +block.magmarock.name = Magmatický kámen +block.cliffs.name = Útesy block.copper-wall.name = Měděná zeď block.copper-wall-large.name = Velká měděná zeď -block.titanium-wall.name = Titanium Zeď -block.titanium-wall-large.name = Velká Titanium Zeď -block.plastanium-wall.name = Plastanium Zeď -block.plastanium-wall-large.name = Velká Plastanium Zeď +block.titanium-wall.name = Titaniová zeď +block.titanium-wall-large.name = Velká titaniová zeď +block.plastanium-wall.name = Plastaniová zeď +block.plastanium-wall-large.name = Velká plastaniová zeď block.phase-wall.name = Fázová stěna block.phase-wall-large.name = Velká fázová stěna block.thorium-wall.name = Thoriová stěna @@ -873,14 +874,14 @@ block.hail.name = Hail block.lancer.name = Lancer block.conveyor.name = Dopravník block.titanium-conveyor.name = Titániový dopravník -block.armored-conveyor.name = Armored Conveyor -block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyors. +block.armored-conveyor.name = Obrněný dopravník +block.armored-conveyor.description = Přepravuje předměty stejně rychle jako titaniový přepravník. Je obrněný a déle vydrží, avšak nepřijímá předměty z boku z ničeho jiného než jiných přepravníků. block.junction.name = Křižovatka block.router.name = Směrovač block.distributor.name = Distributor block.sorter.name = Dělička -block.inverted-sorter.name = Inverted Sorter -block.message.name = Message +block.inverted-sorter.name = Obrácená třídička +block.message.name = Zpráva block.overflow-gate.name = Brána přetečení block.silicon-smelter.name = Silicon Smelter block.phase-weaver.name = Tkalcovna pro fázovou tkaninu @@ -927,24 +928,24 @@ block.salvo.name = Salva block.ripple.name = Vlnění block.phase-conveyor.name = Fázový přepravník block.bridge-conveyor.name = Mostový přepravník -block.plastanium-compressor.name = Kompresor na Plastanium +block.plastanium-compressor.name = Kompresor na plastanium block.pyratite-mixer.name = Pyratit mixér block.blast-mixer.name = Výbušninový mixér block.solar-panel.name = Solární panel block.solar-panel-large.name = Velký solární panel -block.oil-extractor.name = Ropný Extraktor +block.oil-extractor.name = Ropný extraktor block.command-center.name = Řídící středisko block.draug-factory.name = Draug Miner Drone Factory -block.spirit-factory.name = Továrna na Spirit Drony -block.phantom-factory.name = Továrna na Fantom Drony +block.spirit-factory.name = Továrna na Spirit drony +block.phantom-factory.name = Továrna na Fantom drony block.wraith-factory.name = Továrna na Wraithy -block.ghoul-factory.name = Továrna na Ghůl Bombardéry -block.dagger-factory.name = Továrna na Dagger Mechy -block.crawler-factory.name = Crawler Mech Factory -block.titan-factory.name = Továrna na Titán Mechy -block.fortress-factory.name = Továrna na Fortress Mechy +block.ghoul-factory.name = Továrna na Ghůl bombardéry +block.dagger-factory.name = Továrna na Dagger mechy +block.crawler-factory.name = Továrna na Crawler mechy +block.titan-factory.name = Továrna na Titán mechy +block.fortress-factory.name = Továrna na Fortress mechy block.revenant-factory.name = Továrna na Revenanty -block.repair-point.name = Opravný Bod +block.repair-point.name = Opravný bod block.pulse-conduit.name = Pulzní potrubí block.phase-conduit.name = Fázové potrubí block.liquid-router.name = Směrovač tekutin @@ -952,23 +953,23 @@ block.liquid-tank.name = Nádrž na tekutiny block.liquid-junction.name = Křižovatka tekutin block.bridge-conduit.name = Mostové potrubí block.rotary-pump.name = Rotační pumpa -block.thorium-reactor.name = Thoriový Reaktor -block.mass-driver.name = Hromadný Distributor +block.thorium-reactor.name = Thoriový reaktor +block.mass-driver.name = Hromadný distributor block.blast-drill.name = Tlakovzdušný vrt block.thermal-pump.name = Termální pumpa -block.thermal-generator.name = Termální Generátor +block.thermal-generator.name = Termální generátor block.alloy-smelter.name = Slitinová pec block.mender.name = Mender block.mend-projector.name = Opravný projektor block.surge-wall.name = Impulzní stěna -block.surge-wall-large.name = Velká Impulzní stěna +block.surge-wall-large.name = Velká impulzní stěna block.cyclone.name = Cyklón block.fuse.name = Fůze block.shock-mine.name = Šoková mina block.overdrive-projector.name = Vysokorychlostní projektor block.force-projector.name = Silový projektor block.arc.name = Oblouk -block.rtg-generator.name = RTG Generátor +block.rtg-generator.name = RTG generátor block.spectre.name = Spektr block.meltdown.name = Meltdown block.container.name = Kontejnér @@ -981,14 +982,14 @@ team.orange.name = oranžová team.derelict.name = derelict team.green.name = zelená team.purple.name = fialová -unit.spirit.name = Spirit Dron +unit.spirit.name = Spirit dron unit.draug.name = Draug Miner Drone -unit.phantom.name = Fantom Dron +unit.phantom.name = Fantom dron unit.dagger.name = Dagger unit.crawler.name = Crawler unit.titan.name = Titán -unit.ghoul.name = Ghůl Bombardér -unit.wraith.name = Bojovník Wraith +unit.ghoul.name = Ghůl bombardér +unit.wraith.name = Wraith unit.fortress.name = Pevnost unit.revenant.name = Revenant unit.eruptor.name = Eruptor @@ -996,31 +997,31 @@ unit.chaos-array.name = Chaos Array unit.eradicator.name = Eradicator unit.lich.name = Lich unit.reaper.name = Reaper -tutorial.next = [lightgray] -tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper -tutorial.intro.mobile = You have entered the[scarlet] Mindustry Tutorial.[]\nSwipe the screen to move.\n[accent]Pinch with 2 fingers [] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper -tutorial.drill = Manuální těžba je neefektivní.\n[accent]Vrty []budou těžit automaticky.\npolož jeden na měděnou rudu. -tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nTap the drill tab in the bottom right.\nSelect the[accent] mechanical drill[].\nPlace it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement. -tutorial.blockinfo = Each block has different stats. Each drill can only mine certain ores.\nTo check a block's info and stats,[accent] tap the "?" button while selecting it in the build menu.[]\n\n[accent]Access the Mechanical Drill's stats now.[] +tutorial.next = [lightgray] +tutorial.intro = Vítej v [scarlet] Mindustry Tutoriálu.[]\nZačni [accent] těžením mědi[] - klikni na měděnou žílu v blízkosti jádra.\n\n[accent]{0}/{1} copper +tutorial.intro.mobile = Vítej v [scarlet] Mindustry Tutoriálu.[]\nPohybuj se táhnutím do stran.\nPřibližuj a oddaluj [accent]2 prsty [].\nZačni [accent] těžením mědi[] - přibliž se k měděné žíle v blízkosti jádra a klepni na ni.\n\n[accent]{0}/{1} mědi +tutorial.drill = Manuální těžba je neefektivní.\n[accent]Vrty []budou těžit automaticky.\nPostav jeden na měděnou rudu. +tutorial.drill.mobile = Manuální těžba je neefektivní.\n[accent]Vrty []budou těžit automaticky.\nKlepni na vrt v záložce dole vpravo.\nVyber [accent] mechanický vrt[].\nPolož ho klepnutím na měděnou žílu a následně potvrď [accent] fajfkou[] níže.\nStiskni [accent] X [] pro zrušení stavby. +tutorial.blockinfo = Každý blok má jiné vlastnosti. Každý vrt může těžit pouze některé suroviny.\nNa tyto vlastnosti se můžeš podívat [accent] klepnutím na "?" ve stavebním menu.[]\n\n[accent] Nyní se podívej na vlastnosti mechanického vrtu.[] tutorial.conveyor = [accent]Dopravníky[] jsou zapotřebí k dopravě materiálu k jádru.\nVytvoř řadu dopravníku od vrtu až k jádru. -tutorial.conveyor.mobile = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.\n[accent] Place in a line by holding down your finger for a few seconds[] and dragging in a direction.\n\n[accent]{0}/{1} conveyors placed in line\n[accent]0/1 items delivered +tutorial.conveyor.mobile = [accent]Dopravníky[] jsou zapotřebí k dopravě materiálu k jádru.\nVytvoř řadu dopravníku od vrtu až k jádru.\n[accent] Pokládej dopravníky v řadě dlouhým stiskem prstu[] a táhnutím v požadovaném směru.\n\n[accent]{0}/{1} přepravníků položeno v řadě\n[accent]0/1 předmětů doručeno tutorial.turret = Defenzivní stavby musí být postaveny za účelem obrany vůči[LIGHT_GRAY] nepříteli[].\nPostav střílnu Duo blízko svého jádra. -tutorial.drillturret = Duo střílny požadují[accent] měd jako střelivo []ke střelbě.\nPolož vrt blízko střílny pro zásobování mědí. -tutorial.pause = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press space to pause. -tutorial.pause.mobile = During battle, you are able to[accent] pause the game.[]\nYou may queue buildings while paused.\n\n[accent]Press this button in the top left to pause. -tutorial.unpause = Now press space again to unpause. -tutorial.unpause.mobile = Now press it again to unpause. -tutorial.breaking = Blocks frequently need to be destroyed.\n[accent]Hold down right-click[] to destroy all blocks in a selection.[]\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection. -tutorial.breaking.mobile = Blocks frequently need to be destroyed.\n[accent]Select deconstruction mode[], then tap a block to begin breaking it.\nDestroy an area by holding down your finger for a few seconds[] and dragging in a direction.\nPress the checkmark button to confirm breaking.\n\n[accent]Destroy all the scrap blocks to the left of your core using area selection. -tutorial.withdraw = In some situations, taking items directly from blocks is necessary.\nTo do this, [accent]tap a block[] with items in it, then [accent]tap the item[] in the inventory.\nMultiple items can be withdrawn by [accent]tapping and holding[].\n\n[accent]Withdraw some copper from the core.[] -tutorial.deposit = Deposit items into blocks by dragging from your ship to the destination block.\n\n[accent]Deposit your copper back into the core.[] -tutorial.waves = [LIGHT_GRAY] nepřítel[] je přibližuje.\n\nBraň své jádro po dobu dvou vln, postav více střílen. -tutorial.waves.mobile = The[lightgray] enemy[] approaches.\n\nDefend the core for 2 waves. Your ship will automatically fire at enemies.\nBuild more turrets and drills. Mine more copper. -tutorial.launch = Once you reach a specific wave, you are able to[accent] launch the core[], leaving your defenses behind and[accent] obtaining all the resources in your core.[]\nThese resources can then be used to research new technology.\n\n[accent]Press the launch button. +tutorial.drillturret = Duo střílny požadují[accent] měděnou munici []jako střelivo.\nPolož mechanický vrt blízko střílny pro zásobování mědí. +tutorial.pause = Během boje můžeš[accent] pauznout hru.[]\nBěhem pauzy je možné plánovat stavbu budov.\n\n[accent]Pauzni mezerníkem. +tutorial.pause.mobile = Během boje můžeš[accent] pauznout hru.[]\nBěhem pauzy je možné plánovat stavbu budov.\n\n[accent]Pauzu dáš tímhle tlačítkem vlevo nahoře. +tutorial.unpause = Teď zmáčkni mezerník znova a odpauzuj hru. +tutorial.unpause.mobile = Teď ho zmáčkni znova a odpauzuj hru. +tutorial.breaking = Často je nutné bloky i ničit.\n[accent]Drž pravé tlačítko[] a táhni pro výběr oblasti bloků ke zničení.[]\n\n[accent]Znič všechny bloky šrotu vlevo od tvého jádra. +tutorial.breaking.mobile = Často je nutné bloky i ničit.\n[accent]Vyber rozebírací mód[] a klepni na blok, který chceš zničit.\nZnič celou oblast delším stiskem prstu[] a táhnutím v nějakém směru.\nZmáčkni fajfku pro potvrzení zničení.\n\n[accent]Znič všechny bloky šrotu vlevo od tvého jádra. +tutorial.withdraw = Někdy je třeba odebírat předměty přímo z bloků.\n[accent]Klikni na blok[], ve kterém jsou předměty a pak [accent]klikni na předmět[] z jeho inventáře.\nVícero předmětů může být odebráno [accent]kliknutím a držením[].\n\n[accent]Odeber nějakou měď z jádra.[] +tutorial.deposit = Vložit předměty dovnitř bloku můžeš přetažením z tvé lodi na cílový blok.\n\n[accent]Vlož svou měď zpět do jádra.[] +tutorial.waves = [LIGHT_GRAY] Nepřítel[] se přibližuje.\n\nUbraň své jádro po dobu 2 vln, postav více střílen. +tutorial.waves.mobile = [lightgray] Nepřítel[] se přibližuje.\n\nUbraň své jádro po dobu 2 vln. Tvá loď bude automaticky střílet po nepřátelských jednotkách.\nPostav více střílen a vrtů. Natěž více mědi. +tutorial.launch = Jakmile dosáhneš určité vlny, budeš moci[accent] vyslat jádro[]. Opustíš tím svou základnu a[accent] získáš suroviny uložené v jádře.[]\nZískané suroviny mohou být použity pro výzkum nových technologií.\n\n[accent]Stiskni tlačítko vyslat jádro. item.copper.description = Užitečný strukturální materiál. Používá se rozsáhle v ostatních typech bloků. item.lead.description = Základní počáteční materiál. Požívá se rozsáhle v elektronice a v blocích pro transport tekutin. -item.metaglass.description = Vemi důležitá suočást všeho so se týká tekutin -item.graphite.description = Stlačený uhlík nedílná součást většiny infrastruktur +item.metaglass.description = Vemi důležitá součást všeho co se týká tekutin +item.graphite.description = Stlačený uhlík, používaný jako munice a v elektronických komponentách. item.sand.description = Běžný materiál rozšířeně používaný v spalování slitin. item.coal.description = Běžné a snadno dostupné palivo, pochází z Ostravy. item.titanium.description = Vzácný, velice lehký kov, používá se rozsáhle v trasportu tekutin, vrtech a letounech. @@ -1038,29 +1039,29 @@ liquid.slag.description = Rostavený scrap pou žívá se k vírobě olova mědi liquid.oil.description = Může být spálen, vybouchnout nebo použit jako chlazení. liquid.cryofluid.description = Nejefektivnější tekutina pro chlazení. mech.alpha-mech.description = Standartní mech. Má slušnou rychlost a poškození; Může vytvořit až 3 drony Pro zvýšenou ofenzivní způsobilost. -mech.delta-mech.description = Rychlý, Lehce obrněný mech vytvořený pro udeř a uteč akce. Působí malé poškození vůči struktůrám, ale může zneškodnit velkou skupinu nepřátelských jednotek velmi rychle svýmy elektro-obloukovými zbraněmi +mech.delta-mech.description = Rychlý, lehce obrněný mech vytvořený pro udeř a uteč akce. Působí malé poškození vůči struktůrám, ale může zneškodnit velkou skupinu nepřátelských jednotek velmi rychle svýmy elektro-obloukovými zbraněmi mech.tau-mech.description = Podpůrný mech. Léčí spojenecké stavby a jednotky střelbou do nich. Může léčit i spojence ve svém poli působení. mech.omega-mech.description = Objemný a velice dovře obrněný mech, určen pro útok v přední linii. Jeho schopnost obrnění blokuje až 90% příchozího poškození. -mech.dart-ship.description = Standartní loď. Poměrně rychlý a lehký, má malou ofenzívu a pomalou rychlost těžení. +mech.dart-ship.description = Standartní loď. Poměrně rychlá a lehká, má malou ofenzívu a pomalou rychlost těžení. mech.javelin-ship.description = Loď stylu udeř a uteč. Zpočátku pomalý ale umí akcelerovat do obrovské rychlosti a létat u nepřátelských základen a působit značné škody svými elektrickými zbraněmi a raketami. mech.trident-ship.description = Těžký bombardér. Docela dobře obrněný. -mech.glaive-ship.description = Obrovská, Dobře obrněná střelecká loď. Vybavena zápalným opakovačem. Dobrá akcelerace a maximální rychlost. -unit.draug.description = A primitive mining drone. Cheap to produce. Expendable. Automatically mines copper and lead in the vicinity. Delivers mined resources to the closest core. +mech.glaive-ship.description = Obrovská, dobře obrněná střelecká loď. Vybavena zápalným opakovačem. Dobrá akcelerace a maximální rychlost. +unit.draug.description = Jednoduchý těžící dron. Levný a postradatelný. Automaticky těží měď a olovo v blízkosti. Natěžené suroviny donese do nejbližšího jádra. unit.spirit.description = Startovní dron. Standartně se objevuje u jádra. Automaticky těží rudy a opravuje stavby. unit.phantom.description = Pokročilý dron. Automaticky těží rudy a opravuje stavby. Podstatně víc efektivní než Spirit dron. unit.dagger.description = Základní pozemní jednotka. Efektivní ve velkém počtu. -unit.crawler.description = A ground unit consisting of a stripped-down frame with high explosives strapped on top. Not particular durable. Explodes on contact with enemies. +unit.crawler.description = Pozemní jednotka zkonstruovaná z okřesané železné kostry a připlácnutých výbušnin. Vydrží málo a exploduje při kontaktu. unit.titan.description = Pokročilá, obrněná pozemní jednotka. Útočí jak na pozemní tak vzdušné nepřátelské jednotky. unit.fortress.description = Težká, pozemní artilérní jednotka. -unit.eruptor.description = A heavy mech designed to take down structures. Fires a stream of slag at enemy fortifications, melting them and setting volatiles on fire. +unit.eruptor.description = Těžký protibudovní mech. Střílí proud žhavé kapaliny na nepřátelské budovy. Zapaluje a roztavuje vše v cestě. unit.wraith.description = Rychlý, udeř a uteč stíhací letoun. unit.ghoul.description = Těžký, kobercový bombardér. unit.revenant.description = A heavy, hovering missile array. -block.message.description = Stores a message. Used for communication between allies. -block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite. -block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently. +block.message.description = Ukládá zprávu. Používá se pro komunikaci mezi spojenci. +block.graphite-press.description = Přeměňuje neforemné kusy uhlí do ušlechtilých výlisků graphitu. +block.multi-press.description = Vylepšená verze graphitového lisu. Využívá vodu a energii k rychlejšímu a efektivnějšímu zpracování uhlí. block.silicon-smelter.description = Redukuje písek s vysoce čistým koksem za účelem výroby křemíku. -block.kiln.description = Smelts sand and lead into metaglass. Requires small amounts of power. +block.kiln.description = Přetavuje písek a olovo do metaskla. Vyžaduje malé množství energie. block.plastanium-compressor.description = Produkuje plastánium za pomocí titánia a ropy. block.phase-weaver.description = Produkuje fázovou tkaninu z radioaktivního thoria a velkého množství písku. block.alloy-smelter.description = Produkuje impulzní slitinu z titánia, olova, křemíku a mědi. @@ -1069,7 +1070,7 @@ block.blast-mixer.description = Používá ropu k přeměně pyratitu do méně block.pyratite-mixer.description = Míchá uhlí, olovo a písek do velice hořlavého pyratitu. block.melter.description = Taví kámen při velice vysokých teplotách na lávu. block.separator.description = Vystaví kámen velkému tlaku vody k získání různých materiálů obsažené v kameni. -block.spore-press.description = Compresses spore pods into oil. +block.spore-press.description = Vylisuje ze spórů ropu. block.pulverizer.description = Drtí kámen na písek. Užitečné když se v oblasti nenalézá písek. block.coal-centrifuge.description = Solidifes oil into chunks of coal. block.incinerator.description = Zbaví tě přebytku předmětů. @@ -1080,10 +1081,10 @@ block.item-void.description = Likviduje jakéhokoliv vstupní předmět bež pou block.liquid-source.description = Nekonečný zdroj tekutin. Jen pro Sandbox. block.copper-wall.description = Levný defenzivní blok.\nUžitečný k obraně tvého jádra a střílen v prvotních vlnách nepřátel. block.copper-wall-large.description = Levný defenzivní blok.\nUžitečný k obraně tvého jádra a střílen v prvotních vlnách nepřátel.\nZabírá více polí. -block.titanium-wall.description = A moderately strong defensive block.\nProvides moderate protection from enemies. -block.titanium-wall-large.description = A moderately strong defensive block.\nProvides moderate protection from enemies.\nSpans multiple tiles. -block.plastanium-wall.description = A special type of wall that absorbs electric arcs and blocks automatic power node connections. -block.plastanium-wall-large.description = A special type of wall that absorbs electric arcs and blocks automatic power node connections.\nSpans multiple tiles. +block.titanium-wall.description = Středně dobrý obranný blok.\nPoskytuje středně dobrou obranu proti nepřátelům. +block.titanium-wall-large.description = Středně dobrý obranný blok.\nPoskytuje středně dobrou obranu proti nepřátelům.\nZabírá více polí. +block.plastanium-wall.description = Speciální typ zdi, která je schopná absorbovat elektrické oblouky a blokuje energetické připojení. +block.plastanium-wall-large.description = Speciální typ zdi, která je schopná absorbovat elektrické oblouky a blokuje energetické připojení.\nZabírá více polí. block.thorium-wall.description = Sílný defenzivní blok.\nDobrá obrana vůči nepřátelům. block.thorium-wall-large.description = Sílný defenzivní blok.\nDobrá obrana vůči nepřátelům..\nZabírá více polí. block.phase-wall.description = Né tak silná jako zeď Thoria ale odráží nepřátelské projektily dokud nejsou moc silné. @@ -1092,7 +1093,7 @@ block.surge-wall.description = Nejsilnější defenzivní blok.\nMá malou šanc block.surge-wall-large.description = Nejsilnější defenzivní blok.\nMá malou šanci vystřelit elektrický paprsek vůči útočníkovi.\nZabírá více polí. block.door.description = Malé dveře, které se dají otevřít nebo zavřít kliknutím na ně.\nKdyž otevřené nepřátelé mohou střílet a dostat se skrz. block.door-large.description = Velké dveře, které se dají otevřít nebo zavřít kliknutím na ně.\nKdyž otevřené nepřátelé mohou střílet a dostat se skrz.\nZabírá více polí. -block.mender.description = Periodically repairs blocks in its vicinity. Keeps defenses repaired in-between waves.\nOptionally uses silicon to boost range and efficiency. +block.mender.description = Pravidelně opravuje bloky ve svém okolí. Mezi vlnami opraví zátarasy.\nVolitelně lze využít křemíku pro posílení dosahu a efektivity. block.mend-projector.description = Kontinuálně léčí bloky v poli svého působení. block.overdrive-projector.description = Zrychluje funkce blízkých struktůr jako jsou vrty a dopravníky. block.force-projector.description = Vytvoří okolo sebe šestihrané silové pole, chrání jednotky a budovy uvnitř sebe vůči střelám. @@ -1120,13 +1121,13 @@ block.bridge-conduit.description = Pokročilý blok přepravy tekutin. Dovoluje block.phase-conduit.description = Pokročilý blok přepravy tekutin. Používá energii k teleportu tekutin do druhého bodu přez několik polí. block.power-node.description = Vysílá energii mezi propojenými uzly. Dokáže se propojit až se čtyřmi uzly či stavbami najednou. Uzel bude dostávat zásobu energie a bude ji distribuovat mezi připojené bloky. block.power-node-large.description = Má větší dosah než standartní energetický uzel and a dokáže propojit až 6 staveb nebo uzly. -block.surge-tower.description = An extremely long-range power node with fewer available connections. +block.surge-tower.description = Energetický uzel s extrémním dosahem, ale méně dostupnými přípojkami. block.battery.description = Ukládá energii kdykoliv kdy je nadbytek ,poskytuje energii kdykolik když je pokles energie v síti, tak dlouho doku zbývá kapacita. block.battery-large.description = Uloží více energie než standartní baterie. block.combustion-generator.description = Generuje energii spalováním ropy nebo jinných hořlavých materiálů. block.thermal-generator.description = Generuje obrovské množství energie z lávy. block.turbine-generator.description = Více efektivní než spalovací generátor, ale vyžaduje dodatečný přísun vody. -block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite. +block.differential-generator.description = Generuje velké množství energie. Využívá teplotního rozdílu mezi chladící kapalinou a hořícím pyratitem. block.rtg-generator.description = Rádioizotopní Termoelektrický Generátor nevyžaduje chlazení, za to generuje méně energie než Thoriový generátor. block.solar-panel.description = Poskytuje malé množství energie ze slunce. block.solar-panel-large.description = Poskytuje mnohem lepší zdroj energie než standartní solární panel, za to je mnohem nákladnější na stavbu. @@ -1139,17 +1140,17 @@ block.blast-drill.description = Ultimátní vrt, vyžaduje velké množství ene block.water-extractor.description = Extrahuje vodu ze země. Vhodný k použití když se v oblasti nenachází zdroj vody. block.cultivator.description = Kultivuje půdu vodou za účelem získání biohmoty. block.oil-extractor.description = Vyžaduje velké množství energie na extrakci ropy z písku. Použíj ho když se v oblasti nenachází žádný zdroj ropy. -block.core-shard.description = The first iteration of the core capsule. Once destroyed, all contact to the region is lost. Do not let this happen. -block.core-foundation.description = The second version of the core. Better armored. Stores more resources. -block.core-nucleus.description = The third and final iteration of the core capsule. Extremely well armored. Stores massive amounts of resources. -block.vault.description = Ukládá velké množství předmětů každého typu. Připojené kontejnéry, trezory nebo jádra se budou chovat jako samostatné skladovací jednotky. [LIGHT_GRAY] Odbavovač[] lže použít pro odbavení předmětů z trezoru. +block.core-shard.description = První verze jádra. V případě, že je zničeno, veškerý kontakt s regionem je ztracen. Nedopusťte aby se to stalo. +block.core-foundation.description = Druhá, lépe obrněná verze jádra. Pojme více surovin. +block.core-nucleus.description = Třetí a finální iterace vývoje jádra. Extrémně obrněná, extrémně prostorná. +block.vault.description = Ukládá velké množství předmětů každého typu. Připojené kontejnéry, trezory nebo jádra se budou chovat jako samostatné skladovací jednotky. [LIGHT_GRAY] Odbavovač[] lze použít pro odbavení předmětů z trezoru. block.container.description = Ukládá malé množství předmětů každého typu. Připojené kontejnéry, trezory nebo jádra se budou chovat jako samostatné skladovací jednotky. [LIGHT_GRAY] Odbavovač[] lze použít pro odbavení předmětů z kontejnéru. -block.unloader.description = Vykládá předměty z kontejnéru, trezoru nebo jádra na dopravník nebo přímo do produktivních bloků. Druh předmětu pro vykládání lze měti kliknutím na odbavovač. -block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. -block.launch-pad-large.description = An improved version of the launch pad. Stores more items. Launches more frequently. +block.unloader.description = Vykládá předměty z kontejnéru, trezoru nebo jádra na dopravník nebo přímo do produktivních bloků. Druh předmětu pro vykládání lze změnit kliknutím na odbavovač. +block.launch-pad.description = Posílá dávky předmětů do vesmíru bez nutnosti vysílat jádro. Nedokončený. +block.launch-pad-large.description = Vylepšený Launch Pad. Větší úložný prostor, častěji vysílán do vesmíru. block.duo.description = Malá, levná střílna. -block.scatter.description = A medium-sized anti-air turret. Sprays clumps of lead or scrap flak at enemy units. -block.scorch.description = Burns any ground enemies close to it. Highly effective at close range. +block.scatter.description = Protivzdušná střílna střední velikosti. Střílí hrstky olova nebo šrotu. +block.scorch.description = Spálí nepřátele v blízkosti na prach. Velmi efektivní na malé vzdálenosti. block.hail.description = Malá artilérní střílna. block.wave.description = Středně vělká, rychle pálící střílna, která střílí krystalizované bubliny. block.lancer.description = Středně velká střílna, která střílí nabité elektrické paprsky. @@ -1161,8 +1162,8 @@ block.ripple.description = Velká artilérní střílna, která vystřelí něko block.cyclone.description = Velká rychle pálící střílna. block.spectre.description = Velká střílna, která vystřelí dva mocné projektily naráz. block.meltdown.description = Velká střílna, která vystřelí mocný paprsek dalekého dosahu. -block.command-center.description = Issues movement commands to allied units across the map.\nCauses units to patrol, attack an enemy core or retreat to the core/factory. When no enemy core is present, units will default to patrolling under the attack command. -block.draug-factory.description = Produces Draug mining drones. +block.command-center.description = Umožňuje zadávat příkazy k pohybu spojeneckých jednotek po mapě.\nUmožňuje výběr mezi patrolováním, útokem na nepřítele, či návratem k jádru nebo továrně. Pokud se na mapě nenachází nepřátelské jádro, jednotky budou patrolovat v útočném režimu. +block.draug-factory.description = Produkuje těžící Draug drony. block.spirit-factory.description = Produkuje lehké drony, kteří teží minerály a opravují budovy block.phantom-factory.description = Produkuje pokročilé drony kteří jsou podstatně efektivnější jak spirit droni. block.wraith-factory.description = Produkuje rychlé, udeř a uteč stíhače. @@ -1173,10 +1174,10 @@ block.crawler-factory.description = Produces fast self-destructing swarm units. block.titan-factory.description = Produkuje pokročilé, orněné pozemní jednotky. block.fortress-factory.description = Produkuje těžké artilérní, pozmení jednotky. block.repair-point.description = Kontinuálně léčí nejbližší budovy a jednotky. -block.dart-mech-pad.description = Provides transformation into a basic attack mech.\nUse by tapping while standing on it. -block.delta-mech-pad.description = Zanech zde své aktuální plavidlo a změn ho na rychlého, lehce obrněného mecha určeného pro udeř a uteč operace.\nPoužíj ho poklikáním když se nacházíš nad ním. -block.tau-mech-pad.description = Zanech zde své aktuální plavidlo a změn ho na na podpůrného mecha, který léčí spojenecké budovy a jednotky.\nPoužíj ho poklikáním když se nacházíš nad ním. -block.omega-mech-pad.description = Zanech zde své aktuální plavidlo a změn ho na objemného dobře obrněného mecha, určeného pro útok v přední linii.\nPoužíj ho poklikáním když se nacházíš nad ním. -block.javelin-ship-pad.description = Zanech zde své aktuální plavidlo a změn ho na silný a rychlý stíhač s bleskovými zbraněmi.\nPoužíj ho poklikáním když se nacházíš nad ním. -block.trident-ship-pad.description = Zanech zde své aktuální plavidlo a změň ho do docela dobře obrněného těžkého bombardéru.\nPoužíj ho poklikáním když se nacházíš nad ním. -block.glaive-ship-pad.description = Zanech zde své aktuální plavidlo a změn ho na velkou, dobře obrněnou střeleckou loď.\nPoužíj ho poklikáním když se nacházíš nad ním. +block.dart-mech-pad.description = Zanech zde své aktuální plavidlo a vyměň ho za základního útočného mecha.\nAktivuj kliknutím, když se nacházíš nad platformou. +block.delta-mech-pad.description = Zanech zde své aktuální plavidlo a vyměň ho za rychlého, lehce obrněného mecha určeného pro udeř a uteč operace.\nAktivuj kliknutím, když se nacházíš nad platformou. +block.tau-mech-pad.description = Zanech zde své aktuální plavidlo a vyměň ho za na podpůrného mecha, který léčí spojenecké budovy a jednotky.\nAktivuj kliknutím, když se nacházíš nad platformou. +block.omega-mech-pad.description = Zanech zde své aktuální plavidlo a vyměň ho za objemného dobře obrněného mecha, určeného pro útok v přední linii.\nAktivuj kliknutím, když se nacházíš nad platformou. +block.javelin-ship-pad.description = Zanech zde své aktuální plavidlo a vyměň ho za silný a rychlý stíhač s bleskovými zbraněmi.\nAktivuj kliknutím, když se nacházíš nad platformou. +block.trident-ship-pad.description = Zanech zde své aktuální plavidlo a vyměň ho za docela dobře obrněného těžkého bombardéru.\nAktivuj kliknutím, když se nacházíš nad platformou. +block.glaive-ship-pad.description = Zanech zde své aktuální plavidlo a vyměň ho za velkou, dobře obrněnou střeleckou loď.\nAktivuj kliknutím, když se nacházíš nad platformou. diff --git a/core/assets/contributors b/core/assets/contributors index 09337c529a..afe1bc3b45 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -84,3 +84,4 @@ amrsoll Draco Quezler Alicila +Daniel Dusek From 03286b29e8a888dbdfbbabdc55b37670b597bcfa Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 6 Jan 2020 08:37:19 -0500 Subject: [PATCH 76/78] Changed Cyrillic font --- core/assets/fonts/font.ttf | Bin 8477164 -> 8478980 bytes gradle.properties | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/fonts/font.ttf b/core/assets/fonts/font.ttf index 7a323554549d97153856cd083446eb2634c3f3e1..6b585dcbddc2e412c81599f66c5cba61a13e825f 100644 GIT binary patch delta 181743 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 delta 179520 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 EZVVC@kv*hO%$ls(>{-)FN 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 diff --git a/gradle.properties b/gradle.properties index 015c89b285..806d8ee368 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=919a8f30e16d6b3d8fa96d438c5ff621899b4368 +archash=e18f0f1074ef97fc72053c57d82c39183420575d From dd3c4d06ac2dfd19e907e552f282949449f278f0 Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Mon, 6 Jan 2020 17:32:18 +0100 Subject: [PATCH 77/78] Mass driver place range assist (#1331) --- .../world/blocks/distribution/MassDriver.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/core/src/mindustry/world/blocks/distribution/MassDriver.java b/core/src/mindustry/world/blocks/distribution/MassDriver.java index 2974fe457f..f55c31fd28 100644 --- a/core/src/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/mindustry/world/blocks/distribution/MassDriver.java @@ -162,6 +162,16 @@ public class MassDriver extends Block{ @Override public void drawPlace(int x, int y, int rotation, boolean valid){ Drawf.dashCircle(x * tilesize, y*tilesize, range, Pal.accent); + + // check if a mass driver is selected while placing this driver + if(!control.input.frag.config.isShown()) return; + Tile selected = control.input.frag.config.getSelectedTile(); + if(!(selected.block() instanceof MassDriver) || !(selected.dst(x * tilesize, y * tilesize) <= range)) return; + + // if so, draw a dotted line towards it while it is in range + Lines.stroke(2f, Pal.placing); + Lines.dashLine(x * tilesize, y * tilesize, selected.drawx(), selected.drawy(), (int)range / tilesize / 4); + Draw.reset(); } @Override From 7f23803db121e9f9a14fddbda0ccee6dde1f5083 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 6 Jan 2020 16:25:08 -0500 Subject: [PATCH 78/78] Visual changes --- .../world/blocks/distribution/MassDriver.java | 16 ++++++++++++---- .../mindustry/world/blocks/power/PowerDiode.java | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/world/blocks/distribution/MassDriver.java b/core/src/mindustry/world/blocks/distribution/MassDriver.java index f55c31fd28..eacef7d0eb 100644 --- a/core/src/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/mindustry/world/blocks/distribution/MassDriver.java @@ -163,14 +163,22 @@ public class MassDriver extends Block{ public void drawPlace(int x, int y, int rotation, boolean valid){ Drawf.dashCircle(x * tilesize, y*tilesize, range, Pal.accent); - // check if a mass driver is selected while placing this driver + //check if a mass driver is selected while placing this driver if(!control.input.frag.config.isShown()) return; Tile selected = control.input.frag.config.getSelectedTile(); - if(!(selected.block() instanceof MassDriver) || !(selected.dst(x * tilesize, y * tilesize) <= range)) return; + if(selected == null || !(selected.block() instanceof MassDriver) || !(selected.dst(x * tilesize, y * tilesize) <= range)) return; - // if so, draw a dotted line towards it while it is in range + //if so, draw a dotted line towards it while it is in range + float sin = Mathf.absin(Time.time(), 6f, 1f); + Tmp.v1.set(x * tilesize + offset(), y * tilesize + offset()).sub(selected.drawx(), selected.drawy()).limit((size / 2f + 1) * tilesize + sin + 0.5f); + float x2 = x * tilesize - Tmp.v1.x, y2 = y * tilesize - Tmp.v1.y, + x1 = selected.drawx() + Tmp.v1.x, y1 = selected.drawy() + Tmp.v1.y; + int segs = (int)(selected.dst(x * tilesize, y * tilesize) / tilesize); + + Lines.stroke(4f, Pal.gray); + Lines.dashLine(x1, y1, x2, y2, segs); Lines.stroke(2f, Pal.placing); - Lines.dashLine(x * tilesize, y * tilesize, selected.drawx(), selected.drawy(), (int)range / tilesize / 4); + Lines.dashLine(x1, y1, x2, y2, segs); Draw.reset(); } diff --git a/core/src/mindustry/world/blocks/power/PowerDiode.java b/core/src/mindustry/world/blocks/power/PowerDiode.java index 282e716286..eea5b46d72 100644 --- a/core/src/mindustry/world/blocks/power/PowerDiode.java +++ b/core/src/mindustry/world/blocks/power/PowerDiode.java @@ -27,7 +27,7 @@ public class PowerDiode extends Block{ public void update(Tile tile){ super.update(tile); - if(tile.front() == null || tile.back() == null || !tile.back().block().hasPower || !tile.front().block().hasPower) return; + if(tile.front() == null || tile.back() == null || !tile.back().block().hasPower || !tile.front().block().hasPower || tile.back().getTeam() != tile.front().getTeam()) return; PowerGraph backGraph = tile.back().entity.power.graph; PowerGraph frontGraph = tile.front().entity.power.graph;