From f7bd376499172c61932b19c2d2e1dedba7a9f49c Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 8 Oct 2018 16:09:31 -0400 Subject: [PATCH] More public modules --- .../io/anuke/mindustry/ai/BlockIndexer.java | 2 +- .../src/io/anuke/mindustry/ai/Pathfinder.java | 2 +- .../src/io/anuke/mindustry/core/Renderer.java | 2 +- core/src/io/anuke/mindustry/core/World.java | 26 +++---------------- .../io/anuke/mindustry/entities/Units.java | 4 +-- .../mindustry/entities/units/BaseUnit.java | 8 +++--- .../mindustry/entities/units/FlyingUnit.java | 4 +-- .../mindustry/entities/units/types/Drone.java | 6 ++--- .../world/blocks/units/CommandCenter.java | 4 +-- 9 files changed, 19 insertions(+), 39 deletions(-) diff --git a/core/src/io/anuke/mindustry/ai/BlockIndexer.java b/core/src/io/anuke/mindustry/ai/BlockIndexer.java index b9c513489e..aefc70568a 100644 --- a/core/src/io/anuke/mindustry/ai/BlockIndexer.java +++ b/core/src/io/anuke/mindustry/ai/BlockIndexer.java @@ -159,7 +159,7 @@ public class BlockIndexer{ * Find the closest ore block relative to a position. */ public Tile findClosestOre(float xp, float yp, Item item){ - Tile tile = Geometry.findClosest(xp, yp, world.indexer().getOrePositions(item)); + Tile tile = Geometry.findClosest(xp, yp, world.indexer.getOrePositions(item)); if(tile == null) return null; diff --git a/core/src/io/anuke/mindustry/ai/Pathfinder.java b/core/src/io/anuke/mindustry/ai/Pathfinder.java index a00a7e756d..9f35128c4f 100644 --- a/core/src/io/anuke/mindustry/ai/Pathfinder.java +++ b/core/src/io/anuke/mindustry/ai/Pathfinder.java @@ -111,7 +111,7 @@ public class Pathfinder{ path.lastSearchTime = TimeUtils.millis(); - Array set = world.indexer().getEnemy(team, BlockFlag.target); + Array set = world.indexer.getEnemy(team, BlockFlag.target); for(Tile other : set){ path.weights[other.x][other.y] = 0; path.searches[other.x][other.y] = path.search; diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index 2eebee5b56..a53a0152e4 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -373,7 +373,7 @@ public class Renderer extends RendererModule{ ObjectIntMap seen = new ObjectIntMap<>(); for(BlockFlag flag : BlockFlag.values()){ - for(Tile tile : world.indexer().getEnemy(Team.blue, flag)){ + for(Tile tile : world.indexer.getEnemy(Team.blue, flag)){ int index = seen.getAndIncrement(tile, 0, 1); Draw.tscl(0.125f); Draw.text(flag.name(), tile.drawx(), tile.drawy() + tile.block().size * tilesize / 2f + 4 + index * 3); diff --git a/core/src/io/anuke/mindustry/core/World.java b/core/src/io/anuke/mindustry/core/World.java index 2815c52a81..b1b607eb14 100644 --- a/core/src/io/anuke/mindustry/core/World.java +++ b/core/src/io/anuke/mindustry/core/World.java @@ -12,9 +12,9 @@ import io.anuke.mindustry.game.EventType.WorldLoadEvent; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.io.MapIO; import io.anuke.mindustry.maps.*; +import io.anuke.mindustry.maps.generation.WorldGenerator; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.maps.generation.WorldGenerator; import io.anuke.mindustry.world.blocks.OreBlock; import io.anuke.ucore.core.Events; import io.anuke.ucore.core.Timers; @@ -28,12 +28,12 @@ public class World extends Module{ public final Maps maps = new Maps(); public final Sectors sectors = new Sectors(); public final WorldGenerator generator = new WorldGenerator(); + public final BlockIndexer indexer = new BlockIndexer(); + public final Pathfinder pathfinder = new Pathfinder(); private Map currentMap; private Sector currentSector; private Tile[][] tiles; - private Pathfinder pathfinder = new Pathfinder(); - private BlockIndexer indexer = new BlockIndexer(); private Array tempTiles = new ThreadArray<>(); private boolean generating, invalidMap; @@ -52,26 +52,6 @@ public class World extends Module{ maps.dispose(); } - public WorldGenerator generator(){ - return generator; - } - - public Sectors sectors(){ - return sectors; - } - - public Maps maps(){ - return maps; - } - - public BlockIndexer indexer(){ - return indexer; - } - - public Pathfinder pathfinder(){ - return pathfinder; - } - public boolean isInvalidMap(){ return invalidMap; } diff --git a/core/src/io/anuke/mindustry/entities/Units.java b/core/src/io/anuke/mindustry/entities/Units.java index a777ddee76..5d5eee141c 100644 --- a/core/src/io/anuke/mindustry/entities/Units.java +++ b/core/src/io/anuke/mindustry/entities/Units.java @@ -106,7 +106,7 @@ public class Units{ * Returns the neareset ally tile in a range. */ public static TileEntity findAllyTile(Team team, float x, float y, float range, Predicate pred){ - return world.indexer().findTile(team, x, y, range, pred); + return world.indexer.findTile(team, x, y, range, pred); } /** @@ -114,7 +114,7 @@ public class Units{ */ public static TileEntity findEnemyTile(Team team, float x, float y, float range, Predicate pred){ for(Team enemy : state.teams.enemiesOf(team)){ - TileEntity entity = world.indexer().findTile(enemy, x, y, range, pred); + TileEntity entity = world.indexer.findTile(enemy, x, y, range, pred); if(entity != null){ return entity; } diff --git a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java index c328c1b6ed..d75d7011f3 100644 --- a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java @@ -99,12 +99,12 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ } public boolean isCommanded(){ - return !isWave && world.indexer().getAllied(team, BlockFlag.comandCenter).size != 0; + return !isWave && world.indexer.getAllied(team, BlockFlag.comandCenter).size != 0; } public UnitCommand getCommand(){ if(isCommanded()){ - return world.indexer().getAllied(team, BlockFlag.comandCenter).first().entity().command; + return world.indexer.getAllied(team, BlockFlag.comandCenter).first().entity().command; } return null; } @@ -180,12 +180,12 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ } public void targetClosestAllyFlag(BlockFlag flag){ - Tile target = Geometry.findClosest(x, y, world.indexer().getAllied(team, flag)); + Tile target = Geometry.findClosest(x, y, world.indexer.getAllied(team, flag)); if(target != null) this.target = target.entity; } public void targetClosestEnemyFlag(BlockFlag flag){ - Tile target = Geometry.findClosest(x, y, world.indexer().getEnemy(team, flag)); + Tile target = Geometry.findClosest(x, y, world.indexer.getEnemy(team, flag)); if(target != null) this.target = target.entity; } diff --git a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java index 475378c64d..c06a07a7fd 100644 --- a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java @@ -113,7 +113,7 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{ state.set(attack); }else if(!targetHasFlag(BlockFlag.repair)){ retarget(() -> { - Tile target = Geometry.findClosest(x, y, world.indexer().getAllied(team, BlockFlag.repair)); + Tile target = Geometry.findClosest(x, y, world.indexer.getAllied(team, BlockFlag.repair)); if(target != null) FlyingUnit.this.target = target.entity; }); }else{ @@ -177,7 +177,7 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{ @Override public void behavior(){ if(health <= health * type.retreatPercent && !isCommanded() && - Geometry.findClosest(x, y, world.indexer().getAllied(team, BlockFlag.repair)) != null){ + Geometry.findClosest(x, y, world.indexer.getAllied(team, BlockFlag.repair)) != null){ setState(retreat); } diff --git a/core/src/io/anuke/mindustry/entities/units/types/Drone.java b/core/src/io/anuke/mindustry/entities/units/types/Drone.java index b1440fff5f..9e2e288873 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/Drone.java +++ b/core/src/io/anuke/mindustry/entities/units/types/Drone.java @@ -158,7 +158,7 @@ public class Drone extends FlyingUnit implements BuilderTrait{ if(targetItem == null) return; - target = world.indexer().findClosestOre(x, y, targetItem); + target = world.indexer.findClosestOre(x, y, targetItem); }); if(target instanceof Tile){ @@ -224,7 +224,7 @@ public class Drone extends FlyingUnit implements BuilderTrait{ state.set(attack); }else if(!targetHasFlag(BlockFlag.repair)){ if(timer.get(timerTarget, 20)){ - Tile target = Geometry.findClosest(x, y, world.indexer().getAllied(team, BlockFlag.repair)); + Tile target = Geometry.findClosest(x, y, world.indexer.getAllied(team, BlockFlag.repair)); if(target != null) Drone.this.target = target.entity; } }else{ @@ -318,7 +318,7 @@ public class Drone extends FlyingUnit implements BuilderTrait{ @Override public void behavior(){ if(health <= health * type.retreatPercent && - Geometry.findClosest(x, y, world.indexer().getAllied(team, BlockFlag.repair)) != null){ + Geometry.findClosest(x, y, world.indexer.getAllied(team, BlockFlag.repair)) != null){ setState(retreat); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java b/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java index 7af2bca40e..25c816a52a 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java @@ -47,7 +47,7 @@ public class CommandCenter extends Block{ @Override public void playerPlaced(Tile tile){ - ObjectSet set = world.indexer().getAllied(tile.getTeam(), BlockFlag.comandCenter); + ObjectSet set = world.indexer.getAllied(tile.getTeam(), BlockFlag.comandCenter); if(set.size > 0){ CommandCenterEntity entity = tile.entity(); @@ -92,7 +92,7 @@ public class CommandCenter extends Block{ public static void onCommandCenterSet(Player player, Tile tile, UnitCommand command){ Effects.effect(((CommandCenter)tile.block()).effect, tile); - for(Tile center : world.indexer().getAllied(tile.getTeam(), BlockFlag.comandCenter)){ + for(Tile center : world.indexer.getAllied(tile.getTeam(), BlockFlag.comandCenter)){ if(center.block() instanceof CommandCenter){ CommandCenterEntity entity = center.entity(); entity.command = command;