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/entities/Effect.java
View File

@@ -7,8 +7,8 @@ import arc.graphics.g2d.*;
import arc.math.*;
import arc.math.geom.*;
import arc.struct.*;
import arc.util.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import mindustry.*;
import mindustry.content.*;
import mindustry.gen.*;

2
core/src/mindustry/entities/EntityGroup.java
View File

@@ -8,7 +8,7 @@ import mindustry.gen.*;
import java.util.*;
import static mindustry.Vars.collisions;
import static mindustry.Vars.*;
/** Represents a group of a certain type of entity.*/
@SuppressWarnings("unchecked")

1
core/src/mindustry/entities/abilities/StatusFieldAbility.java
View File

@@ -1,6 +1,5 @@
package mindustry.entities.abilities;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import mindustry.content.*;
import mindustry.entities.*;

15
core/src/mindustry/entities/bullet/MassDriverBolt.java
View File

@@ -1,15 +1,14 @@
package mindustry.entities.bullet;
import arc.graphics.Color;
import arc.graphics.g2d.Draw;
import arc.math.Angles;
import arc.math.Mathf;
import mindustry.content.Fx;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.math.*;
import mindustry.content.*;
import mindustry.gen.*;
import mindustry.graphics.Pal;
import mindustry.world.blocks.distribution.MassDriver.DriverBulletData;
import mindustry.graphics.*;
import mindustry.world.blocks.distribution.MassDriver.*;
import static mindustry.Vars.content;
import static mindustry.Vars.*;
public class MassDriverBolt extends BulletType{

1
core/src/mindustry/entities/comp/BuildingComp.java
View File

@@ -1238,6 +1238,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
case powerNetOut -> power == null ? 0 : power.graph.getLastScaledPowerOut() * 60;
case powerNetStored -> power == null ? 0 : power.graph.getLastPowerStored();
case powerNetCapacity -> power == null ? 0 : power.graph.getLastCapacity();
case enabled -> enabled ? 1 : 0;
default -> 0;
};
}

2
core/src/mindustry/entities/comp/EntityComp.java
View File

@@ -6,7 +6,7 @@ import mindustry.annotations.Annotations.*;
import mindustry.entities.*;
import mindustry.gen.*;
import static mindustry.Vars.player;
import static mindustry.Vars.*;
@Component
@BaseComponent

2
core/src/mindustry/entities/comp/FlyingComp.java
View File

@@ -10,7 +10,7 @@ import mindustry.game.EventType.*;
import mindustry.gen.*;
import mindustry.world.blocks.environment.*;
import static mindustry.Vars.net;
import static mindustry.Vars.*;
@Component
abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{

2
core/src/mindustry/entities/comp/HitboxComp.java
View File

@@ -2,8 +2,8 @@ package mindustry.entities.comp;
import arc.func.*;
import arc.math.*;
import arc.math.geom.QuadTree.*;
import arc.math.geom.*;
import arc.math.geom.QuadTree.*;
import mindustry.annotations.Annotations.*;
import mindustry.gen.*;

2
core/src/mindustry/entities/comp/MinerComp.java
View File

@@ -4,8 +4,8 @@ import arc.*;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.math.*;
import arc.util.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import mindustry.annotations.Annotations.*;
import mindustry.content.*;
import mindustry.gen.*;

2
core/src/mindustry/entities/comp/PosComp.java
View File

@@ -8,7 +8,7 @@ import mindustry.content.*;
import mindustry.world.*;
import mindustry.world.blocks.environment.*;
import static mindustry.Vars.world;
import static mindustry.Vars.*;
@Component
abstract class PosComp implements Position{

2
core/src/mindustry/entities/comp/ShieldComp.java
View File

@@ -5,7 +5,7 @@ import mindustry.annotations.Annotations.*;
import mindustry.content.*;
import mindustry.gen.*;
import static mindustry.Vars.minArmorDamage;
import static mindustry.Vars.*;
@Component
abstract class ShieldComp implements Healthc, Posc{

2
core/src/mindustry/entities/comp/TeamComp.java
View File

@@ -5,7 +5,7 @@ import mindustry.annotations.Annotations.*;
import mindustry.game.*;
import mindustry.gen.*;
import static mindustry.Vars.state;
import static mindustry.Vars.*;
@Component
abstract class TeamComp implements Posc{

2
core/src/mindustry/entities/comp/VelComp.java
View File

@@ -2,8 +2,8 @@ package mindustry.entities.comp;
import arc.math.*;
import arc.math.geom.*;
import arc.util.*;
import arc.util.ArcAnnotate.*;
import arc.util.*;
import mindustry.annotations.Annotations.*;
import mindustry.entities.EntityCollisions.*;
import mindustry.gen.*;