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

Compile fixes

Browse Source
This commit is contained in:
Anuken
2019-12-25 13:25:44 -05:00
parent 1e7c83f0c9
commit c681cc5cf8
8 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/Vars.java
View File

@@ -22,6 +22,7 @@ import mindustry.input.*;
import mindustry.maps.*; import mindustry.maps.*;
import mindustry.mod.*; import mindustry.mod.*;
import mindustry.net.Net; import mindustry.net.Net;
import mindustry.type.Weather.*;
import mindustry.world.blocks.defense.ForceProjector.*; import mindustry.world.blocks.defense.ForceProjector.*;
import java.nio.charset.*; import java.nio.charset.*;

2
core/src/mindustry/content/Planets.java
View File

@@ -1,6 +1,6 @@
package mindustry.content; package mindustry.content;
import io.anuke.mindustry.ctype.*; import mindustry.ctype.*;
import mindustry.type.*; import mindustry.type.*;
public class Planets implements ContentList{ public class Planets implements ContentList{

10
core/src/mindustry/maps/filters/CoreSpawnFilter.java
View File

@@ -1,12 +1,12 @@
package mindustry.maps.filters; package mindustry.maps.filters;
import io.anuke.arc.collection.*; import arc.struct.*;
import io.anuke.arc.util.*; import arc.util.*;
import io.anuke.mindustry.maps.filters.FilterOption.*; import mindustry.maps.filters.FilterOption.*;
import io.anuke.mindustry.world.blocks.storage.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.blocks.storage.*;
import static io.anuke.mindustry.Vars.*; import static mindustry.Vars.*;
/** Selects X spawns from the core spawn pool.*/ /** Selects X spawns from the core spawn pool.*/
public class CoreSpawnFilter extends GenerateFilter{ public class CoreSpawnFilter extends GenerateFilter{

7
core/src/mindustry/maps/filters/EnemySpawnFilter.java
View File

@@ -1,8 +1,9 @@
package mindustry.maps.filters; package mindustry.maps.filters;
import io.anuke.arc.collection.*; import arc.struct.*;
import io.anuke.arc.util.*; import arc.util.*;
import io.anuke.mindustry.maps.filters.FilterOption.*; import mindustry.content.*;
import mindustry.maps.filters.FilterOption.*;
import mindustry.world.*; import mindustry.world.*;
/** Selects X spawns from the spawn pool.*/ /** Selects X spawns from the spawn pool.*/

9
core/src/mindustry/maps/generators/RandomGenerator.java
View File

@@ -1,10 +1,9 @@
package mindustry.maps.generators; package mindustry.maps.generators;
import arc.struct.StringMap; import arc.struct.*;
import mindustry.content.Blocks; import mindustry.content.*;
import mindustry.maps.Map; import mindustry.maps.*;
import mindustry.world.Block; import mindustry.world.*;
import mindustry.world.Tile;
import static mindustry.Vars.world; import static mindustry.Vars.world;

8
core/src/mindustry/maps/zonegen/OvergrowthGenerator.java
View File

@@ -1,9 +1,9 @@
package mindustry.maps.zonegen; package mindustry.maps.zonegen;
import arc.math.Mathf; import arc.math.*;
import mindustry.content.Blocks; import mindustry.content.*;
import mindustry.maps.generators.BasicGenerator; import mindustry.maps.generators.*;
import mindustry.world.Tile; import mindustry.world.*;
import static mindustry.Vars.schematics; import static mindustry.Vars.schematics;

4
core/src/mindustry/type/Planet.java
View File

@@ -1,7 +1,7 @@
package mindustry.type; package mindustry.type;
import io.anuke.arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import io.anuke.mindustry.ctype.*; import mindustry.ctype.*;
//TODO add full icon for this planet //TODO add full icon for this planet
public class Planet extends UnlockableContent{ public class Planet extends UnlockableContent{

17
core/src/mindustry/type/Weather.java
View File

@@ -1,16 +1,16 @@
package mindustry.type; package mindustry.type;
import io.anuke.annotations.Annotations.*; import arc.util.ArcAnnotate.*;
import io.anuke.arc.util.ArcAnnotate.*; import mindustry.annotations.Annotations.*;
import io.anuke.mindustry.ctype.*; import mindustry.ctype.*;
import io.anuke.mindustry.entities.*; import mindustry.entities.*;
import io.anuke.mindustry.entities.traits.*; import mindustry.entities.traits.*;
import io.anuke.mindustry.entities.type.*; import mindustry.entities.type.*;
import mindustry.type.Weather.*; import mindustry.type.Weather.*;
import java.io.*; import java.io.*;
import static io.anuke.mindustry.Vars.*; import static mindustry.Vars.*;
public abstract class Weather<T extends WeatherEntity> extends MappableContent{ public abstract class Weather<T extends WeatherEntity> extends MappableContent{
protected float duration = 100f; protected float duration = 100f;
@@ -34,7 +34,8 @@ public abstract class Weather<T extends WeatherEntity> extends MappableContent{
/** How long this event has been occuring in ticks. */ /** How long this event has been occuring in ticks. */
protected float life; protected float life;
/** Type of weather that is being simulated. */ /** Type of weather that is being simulated. */
protected @NonNull Weather weather; protected @NonNull
Weather weather;
public WeatherEntity(Weather weather){ public WeatherEntity(Weather weather){
this.weather = weather; this.weather = weather;