From 6b3039dba22fb8ac92ef8658fa5686ecb112ee03 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 17 Jul 2020 19:00:39 -0400 Subject: [PATCH] Modifier reordering --- annotations/src/main/resources/classids.properties | 1 + .../revisions/CommanderPayloadUnitWaterMove/0.json | 1 + core/src/mindustry/ai/BaseAI.java | 2 +- core/src/mindustry/ai/BlockIndexer.java | 2 +- core/src/mindustry/content/UnitTypes.java | 10 ++++++++-- core/src/mindustry/core/NetClient.java | 4 ++-- core/src/mindustry/core/NetServer.java | 12 ++++++------ core/src/mindustry/editor/OperationStack.java | 2 +- core/src/mindustry/editor/WaveInfoDialog.java | 2 +- core/src/mindustry/graphics/BlockRenderer.java | 6 +++--- core/src/mindustry/graphics/FloorRenderer.java | 2 +- core/src/mindustry/graphics/IndexedRenderer.java | 2 +- core/src/mindustry/graphics/InverseKinematics.java | 4 ++-- core/src/mindustry/input/DesktopInput.java | 2 +- core/src/mindustry/input/InputHandler.java | 2 +- .../src/mindustry/maps/generators/BaseGenerator.java | 2 +- .../ui/fragments/BlockInventoryFragment.java | 4 ++-- core/src/mindustry/ui/fragments/ChatFragment.java | 2 +- .../ui/fragments/ScriptConsoleFragment.java | 2 +- .../src/mindustry/world/blocks/power/PowerGraph.java | 8 ++++---- 20 files changed, 40 insertions(+), 32 deletions(-) create mode 100644 annotations/src/main/resources/revisions/CommanderPayloadUnitWaterMove/0.json diff --git a/annotations/src/main/resources/classids.properties b/annotations/src/main/resources/classids.properties index 91aa31d081..0920fbaca5 100644 --- a/annotations/src/main/resources/classids.properties +++ b/annotations/src/main/resources/classids.properties @@ -4,6 +4,7 @@ alpha=0 arkyid=37 atrax=38 block=1 +bryde=40 cix=2 draug=3 flare=36 diff --git a/annotations/src/main/resources/revisions/CommanderPayloadUnitWaterMove/0.json b/annotations/src/main/resources/revisions/CommanderPayloadUnitWaterMove/0.json new file mode 100644 index 0000000000..dbb981dfd1 --- /dev/null +++ b/annotations/src/main/resources/revisions/CommanderPayloadUnitWaterMove/0.json @@ -0,0 +1 @@ +{fields:[{name:ammo,type:int,size:4},{name:armor,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:payloads,type:arc.struct.Seq,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]} \ No newline at end of file diff --git a/core/src/mindustry/ai/BaseAI.java b/core/src/mindustry/ai/BaseAI.java index 88e224db76..df2fc26302 100644 --- a/core/src/mindustry/ai/BaseAI.java +++ b/core/src/mindustry/ai/BaseAI.java @@ -25,7 +25,7 @@ public class BaseAI{ private static final float step = 5; private static final int attempts = 5; private static final float emptyChance = 0.01f; - private final static int timerStep = 0, timerSpawn = 1; + private static final int timerStep = 0, timerSpawn = 1; private static int correct = 0, incorrect = 0; diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java index 46261c1c5f..c07a5802a2 100644 --- a/core/src/mindustry/ai/BlockIndexer.java +++ b/core/src/mindustry/ai/BlockIndexer.java @@ -22,7 +22,7 @@ import static mindustry.Vars.*; /** Class used for indexing special target blocks for AI. */ public class BlockIndexer{ /** Size of one quadrant. */ - private final static int quadrantSize = 16; + private static final int quadrantSize = 16; /** Set of all ores that are being scanned. */ private final ObjectSet scanOres = new ObjectSet<>(); diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 7fb7bfe67f..fce3292833 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -45,7 +45,10 @@ public class UnitTypes implements ContentList{ public static @EntityDef({Unitc.class, Builderc.class, Minerc.class, Trailc.class}) UnitType alpha, beta, gamma; //water - public static @EntityDef({Unitc.class, WaterMovec.class, Commanderc.class}) UnitType risse, minke, bryde; + public static @EntityDef({Unitc.class, WaterMovec.class, Commanderc.class}) UnitType risse, minke; + + //water + payload + public static @EntityDef({Unitc.class, WaterMovec.class, Commanderc.class, Payloadc.class}) UnitType bryde; //special block unit type public static @EntityDef({Unitc.class, BlockUnitc.class}) UnitType block; @@ -678,6 +681,8 @@ public class UnitTypes implements ContentList{ immunities = ObjectSet.with(StatusEffects.wet); trailLength = 20; + armor = 2f; + weapons.add(new Weapon("mount-weapon"){{ reload = 12f; x = 4f; @@ -771,6 +776,7 @@ public class UnitTypes implements ContentList{ trailX = 7f; trailY = -9f; trailScl = 1.5f; + payloadCapacity = 4; abilities.add(new HealFieldAbility(22f, 60f * 4, 70f), new ShieldFieldAbility(20f, 40f, 60f * 4, 60f)); @@ -796,7 +802,7 @@ public class UnitTypes implements ContentList{ hitEffect = Fx.massiveExplosion; knockback = 1.5f; lifetime = 140f; - height = 17f; + height = 15.5f; width = 15f; collidesTiles = false; ammoMultiplier = 4f; diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java index 1cbfb8bfb7..74e57ac4dc 100644 --- a/core/src/mindustry/core/NetClient.java +++ b/core/src/mindustry/core/NetClient.java @@ -28,8 +28,8 @@ import java.util.zip.*; import static mindustry.Vars.*; public class NetClient implements ApplicationListener{ - private final static float dataTimeout = 60 * 18; - private final static float playerSyncTime = 2; + private static final float dataTimeout = 60 * 18; + private static final float playerSyncTime = 2; public final static float viewScale = 2f; private long ping; diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index 5c6b403773..42dfb92edb 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -34,13 +34,13 @@ import static arc.util.Log.*; import static mindustry.Vars.*; public class NetServer implements ApplicationListener{ - private final static int maxSnapshotSize = 430, timerBlockSync = 0; - private final static float serverSyncTime = 12, blockSyncTime = 60 * 8; - private final static FloatBuffer fbuffer = FloatBuffer.allocate(20); - private final static Vec2 vector = new Vec2(); - private final static Rect viewport = new Rect(); + private static final int maxSnapshotSize = 430, timerBlockSync = 0; + private static final float serverSyncTime = 12, blockSyncTime = 60 * 8; + private static final FloatBuffer fbuffer = FloatBuffer.allocate(20); + private static final Vec2 vector = new Vec2(); + private static final 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; + private static final float correctDist = 16f; public final Administration admins = new Administration(); public final CommandHandler clientCommands = new CommandHandler("/"); diff --git a/core/src/mindustry/editor/OperationStack.java b/core/src/mindustry/editor/OperationStack.java index 623bd1a3cd..0558de14bc 100755 --- a/core/src/mindustry/editor/OperationStack.java +++ b/core/src/mindustry/editor/OperationStack.java @@ -3,7 +3,7 @@ package mindustry.editor; import arc.struct.Seq; public class OperationStack{ - private final static int maxSize = 10; + private static final int maxSize = 10; private Seq stack = new Seq<>(); private int index = 0; diff --git a/core/src/mindustry/editor/WaveInfoDialog.java b/core/src/mindustry/editor/WaveInfoDialog.java index 56ecfa9de3..e64cd2659d 100644 --- a/core/src/mindustry/editor/WaveInfoDialog.java +++ b/core/src/mindustry/editor/WaveInfoDialog.java @@ -25,7 +25,7 @@ import static mindustry.Vars.*; import static mindustry.game.SpawnGroup.never; public class WaveInfoDialog extends BaseDialog{ - private final static int displayed = 20; + private static final int displayed = 20; private Seq groups = new Seq<>(); private Table table, preview; diff --git a/core/src/mindustry/graphics/BlockRenderer.java b/core/src/mindustry/graphics/BlockRenderer.java index dd66dd86e9..3e37bfe90e 100644 --- a/core/src/mindustry/graphics/BlockRenderer.java +++ b/core/src/mindustry/graphics/BlockRenderer.java @@ -20,9 +20,9 @@ import static arc.Core.camera; import static mindustry.Vars.*; public class BlockRenderer implements Disposable{ - private final static int initialRequests = 32 * 32; - private final static int expandr = 9; - private final static Color shadowColor = new Color(0, 0, 0, 0.71f); + private static final int initialRequests = 32 * 32; + private static final int expandr = 9; + private static final Color shadowColor = new Color(0, 0, 0, 0.71f); public final FloorRenderer floor = new FloorRenderer(); diff --git a/core/src/mindustry/graphics/FloorRenderer.java b/core/src/mindustry/graphics/FloorRenderer.java index fe83e9bbcb..7a7f502473 100644 --- a/core/src/mindustry/graphics/FloorRenderer.java +++ b/core/src/mindustry/graphics/FloorRenderer.java @@ -18,7 +18,7 @@ import static mindustry.Vars.*; public class FloorRenderer implements Disposable{ //TODO find out number with best performance - private final static int chunksize = mobile ? 16 : 32; + private static final int chunksize = mobile ? 16 : 32; private Chunk[][] cache; private MultiCacheBatch cbatch; diff --git a/core/src/mindustry/graphics/IndexedRenderer.java b/core/src/mindustry/graphics/IndexedRenderer.java index 60eeace8ed..83067c1f96 100644 --- a/core/src/mindustry/graphics/IndexedRenderer.java +++ b/core/src/mindustry/graphics/IndexedRenderer.java @@ -9,7 +9,7 @@ import arc.util.*; //TODO this class is a trainwreck, remove it public class IndexedRenderer implements Disposable{ - private final static int vsize = 5; + private static final int vsize = 5; private Shader program = new Shader( "attribute vec4 a_position;\n" + diff --git a/core/src/mindustry/graphics/InverseKinematics.java b/core/src/mindustry/graphics/InverseKinematics.java index 196a0bffaa..a920dc6527 100644 --- a/core/src/mindustry/graphics/InverseKinematics.java +++ b/core/src/mindustry/graphics/InverseKinematics.java @@ -7,12 +7,12 @@ public class InverseKinematics{ private static final Vec2[] mat1 = {new Vec2(), new Vec2()}, mat2 = {new Vec2(), new Vec2()}; private static final Vec2 temp = new Vec2(), temp2 = new Vec2(), at1 = new Vec2(); - static public boolean solve(float lengthA, float lengthB, Vec2 end, boolean side, Vec2 result){ + public static boolean solve(float lengthA, float lengthB, Vec2 end, boolean side, Vec2 result){ at1.set(end).rotate(side ? 1 : -1).setLength(lengthA + lengthB).add(end.x / 2f, end.y / 2f); return solve(lengthA, lengthB, end, at1, result); } - static public boolean solve(float lengthA, float lengthB, Vec2 end, Vec2 attractor, Vec2 result){ + public static boolean solve(float lengthA, float lengthB, Vec2 end, Vec2 attractor, Vec2 result){ Vec2 axis = mat2[0].set(end).nor(); mat2[1].set(attractor).sub(temp2.set(axis).scl(attractor.dot(axis))).nor(); mat1[0].set(mat2[0].x, mat2[1].x); diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java index ec9d48b9b6..c1b53eae85 100644 --- a/core/src/mindustry/input/DesktopInput.java +++ b/core/src/mindustry/input/DesktopInput.java @@ -607,7 +607,7 @@ public class DesktopInput extends InputHandler{ Payloadc pay = (Payloadc)unit; if(Core.input.keyTap(Binding.pickupCargo) && pay.payloads().size < unit.type().payloadCapacity){ - Unit target = Units.closest(player.team(), pay.x(), pay.y(), unit.type().hitsize * 1.1f, u -> u.isAI() && u.isGrounded() && u.mass() < unit.mass()); + Unit target = Units.closest(player.team(), pay.x(), pay.y(), unit.type().hitsize * 2.5f, u -> u.isAI() && u.isGrounded() && u.mass() < unit.mass() && u.within(unit, u.hitSize + unit.hitSize * 1.2f)); if(target != null){ Call.pickupUnitPayload(player, target); }else if(!pay.hasPayload()){ diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index a21aa3d1dd..b4dc06bb5e 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -113,7 +113,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ if(target.isAI() && target.isGrounded() && pay.payloads().size < unit.type().payloadCapacity && target.mass() < unit.mass() - && target.within(unit, unit.type().hitsize * 1.5f)){ + && target.within(unit, unit.type().hitsize * 1.5f + target.type().hitsize)){ pay.pickup(target); } } diff --git a/core/src/mindustry/maps/generators/BaseGenerator.java b/core/src/mindustry/maps/generators/BaseGenerator.java index 3d8f11c4c2..90cc66418e 100644 --- a/core/src/mindustry/maps/generators/BaseGenerator.java +++ b/core/src/mindustry/maps/generators/BaseGenerator.java @@ -21,7 +21,7 @@ import static mindustry.Vars.*; public class BaseGenerator{ private static final Vec2 axis = new Vec2(), rotator = new Vec2(); - private final static int range = 180; + private static final int range = 180; private Tiles tiles; private Team team; diff --git a/core/src/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/mindustry/ui/fragments/BlockInventoryFragment.java index 9ba68ae719..262fdf6585 100644 --- a/core/src/mindustry/ui/fragments/BlockInventoryFragment.java +++ b/core/src/mindustry/ui/fragments/BlockInventoryFragment.java @@ -28,8 +28,8 @@ import java.util.*; import static mindustry.Vars.*; public class BlockInventoryFragment extends Fragment{ - private final static float holdWithdraw = 20f; - private final static float holdShrink = 120f; + private static final float holdWithdraw = 20f; + private static final float holdShrink = 120f; private Table table = new Table(); private Building tile; diff --git a/core/src/mindustry/ui/fragments/ChatFragment.java b/core/src/mindustry/ui/fragments/ChatFragment.java index 7b5057bb46..d7fd20fa68 100644 --- a/core/src/mindustry/ui/fragments/ChatFragment.java +++ b/core/src/mindustry/ui/fragments/ChatFragment.java @@ -21,7 +21,7 @@ import static mindustry.Vars.net; import static mindustry.Vars.*; public class ChatFragment extends Table{ - private final static int messagesShown = 10; + private static final int messagesShown = 10; private Seq messages = new Seq<>(); private float fadetime; private boolean shown = false; diff --git a/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java b/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java index 7a057a262d..d19a278a29 100644 --- a/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java +++ b/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java @@ -19,7 +19,7 @@ import static arc.Core.*; import static mindustry.Vars.*; public class ScriptConsoleFragment extends Table{ - private final static int messagesShown = 30; + private static final int messagesShown = 30; private Seq messages = new Seq<>(); private boolean open = false, shown; private TextField chatfield; diff --git a/core/src/mindustry/world/blocks/power/PowerGraph.java b/core/src/mindustry/world/blocks/power/PowerGraph.java index 302b2a06c1..093206ad56 100644 --- a/core/src/mindustry/world/blocks/power/PowerGraph.java +++ b/core/src/mindustry/world/blocks/power/PowerGraph.java @@ -8,10 +8,10 @@ import mindustry.gen.*; import mindustry.world.consumers.*; public class PowerGraph{ - private final static Queue queue = new Queue<>(); - private final static Seq outArray1 = new Seq<>(); - private final static Seq outArray2 = new Seq<>(); - private final static IntSet closedSet = new IntSet(); + private static final Queue queue = new Queue<>(); + private static final Seq outArray1 = new Seq<>(); + private static final Seq outArray2 = new Seq<>(); + private static final IntSet closedSet = new IntSet(); private final ObjectSet producers = new ObjectSet<>(); private final ObjectSet consumers = new ObjectSet<>();