From bbe6c5017abfe597f6483a53b92bfb4c435ae6e4 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 19 Aug 2020 15:13:29 -0400 Subject: [PATCH] Removed synthetic accessors / Sector sanity tests --- core/src/mindustry/content/Blocks.java | 2 +- core/src/mindustry/content/TechTree.java | 4 ++-- core/src/mindustry/core/World.java | 3 +++ .../mindustry/editor/MapGenerateDialog.java | 9 ++++++--- core/src/mindustry/editor/MapView.java | 14 +++++++------- core/src/mindustry/editor/WaveInfoDialog.java | 2 +- .../mindustry/entities/comp/BuildingComp.java | 3 +-- core/src/mindustry/game/Saves.java | 8 ++++---- core/src/mindustry/game/Tutorial.java | 6 +++--- core/src/mindustry/graphics/FloorRenderer.java | 3 +++ core/src/mindustry/io/JsonIO.java | 2 +- core/src/mindustry/logic/LCanvas.java | 2 +- core/src/mindustry/logic/LCategory.java | 2 +- core/src/mindustry/maps/Maps.java | 2 +- core/src/mindustry/mod/ContentParser.java | 18 +++++++++--------- core/src/mindustry/mod/Mods.java | 2 +- core/src/mindustry/mod/Scripts.java | 2 +- core/src/mindustry/net/ArcNetProvider.java | 2 +- core/src/mindustry/ui/dialogs/AboutDialog.java | 4 ++-- core/src/mindustry/ui/dialogs/ColorPicker.java | 2 +- .../ui/dialogs/CustomRulesDialog.java | 2 +- core/src/mindustry/ui/dialogs/FileChooser.java | 6 +++--- .../src/mindustry/ui/dialogs/PlanetDialog.java | 8 ++++---- .../mindustry/ui/dialogs/ResearchDialog.java | 14 +++++++------- .../mindustry/ui/dialogs/SchematicsDialog.java | 2 +- .../ui/fragments/BlockConfigFragment.java | 4 ++-- .../ui/fragments/BlockInventoryFragment.java | 12 ++++++------ .../ui/fragments/MinimapFragment.java | 2 +- core/src/mindustry/world/Tiles.java | 5 ++++- .../world/blocks/defense/ForceProjector.java | 4 ++-- .../world/blocks/distribution/Conveyor.java | 4 ++-- .../world/blocks/units/RepairPoint.java | 2 +- tests/src/test/java/SectorTests.java | 3 +++ 33 files changed, 87 insertions(+), 73 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 80bc7d2fb8..65d45aa256 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -270,7 +270,7 @@ public class Blocks implements ContentList{ }}; grass = new Floor("grass"){{ - + attributes.set(Attribute.water, 0.1f); }}; salt = new Floor("salt"){{ diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java index 2a92e9ad0f..f5c6b19d3c 100644 --- a/core/src/mindustry/content/TechTree.java +++ b/core/src/mindustry/content/TechTree.java @@ -17,7 +17,7 @@ import static mindustry.content.UnitTypes.*; import static mindustry.type.ItemStack.*; public class TechTree implements ContentList{ - private static ObjectMap map = new ObjectMap<>(); + static ObjectMap map = new ObjectMap<>(); public static Seq all; public static TechNode root; @@ -544,7 +544,7 @@ public class TechTree implements ContentList{ } public static class TechNode{ - private static TechNode context; + static TechNode context; /** Depth in tech tree. */ public int depth; diff --git a/core/src/mindustry/core/World.java b/core/src/mindustry/core/World.java index f9c7e97e15..9dea5f0e35 100644 --- a/core/src/mindustry/core/World.java +++ b/core/src/mindustry/core/World.java @@ -484,6 +484,9 @@ public class World{ private class Context implements WorldContext{ + Context(){ + } + @Override public Tile tile(int index){ return tiles.geti(index); diff --git a/core/src/mindustry/editor/MapGenerateDialog.java b/core/src/mindustry/editor/MapGenerateDialog.java index 684f410b26..0d2922a1a5 100644 --- a/core/src/mindustry/editor/MapGenerateDialog.java +++ b/core/src/mindustry/editor/MapGenerateDialog.java @@ -37,18 +37,18 @@ public class MapGenerateDialog extends BaseDialog{ private Pixmap pixmap; private Texture texture; private GenerateInput input = new GenerateInput(); - private Seq filters = new Seq<>(); + Seq filters = new Seq<>(); private int scaling = mobile ? 3 : 1; private Table filterTable; private AsyncExecutor executor = new AsyncExecutor(1); private AsyncResult result; - private boolean generating; + boolean generating; private GenTile returnTile = new GenTile(); private GenTile[][] buffer1, buffer2; private Cons> applier; - private CachedTile ctile = new CachedTile(){ + CachedTile ctile = new CachedTile(){ //nothing. @Override protected void changeEntity(Team team, Prov entityprov, int rotation){ @@ -408,6 +408,9 @@ public class MapGenerateDialog extends BaseDialog{ public byte team; public short block, floor, ore; + GenTile(){ + } + public void set(Block floor, Block wall, Block ore, Team team){ this.floor = floor.id; this.block = wall.id; diff --git a/core/src/mindustry/editor/MapView.java b/core/src/mindustry/editor/MapView.java index c1715a3d3b..7689e7aa48 100644 --- a/core/src/mindustry/editor/MapView.java +++ b/core/src/mindustry/editor/MapView.java @@ -22,7 +22,7 @@ import static mindustry.Vars.ui; public class MapView extends Element implements GestureListener{ private MapEditor editor; - private EditorTool tool = EditorTool.pencil; + EditorTool tool = EditorTool.pencil; private float offsetx, offsety; private float zoom = 1f; private boolean grid = false; @@ -31,11 +31,11 @@ public class MapView extends Element implements GestureListener{ private Rect rect = new Rect(); private Vec2[][] brushPolygons = new Vec2[MapEditor.brushSizes.length][0]; - private boolean drawing; - private int lastx, lasty; - private int startx, starty; - private float mousex, mousey; - private EditorTool lastTool; + boolean drawing; + int lastx, lasty; + int startx, starty; + float mousex, mousey; + EditorTool lastTool; public MapView(MapEditor editor){ this.editor = editor; @@ -204,7 +204,7 @@ public class MapView extends Element implements GestureListener{ zoom = Mathf.clamp(zoom, 0.2f, 20f); } - private Point2 project(float x, float y){ + Point2 project(float x, float y){ float ratio = 1f / ((float)editor.width() / editor.height()); float size = Math.min(width, height); float sclwidth = size * zoom; diff --git a/core/src/mindustry/editor/WaveInfoDialog.java b/core/src/mindustry/editor/WaveInfoDialog.java index 9de662dfa7..d5b957e143 100644 --- a/core/src/mindustry/editor/WaveInfoDialog.java +++ b/core/src/mindustry/editor/WaveInfoDialog.java @@ -23,7 +23,7 @@ import static mindustry.game.SpawnGroup.*; public class WaveInfoDialog extends BaseDialog{ private int displayed = 20; - private Seq groups = new Seq<>(); + Seq groups = new Seq<>(); private Table table; private int start = 0; diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index c8a643948b..773a15bc36 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -41,11 +41,10 @@ import static mindustry.Vars.*; @Component(base = true) abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, QuadTreeObject, Displayable, Senseable, Controllable{ //region vars and initialization - static final float timeToSleep = 60f * 1; + static final float timeToSleep = 60f * 1, timeToUncontrol = 60f * 6; static final ObjectSet tmpTiles = new ObjectSet<>(); static final Seq tempTileEnts = new Seq<>(); static final Seq tempTiles = new Seq<>(); - static final float timeToUncontrol = 60f * 6; static int sleepingEntities = 0; @Import float x, y, health; diff --git a/core/src/mindustry/game/Saves.java b/core/src/mindustry/game/Saves.java index bf9dd2ae95..501eaf2c3c 100644 --- a/core/src/mindustry/game/Saves.java +++ b/core/src/mindustry/game/Saves.java @@ -23,14 +23,14 @@ import java.util.*; import static mindustry.Vars.*; public class Saves{ - private Seq saves = new Seq<>(); - private @Nullable SaveSlot current; + Seq saves = new Seq<>(); + @Nullable SaveSlot current; private @Nullable SaveSlot lastSectorSave; - private AsyncExecutor previewExecutor = new AsyncExecutor(1); + AsyncExecutor previewExecutor = new AsyncExecutor(1); private boolean saving; private float time; - private long totalPlaytime; + long totalPlaytime; private long lastTimestamp; public Saves(){ diff --git a/core/src/mindustry/game/Tutorial.java b/core/src/mindustry/game/Tutorial.java index cfaa85a84c..bfa18e8e50 100644 --- a/core/src/mindustry/game/Tutorial.java +++ b/core/src/mindustry/game/Tutorial.java @@ -23,9 +23,9 @@ public class Tutorial{ private static final int mineCopper = 18; private static final int blocksToBreak = 3, blockOffset = -6; - private ObjectSet events = new ObjectSet<>(); - private ObjectIntMap blocksPlaced = new ObjectIntMap<>(); - private int sentence; + ObjectSet events = new ObjectSet<>(); + ObjectIntMap blocksPlaced = new ObjectIntMap<>(); + int sentence; public TutorialStage stage = TutorialStage.values()[0]; public Tutorial(){ diff --git a/core/src/mindustry/graphics/FloorRenderer.java b/core/src/mindustry/graphics/FloorRenderer.java index b13011fbba..43c45ad221 100644 --- a/core/src/mindustry/graphics/FloorRenderer.java +++ b/core/src/mindustry/graphics/FloorRenderer.java @@ -256,5 +256,8 @@ public class FloorRenderer implements Disposable{ /** Maps cache layer ID to cache ID in the batch. * -1 means that this cache is unoccupied. */ int[] caches = new int[CacheLayer.all.length]; + + Chunk(){ + } } } diff --git a/core/src/mindustry/io/JsonIO.java b/core/src/mindustry/io/JsonIO.java index 3629ddebae..a8995103d0 100644 --- a/core/src/mindustry/io/JsonIO.java +++ b/core/src/mindustry/io/JsonIO.java @@ -68,7 +68,7 @@ public class JsonIO{ return json.prettyPrint(in); } - private static void apply(Json json){ + static void apply(Json json){ json.setIgnoreUnknownFields(true); json.setElementType(Rules.class, "spawns", SpawnGroup.class); json.setElementType(Rules.class, "loadout", ItemStack.class); diff --git a/core/src/mindustry/logic/LCanvas.java b/core/src/mindustry/logic/LCanvas.java index 8469f0632f..11415c0e97 100644 --- a/core/src/mindustry/logic/LCanvas.java +++ b/core/src/mindustry/logic/LCanvas.java @@ -21,7 +21,7 @@ import mindustry.world.blocks.logic.*; public class LCanvas extends Table{ private static final Color backgroundCol = Pal.darkMetal.cpy().mul(0.1f), gridCol = Pal.darkMetal.cpy().mul(0.5f); - private static Seq postDraw = new Seq<>(); + static Seq postDraw = new Seq<>(); private Vec2 offset = new Vec2(); DragLayout statements; diff --git a/core/src/mindustry/logic/LCategory.java b/core/src/mindustry/logic/LCategory.java index 7689cd7819..b576261f74 100644 --- a/core/src/mindustry/logic/LCategory.java +++ b/core/src/mindustry/logic/LCategory.java @@ -7,7 +7,7 @@ public enum LCategory{ blocks(Pal.accentBack), control(Color.cyan.cpy().shiftSaturation(-0.6f).mul(0.7f)), operations(Pal.place.cpy().shiftSaturation(-0.5f).mul(0.7f)), - io(Pal.remove.cpy().shiftSaturation(-0.5f).mul(0.7f));; + io(Pal.remove.cpy().shiftSaturation(-0.5f).mul(0.7f)); public final Color color; diff --git a/core/src/mindustry/maps/Maps.java b/core/src/mindustry/maps/Maps.java index f36fe9e6cf..137b91bb36 100644 --- a/core/src/mindustry/maps/Maps.java +++ b/core/src/mindustry/maps/Maps.java @@ -32,7 +32,7 @@ public class Maps{ /** List of all built-in maps. Filenames only. */ private static String[] defaultMapNames = {"maze", "fortress", "labyrinth", "islands", "tendrils", "caldera", "wasteland", "shattered", "fork", "triad", "veins", "glacier"}; /** Maps tagged as PvP */ - private static final String[] pvpMaps = {"veins", "glacier"}; + static final String[] pvpMaps = {"veins", "glacier"}; /** All maps stored in an ordered array. */ private Seq maps = new Seq<>(); /** Serializer for meta. */ diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index b3f7036dca..d4a8087e91 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -35,9 +35,9 @@ import java.lang.reflect.*; @SuppressWarnings("unchecked") public class ContentParser{ private static final boolean ignoreUnknownFields = true; - private ObjectMap, ContentType> contentTypes = new ObjectMap<>(); + ObjectMap, ContentType> contentTypes = new ObjectMap<>(); - private ObjectMap, FieldParser> classParsers = new ObjectMap, FieldParser>(){{ + ObjectMap, FieldParser> classParsers = new ObjectMap, FieldParser>(){{ put(Effect.class, (type, data) -> field(Fx.class, data)); put(Schematic.class, (type, data) -> { Object result = fieldOpt(Loadouts.class, data); @@ -105,7 +105,7 @@ public class ContentParser{ private Seq reads = new Seq<>(); private Seq postreads = new Seq<>(); private ObjectSet toBeParsed = new ObjectSet<>(); - private LoadedMod currentMod; + LoadedMod currentMod; private Content currentContent; private Json parser = new Json(){ @@ -480,7 +480,7 @@ public class ContentParser{ return first != null ? first : Vars.content.getByName(type, currentMod.name + "-" + name); } - private T make(Class type){ + T make(Class type){ try{ Constructor cons = type.getDeclaredConstructor(); cons.setAccessible(true); @@ -515,7 +515,7 @@ public class ContentParser{ } } - private Object field(Class type, JsonValue value){ + Object field(Class type, JsonValue value){ return field(type, value.asString()); } @@ -530,7 +530,7 @@ public class ContentParser{ } } - private Object fieldOpt(Class type, JsonValue value){ + Object fieldOpt(Class type, JsonValue value){ try{ return type.getField(value.asString()).get(null); }catch(Exception e){ @@ -538,7 +538,7 @@ public class ContentParser{ } } - private void checkNullFields(Object object){ + void checkNullFields(Object object){ if(object instanceof Number || object instanceof String || toBeParsed.contains(object)) return; parser.getFields(object.getClass()).values().toSeq().each(field -> { @@ -559,7 +559,7 @@ public class ContentParser{ readFields(object, jsonMap); } - private void readFields(Object object, JsonValue jsonMap){ + void readFields(Object object, JsonValue jsonMap){ toBeParsed.remove(object); Class type = object.getClass(); ObjectMap fields = parser.getFields(type); @@ -593,7 +593,7 @@ public class ContentParser{ } /** Tries to resolve a class from a list of potential class names. */ - private Class resolve(String base, String... potentials){ + Class resolve(String base, String... potentials){ if(!base.isEmpty() && Character.isLowerCase(base.charAt(0))) base = Strings.capitalize(base); for(String type : potentials){ diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java index 0b80960ba7..03e994d757 100644 --- a/core/src/mindustry/mod/Mods.java +++ b/core/src/mindustry/mod/Mods.java @@ -39,7 +39,7 @@ public class Mods implements Loadable{ private int totalSprites; private MultiPacker packer; - private Seq mods = new Seq<>(); + Seq mods = new Seq<>(); private ObjectMap, ModMeta> metas = new ObjectMap<>(); private boolean requiresReload, createdAtlas; diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java index 4559bf6d02..9a77de94c1 100644 --- a/core/src/mindustry/mod/Scripts.java +++ b/core/src/mindustry/mod/Scripts.java @@ -23,7 +23,7 @@ public class Scripts implements Disposable{ private final Context context; private final Scriptable scope; private boolean errored; - private LoadedMod currentMod = null; + LoadedMod currentMod = null; public Scripts(){ Time.mark(); diff --git a/core/src/mindustry/net/ArcNetProvider.java b/core/src/mindustry/net/ArcNetProvider.java index eff7c3e95d..b6a3cf378a 100644 --- a/core/src/mindustry/net/ArcNetProvider.java +++ b/core/src/mindustry/net/ArcNetProvider.java @@ -265,7 +265,7 @@ public class ArcNetProvider implements NetProvider{ return null; } - private void handleException(Throwable e){ + void handleException(Throwable e){ if(e instanceof ArcNetException){ Core.app.post(() -> net.showError(new IOException("mismatch"))); }else if(e instanceof ClosedChannelException){ diff --git a/core/src/mindustry/ui/dialogs/AboutDialog.java b/core/src/mindustry/ui/dialogs/AboutDialog.java index 1c3d13712c..3ba3b5d7e2 100644 --- a/core/src/mindustry/ui/dialogs/AboutDialog.java +++ b/core/src/mindustry/ui/dialogs/AboutDialog.java @@ -15,8 +15,8 @@ import mindustry.ui.Links.*; import static mindustry.Vars.*; public class AboutDialog extends BaseDialog{ - private Seq contributors = new Seq<>(); - private static ObjectSet bannedItems = ObjectSet.with("google-play", "itch.io", "dev-builds", "f-droid"); + Seq contributors = new Seq<>(); + static ObjectSet bannedItems = ObjectSet.with("google-play", "itch.io", "dev-builds", "f-droid"); public AboutDialog(){ super("@about.button"); diff --git a/core/src/mindustry/ui/dialogs/ColorPicker.java b/core/src/mindustry/ui/dialogs/ColorPicker.java index 811d7be230..80c042e1eb 100644 --- a/core/src/mindustry/ui/dialogs/ColorPicker.java +++ b/core/src/mindustry/ui/dialogs/ColorPicker.java @@ -8,7 +8,7 @@ import mindustry.graphics.*; public class ColorPicker extends BaseDialog{ private Cons cons = c -> {}; - private Color current = new Color(); + Color current = new Color(); public ColorPicker(){ super("@pickcolor"); diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java index 74e0730f68..fb2291218f 100644 --- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java +++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java @@ -20,7 +20,7 @@ import static mindustry.Vars.*; public class CustomRulesDialog extends BaseDialog{ private Table main; - private Rules rules; + Rules rules; private Prov resetter; private LoadoutDialog loadoutDialog; private BaseDialog banDialog; diff --git a/core/src/mindustry/ui/dialogs/FileChooser.java b/core/src/mindustry/ui/dialogs/FileChooser.java index be0fd46fe6..78a3c1a459 100644 --- a/core/src/mindustry/ui/dialogs/FileChooser.java +++ b/core/src/mindustry/ui/dialogs/FileChooser.java @@ -17,10 +17,10 @@ import java.util.*; public class FileChooser extends BaseDialog{ private static final Fi homeDirectory = Core.files.absolute(Core.files.getExternalStoragePath()); - private static Fi lastDirectory = homeDirectory; + static Fi lastDirectory = homeDirectory; private Table files; - private Fi directory = lastDirectory; + Fi directory = lastDirectory; private ScrollPane pane; private TextField navigation, filefield; private TextButton ok; @@ -163,7 +163,7 @@ public class FileChooser extends BaseDialog{ return handles; } - private void updateFiles(boolean push){ + void updateFiles(boolean push){ if(push) stack.push(directory); navigation.setText(directory.toString()); diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index 3eb53717fc..7d03210041 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -30,15 +30,15 @@ import static mindustry.ui.dialogs.PlanetDialog.Mode.*; public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ private final FrameBuffer buffer = new FrameBuffer(2, 2, true); - private final PlanetRenderer planets = renderer.planets; + final PlanetRenderer planets = renderer.planets; private final LaunchLoadoutDialog loadouts = new LaunchLoadoutDialog(); private final Table stable = new Table().background(Styles.black3); private int launchRange; private float zoom = 1f, selectAlpha = 1f; - private @Nullable Sector selected, hovered, launchSector; + @Nullable Sector selected, hovered, launchSector; private CoreBuild launcher; - private Mode mode = look; + Mode mode = look; private boolean launching; public PlanetDialog(){ @@ -291,7 +291,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ } //TODO localize - private void updateSelected(){ + void updateSelected(){ Sector sector = selected; if(sector == null){ diff --git a/core/src/mindustry/ui/dialogs/ResearchDialog.java b/core/src/mindustry/ui/dialogs/ResearchDialog.java index d62fc7a623..3265a50104 100644 --- a/core/src/mindustry/ui/dialogs/ResearchDialog.java +++ b/core/src/mindustry/ui/dialogs/ResearchDialog.java @@ -32,14 +32,14 @@ import java.util.*; import static mindustry.Vars.*; public class ResearchDialog extends BaseDialog{ - private final float nodeSize = Scl.scl(60f); - private ObjectSet nodes = new ObjectSet<>(); - private TechTreeNode root = new TechTreeNode(TechTree.root, null); - private Rect bounds = new Rect(); - private ItemsDisplay itemDisplay; - private View view; + final float nodeSize = Scl.scl(60f); + ObjectSet nodes = new ObjectSet<>(); + TechTreeNode root = new TechTreeNode(TechTree.root, null); + Rect bounds = new Rect(); + ItemsDisplay itemDisplay; + View view; - private ItemSeq items; + ItemSeq items; public ResearchDialog(){ super(""); diff --git a/core/src/mindustry/ui/dialogs/SchematicsDialog.java b/core/src/mindustry/ui/dialogs/SchematicsDialog.java index 6cd110f4b7..3d920d1f14 100644 --- a/core/src/mindustry/ui/dialogs/SchematicsDialog.java +++ b/core/src/mindustry/ui/dialogs/SchematicsDialog.java @@ -74,7 +74,7 @@ public class SchematicsDialog extends BaseDialog{ t.clear(); int i = 0; - String regex = "[`~!@#$%^&*()-_=+[{]}|;:'\",<.>/?]"; + String regex = "[`~!@#$%^&*()-_=+{}|;:'\",<.>/?]"; String searchString = search.toLowerCase().replaceAll(regex, " "); firstSchematic = null; diff --git a/core/src/mindustry/ui/fragments/BlockConfigFragment.java b/core/src/mindustry/ui/fragments/BlockConfigFragment.java index 41f5d58770..6719add761 100644 --- a/core/src/mindustry/ui/fragments/BlockConfigFragment.java +++ b/core/src/mindustry/ui/fragments/BlockConfigFragment.java @@ -12,8 +12,8 @@ import mindustry.gen.*; import static mindustry.Vars.*; public class BlockConfigFragment extends Fragment{ - private Table table = new Table(); - private Building configTile; + Table table = new Table(); + Building configTile; @Override public void build(Group parent){ diff --git a/core/src/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/mindustry/ui/fragments/BlockInventoryFragment.java index 4569b326cc..73ecb3ffe9 100644 --- a/core/src/mindustry/ui/fragments/BlockInventoryFragment.java +++ b/core/src/mindustry/ui/fragments/BlockInventoryFragment.java @@ -31,12 +31,12 @@ public class BlockInventoryFragment extends Fragment{ private static final float holdWithdraw = 20f; private static final float holdShrink = 120f; - private Table table = new Table(); - private Building tile; - private float holdTime = 0f, emptyTime; - private boolean holding; - private float[] shrinkHoldTimes = new float[content.items().size]; - private Item lastItem; + Table table = new Table(); + Building tile; + float holdTime = 0f, emptyTime; + boolean holding; + float[] shrinkHoldTimes = new float[content.items().size]; + Item lastItem; { Events.on(WorldLoadEvent.class, e -> hide()); diff --git a/core/src/mindustry/ui/fragments/MinimapFragment.java b/core/src/mindustry/ui/fragments/MinimapFragment.java index 2414a298c0..68ac728af7 100644 --- a/core/src/mindustry/ui/fragments/MinimapFragment.java +++ b/core/src/mindustry/ui/fragments/MinimapFragment.java @@ -16,7 +16,7 @@ import static mindustry.Vars.*; public class MinimapFragment extends Fragment{ private boolean shown; - private float panx, pany, zoom = 1f, lastZoom = -1; + float panx, pany, zoom = 1f, lastZoom = -1; private float baseSize = Scl.scl(5f); private Element elem; diff --git a/core/src/mindustry/world/Tiles.java b/core/src/mindustry/world/Tiles.java index 74c784a850..3fa0a0aef0 100644 --- a/core/src/mindustry/world/Tiles.java +++ b/core/src/mindustry/world/Tiles.java @@ -11,7 +11,7 @@ import java.util.*; public class Tiles implements Iterable{ public final int width, height; - private final Tile[] array; + final Tile[] array; public Tiles(int width, int height){ this.array = new Tile[width * height]; @@ -87,6 +87,9 @@ public class Tiles implements Iterable{ private class TileIterator implements Iterator{ int index = 0; + TileIterator(){ + } + @Override public boolean hasNext(){ return index < array.length; diff --git a/core/src/mindustry/world/blocks/defense/ForceProjector.java b/core/src/mindustry/world/blocks/defense/ForceProjector.java index 02a73f2234..6f90531d86 100644 --- a/core/src/mindustry/world/blocks/defense/ForceProjector.java +++ b/core/src/mindustry/world/blocks/defense/ForceProjector.java @@ -31,8 +31,8 @@ public class ForceProjector extends Block{ public float basePowerDraw = 0.2f; public @Load("@-top") TextureRegion topRegion; - private static ForceProjectorEntity paramEntity; - private static final Cons shieldConsumer = trait -> { + static ForceProjectorEntity paramEntity; + static final Cons shieldConsumer = trait -> { if(trait.team() != paramEntity.team && Intersector.isInsideHexagon(paramEntity.x, paramEntity.y, paramEntity.realRadius() * 2f, trait.x(), trait.y())){ trait.absorb(); Fx.absorb.at(trait); diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index cc9c330b3d..3be0d50ee3 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -25,8 +25,8 @@ public class Conveyor extends Block implements Autotiler{ private static final float itemSpace = 0.4f; private static final int capacity = 4; - private final Vec2 tr1 = new Vec2(); - private final Vec2 tr2 = new Vec2(); + final Vec2 tr1 = new Vec2(); + final Vec2 tr2 = new Vec2(); public @Load(value = "@-#1-#2", lengths = {7, 4}) TextureRegion[][] regions; diff --git a/core/src/mindustry/world/blocks/units/RepairPoint.java b/core/src/mindustry/world/blocks/units/RepairPoint.java index 62c8435524..d0670783c8 100644 --- a/core/src/mindustry/world/blocks/units/RepairPoint.java +++ b/core/src/mindustry/world/blocks/units/RepairPoint.java @@ -16,7 +16,7 @@ import mindustry.world.meta.*; import static mindustry.Vars.*; public class RepairPoint extends Block{ - private static final Rect rect = new Rect(); + static final Rect rect = new Rect(); public int timerTarget = timers++; diff --git a/tests/src/test/java/SectorTests.java b/tests/src/test/java/SectorTests.java index b299e602f8..4110670eed 100644 --- a/tests/src/test/java/SectorTests.java +++ b/tests/src/test/java/SectorTests.java @@ -92,6 +92,9 @@ public class SectorTests{ //assertTrue(total < 75, "Sector spawns too many enemies at wave " + i + " (" + total + ")"); } + assertEquals(1, Team.sharded.cores().size, "Sector must have one core: " + zone); + assertTrue(Team.sharded.core().items.total() < 1000, "Sector must not have starting resources: " + zone); + assertTrue(hasSpawnPoint, "Sector \"" + zone.name + "\" has no spawn points."); assertTrue(spawner.countSpawns() > 0 || (state.rules.attackMode && state.teams.get(state.rules.waveTeam).hasCore()), "Sector \"" + zone.name + "\" has no enemy spawn points: " + spawner.countSpawns()); }));