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

Functional loading

Browse Source
This commit is contained in:
Anuken
2019-08-27 09:27:09 -04:00
parent 76cd7ba8d1
commit 1e80bdf19f
209 changed files with 383 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/entities/Damage.java
+1 -1
View File
@@ -21,7 +21,7 @@ import io.anuke.mindustry.gen.PropCell;
import io.anuke.mindustry.graphics.Pal;
import io.anuke.mindustry.world.Tile;
import static io.anuke.mindustry.Min.*;
import static io.anuke.mindustry.Vars.*;
/** Utility class for damaging in an area. */
public class Damage{
core/src/io/anuke/mindustry/entities/Entities.java
+1 -1
View File
@@ -10,7 +10,7 @@ import io.anuke.arc.math.geom.Rectangle;
import io.anuke.mindustry.entities.traits.DrawTrait;
import io.anuke.mindustry.entities.traits.Entity;
import static io.anuke.mindustry.Min.collisions;
import static io.anuke.mindustry.Vars.collisions;
public class Entities{
private static final Array<EntityGroup<?>> groupArray = new Array<>();
core/src/io/anuke/mindustry/entities/EntityCollisions.java
+2 -2
View File
@@ -7,8 +7,8 @@ import io.anuke.mindustry.entities.traits.Entity;
import io.anuke.mindustry.entities.traits.SolidTrait;
import io.anuke.mindustry.world.Tile;
import static io.anuke.mindustry.Min.tilesize;
import static io.anuke.mindustry.Min.world;
import static io.anuke.mindustry.Vars.tilesize;
import static io.anuke.mindustry.Vars.world;
public class EntityCollisions{
//range for tile collision scanning
core/src/io/anuke/mindustry/entities/Units.java
+1 -1
View File
@@ -11,7 +11,7 @@ import io.anuke.mindustry.entities.type.*;
import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.world.Tile;
import static io.anuke.mindustry.Min.*;
import static io.anuke.mindustry.Vars.*;
/** Utility class for unit and team interactions.*/
public class Units{
core/src/io/anuke/mindustry/entities/bullet/Bullet.java
+2 -2
View File
@@ -16,8 +16,8 @@ import io.anuke.mindustry.entities.type.Unit;
import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.world.Tile;
import static io.anuke.mindustry.Min.bulletGroup;
import static io.anuke.mindustry.Min.world;
import static io.anuke.mindustry.Vars.bulletGroup;
import static io.anuke.mindustry.Vars.world;
public class Bullet extends SolidEntity implements DamageTrait, ScaleTrait, Poolable, DrawTrait, VelocityTrait, TimeTrait, TeamTrait, AbsorbTrait{
public Interval timer = new Interval(3);
core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java
+1 -1
View File
@@ -9,7 +9,7 @@ import io.anuke.mindustry.entities.effect.*;
import io.anuke.mindustry.type.*;
import io.anuke.mindustry.world.*;
import static io.anuke.mindustry.Min.*;
import static io.anuke.mindustry.Vars.*;
public class LiquidBulletType extends BulletType{
Liquid liquid;
core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java
+1 -1
View File
@@ -9,7 +9,7 @@ import io.anuke.mindustry.entities.Effects;
import io.anuke.mindustry.graphics.Pal;
import io.anuke.mindustry.world.blocks.distribution.MassDriver.DriverBulletData;
import static io.anuke.mindustry.Min.content;
import static io.anuke.mindustry.Vars.content;
public class MassDriverBolt extends BulletType{
core/src/io/anuke/mindustry/entities/effect/Decal.java
+1 -1
View File
@@ -8,7 +8,7 @@ import io.anuke.mindustry.entities.traits.BelowLiquidTrait;
import io.anuke.mindustry.entities.traits.DrawTrait;
import io.anuke.mindustry.graphics.Pal;
import static io.anuke.mindustry.Min.groundEffectGroup;
import static io.anuke.mindustry.Vars.groundEffectGroup;
/**
* Class for creating block rubble on the ground.
core/src/io/anuke/mindustry/entities/effect/Fire.java
+1 -1
View File
@@ -17,7 +17,7 @@ import io.anuke.mindustry.world.*;
import java.io.*;
import static io.anuke.mindustry.Min.*;
import static io.anuke.mindustry.Vars.*;
public class Fire extends TimedEntity implements SaveTrait, SyncTrait{
private static final IntMap<Fire> map = new IntMap<>();
core/src/io/anuke/mindustry/entities/effect/GroundEffectEntity.java
+2 -2
View File
@@ -2,7 +2,7 @@ package io.anuke.mindustry.entities.effect;
import io.anuke.arc.math.Mathf;
import io.anuke.arc.util.Time;
import io.anuke.mindustry.Min;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.entities.Effects;
import io.anuke.mindustry.entities.Effects.Effect;
import io.anuke.mindustry.entities.Effects.EffectRenderer;
@@ -27,7 +27,7 @@ public class GroundEffectEntity extends EffectEntity{
if(!once && time >= lifetime()){
once = true;
time = 0f;
Tile tile = Min.world.tileWorld(x, y);
Tile tile = Vars.world.tileWorld(x, y);
if(tile != null && tile.floor().isLiquid){
remove();
}
core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java
+1 -1
View File
@@ -17,7 +17,7 @@ import io.anuke.mindustry.graphics.Pal;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.world.Tile;
import static io.anuke.mindustry.Min.effectGroup;
import static io.anuke.mindustry.Vars.effectGroup;
public class ItemTransfer extends TimedEntity implements DrawTrait{
private Vector2 from = new Vector2();
core/src/io/anuke/mindustry/entities/effect/Lightning.java
+1 -1
View File
@@ -21,7 +21,7 @@ import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.gen.Call;
import io.anuke.mindustry.graphics.Pal;
import static io.anuke.mindustry.Min.bulletGroup;
import static io.anuke.mindustry.Vars.bulletGroup;
public class Lightning extends TimedEntity implements DrawTrait, TimeTrait{
public static final float lifetime = 10f;
core/src/io/anuke/mindustry/entities/effect/Puddle.java
+1 -1
View File
@@ -24,7 +24,7 @@ import io.anuke.mindustry.world.Tile;
import java.io.*;
import static io.anuke.mindustry.Min.*;
import static io.anuke.mindustry.Vars.*;
public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrait, SyncTrait{
private static final IntMap<Puddle> map = new IntMap<>();
core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java
+1 -1
View File
@@ -5,7 +5,7 @@ import io.anuke.arc.graphics.g2d.Draw;
import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.arc.math.Mathf;
import static io.anuke.mindustry.Min.headless;
import static io.anuke.mindustry.Vars.headless;
public class RubbleDecal extends Decal{
private TextureRegion region;
core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java
+2 -2
View File
@@ -7,8 +7,8 @@ import io.anuke.arc.math.Angles;
import io.anuke.arc.math.Mathf;
import io.anuke.mindustry.world.Tile;
import static io.anuke.mindustry.Min.headless;
import static io.anuke.mindustry.Min.world;
import static io.anuke.mindustry.Vars.headless;
import static io.anuke.mindustry.Vars.world;
public class ScorchDecal extends Decal{
private static final int scorches = 5;
core/src/io/anuke/mindustry/entities/impl/EffectEntity.java
+1 -1
View File
@@ -9,7 +9,7 @@ import io.anuke.mindustry.entities.EntityGroup;
import io.anuke.mindustry.entities.traits.DrawTrait;
import io.anuke.mindustry.entities.traits.Entity;
import static io.anuke.mindustry.Min.effectGroup;
import static io.anuke.mindustry.Vars.effectGroup;
public class EffectEntity extends TimedEntity implements Poolable, DrawTrait{
public Effect effect;
core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
+2 -2
View File
@@ -21,7 +21,7 @@ import io.anuke.mindustry.world.blocks.BuildBlock.*;
import java.io.*;
import java.util.*;
import static io.anuke.mindustry.Min.*;
import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.entities.traits.BuilderTrait.BuildDataStatic.*;
/** Interface for units that build things.*/
@@ -228,7 +228,7 @@ public interface BuilderTrait extends Entity, TeamTrait{
float px = unit.x + Angles.trnsx(unit.rotation, focusLen);
float py = unit.y + Angles.trnsy(unit.rotation, focusLen);
float sz = Min.tilesize * tile.block().size / 2f;
float sz = Vars.tilesize * tile.block().size / 2f;
float ang = unit.angleTo(tile);
tmptr[0].set(tile.drawx() - sz, tile.drawy() - sz);
core/src/io/anuke/mindustry/entities/traits/MinerTrait.java
+1 -1
View File
@@ -13,7 +13,7 @@ import io.anuke.mindustry.graphics.*;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.world.Tile;
import static io.anuke.mindustry.Min.*;
import static io.anuke.mindustry.Vars.*;
public interface MinerTrait extends Entity{
core/src/io/anuke/mindustry/entities/traits/SolidTrait.java
+2 -2
View File
@@ -3,7 +3,7 @@ package io.anuke.mindustry.entities.traits;
import io.anuke.arc.math.geom.*;
import io.anuke.arc.math.geom.QuadTree.QuadTreeObject;
import io.anuke.mindustry.Min;
import io.anuke.mindustry.Vars;
public interface SolidTrait extends QuadTreeObject, MoveTrait, VelocityTrait, Entity, Position{
@@ -33,6 +33,6 @@ public interface SolidTrait extends QuadTreeObject, MoveTrait, VelocityTrait, En
}
default void move(float x, float y){
Min.collisions.move(this, x, y);
Vars.collisions.move(this, x, y);
}
}
core/src/io/anuke/mindustry/entities/type/BaseUnit.java
+5 -5
View File
@@ -22,7 +22,7 @@ import io.anuke.mindustry.world.meta.*;
import java.io.*;
import static io.anuke.mindustry.Min.*;
import static io.anuke.mindustry.Vars.*;
/** Base class for AI units. */
public abstract class BaseUnit extends Unit implements ShooterTrait{
@@ -163,8 +163,8 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
public TileEntity getClosestEnemyCore(){
for(Team enemy : Min.state.teams.enemiesOf(team)){
Tile tile = Geometry.findClosest(x, y, Min.state.teams.get(enemy).cores);
for(Team enemy : Vars.state.teams.enemiesOf(team)){
Tile tile = Geometry.findClosest(x, y, Vars.state.teams.get(enemy).cores);
if(tile != null){
return tile.entity;
}
@@ -183,7 +183,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
@Override
public float getDamageMultipler(){
return status.getDamageMultiplier() * Min.state.rules.unitDamageMultiplier;
return status.getDamageMultiplier() * Vars.state.rules.unitDamageMultiplier;
}
@Override
@@ -232,7 +232,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
@Override
public float maxHealth(){
return type.health * Min.state.rules.unitHealthMultiplier;
return type.health * Vars.state.rules.unitHealthMultiplier;
}
@Override
core/src/io/anuke/mindustry/entities/type/FlyingUnit.java
+1 -1
View File
@@ -13,7 +13,7 @@ import io.anuke.mindustry.net.*;
import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.meta.*;
import static io.anuke.mindustry.Min.*;
import static io.anuke.mindustry.Vars.*;
public abstract class FlyingUnit extends BaseUnit{
protected float[] weaponAngles = {0, 0};
core/src/io/anuke/mindustry/entities/type/GroundUnit.java
+3 -3
View File
@@ -14,7 +14,7 @@ import io.anuke.mindustry.type.*;
import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.blocks.*;
import static io.anuke.mindustry.Min.*;
import static io.anuke.mindustry.Vars.*;
public abstract class GroundUnit extends BaseUnit{
protected static Vector2 vec = new Vector2();
@@ -235,8 +235,8 @@ public abstract class GroundUnit extends BaseUnit{
protected void moveAwayFromCore(){
Team enemy = null;
for(Team team : Min.state.teams.enemiesOf(team)){
if(Min.state.teams.isActive(team)){
for(Team team : Vars.state.teams.enemiesOf(team)){
if(Vars.state.teams.isActive(team)){
enemy = team;
break;
}
core/src/io/anuke/mindustry/entities/type/Player.java
+3 -3
View File
@@ -12,7 +12,7 @@ import io.anuke.arc.math.geom.*;
import io.anuke.arc.scene.ui.layout.*;
import io.anuke.arc.util.*;
import io.anuke.arc.util.pooling.Pools;
import io.anuke.mindustry.Min;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.content.*;
import io.anuke.mindustry.entities.*;
import io.anuke.mindustry.entities.traits.*;
@@ -31,7 +31,7 @@ import io.anuke.mindustry.world.blocks.*;
import java.io.*;
import static io.anuke.mindustry.Min.*;
import static io.anuke.mindustry.Vars.*;
public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
public static final int timerSync = 2;
@@ -859,7 +859,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
byte mechid = stream.readByte();
int spawner = stream.readInt();
Tile stile = world.tile(spawner);
Player player = headless ? this : Min.player;
Player player = headless ? this : Vars.player;
player.readSaveSuper(stream, version);
player.mech = content.getByID(ContentType.mech, mechid);
player.dead = false;
core/src/io/anuke/mindustry/entities/type/TileEntity.java
+1 -1
View File
@@ -20,7 +20,7 @@ import io.anuke.mindustry.world.modules.*;
import java.io.*;
import static io.anuke.mindustry.Min.*;
import static io.anuke.mindustry.Vars.*;
public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
public static final float timeToSleep = 60f * 4; //4 seconds to fall asleep
core/src/io/anuke/mindustry/entities/type/Unit.java
+1 -1
View File
@@ -27,7 +27,7 @@ import io.anuke.mindustry.world.blocks.*;
import java.io.*;
import static io.anuke.mindustry.Min.*;
import static io.anuke.mindustry.Vars.*;
public abstract class Unit extends DestructibleEntity implements SaveTrait, TargetTrait, SyncTrait, DrawTrait, TeamTrait{
/** Total duration of hit flash effect */
core/src/io/anuke/mindustry/entities/type/base/BaseDrone.java
+1 -1
View File
@@ -7,7 +7,7 @@ import io.anuke.mindustry.entities.units.*;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.meta.BlockFlag;
import static io.anuke.mindustry.Min.*;
import static io.anuke.mindustry.Vars.*;
public abstract class BaseDrone extends FlyingUnit{
public final UnitState retreat = new UnitState(){
core/src/io/anuke/mindustry/entities/type/base/BuilderDrone.java
+3 -3
View File
@@ -6,7 +6,7 @@ import io.anuke.arc.collection.IntIntMap;
import io.anuke.arc.collection.Queue;
import io.anuke.arc.math.Mathf;
import io.anuke.arc.util.*;
import io.anuke.mindustry.Min;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.entities.EntityGroup;
import io.anuke.mindustry.entities.traits.BuilderTrait;
import io.anuke.mindustry.entities.traits.TargetTrait;
@@ -21,7 +21,7 @@ import io.anuke.mindustry.world.blocks.BuildBlock.BuildEntity;
import java.io.*;
import static io.anuke.mindustry.Min.*;
import static io.anuke.mindustry.Vars.*;
public class BuilderDrone extends BaseDrone implements BuilderTrait{
private static final StaticReset reset = new StaticReset();
@@ -189,7 +189,7 @@ public class BuilderDrone extends BaseDrone implements BuilderTrait{
}
if(isRebuild() && !isBuilding()){
TeamData data = Min.state.teams.get(team);
TeamData data = Vars.state.teams.get(team);
if(!data.brokenBlocks.isEmpty()){
long block = data.brokenBlocks.removeLast();
core/src/io/anuke/mindustry/entities/type/base/MinerDrone.java
+1 -1
View File
@@ -14,7 +14,7 @@ import io.anuke.mindustry.world.Tile;
import java.io.*;
import static io.anuke.mindustry.Min.*;
import static io.anuke.mindustry.Vars.*;
/** A drone that only mines.*/
public class MinerDrone extends BaseDrone implements MinerTrait{
core/src/io/anuke/mindustry/entities/type/base/RepairDrone.java
+1 -1
View File
@@ -9,7 +9,7 @@ import io.anuke.mindustry.world.blocks.*;
import java.io.*;
import static io.anuke.mindustry.Min.world;
import static io.anuke.mindustry.Vars.world;
public class RepairDrone extends BaseDrone{
public final UnitState repair = new UnitState(){
core/src/io/anuke/mindustry/entities/units/Statuses.java
+1 -1
View File
@@ -14,7 +14,7 @@ import io.anuke.mindustry.type.StatusEffect;
import java.io.*;
import static io.anuke.mindustry.Min.content;
import static io.anuke.mindustry.Vars.content;
/** Class for controlling status effects on an entity. */
public class Statuses implements Saveable{
core/src/io/anuke/mindustry/entities/units/UnitDrops.java
+4 -4
View File
@@ -1,7 +1,7 @@
package io.anuke.mindustry.entities.units;
import io.anuke.arc.math.Mathf;
import io.anuke.mindustry.Min;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.entities.type.BaseUnit;
import io.anuke.mindustry.entities.type.TileEntity;
@@ -13,13 +13,13 @@ public class UnitDrops{
public static void dropItems(BaseUnit unit){
//items only dropped in waves for enemy team
if(unit.getTeam() != Min.waveTeam || !Min.state.rules.unitDrops){
if(unit.getTeam() != Vars.waveTeam || !Vars.state.rules.unitDrops){
return;
}
TileEntity core = unit.getClosestEnemyCore();
if(core == null || core.dst(unit) > Min.mineTransferRange){
if(core == null || core.dst(unit) > Vars.mineTransferRange){
return;
}
@@ -30,7 +30,7 @@ public class UnitDrops{
for(int i = 0; i < 3; i++){
for(Item item : dropTable){
//only drop unlocked items
if(!Min.headless && !Min.data.isUnlocked(item)){
if(!Vars.headless && !Vars.data.isUnlocked(item)){
continue;
}