Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Anuken
2020-05-02 12:30:29 -04:00
parent fd62125862
commit fed4d10ec6
31 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
annotations/src/main/java/mindustry/annotations/Annotations.java
View File

@@ -89,11 +89,11 @@ public class Annotations{
@Target(ElementType.FIELD) @Target(ElementType.FIELD)
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
public @interface LoadRegion{ public @interface Load{
String value(); String value();
int length() default 1; int length() default 1;
int[] lengths() default {}; int[] lengths() default {};
String fallback() default "error"; //TODO String fallback() default "error";
} }
@Target(ElementType.TYPE) @Target(ElementType.TYPE)

6
annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java
View File

@@ -12,7 +12,7 @@ import mindustry.annotations.util.*;
import javax.annotation.processing.*; import javax.annotation.processing.*;
import javax.lang.model.element.*; import javax.lang.model.element.*;
@SupportedAnnotationTypes({"mindustry.annotations.Annotations.LoadRegion",}) @SupportedAnnotationTypes("mindustry.annotations.Annotations.Load")
public class LoadRegionProcessor extends BaseProcessor{ public class LoadRegionProcessor extends BaseProcessor{
@Override @Override
@@ -25,7 +25,7 @@ public class LoadRegionProcessor extends BaseProcessor{
ObjectMap<Stype, Array<Svar>> fieldMap = new ObjectMap<>(); ObjectMap<Stype, Array<Svar>> fieldMap = new ObjectMap<>();
for(Svar field : fields(LoadRegion.class)){ for(Svar field : fields(Load.class)){
if(!field.is(Modifier.PUBLIC)){ if(!field.is(Modifier.PUBLIC)){
err("@LoadRegion field must be public", field); 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()); method.beginControlFlow("if(content instanceof $T)", entry.key.tname());
for(Svar field : entry.value){ for(Svar field : entry.value){
LoadRegion an = field.annotation(LoadRegion.class); Load an = field.annotation(Load.class);
//get # of array dimensions //get # of array dimensions
int dims = count(field.mirror().toString(), "[]"); int dims = count(field.mirror().toString(), "[]");
boolean doFallback = !an.fallback().equals("error"); boolean doFallback = !an.fallback().equals("error");

2
core/src/mindustry/world/blocks/defense/Door.java
View File

@@ -20,7 +20,7 @@ public class Door extends Wall{
public final int timerToggle = timers++; public final int timerToggle = timers++;
public Effect openfx = Fx.dooropen; public Effect openfx = Fx.dooropen;
public Effect closefx = Fx.doorclose; public Effect closefx = Fx.doorclose;
public @LoadRegion("@-open") TextureRegion openRegion; public @Load("@-open") TextureRegion openRegion;
public Door(String name){ public Door(String name){
super(name); super(name);

2
core/src/mindustry/world/blocks/defense/ForceProjector.java
View File

@@ -29,7 +29,7 @@ public class ForceProjector extends Block{
public float cooldownLiquid = 1.5f; public float cooldownLiquid = 1.5f;
public float cooldownBrokenBase = 0.35f; public float cooldownBrokenBase = 0.35f;
public float basePowerDraw = 0.2f; public float basePowerDraw = 0.2f;
public @LoadRegion("@-top") TextureRegion topRegion; public @Load("@-top") TextureRegion topRegion;
private static ForceProjectorEntity paramEntity; private static ForceProjectorEntity paramEntity;
private static Cons<Shielderc> shieldConsumer = trait -> { private static Cons<Shielderc> shieldConsumer = trait -> {

2
core/src/mindustry/world/blocks/defense/MendProjector.java
View File

@@ -18,7 +18,7 @@ public class MendProjector extends Block{
public final int timerUse = timers++; public final int timerUse = timers++;
public Color baseColor = Color.valueOf("84f491"); public Color baseColor = Color.valueOf("84f491");
public Color phaseColor = Color.valueOf("ffd59e"); public Color phaseColor = Color.valueOf("ffd59e");
public @LoadRegion("@-top") TextureRegion topRegion; public @Load("@-top") TextureRegion topRegion;
public float reload = 250f; public float reload = 250f;
public float range = 60f; public float range = 60f;
public float healPercent = 12f; public float healPercent = 12f;

2
core/src/mindustry/world/blocks/defense/OverdriveProjector.java
View File

@@ -16,7 +16,7 @@ import static mindustry.Vars.*;
public class OverdriveProjector extends Block{ public class OverdriveProjector extends Block{
public final int timerUse = timers++; public final int timerUse = timers++;
public @LoadRegion("@-top") TextureRegion topRegion; public @Load("@-top") TextureRegion topRegion;
public float reload = 60f; public float reload = 60f;
public float range = 80f; public float range = 80f;
public float speedBoost = 1.5f; public float speedBoost = 1.5f;

2
core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
View File

@@ -16,7 +16,7 @@ import static mindustry.Vars.tilesize;
public class LiquidTurret extends Turret{ public class LiquidTurret extends Turret{
public ObjectMap<Liquid, BulletType> ammoTypes = new ObjectMap<>(); public ObjectMap<Liquid, BulletType> ammoTypes = new ObjectMap<>();
public @LoadRegion("@-liquid") TextureRegion liquidRegion; public @Load("@-liquid") TextureRegion liquidRegion;
public LiquidTurret(String name){ public LiquidTurret(String name){
super(name); super(name);

4
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -52,8 +52,8 @@ public abstract class Turret extends Block{
protected Vec2 tr = new Vec2(); protected Vec2 tr = new Vec2();
protected Vec2 tr2 = new Vec2(); protected Vec2 tr2 = new Vec2();
public @LoadRegion("block-$size") TextureRegion baseRegion; public @Load("block-$size") TextureRegion baseRegion;
public @LoadRegion("@-heat") TextureRegion heatRegion; public @Load("@-heat") TextureRegion heatRegion;
public Cons<TurretEntity> drawer = tile -> Draw.rect(region, tile.x() + tr2.x, tile.y() + tr2.y, tile.rotation - 90); public Cons<TurretEntity> drawer = tile -> Draw.rect(region, tile.x() + tr2.x, tile.y() + tr2.y, tile.rotation - 90);
public Cons<TurretEntity> heatDrawer = tile -> { public Cons<TurretEntity> heatDrawer = tile -> {

2
core/src/mindustry/world/blocks/distribution/Conveyor.java
View File

@@ -29,7 +29,7 @@ public class Conveyor extends Block implements Autotiler{
private final Vec2 tr1 = new Vec2(); private final Vec2 tr1 = new Vec2();
private final Vec2 tr2 = 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 speed = 0f;
public float displayedSpeed = 0f; public float displayedSpeed = 0f;

6
core/src/mindustry/world/blocks/distribution/ItemBridge.java
View File

@@ -23,9 +23,9 @@ public class ItemBridge extends Block{
public final int timerTransport = timers++; public final int timerTransport = timers++;
public int range; public int range;
public float transportTime = 2f; public float transportTime = 2f;
public @LoadRegion("@-end") TextureRegion endRegion; public @Load("@-end") TextureRegion endRegion;
public @LoadRegion("@-bridge") TextureRegion bridgeRegion; public @Load("@-bridge") TextureRegion bridgeRegion;
public @LoadRegion("@-arrow") TextureRegion arrowRegion; public @Load("@-arrow") TextureRegion arrowRegion;
private static BuildRequest otherReq; private static BuildRequest otherReq;
private static int lastPlaced = -1; private static int lastPlaced = -1;

2
core/src/mindustry/world/blocks/distribution/MassDriver.java
View File

@@ -30,7 +30,7 @@ public class MassDriver extends Block{
public Effect smokeEffect = Fx.shootBigSmoke2; public Effect smokeEffect = Fx.shootBigSmoke2;
public Effect recieveEffect = Fx.mineBig; public Effect recieveEffect = Fx.mineBig;
public float shake = 3f; public float shake = 3f;
public @LoadRegion("@-base") TextureRegion baseRegion; public @Load("@-base") TextureRegion baseRegion;
public MassDriver(String name){ public MassDriver(String name){
super(name); super(name);

4
core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
View File

@@ -19,8 +19,8 @@ import static mindustry.Vars.*;
public class PayloadConveyor extends Block{ public class PayloadConveyor extends Block{
public float moveTime = 70f; public float moveTime = 70f;
public @LoadRegion("@-top") TextureRegion topRegion; public @Load("@-top") TextureRegion topRegion;
public @LoadRegion("@-edge") TextureRegion edgeRegion; public @Load("@-edge") TextureRegion edgeRegion;
public Interpolation interp = Interpolation.pow5; public Interpolation interp = Interpolation.pow5;
public PayloadConveyor(String name){ public PayloadConveyor(String name){

6
core/src/mindustry/world/blocks/distribution/StackConveyor.java
View File

@@ -20,9 +20,9 @@ import static mindustry.Vars.*;
public class StackConveyor extends Block implements Autotiler{ public class StackConveyor extends Block implements Autotiler{
protected static final int stateMove = 0, stateLoad = 1, stateUnload = 2; protected static final int stateMove = 0, stateLoad = 1, stateUnload = 2;
public @LoadRegion(value = "@-#", length = 3) TextureRegion[] regions; public @Load(value = "@-#", length = 3) TextureRegion[] regions;
public @LoadRegion("@-edge") TextureRegion edgeRegion; public @Load("@-edge") TextureRegion edgeRegion;
public @LoadRegion("@-stack") TextureRegion stackRegion; public @Load("@-stack") TextureRegion stackRegion;
public float speed = 0f; public float speed = 0f;
public float recharge = 4f; public float recharge = 4f;

2
core/src/mindustry/world/blocks/environment/StaticWall.java
View File

@@ -11,7 +11,7 @@ import mindustry.world.*;
import static mindustry.Vars.world; import static mindustry.Vars.world;
public class StaticWall extends Rock{ public class StaticWall extends Rock{
public @LoadRegion("@-large") TextureRegion large; public @Load("@-large") TextureRegion large;
public TextureRegion[][] split; public TextureRegion[][] split;
public StaticWall(String name){ public StaticWall(String name){

2
core/src/mindustry/world/blocks/liquid/ArmoredConduit.java
View File

@@ -7,7 +7,7 @@ import mindustry.type.*;
import mindustry.world.*; import mindustry.world.*;
public class ArmoredConduit extends Conduit{ public class ArmoredConduit extends Conduit{
public @LoadRegion("@-cap") TextureRegion capRegion; public @Load("@-cap") TextureRegion capRegion;
public ArmoredConduit(String name){ public ArmoredConduit(String name){
super(name); super(name);

4
core/src/mindustry/world/blocks/liquid/Conduit.java
View File

@@ -21,8 +21,8 @@ public class Conduit extends LiquidBlock implements Autotiler{
public Color botColor = Color.valueOf("565656"); public Color botColor = Color.valueOf("565656");
public @LoadRegion(value = "@-top-#", length = 7) TextureRegion[] topRegions; public @Load(value = "@-top-#", length = 7) TextureRegion[] topRegions;
public @LoadRegion(value = "@-bottom-#", length = 7, fallback = "conduit") TextureRegion[] botRegions; public @Load(value = "@-bottom-#", length = 7, fallback = "conduit") TextureRegion[] botRegions;
public float leakResistance = 1.5f; public float leakResistance = 1.5f;

6
core/src/mindustry/world/blocks/liquid/LiquidBlock.java
View File

@@ -8,9 +8,9 @@ import mindustry.world.*;
import mindustry.world.meta.*; import mindustry.world.meta.*;
public class LiquidBlock extends Block{ public class LiquidBlock extends Block{
public @LoadRegion("@-liquid") TextureRegion liquidRegion; public @Load("@-liquid") TextureRegion liquidRegion;
public @LoadRegion("@-top") TextureRegion bottomRegion; public @Load("@-top") TextureRegion bottomRegion;
public @LoadRegion("@-bottom") TextureRegion topRegion; public @Load("@-bottom") TextureRegion topRegion;
public LiquidBlock(String name){ public LiquidBlock(String name){
super(name); super(name);

2
core/src/mindustry/world/blocks/power/Battery.java
View File

@@ -8,7 +8,7 @@ import mindustry.gen.*;
import static mindustry.Vars.tilesize; import static mindustry.Vars.tilesize;
public class Battery extends PowerDistributor{ public class Battery extends PowerDistributor{
public @LoadRegion("@-top") TextureRegion topRegion; public @Load("@-top") TextureRegion topRegion;
public Color emptyLightColor = Color.valueOf("f8c266"); public Color emptyLightColor = Color.valueOf("f8c266");
public Color fullLightColor = Color.valueOf("fb9567"); public Color fullLightColor = Color.valueOf("fb9567");

4
core/src/mindustry/world/blocks/power/ImpactReactor.java
View File

@@ -27,8 +27,8 @@ public class ImpactReactor extends PowerGenerator{
public Color plasma1 = Color.valueOf("ffd06b"), plasma2 = Color.valueOf("ff361b"); public Color plasma1 = Color.valueOf("ffd06b"), plasma2 = Color.valueOf("ff361b");
public @LoadRegion("@-bottom") TextureRegion bottomRegion; public @Load("@-bottom") TextureRegion bottomRegion;
public @LoadRegion(value = "@-plasma-#", length = 4) TextureRegion[] plasmaRegions; public @Load(value = "@-plasma-#", length = 4) TextureRegion[] plasmaRegions;
public ImpactReactor(String name){ public ImpactReactor(String name){
super(name); super(name);

4
core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java
View File

@@ -31,8 +31,8 @@ public class ItemLiquidGenerator extends PowerGenerator{
public Effect generateEffect = Fx.generatespark; public Effect generateEffect = Fx.generatespark;
public Effect explodeEffect = Fx.generatespark; public Effect explodeEffect = Fx.generatespark;
public Color heatColor = Color.valueOf("ff9b59"); public Color heatColor = Color.valueOf("ff9b59");
public @LoadRegion("@-top") TextureRegion topRegion; public @Load("@-top") TextureRegion topRegion;
public @LoadRegion("@-liquid") TextureRegion liquidRegion; public @Load("@-liquid") TextureRegion liquidRegion;
public boolean randomlyExplode = true; public boolean randomlyExplode = true;
public boolean defaults = false; public boolean defaults = false;

2
core/src/mindustry/world/blocks/power/LightBlock.java
View File

@@ -17,7 +17,7 @@ public class LightBlock extends Block{
public float brightness = 0.9f; public float brightness = 0.9f;
public float radius = 200f; public float radius = 200f;
public @LoadRegion("@-top") TextureRegion topRegion; public @Load("@-top") TextureRegion topRegion;
public LightBlock(String name){ public LightBlock(String name){
super(name); super(name);

4
core/src/mindustry/world/blocks/power/NuclearReactor.java
View File

@@ -36,8 +36,8 @@ public class NuclearReactor extends PowerGenerator{
public float flashThreshold = 0.46f; //heat threshold at which the lights start flashing public float flashThreshold = 0.46f; //heat threshold at which the lights start flashing
public float coolantPower = 0.5f; public float coolantPower = 0.5f;
public @LoadRegion("@-top") TextureRegion topRegion; public @Load("@-top") TextureRegion topRegion;
public @LoadRegion("@-lights") TextureRegion lightsRegion; public @Load("@-lights") TextureRegion lightsRegion;
public NuclearReactor(String name){ public NuclearReactor(String name){
super(name); super(name);

2
core/src/mindustry/world/blocks/power/PowerDiode.java
View File

@@ -12,7 +12,7 @@ import mindustry.world.*;
import mindustry.world.meta.*; import mindustry.world.meta.*;
public class PowerDiode extends Block{ public class PowerDiode extends Block{
public @LoadRegion("@-arrow") TextureRegion arrow; public @Load("@-arrow") TextureRegion arrow;
public PowerDiode(String name){ public PowerDiode(String name){
super(name); super(name);

4
core/src/mindustry/world/blocks/power/PowerNode.java
View File

@@ -27,8 +27,8 @@ public class PowerNode extends PowerBlock{
protected final ObjectSet<PowerGraph> graphs = new ObjectSet<>(); protected final ObjectSet<PowerGraph> graphs = new ObjectSet<>();
protected final Vec2 t1 = new Vec2(), t2 = new Vec2(); protected final Vec2 t1 = new Vec2(), t2 = new Vec2();
public @LoadRegion("laser") TextureRegion laser; public @Load("laser") TextureRegion laser;
public @LoadRegion("laser-end") TextureRegion laserEnd; public @Load("laser-end") TextureRegion laserEnd;
public float laserRange = 6; public float laserRange = 6;
public int maxNodes = 3; public int maxNodes = 3;

4
core/src/mindustry/world/blocks/production/Cultivator.java
View File

@@ -17,8 +17,8 @@ public class Cultivator extends GenericCrafter{
public Color plantColorLight = Color.valueOf("7457ce"); public Color plantColorLight = Color.valueOf("7457ce");
public Color bottomColor = Color.valueOf("474747"); public Color bottomColor = Color.valueOf("474747");
public @LoadRegion("@-middle") TextureRegion middleRegion; public @Load("@-middle") TextureRegion middleRegion;
public @LoadRegion("@-top") TextureRegion topRegion; public @Load("@-top") TextureRegion topRegion;
public Rand random = new Rand(0); public Rand random = new Rand(0);
public float recurrence = 6f; public float recurrence = 6f;
public Attribute attribute = Attribute.spores; public Attribute attribute = Attribute.spores;

6
core/src/mindustry/world/blocks/production/Drill.java
View File

@@ -50,9 +50,9 @@ public class Drill extends Block{
public boolean drawRim = false; public boolean drawRim = false;
public Color heatColor = Color.valueOf("ff5512"); public Color heatColor = Color.valueOf("ff5512");
public @LoadRegion("@-rim") TextureRegion rimRegion; public @Load("@-rim") TextureRegion rimRegion;
public @LoadRegion("@-rotator") TextureRegion rotatorRegion; public @Load("@-rotator") TextureRegion rotatorRegion;
public @LoadRegion("@-top") TextureRegion topRegion; public @Load("@-top") TextureRegion topRegion;
public Drill(String name){ public Drill(String name){
super(name); super(name);

6
core/src/mindustry/world/blocks/production/Fracker.java
View File

@@ -8,9 +8,9 @@ import mindustry.world.meta.*;
public class Fracker extends SolidPump{ public class Fracker extends SolidPump{
public float itemUseTime = 100f; public float itemUseTime = 100f;
public @LoadRegion("@-liquid") TextureRegion liquidRegion; public @Load("@-liquid") TextureRegion liquidRegion;
public @LoadRegion("@-rotator") TextureRegion rotatorRegion; public @Load("@-rotator") TextureRegion rotatorRegion;
public @LoadRegion("@-top") TextureRegion topRegion; public @Load("@-top") TextureRegion topRegion;
public Fracker(String name){ public Fracker(String name){
super(name); super(name);

2
core/src/mindustry/world/blocks/production/GenericSmelter.java
View File

@@ -10,7 +10,7 @@ import mindustry.graphics.*;
/** A GenericCrafter with a new glowing region drawn on top. */ /** A GenericCrafter with a new glowing region drawn on top. */
public class GenericSmelter extends GenericCrafter{ public class GenericSmelter extends GenericCrafter{
public Color flameColor = Color.valueOf("ffc999"); public Color flameColor = Color.valueOf("ffc999");
public @LoadRegion("@-top") TextureRegion topRegion; public @Load("@-top") TextureRegion topRegion;
public GenericSmelter(String name){ public GenericSmelter(String name){
super(name); super(name);

4
core/src/mindustry/world/blocks/production/Separator.java
View File

@@ -20,8 +20,8 @@ public class Separator extends Block{
public @NonNull ItemStack[] results; public @NonNull ItemStack[] results;
public float craftTime; public float craftTime;
public @LoadRegion("@-liquid") TextureRegion liquidRegion; public @Load("@-liquid") TextureRegion liquidRegion;
public @LoadRegion("@-spinner") TextureRegion spinnerRegion; public @Load("@-spinner") TextureRegion spinnerRegion;
public float spinnerSpeed = 3f; public float spinnerSpeed = 3f;
public Separator(String name){ public Separator(String name){

6
core/src/mindustry/world/blocks/units/RepairPoint.java
View File

@@ -25,9 +25,9 @@ public class RepairPoint extends Block{
public float repairSpeed = 0.3f; public float repairSpeed = 0.3f;
public float powerUse; public float powerUse;
public @LoadRegion("@-base") TextureRegion baseRegion; public @Load("@-base") TextureRegion baseRegion;
public @LoadRegion("laser") TextureRegion laser; public @Load("laser") TextureRegion laser;
public @LoadRegion("laser-end") TextureRegion laserEnd; public @Load("laser-end") TextureRegion laserEnd;
public RepairPoint(String name){ public RepairPoint(String name){
super(name); super(name);

2
core/src/mindustry/world/blocks/units/UnitFactory.java
View File

@@ -29,7 +29,7 @@ public class UnitFactory extends Block{
public float launchVelocity = 5f; public float launchVelocity = 5f;
public @LoadRegion("@-top") TextureRegion topRegion; public @Load("@-top") TextureRegion topRegion;
public int[] capacities; public int[] capacities;
public UnitPlan[] plans = new UnitPlan[0]; public UnitPlan[] plans = new UnitPlan[0];