diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 323f718ad4..873b8d68e3 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -2019,7 +2019,6 @@ block.shield-breaker.name = Shield Breaker (temp name/sprite) block.tank-fabricator.name = Tank Fabricator block.mech-fabricator.name = Mech Fabricator block.ship-fabricator.name = Ship Fabricator -block.refabricator.name = Refabricator block.prime-refabricator.name = Prime Refabricator block.unit-repair-tower.name = Unit Repair Tower block.diffuse.name = Diffuse @@ -2040,7 +2039,6 @@ unit.incite.name = Incite unit.emanate.name = Emanate unit.manifold.name = Manifold unit.assembly-drone.name = Assembly Drone -unit.effect-drone.name = Effect Drone unit.precept.name = Precept unit.merui.name = Merui unit.anthicus.name = Anthicus diff --git a/core/src/mindustry/world/Tile.java b/core/src/mindustry/world/Tile.java index 5e83f1cac1..800d867df0 100644 --- a/core/src/mindustry/world/Tile.java +++ b/core/src/mindustry/world/Tile.java @@ -507,19 +507,23 @@ public class Tile implements Position, QuadTreeObject, Displayable{ } public @Nullable Tile nearby(int rotation){ - if(rotation == 0) return world.tile(x + 1, y); - if(rotation == 1) return world.tile(x, y + 1); - if(rotation == 2) return world.tile(x - 1, y); - if(rotation == 3) return world.tile(x, y - 1); - return null; + return switch(rotation){ + case 0 -> world.tile(x + 1, y); + case 1 -> world.tile(x, y + 1); + case 2 -> world.tile(x - 1, y); + case 3 -> world.tile(x, y - 1); + default -> null; + }; } public @Nullable Building nearbyBuild(int rotation){ - if(rotation == 0) return world.build(x + 1, y); - if(rotation == 1) return world.build(x, y + 1); - if(rotation == 2) return world.build(x - 1, y); - if(rotation == 3) return world.build(x, y - 1); - return null; + return switch(rotation){ + case 0 -> world.build(x + 1, y); + case 1 -> world.build(x, y + 1); + case 2 -> world.build(x - 1, y); + case 3 -> world.build(x, y - 1); + default -> null; + }; } public boolean interactable(Team team){