From fed4d10ec64a18014b0bc6c14e50a1290db1f6c1 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 2 May 2020 12:30:29 -0400 Subject: [PATCH] Cleanup --- .../src/main/java/mindustry/annotations/Annotations.java | 4 ++-- .../mindustry/annotations/misc/LoadRegionProcessor.java | 6 +++--- core/src/mindustry/world/blocks/defense/Door.java | 2 +- core/src/mindustry/world/blocks/defense/ForceProjector.java | 2 +- core/src/mindustry/world/blocks/defense/MendProjector.java | 2 +- .../mindustry/world/blocks/defense/OverdriveProjector.java | 2 +- .../world/blocks/defense/turrets/LiquidTurret.java | 2 +- core/src/mindustry/world/blocks/defense/turrets/Turret.java | 4 ++-- core/src/mindustry/world/blocks/distribution/Conveyor.java | 2 +- .../src/mindustry/world/blocks/distribution/ItemBridge.java | 6 +++--- .../src/mindustry/world/blocks/distribution/MassDriver.java | 2 +- .../world/blocks/distribution/PayloadConveyor.java | 4 ++-- .../mindustry/world/blocks/distribution/StackConveyor.java | 6 +++--- core/src/mindustry/world/blocks/environment/StaticWall.java | 2 +- core/src/mindustry/world/blocks/liquid/ArmoredConduit.java | 2 +- core/src/mindustry/world/blocks/liquid/Conduit.java | 4 ++-- core/src/mindustry/world/blocks/liquid/LiquidBlock.java | 6 +++--- core/src/mindustry/world/blocks/power/Battery.java | 2 +- core/src/mindustry/world/blocks/power/ImpactReactor.java | 4 ++-- .../mindustry/world/blocks/power/ItemLiquidGenerator.java | 4 ++-- core/src/mindustry/world/blocks/power/LightBlock.java | 2 +- core/src/mindustry/world/blocks/power/NuclearReactor.java | 4 ++-- core/src/mindustry/world/blocks/power/PowerDiode.java | 2 +- core/src/mindustry/world/blocks/power/PowerNode.java | 4 ++-- core/src/mindustry/world/blocks/production/Cultivator.java | 4 ++-- core/src/mindustry/world/blocks/production/Drill.java | 6 +++--- core/src/mindustry/world/blocks/production/Fracker.java | 6 +++--- .../mindustry/world/blocks/production/GenericSmelter.java | 2 +- core/src/mindustry/world/blocks/production/Separator.java | 4 ++-- core/src/mindustry/world/blocks/units/RepairPoint.java | 6 +++--- core/src/mindustry/world/blocks/units/UnitFactory.java | 2 +- 31 files changed, 55 insertions(+), 55 deletions(-) diff --git a/annotations/src/main/java/mindustry/annotations/Annotations.java b/annotations/src/main/java/mindustry/annotations/Annotations.java index 594e14023b..7fec308493 100644 --- a/annotations/src/main/java/mindustry/annotations/Annotations.java +++ b/annotations/src/main/java/mindustry/annotations/Annotations.java @@ -89,11 +89,11 @@ public class Annotations{ @Target(ElementType.FIELD) @Retention(RetentionPolicy.SOURCE) - public @interface LoadRegion{ + public @interface Load{ String value(); int length() default 1; int[] lengths() default {}; - String fallback() default "error"; //TODO + String fallback() default "error"; } @Target(ElementType.TYPE) diff --git a/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java b/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java index ad0268aefa..ed8e2415ed 100644 --- a/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java +++ b/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java @@ -12,7 +12,7 @@ import mindustry.annotations.util.*; import javax.annotation.processing.*; import javax.lang.model.element.*; -@SupportedAnnotationTypes({"mindustry.annotations.Annotations.LoadRegion",}) +@SupportedAnnotationTypes("mindustry.annotations.Annotations.Load") public class LoadRegionProcessor extends BaseProcessor{ @Override @@ -25,7 +25,7 @@ public class LoadRegionProcessor extends BaseProcessor{ ObjectMap> fieldMap = new ObjectMap<>(); - for(Svar field : fields(LoadRegion.class)){ + for(Svar field : fields(Load.class)){ if(!field.is(Modifier.PUBLIC)){ err("@LoadRegion field must be public", field); } @@ -37,7 +37,7 @@ public class LoadRegionProcessor extends BaseProcessor{ method.beginControlFlow("if(content instanceof $T)", entry.key.tname()); for(Svar field : entry.value){ - LoadRegion an = field.annotation(LoadRegion.class); + Load an = field.annotation(Load.class); //get # of array dimensions int dims = count(field.mirror().toString(), "[]"); boolean doFallback = !an.fallback().equals("error"); diff --git a/core/src/mindustry/world/blocks/defense/Door.java b/core/src/mindustry/world/blocks/defense/Door.java index 2f1cc2999d..8957e0d060 100644 --- a/core/src/mindustry/world/blocks/defense/Door.java +++ b/core/src/mindustry/world/blocks/defense/Door.java @@ -20,7 +20,7 @@ public class Door extends Wall{ public final int timerToggle = timers++; public Effect openfx = Fx.dooropen; public Effect closefx = Fx.doorclose; - public @LoadRegion("@-open") TextureRegion openRegion; + public @Load("@-open") TextureRegion openRegion; public Door(String name){ super(name); diff --git a/core/src/mindustry/world/blocks/defense/ForceProjector.java b/core/src/mindustry/world/blocks/defense/ForceProjector.java index e84e5e2d4e..293f8e83fb 100644 --- a/core/src/mindustry/world/blocks/defense/ForceProjector.java +++ b/core/src/mindustry/world/blocks/defense/ForceProjector.java @@ -29,7 +29,7 @@ public class ForceProjector extends Block{ public float cooldownLiquid = 1.5f; public float cooldownBrokenBase = 0.35f; public float basePowerDraw = 0.2f; - public @LoadRegion("@-top") TextureRegion topRegion; + public @Load("@-top") TextureRegion topRegion; private static ForceProjectorEntity paramEntity; private static Cons shieldConsumer = trait -> { diff --git a/core/src/mindustry/world/blocks/defense/MendProjector.java b/core/src/mindustry/world/blocks/defense/MendProjector.java index 1c291dd1cc..d9c25dc27b 100644 --- a/core/src/mindustry/world/blocks/defense/MendProjector.java +++ b/core/src/mindustry/world/blocks/defense/MendProjector.java @@ -18,7 +18,7 @@ public class MendProjector extends Block{ public final int timerUse = timers++; public Color baseColor = Color.valueOf("84f491"); public Color phaseColor = Color.valueOf("ffd59e"); - public @LoadRegion("@-top") TextureRegion topRegion; + public @Load("@-top") TextureRegion topRegion; public float reload = 250f; public float range = 60f; public float healPercent = 12f; diff --git a/core/src/mindustry/world/blocks/defense/OverdriveProjector.java b/core/src/mindustry/world/blocks/defense/OverdriveProjector.java index fe94e3da91..f9fcd08e21 100644 --- a/core/src/mindustry/world/blocks/defense/OverdriveProjector.java +++ b/core/src/mindustry/world/blocks/defense/OverdriveProjector.java @@ -16,7 +16,7 @@ import static mindustry.Vars.*; public class OverdriveProjector extends Block{ public final int timerUse = timers++; - public @LoadRegion("@-top") TextureRegion topRegion; + public @Load("@-top") TextureRegion topRegion; public float reload = 60f; public float range = 80f; public float speedBoost = 1.5f; diff --git a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java index e7a44dd090..48974dcfa5 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java @@ -16,7 +16,7 @@ import static mindustry.Vars.tilesize; public class LiquidTurret extends Turret{ public ObjectMap ammoTypes = new ObjectMap<>(); - public @LoadRegion("@-liquid") TextureRegion liquidRegion; + public @Load("@-liquid") TextureRegion liquidRegion; public LiquidTurret(String name){ super(name); diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 62896c0b11..3228977bd8 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -52,8 +52,8 @@ public abstract class Turret extends Block{ protected Vec2 tr = new Vec2(); protected Vec2 tr2 = new Vec2(); - public @LoadRegion("block-$size") TextureRegion baseRegion; - public @LoadRegion("@-heat") TextureRegion heatRegion; + public @Load("block-$size") TextureRegion baseRegion; + public @Load("@-heat") TextureRegion heatRegion; public Cons drawer = tile -> Draw.rect(region, tile.x() + tr2.x, tile.y() + tr2.y, tile.rotation - 90); public Cons heatDrawer = tile -> { diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index 791f05287b..d7b16187e3 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -29,7 +29,7 @@ public class Conveyor extends Block implements Autotiler{ private final Vec2 tr1 = new Vec2(); private final Vec2 tr2 = new Vec2(); - public @LoadRegion(value = "@-#1-#2", lengths = {7, 4}) TextureRegion[][] regions; + public @Load(value = "@-#1-#2", lengths = {7, 4}) TextureRegion[][] regions; public float speed = 0f; public float displayedSpeed = 0f; diff --git a/core/src/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java index 51673d64c8..ce008f2bd4 100644 --- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java @@ -23,9 +23,9 @@ public class ItemBridge extends Block{ public final int timerTransport = timers++; public int range; public float transportTime = 2f; - public @LoadRegion("@-end") TextureRegion endRegion; - public @LoadRegion("@-bridge") TextureRegion bridgeRegion; - public @LoadRegion("@-arrow") TextureRegion arrowRegion; + public @Load("@-end") TextureRegion endRegion; + public @Load("@-bridge") TextureRegion bridgeRegion; + public @Load("@-arrow") TextureRegion arrowRegion; private static BuildRequest otherReq; private static int lastPlaced = -1; diff --git a/core/src/mindustry/world/blocks/distribution/MassDriver.java b/core/src/mindustry/world/blocks/distribution/MassDriver.java index 5fff6a32f1..0d5c63cf97 100644 --- a/core/src/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/mindustry/world/blocks/distribution/MassDriver.java @@ -30,7 +30,7 @@ public class MassDriver extends Block{ public Effect smokeEffect = Fx.shootBigSmoke2; public Effect recieveEffect = Fx.mineBig; public float shake = 3f; - public @LoadRegion("@-base") TextureRegion baseRegion; + public @Load("@-base") TextureRegion baseRegion; public MassDriver(String name){ super(name); diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java index 8ad9091bf7..7241f0fad7 100644 --- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java @@ -19,8 +19,8 @@ import static mindustry.Vars.*; public class PayloadConveyor extends Block{ public float moveTime = 70f; - public @LoadRegion("@-top") TextureRegion topRegion; - public @LoadRegion("@-edge") TextureRegion edgeRegion; + public @Load("@-top") TextureRegion topRegion; + public @Load("@-edge") TextureRegion edgeRegion; public Interpolation interp = Interpolation.pow5; public PayloadConveyor(String name){ diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java index ecf78b2d28..e5b2aba1d4 100644 --- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/StackConveyor.java @@ -20,9 +20,9 @@ import static mindustry.Vars.*; public class StackConveyor extends Block implements Autotiler{ protected static final int stateMove = 0, stateLoad = 1, stateUnload = 2; - public @LoadRegion(value = "@-#", length = 3) TextureRegion[] regions; - public @LoadRegion("@-edge") TextureRegion edgeRegion; - public @LoadRegion("@-stack") TextureRegion stackRegion; + public @Load(value = "@-#", length = 3) TextureRegion[] regions; + public @Load("@-edge") TextureRegion edgeRegion; + public @Load("@-stack") TextureRegion stackRegion; public float speed = 0f; public float recharge = 4f; diff --git a/core/src/mindustry/world/blocks/environment/StaticWall.java b/core/src/mindustry/world/blocks/environment/StaticWall.java index e971c48970..4142db8700 100644 --- a/core/src/mindustry/world/blocks/environment/StaticWall.java +++ b/core/src/mindustry/world/blocks/environment/StaticWall.java @@ -11,7 +11,7 @@ import mindustry.world.*; import static mindustry.Vars.world; public class StaticWall extends Rock{ - public @LoadRegion("@-large") TextureRegion large; + public @Load("@-large") TextureRegion large; public TextureRegion[][] split; public StaticWall(String name){ diff --git a/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java b/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java index 21236cd30a..09ff1dd5c4 100644 --- a/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java +++ b/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java @@ -7,7 +7,7 @@ import mindustry.type.*; import mindustry.world.*; public class ArmoredConduit extends Conduit{ - public @LoadRegion("@-cap") TextureRegion capRegion; + public @Load("@-cap") TextureRegion capRegion; public ArmoredConduit(String name){ super(name); diff --git a/core/src/mindustry/world/blocks/liquid/Conduit.java b/core/src/mindustry/world/blocks/liquid/Conduit.java index fcfb4df8af..8dd5ff61d9 100644 --- a/core/src/mindustry/world/blocks/liquid/Conduit.java +++ b/core/src/mindustry/world/blocks/liquid/Conduit.java @@ -21,8 +21,8 @@ public class Conduit extends LiquidBlock implements Autotiler{ public Color botColor = Color.valueOf("565656"); - public @LoadRegion(value = "@-top-#", length = 7) TextureRegion[] topRegions; - public @LoadRegion(value = "@-bottom-#", length = 7, fallback = "conduit") TextureRegion[] botRegions; + public @Load(value = "@-top-#", length = 7) TextureRegion[] topRegions; + public @Load(value = "@-bottom-#", length = 7, fallback = "conduit") TextureRegion[] botRegions; public float leakResistance = 1.5f; diff --git a/core/src/mindustry/world/blocks/liquid/LiquidBlock.java b/core/src/mindustry/world/blocks/liquid/LiquidBlock.java index 958c67dd18..6c76979468 100644 --- a/core/src/mindustry/world/blocks/liquid/LiquidBlock.java +++ b/core/src/mindustry/world/blocks/liquid/LiquidBlock.java @@ -8,9 +8,9 @@ import mindustry.world.*; import mindustry.world.meta.*; public class LiquidBlock extends Block{ - public @LoadRegion("@-liquid") TextureRegion liquidRegion; - public @LoadRegion("@-top") TextureRegion bottomRegion; - public @LoadRegion("@-bottom") TextureRegion topRegion; + public @Load("@-liquid") TextureRegion liquidRegion; + public @Load("@-top") TextureRegion bottomRegion; + public @Load("@-bottom") TextureRegion topRegion; public LiquidBlock(String name){ super(name); diff --git a/core/src/mindustry/world/blocks/power/Battery.java b/core/src/mindustry/world/blocks/power/Battery.java index 15216d0be2..03b94961f5 100644 --- a/core/src/mindustry/world/blocks/power/Battery.java +++ b/core/src/mindustry/world/blocks/power/Battery.java @@ -8,7 +8,7 @@ import mindustry.gen.*; import static mindustry.Vars.tilesize; public class Battery extends PowerDistributor{ - public @LoadRegion("@-top") TextureRegion topRegion; + public @Load("@-top") TextureRegion topRegion; public Color emptyLightColor = Color.valueOf("f8c266"); public Color fullLightColor = Color.valueOf("fb9567"); diff --git a/core/src/mindustry/world/blocks/power/ImpactReactor.java b/core/src/mindustry/world/blocks/power/ImpactReactor.java index 55946082e0..38bffe2135 100644 --- a/core/src/mindustry/world/blocks/power/ImpactReactor.java +++ b/core/src/mindustry/world/blocks/power/ImpactReactor.java @@ -27,8 +27,8 @@ public class ImpactReactor extends PowerGenerator{ public Color plasma1 = Color.valueOf("ffd06b"), plasma2 = Color.valueOf("ff361b"); - public @LoadRegion("@-bottom") TextureRegion bottomRegion; - public @LoadRegion(value = "@-plasma-#", length = 4) TextureRegion[] plasmaRegions; + public @Load("@-bottom") TextureRegion bottomRegion; + public @Load(value = "@-plasma-#", length = 4) TextureRegion[] plasmaRegions; public ImpactReactor(String name){ super(name); diff --git a/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java b/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java index 4ac5d65cdc..641245b8ac 100644 --- a/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java +++ b/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java @@ -31,8 +31,8 @@ public class ItemLiquidGenerator extends PowerGenerator{ public Effect generateEffect = Fx.generatespark; public Effect explodeEffect = Fx.generatespark; public Color heatColor = Color.valueOf("ff9b59"); - public @LoadRegion("@-top") TextureRegion topRegion; - public @LoadRegion("@-liquid") TextureRegion liquidRegion; + public @Load("@-top") TextureRegion topRegion; + public @Load("@-liquid") TextureRegion liquidRegion; public boolean randomlyExplode = true; public boolean defaults = false; diff --git a/core/src/mindustry/world/blocks/power/LightBlock.java b/core/src/mindustry/world/blocks/power/LightBlock.java index 3e4ec03482..e752b047dc 100644 --- a/core/src/mindustry/world/blocks/power/LightBlock.java +++ b/core/src/mindustry/world/blocks/power/LightBlock.java @@ -17,7 +17,7 @@ public class LightBlock extends Block{ public float brightness = 0.9f; public float radius = 200f; - public @LoadRegion("@-top") TextureRegion topRegion; + public @Load("@-top") TextureRegion topRegion; public LightBlock(String name){ super(name); diff --git a/core/src/mindustry/world/blocks/power/NuclearReactor.java b/core/src/mindustry/world/blocks/power/NuclearReactor.java index 08a963bd32..ec2e8b6461 100644 --- a/core/src/mindustry/world/blocks/power/NuclearReactor.java +++ b/core/src/mindustry/world/blocks/power/NuclearReactor.java @@ -36,8 +36,8 @@ public class NuclearReactor extends PowerGenerator{ public float flashThreshold = 0.46f; //heat threshold at which the lights start flashing public float coolantPower = 0.5f; - public @LoadRegion("@-top") TextureRegion topRegion; - public @LoadRegion("@-lights") TextureRegion lightsRegion; + public @Load("@-top") TextureRegion topRegion; + public @Load("@-lights") TextureRegion lightsRegion; public NuclearReactor(String name){ super(name); diff --git a/core/src/mindustry/world/blocks/power/PowerDiode.java b/core/src/mindustry/world/blocks/power/PowerDiode.java index 048386eb72..dad6ad6bec 100644 --- a/core/src/mindustry/world/blocks/power/PowerDiode.java +++ b/core/src/mindustry/world/blocks/power/PowerDiode.java @@ -12,7 +12,7 @@ import mindustry.world.*; import mindustry.world.meta.*; public class PowerDiode extends Block{ - public @LoadRegion("@-arrow") TextureRegion arrow; + public @Load("@-arrow") TextureRegion arrow; public PowerDiode(String name){ super(name); diff --git a/core/src/mindustry/world/blocks/power/PowerNode.java b/core/src/mindustry/world/blocks/power/PowerNode.java index 06a4cd5568..2f8c2be457 100644 --- a/core/src/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/mindustry/world/blocks/power/PowerNode.java @@ -27,8 +27,8 @@ public class PowerNode extends PowerBlock{ protected final ObjectSet graphs = new ObjectSet<>(); protected final Vec2 t1 = new Vec2(), t2 = new Vec2(); - public @LoadRegion("laser") TextureRegion laser; - public @LoadRegion("laser-end") TextureRegion laserEnd; + public @Load("laser") TextureRegion laser; + public @Load("laser-end") TextureRegion laserEnd; public float laserRange = 6; public int maxNodes = 3; diff --git a/core/src/mindustry/world/blocks/production/Cultivator.java b/core/src/mindustry/world/blocks/production/Cultivator.java index 10eac817f3..a7c182739c 100644 --- a/core/src/mindustry/world/blocks/production/Cultivator.java +++ b/core/src/mindustry/world/blocks/production/Cultivator.java @@ -17,8 +17,8 @@ public class Cultivator extends GenericCrafter{ public Color plantColorLight = Color.valueOf("7457ce"); public Color bottomColor = Color.valueOf("474747"); - public @LoadRegion("@-middle") TextureRegion middleRegion; - public @LoadRegion("@-top") TextureRegion topRegion; + public @Load("@-middle") TextureRegion middleRegion; + public @Load("@-top") TextureRegion topRegion; public Rand random = new Rand(0); public float recurrence = 6f; public Attribute attribute = Attribute.spores; diff --git a/core/src/mindustry/world/blocks/production/Drill.java b/core/src/mindustry/world/blocks/production/Drill.java index d974ee403a..9effee6d16 100644 --- a/core/src/mindustry/world/blocks/production/Drill.java +++ b/core/src/mindustry/world/blocks/production/Drill.java @@ -50,9 +50,9 @@ public class Drill extends Block{ public boolean drawRim = false; public Color heatColor = Color.valueOf("ff5512"); - public @LoadRegion("@-rim") TextureRegion rimRegion; - public @LoadRegion("@-rotator") TextureRegion rotatorRegion; - public @LoadRegion("@-top") TextureRegion topRegion; + public @Load("@-rim") TextureRegion rimRegion; + public @Load("@-rotator") TextureRegion rotatorRegion; + public @Load("@-top") TextureRegion topRegion; public Drill(String name){ super(name); diff --git a/core/src/mindustry/world/blocks/production/Fracker.java b/core/src/mindustry/world/blocks/production/Fracker.java index 4b22ef1828..bae1612869 100644 --- a/core/src/mindustry/world/blocks/production/Fracker.java +++ b/core/src/mindustry/world/blocks/production/Fracker.java @@ -8,9 +8,9 @@ import mindustry.world.meta.*; public class Fracker extends SolidPump{ public float itemUseTime = 100f; - public @LoadRegion("@-liquid") TextureRegion liquidRegion; - public @LoadRegion("@-rotator") TextureRegion rotatorRegion; - public @LoadRegion("@-top") TextureRegion topRegion; + public @Load("@-liquid") TextureRegion liquidRegion; + public @Load("@-rotator") TextureRegion rotatorRegion; + public @Load("@-top") TextureRegion topRegion; public Fracker(String name){ super(name); diff --git a/core/src/mindustry/world/blocks/production/GenericSmelter.java b/core/src/mindustry/world/blocks/production/GenericSmelter.java index 81dfeacb8e..297803c694 100644 --- a/core/src/mindustry/world/blocks/production/GenericSmelter.java +++ b/core/src/mindustry/world/blocks/production/GenericSmelter.java @@ -10,7 +10,7 @@ import mindustry.graphics.*; /** A GenericCrafter with a new glowing region drawn on top. */ public class GenericSmelter extends GenericCrafter{ public Color flameColor = Color.valueOf("ffc999"); - public @LoadRegion("@-top") TextureRegion topRegion; + public @Load("@-top") TextureRegion topRegion; public GenericSmelter(String name){ super(name); diff --git a/core/src/mindustry/world/blocks/production/Separator.java b/core/src/mindustry/world/blocks/production/Separator.java index d5c917ba10..bdfaf05b3c 100644 --- a/core/src/mindustry/world/blocks/production/Separator.java +++ b/core/src/mindustry/world/blocks/production/Separator.java @@ -20,8 +20,8 @@ public class Separator extends Block{ public @NonNull ItemStack[] results; public float craftTime; - public @LoadRegion("@-liquid") TextureRegion liquidRegion; - public @LoadRegion("@-spinner") TextureRegion spinnerRegion; + public @Load("@-liquid") TextureRegion liquidRegion; + public @Load("@-spinner") TextureRegion spinnerRegion; public float spinnerSpeed = 3f; public Separator(String name){ diff --git a/core/src/mindustry/world/blocks/units/RepairPoint.java b/core/src/mindustry/world/blocks/units/RepairPoint.java index bc889e3ab1..5092c25cee 100644 --- a/core/src/mindustry/world/blocks/units/RepairPoint.java +++ b/core/src/mindustry/world/blocks/units/RepairPoint.java @@ -25,9 +25,9 @@ public class RepairPoint extends Block{ public float repairSpeed = 0.3f; public float powerUse; - public @LoadRegion("@-base") TextureRegion baseRegion; - public @LoadRegion("laser") TextureRegion laser; - public @LoadRegion("laser-end") TextureRegion laserEnd; + public @Load("@-base") TextureRegion baseRegion; + public @Load("laser") TextureRegion laser; + public @Load("laser-end") TextureRegion laserEnd; public RepairPoint(String name){ super(name); diff --git a/core/src/mindustry/world/blocks/units/UnitFactory.java b/core/src/mindustry/world/blocks/units/UnitFactory.java index baec3bcf21..cc3a264f77 100644 --- a/core/src/mindustry/world/blocks/units/UnitFactory.java +++ b/core/src/mindustry/world/blocks/units/UnitFactory.java @@ -29,7 +29,7 @@ public class UnitFactory extends Block{ public float launchVelocity = 5f; - public @LoadRegion("@-top") TextureRegion topRegion; + public @Load("@-top") TextureRegion topRegion; public int[] capacities; public UnitPlan[] plans = new UnitPlan[0];