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-10-02 19:51:30 -04:00
parent 10dd2b4b33
commit 5861fe61b2
158 changed files with 311 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/Attributes.java
View File

@@ -2,7 +2,7 @@ package mindustry.world.blocks;
import arc.util.serialization.*;
import arc.util.serialization.Json.*;
import mindustry.world.meta.Attribute;
import mindustry.world.meta.*;
import java.util.*;

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

@@ -1,8 +1,8 @@
package mindustry.world.blocks.defense;
import arc.audio.*;
import arc.Graphics.*;
import arc.Graphics.Cursor.*;
import arc.audio.*;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.math.geom.*;

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

@@ -6,7 +6,7 @@ import mindustry.content.*;
import mindustry.entities.*;
import mindustry.entities.bullet.*;
import static mindustry.Vars.tilesize;
import static mindustry.Vars.*;
public class ChargeTurret extends PowerTurret{
public float chargeTime = 30f;

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

@@ -9,7 +9,7 @@ import mindustry.world.consumers.*;
import mindustry.world.meta.*;
import mindustry.world.meta.values.*;
import static mindustry.Vars.tilesize;
import static mindustry.Vars.*;
public class LaserTurret extends PowerTurret{
public float firingMoveFract = 0.25f;

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

@@ -6,8 +6,8 @@ import mindustry.annotations.Annotations.*;
import mindustry.entities.*;
import mindustry.entities.bullet.*;
import mindustry.gen.*;
import mindustry.type.*;
import mindustry.graphics.*;
import mindustry.type.*;
import mindustry.world.consumers.*;
import mindustry.world.meta.*;
import mindustry.world.meta.values.*;

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

@@ -178,12 +178,13 @@ public abstract class Turret extends Block{
@Override
public double sense(LAccess sensor){
if(sensor == LAccess.rotation) return rotation;
if(sensor == LAccess.shootX) return targetPos.x;
if(sensor == LAccess.shootY) return targetPos.y;
if(sensor == LAccess.shooting) return (isControlled() ? unit.isShooting() : logicControlled() ? logicShooting : validateTarget()) ? 1 : 0;
return super.sense(sensor);
return switch(sensor){
case rotation -> rotation;
case shootX -> targetPos.x;
case shootY -> targetPos.y;
case shooting -> (isControlled() ? unit.isShooting() : logicControlled() ? logicShooting : validateTarget()) ? 1 : 0;
default -> super.sense(sensor);
};
}
@Override

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

@@ -162,7 +162,7 @@ public class Conveyor extends Block implements Autotiler{
@Override
public boolean shouldIdleSound(){
return clogHeat <= 0.5f ;
return clogHeat <= 0.5f;
}
@Override

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

@@ -7,7 +7,7 @@ import mindustry.type.*;
import mindustry.world.*;
import mindustry.world.meta.*;
import static mindustry.Vars.content;
import static mindustry.Vars.*;
public class Junction extends Block{
public float speed = 26; //frames taken to go through this junction

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

@@ -1,15 +1,15 @@
package mindustry.world.blocks.distribution;
import arc.math.*;
import arc.util.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.gen.*;
import mindustry.type.*;
import mindustry.world.*;
import mindustry.world.meta.*;
import static mindustry.Vars.world;
import static mindustry.Vars.*;
public class OverflowGate extends Block{
public float speed = 1f;

10
core/src/mindustry/world/blocks/environment/Boulder.java
View File

@@ -1,11 +1,9 @@
package mindustry.world.blocks.environment;
import arc.Core;
import arc.graphics.g2d.Draw;
import arc.graphics.g2d.TextureRegion;
import arc.math.Mathf;
import mindustry.world.Block;
import mindustry.world.Tile;
import arc.*;
import arc.graphics.g2d.*;
import arc.math.*;
import mindustry.world.*;
public class Boulder extends Block{
protected int variants;

4
core/src/mindustry/world/blocks/environment/OreBlock.java
View File

@@ -1,15 +1,15 @@
package mindustry.world.blocks.environment;
import arc.*;
import mindustry.annotations.Annotations.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
import mindustry.annotations.Annotations.*;
import mindustry.graphics.*;
import mindustry.graphics.MultiPacker.*;
import mindustry.type.*;
import mindustry.world.*;
import static mindustry.Vars.tilesize;
import static mindustry.Vars.*;
/**An overlay ore for a specific item type.*/
public class OreBlock extends OverlayFloor{

6
core/src/mindustry/world/blocks/environment/OverlayFloor.java
View File

@@ -1,8 +1,8 @@
package mindustry.world.blocks.environment;
import arc.graphics.g2d.Draw;
import arc.math.Mathf;
import mindustry.world.Tile;
import arc.graphics.g2d.*;
import arc.math.*;
import mindustry.world.*;
/**A type of floor that is overlaid on top of over floors.*/
public class OverlayFloor extends Floor{

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

@@ -4,7 +4,7 @@ import arc.graphics.g2d.*;
import arc.util.*;
import mindustry.world.*;
import static mindustry.Vars.tilesize;
import static mindustry.Vars.*;
public class StaticTree extends StaticWall{

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

@@ -8,7 +8,7 @@ import mindustry.annotations.Annotations.*;
import mindustry.graphics.*;
import mindustry.world.*;
import static mindustry.Vars.world;
import static mindustry.Vars.*;
public class StaticWall extends Boulder{
public @Load("@-large") TextureRegion large;

7
core/src/mindustry/world/blocks/environment/TreeBlock.java
View File

@@ -1,13 +1,12 @@
package mindustry.world.blocks.environment;
import arc.graphics.g2d.*;
import arc.math.Mathf;
import arc.math.*;
import arc.math.geom.*;
import arc.util.*;
import mindustry.annotations.Annotations.*;
import mindustry.graphics.Layer;
import mindustry.world.Block;
import mindustry.world.Tile;
import mindustry.graphics.*;
import mindustry.world.*;
public class TreeBlock extends Block{
public @Load("@-shadow") TextureRegion shadow;

2
core/src/mindustry/world/blocks/experimental/BlockLoader.java
View File

@@ -10,7 +10,7 @@ import mindustry.ui.*;
import mindustry.world.blocks.payloads.*;
import mindustry.world.blocks.production.*;
import static mindustry.Vars.content;
import static mindustry.Vars.*;
public class BlockLoader extends PayloadAcceptor{
public final int timerLoad = timers++;

2
core/src/mindustry/world/blocks/experimental/BlockUnloader.java
View File

@@ -3,7 +3,7 @@ package mindustry.world.blocks.experimental;
import mindustry.gen.*;
import mindustry.type.*;
import static mindustry.Vars.content;
import static mindustry.Vars.*;
public class BlockUnloader extends BlockLoader{

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

@@ -6,7 +6,7 @@ import mindustry.type.*;
import mindustry.world.blocks.distribution.*;
import mindustry.world.meta.*;
import static mindustry.Vars.world;
import static mindustry.Vars.*;
public class LiquidBridge extends ItemBridge{

7
core/src/mindustry/world/blocks/logic/SwitchBlock.java
View File

@@ -4,7 +4,6 @@ import arc.graphics.g2d.*;
import arc.util.io.*;
import mindustry.annotations.Annotations.*;
import mindustry.gen.*;
import mindustry.logic.*;
import mindustry.world.*;
public class SwitchBlock extends Block{
@@ -22,12 +21,6 @@ public class SwitchBlock extends Block{
public class SwitchBuild extends Building{
@Override
public double sense(LAccess sensor){
if(sensor == LAccess.enabled) return enabled ? 1 : 0;
return super.sense(sensor);
}
@Override
public boolean configTapped(){
configure(!enabled);

2
core/src/mindustry/world/blocks/payloads/BlockPayload.java
View File

@@ -8,7 +8,7 @@ import mindustry.graphics.*;
import mindustry.ui.*;
import mindustry.world.*;
import static mindustry.Vars.tilesize;
import static mindustry.Vars.*;
public class BlockPayload implements Payload{
public Building entity;

2
core/src/mindustry/world/blocks/payloads/UnitPayload.java
View File

@@ -7,8 +7,8 @@ import arc.math.geom.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.*;
import mindustry.entities.*;
import mindustry.entities.EntityCollisions.*;
import mindustry.entities.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.ui.*;

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

@@ -8,7 +8,7 @@ import mindustry.annotations.Annotations.*;
import mindustry.gen.*;
import mindustry.world.meta.*;
import static mindustry.Vars.tilesize;
import static mindustry.Vars.*;
public class Battery extends PowerDistributor{
public @Load("@-top") TextureRegion topRegion;

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

@@ -1,8 +1,8 @@
package mindustry.world.blocks.power;
import arc.graphics.g2d.*;
import mindustry.graphics.*;
import mindustry.annotations.Annotations.*;
import mindustry.graphics.*;
import mindustry.type.*;
public class BurnerGenerator extends ItemLiquidGenerator{

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

@@ -1,8 +1,8 @@
package mindustry.world.blocks.power;
import arc.func.Boolf;
import arc.func.*;
import mindustry.gen.*;
import mindustry.world.consumers.ConsumePower;
import mindustry.world.consumers.*;
/** A power consumer that only activates sometimes. */
public class ConditionalConsumePower extends ConsumePower{

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

@@ -1,6 +1,6 @@
package mindustry.world.blocks.power;
import mindustry.type.Item;
import mindustry.type.*;
public class DecayGenerator extends ItemLiquidGenerator{

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

@@ -1,7 +1,7 @@
package mindustry.world.blocks.power;
import mindustry.world.Block;
import mindustry.world.meta.BlockGroup;
import mindustry.world.*;
import mindustry.world.meta.*;
public abstract class PowerBlock extends Block{

3
core/src/mindustry/world/blocks/power/SingleTypeGenerator.java
View File

@@ -1,7 +1,6 @@
package mindustry.world.blocks.power;
import mindustry.type.Item;
import mindustry.type.Liquid;
import mindustry.type.*;
public class SingleTypeGenerator extends ItemLiquidGenerator{

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

@@ -1,8 +1,8 @@
package mindustry.world.blocks.production;
import arc.graphics.g2d.*;
import mindustry.graphics.*;
import mindustry.annotations.Annotations.*;
import mindustry.graphics.*;
import mindustry.world.meta.*;
public class Fracker extends SolidPump{

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

@@ -11,7 +11,7 @@ import mindustry.graphics.*;
import mindustry.world.*;
import mindustry.world.blocks.payloads.*;
import static mindustry.Vars.tilesize;
import static mindustry.Vars.*;
public class PayloadAcceptor extends Block{
public float payloadSpeed = 0.5f;

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

@@ -4,8 +4,8 @@ import arc.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
import mindustry.game.*;
import mindustry.type.*;
import mindustry.graphics.*;
import mindustry.type.*;
import mindustry.ui.*;
import mindustry.world.*;
import mindustry.world.blocks.liquid.*;

2
core/src/mindustry/world/blocks/sandbox/LiquidSource.java
View File

@@ -11,7 +11,7 @@ import mindustry.type.*;
import mindustry.world.*;
import mindustry.world.blocks.*;
import static mindustry.Vars.content;
import static mindustry.Vars.*;
public class LiquidSource extends Block{

4
core/src/mindustry/world/blocks/sandbox/PowerVoid.java
View File

@@ -1,7 +1,7 @@
package mindustry.world.blocks.sandbox;
import mindustry.world.blocks.power.PowerBlock;
import mindustry.world.meta.BlockStat;
import mindustry.world.blocks.power.*;
import mindustry.world.meta.*;
public class PowerVoid extends PowerBlock{

1
core/src/mindustry/world/blocks/storage/CoreBlock.java
View File

@@ -6,7 +6,6 @@ import arc.graphics.g2d.*;
import arc.math.*;
import arc.math.geom.*;
import arc.struct.*;
import arc.util.ArcAnnotate.*;
import mindustry.annotations.Annotations.*;
import mindustry.content.*;
import mindustry.core.*;

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

@@ -7,8 +7,8 @@ import arc.math.*;
import arc.scene.style.*;
import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.*;
import mindustry.entities.*;