Skip to content

Commit 71eaa6e

Browse files
JasperGeurtzJasperGeurtz
committed
small improvements suggested by intelliJ
1 parent fad4bd7 commit 71eaa6e

File tree

14 files changed

+197
-205
lines changed

14 files changed

+197
-205
lines changed

‎src/main/java/bwapi/BuildingPlacer.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
class BuildingPlacer {
44
private static final int MAX_RANGE = 64;
5-
private static TilePosition[] gDirections = {
5+
private static final TilePosition[] gDirections = {
66
new TilePosition(1, 1),
77
new TilePosition(0, 1),
88
new TilePosition(-1, 1),
@@ -12,7 +12,7 @@ class BuildingPlacer {
1212
new TilePosition(0, -1),
1313
new TilePosition(-1, -1)
1414
};
15-
private static BuildTemplate[] buildTemplates = // [13 + 1]
15+
private static final BuildTemplate[] buildTemplates = // [13 + 1]
1616
{
1717
new BuildTemplate(32, 0, 0, 1),
1818
new BuildTemplate(0, 32, 1, 0),
@@ -362,7 +362,7 @@ private static class BuildTemplate {
362362
}
363363

364364
static class PlacementReserve {
365-
public final int maxSearch;
365+
final int maxSearch;
366366
byte[][] data;
367367
byte[][] save;
368368

‎src/main/java/bwapi/Color.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ RGBRESERVE, RGBRESERVE, RGBRESERVE, RGBRESERVE, RGBRESERVE, RGBRESERVE, RGBRESER
5555
};
5656

5757
private static boolean rgbInitialized;
58-
private static byte[][][] closestColor = new byte[64][64][64];
58+
private static final byte[][][] closestColor = new byte[64][64][64];
5959
public final int id;
6060

6161
public Color(final int r, final int g, final int b) {

‎src/main/java/bwapi/Game.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ public boolean isBuildable(final TilePosition position, final boolean includeBui
574574
if (!position.isValid(this)) {
575575
return false;
576576
}
577-
return buildable[position.x][position.y] && (includeBuildings ? !gameData.isOccupied(position.x, position.y) : true);
577+
return buildable[position.x][position.y] && (!includeBuildings || !gameData.isOccupied(position.x, position.y));
578578
}
579579

580580
public boolean isVisible(final int tileX, final int tileY) {
@@ -949,11 +949,8 @@ public boolean canResearch(final TechType type, final Unit unit, final boolean c
949949
return false;
950950
}
951951

952-
if (!self.hasUnitTypeRequirement(type.requiredUnit())) {
953-
return false;
954-
}
952+
return self.hasUnitTypeRequirement(type.requiredUnit());
955953

956-
return true;
957954
}
958955

959956
public boolean canUpgrade(final UpgradeType type, final Unit unit) {
@@ -1488,9 +1485,7 @@ public boolean hasPath(final Position source, final Position destination) {
14881485
if (source.isValid(this) && destination.isValid(this)) {
14891486
final Region rgnA = getRegionAt(source);
14901487
final Region rgnB = getRegionAt(destination);
1491-
if (rgnA != null && rgnB != null && rgnA.getRegionGroupID() == rgnB.getRegionGroupID()) {
1492-
return true;
1493-
}
1488+
return rgnA != null && rgnB != null && rgnA.getRegionGroupID() == rgnB.getRegionGroupID();
14941489
}
14951490
return false;
14961491
}

‎src/main/java/bwapi/Latency.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public enum Latency {
1818
this.id = id;
1919
}
2020

21-
static Latency[] idToEnum = new Latency[24 + 1];
21+
static final Latency[] idToEnum = new Latency[24 + 1];
2222

2323
static {
2424
Arrays.stream(Latency.values()).forEach(v -> idToEnum[v.id] = v);

‎src/main/java/bwapi/Race.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,28 @@ public enum Race {
1616
None(7),
1717
Unknown(8);
1818

19-
public static Race[] races = new Race[8 + 1];
20-
static UnitType[] workerTypes = {
19+
public static final Race[] races = new Race[8 + 1];
20+
static final UnitType[] workerTypes = {
2121
Zerg_Drone, Terran_SCV, Protoss_Probe,
2222
UnitType.None, UnitType.None, UnitType.None, // unused
2323
UnitType.Unknown, UnitType.None, UnitType.Unknown // random, none, unk
2424
};
25-
static UnitType[] baseTypes = {
25+
static final UnitType[] baseTypes = {
2626
Zerg_Hatchery, Terran_Command_Center, Protoss_Nexus,
2727
UnitType.None, UnitType.None, UnitType.None, // unused
2828
UnitType.Unknown, UnitType.None, UnitType.Unknown // random, none, unk
2929
};
30-
static UnitType[] refineryTypes = {
30+
static final UnitType[] refineryTypes = {
3131
Zerg_Extractor, Terran_Refinery, Protoss_Assimilator,
3232
UnitType.None, UnitType.None, UnitType.None, // unused
3333
UnitType.Unknown, UnitType.None, UnitType.Unknown // random, none, unk
3434
};
35-
static UnitType[] transportTypes = {
35+
static final UnitType[] transportTypes = {
3636
Zerg_Overlord, Terran_Dropship, Protoss_Shuttle,
3737
UnitType.None, UnitType.None, UnitType.None, // unused
3838
UnitType.Unknown, UnitType.None, UnitType.Unknown // random, none, unk
3939
};
40-
static UnitType[] supplyTypes = {
40+
static final UnitType[] supplyTypes = {
4141
Zerg_Overlord, Terran_Supply_Depot, Protoss_Pylon,
4242
UnitType.None, UnitType.None, UnitType.None, // unused
4343
UnitType.Unknown, UnitType.None, UnitType.Unknown // random, none, unk

‎src/main/java/bwapi/TechType.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ public enum TechType {
4949
Unknown(46);
5050

5151
/// IMPLEMENTATION
52-
private static int[] defaultOreCost = // Same as default gas cost
52+
private static final int[] defaultOreCost = // Same as default gas cost
5353
{100, 200, 200, 100, 0, 150, 0, 200, 100, 150, 100, 100, 0, 100, 0, 200, 100, 100, 0, 200, 150, 150, 150, 0, 100, 200, 0, 200, 0, 100, 100, 100, 200};
54-
private static int[] defaultTimeCost =
54+
private static final int[] defaultTimeCost =
5555
{1200, 1500, 1800, 1200, 0, 1200, 0, 1200, 1800, 1500, 1200, 1200, 0, 1200, 0, 1500, 1500, 1200, 0, 1800, 1200, 1800, 1500, 0, 1200, 1200, 0, 1800, 0, 1800, 1800, 1500, 1800};
56-
private static int[] defaultEnergyCost =
56+
private static final int[] defaultEnergyCost =
5757
{0, 100, 100, 0, 50, 0, 100, 75, 150, 25, 25, 0, 0, 150, 100, 150, 0, 75, 75, 75, 100, 150, 100, 0, 50, 125, 0, 150, 0, 50, 75, 100, 0, 0, 1};
58-
private static UnitType[] whatResearches = {
58+
private static final UnitType[] whatResearches = {
5959
UnitType.Terran_Academy, UnitType.Terran_Covert_Ops, UnitType.Terran_Science_Facility, UnitType.Terran_Machine_Shop,
6060
UnitType.None, UnitType.Terran_Machine_Shop, UnitType.None, UnitType.Terran_Science_Facility, UnitType.Terran_Physics_Lab,
6161
UnitType.Terran_Control_Tower, UnitType.Terran_Covert_Ops, UnitType.Zerg_Hatchery, UnitType.None, UnitType.Zerg_Queens_Nest,
@@ -66,38 +66,38 @@ public enum TechType {
6666
UnitType.Zerg_Hydralisk_Den, UnitType.None, UnitType.None, UnitType.None, UnitType.None, UnitType.None, UnitType.None, UnitType.None, UnitType.None, UnitType.None, UnitType.None, UnitType.None,
6767
UnitType.None, UnitType.None, UnitType.Unknown
6868
};
69-
private static Race[] techRaces = {
69+
private static final Race[] techRaces = {
7070
Race.Terran, Race.Terran, Race.Terran, Race.Terran, Race.Terran, Race.Terran, Race.Terran, Race.Terran, Race.Terran, Race.Terran, Race.Terran,
7171
Race.Zerg, Race.Zerg, Race.Zerg, Race.Zerg, Race.Zerg, Race.Zerg, Race.Zerg, Race.Zerg,
7272
Race.Protoss, Race.Protoss, Race.Protoss, Race.Protoss, Race.Protoss,
7373
Race.Terran, Race.Protoss, Race.None, Race.Protoss, Race.Protoss, Race.Protoss, Race.Terran, Race.Protoss, Race.Zerg, Race.None, Race.Terran,
7474
Race.None, Race.None, Race.None, Race.None, Race.None, Race.None, Race.None, Race.None, Race.None, Race.None, Race.Terran, Race.Unknown
7575
};
76-
private static WeaponType[] techWeapons = {
76+
private static final WeaponType[] techWeapons = {
7777
WeaponType.None, WeaponType.Lockdown, WeaponType.EMP_Shockwave, WeaponType.Spider_Mines, WeaponType.None, WeaponType.None, WeaponType.None, WeaponType.Irradiate, WeaponType.Yamato_Gun,
7878
WeaponType.None, WeaponType.None, WeaponType.None, WeaponType.None, WeaponType.Spawn_Broodlings, WeaponType.Dark_Swarm, WeaponType.Plague, WeaponType.Consume, WeaponType.Ensnare, WeaponType.Parasite,
7979
WeaponType.Psionic_Storm, WeaponType.None, WeaponType.None, WeaponType.Stasis_Field, WeaponType.None, WeaponType.Restoration, WeaponType.Disruption_Web, WeaponType.None, WeaponType.Mind_Control,
8080
WeaponType.None, WeaponType.Feedback, WeaponType.Optical_Flare, WeaponType.Maelstrom, WeaponType.None, WeaponType.None, WeaponType.None, WeaponType.None, WeaponType.None, WeaponType.None, WeaponType.None, WeaponType.None, WeaponType.None,
8181
WeaponType.None, WeaponType.None, WeaponType.None, WeaponType.None, WeaponType.Nuclear_Strike, WeaponType.Unknown
8282
};
83-
private static int TARG_UNIT = 1;
84-
private static int TARG_POS = 2;
85-
private static int TARG_BOTH = 3;
86-
private static int[] techTypeFlags = {
83+
private static final int TARG_UNIT = 1;
84+
private static final int TARG_POS = 2;
85+
private static final int TARG_BOTH = 3;
86+
private static final int[] techTypeFlags = {
8787
0, TARG_UNIT, TARG_BOTH, TARG_POS, TARG_BOTH, 0, TARG_UNIT, TARG_UNIT, TARG_UNIT, 0, 0, 0,
8888
TARG_UNIT, TARG_UNIT, TARG_BOTH, TARG_BOTH, TARG_UNIT, TARG_BOTH, TARG_UNIT, TARG_BOTH, TARG_UNIT,
8989
TARG_BOTH, TARG_BOTH, TARG_UNIT, TARG_UNIT, TARG_BOTH, 0, TARG_UNIT, TARG_UNIT, TARG_UNIT, TARG_UNIT,
9090
TARG_BOTH, 0, 0, TARG_BOTH, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, TARG_BOTH
9191
};
92-
private static Order[] techOrders = {
92+
private static final Order[] techOrders = {
9393
Order.None, CastLockdown, CastEMPShockwave, PlaceMine, CastScannerSweep, Order.None, CastDefensiveMatrix,
9494
CastIrradiate, FireYamatoGun, Order.None, Order.None, Order.None, CastInfestation, CastSpawnBroodlings,
9595
CastDarkSwarm, CastPlague, CastConsume, CastEnsnare, CastParasite, CastPsionicStorm,
9696
CastHallucination, CastRecall, CastStasisField, Order.None, CastRestoration, CastDisruptionWeb,
9797
Order.None, CastMindControl, Order.None, CastFeedback, CastOpticalFlare, CastMaelstrom, Order.None, Order.None, MedicHeal,
9898
Order.None, Order.None, Order.None, Order.None, Order.None, Order.None, Order.None, Order.None, Order.None, Order.None, NukePaint, Order.Unknown
9999
};
100-
private static UnitType[][] techWhatUses = {
100+
private static final UnitType[][] techWhatUses = {
101101
// Stimpacks
102102
{UnitType.Terran_Marine, UnitType.Terran_Firebat, UnitType.Hero_Jim_Raynor_Marine, UnitType.Hero_Gui_Montag},
103103
// Lockdown

‎src/main/java/bwapi/Unit.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import static bwapi.UnitType.*;
1414

1515
public class Unit implements Comparable<Unit>{
16-
private static Set<Order> gatheringGasOrders = EnumSet.of(
16+
private static final Set<Order> gatheringGasOrders = EnumSet.of(
1717
Harvest1, Harvest2, MoveToGas, WaitForGas, HarvestGas, ReturnGas, ResetCollision);
18-
private static Set<Order> gatheringMineralOrders = EnumSet.of(
18+
private static final Set<Order> gatheringMineralOrders = EnumSet.of(
1919
Harvest1, Harvest2, MoveToMinerals, WaitForMinerals, MiningMinerals, ReturnMinerals, ResetCollision);
2020
private final UnitData unitData;
2121
private final Game game;
@@ -3159,9 +3159,7 @@ public boolean canUnloadAtPosition(Position targDropPos, boolean checkCanIssueCo
31593159
if (getType() != Terran_Bunker) {
31603160
if (!new WalkPosition(targDropPos.x / 8, targDropPos.y / 8).isValid(game)) {
31613161
return false;
3162-
} else if (!game.isWalkable(targDropPos.x / 8, targDropPos.y / 8)) {
3163-
return false;
3164-
}
3162+
} else return game.isWalkable(targDropPos.x / 8, targDropPos.y / 8);
31653163
}
31663164

31673165
return true;

‎src/main/java/bwapi/UnitCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import static bwapi.UnitCommandType.*;
88

99
public class UnitCommand {
10-
private static Set<UnitCommandType> posComs = EnumSet.of(Build, Land, Place_COP);
10+
private static final Set<UnitCommandType> posComs = EnumSet.of(Build, Land, Place_COP);
1111
final UnitCommandType type;
1212
final Unit target;
1313
final int x;

‎src/main/java/bwapi/UnitType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public enum UnitType {
240240
Factories(232),
241241
Unknown(233);
242242

243-
static UnitType[] idToEnum = new UnitType[233 + 1];
243+
static final UnitType[] idToEnum = new UnitType[233 + 1];
244244

245245
static {
246246
Arrays.stream(UnitType.values()).forEach(v -> idToEnum[v.id] = v);

0 commit comments

Comments
 (0)