Compile fixes
This commit is contained in:
@@ -22,6 +22,7 @@ import mindustry.input.*;
|
||||
import mindustry.maps.*;
|
||||
import mindustry.mod.*;
|
||||
import mindustry.net.Net;
|
||||
import mindustry.type.Weather.*;
|
||||
import mindustry.world.blocks.defense.ForceProjector.*;
|
||||
|
||||
import java.nio.charset.*;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package mindustry.content;
|
||||
|
||||
import io.anuke.mindustry.ctype.*;
|
||||
import mindustry.ctype.*;
|
||||
import mindustry.type.*;
|
||||
|
||||
public class Planets implements ContentList{
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package mindustry.maps.filters;
|
||||
|
||||
import io.anuke.arc.collection.*;
|
||||
import io.anuke.arc.util.*;
|
||||
import io.anuke.mindustry.maps.filters.FilterOption.*;
|
||||
import io.anuke.mindustry.world.blocks.storage.*;
|
||||
import arc.struct.*;
|
||||
import arc.util.*;
|
||||
import mindustry.maps.filters.FilterOption.*;
|
||||
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.*/
|
||||
public class CoreSpawnFilter extends GenerateFilter{
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
package mindustry.maps.filters;
|
||||
|
||||
import io.anuke.arc.collection.*;
|
||||
import io.anuke.arc.util.*;
|
||||
import io.anuke.mindustry.maps.filters.FilterOption.*;
|
||||
import arc.struct.*;
|
||||
import arc.util.*;
|
||||
import mindustry.content.*;
|
||||
import mindustry.maps.filters.FilterOption.*;
|
||||
import mindustry.world.*;
|
||||
|
||||
/** Selects X spawns from the spawn pool.*/
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
package mindustry.maps.generators;
|
||||
|
||||
import arc.struct.StringMap;
|
||||
import mindustry.content.Blocks;
|
||||
import mindustry.maps.Map;
|
||||
import mindustry.world.Block;
|
||||
import mindustry.world.Tile;
|
||||
import arc.struct.*;
|
||||
import mindustry.content.*;
|
||||
import mindustry.maps.*;
|
||||
import mindustry.world.*;
|
||||
|
||||
import static mindustry.Vars.world;
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package mindustry.maps.zonegen;
|
||||
|
||||
import arc.math.Mathf;
|
||||
import mindustry.content.Blocks;
|
||||
import mindustry.maps.generators.BasicGenerator;
|
||||
import mindustry.world.Tile;
|
||||
import arc.math.*;
|
||||
import mindustry.content.*;
|
||||
import mindustry.maps.generators.*;
|
||||
import mindustry.world.*;
|
||||
|
||||
import static mindustry.Vars.schematics;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package mindustry.type;
|
||||
|
||||
import io.anuke.arc.scene.ui.layout.*;
|
||||
import io.anuke.mindustry.ctype.*;
|
||||
import arc.scene.ui.layout.*;
|
||||
import mindustry.ctype.*;
|
||||
|
||||
//TODO add full icon for this planet
|
||||
public class Planet extends UnlockableContent{
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
package mindustry.type;
|
||||
|
||||
import io.anuke.annotations.Annotations.*;
|
||||
import io.anuke.arc.util.ArcAnnotate.*;
|
||||
import io.anuke.mindustry.ctype.*;
|
||||
import io.anuke.mindustry.entities.*;
|
||||
import io.anuke.mindustry.entities.traits.*;
|
||||
import io.anuke.mindustry.entities.type.*;
|
||||
import arc.util.ArcAnnotate.*;
|
||||
import mindustry.annotations.Annotations.*;
|
||||
import mindustry.ctype.*;
|
||||
import mindustry.entities.*;
|
||||
import mindustry.entities.traits.*;
|
||||
import mindustry.entities.type.*;
|
||||
import mindustry.type.Weather.*;
|
||||
|
||||
import java.io.*;
|
||||
|
||||
import static io.anuke.mindustry.Vars.*;
|
||||
import static mindustry.Vars.*;
|
||||
|
||||
public abstract class Weather<T extends WeatherEntity> extends MappableContent{
|
||||
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. */
|
||||
protected float life;
|
||||
/** Type of weather that is being simulated. */
|
||||
protected @NonNull Weather weather;
|
||||
protected @NonNull
|
||||
Weather weather;
|
||||
|
||||
public WeatherEntity(Weather weather){
|
||||
this.weather = weather;
|
||||
|
||||
Reference in New Issue
Block a user