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

Full merge

Browse Source
This commit is contained in:
Anuken
2019-12-25 13:34:27 -05:00
parent c681cc5cf8
commit c307fc02cf
7 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/content/Zones.java
View File

@@ -1,15 +1,15 @@
package mindustry.content; package mindustry.content;
import mindustry.ctype.ContentList; import mindustry.ctype.*;
import mindustry.game.*;
import mindustry.game.Objectives.*; import mindustry.game.Objectives.*;
import mindustry.game.*;
import mindustry.maps.generators.*; import mindustry.maps.generators.*;
import mindustry.maps.generators.MapGenerator.*;
import mindustry.maps.zonegen.*; import mindustry.maps.zonegen.*;
import mindustry.type.*; import mindustry.type.*;
import static arc.struct.Array.with; import static arc.struct.Array.with;
import static mindustry.content.Items.*; import static mindustry.content.Items.*;
import static mindustry.content.Planets.starter;
import static mindustry.type.ItemStack.list; import static mindustry.type.ItemStack.list;
public class Zones implements ContentList{ public class Zones implements ContentList{

1
core/src/mindustry/maps/filters/NoiseFilter.java
View File

@@ -1,5 +1,6 @@
package mindustry.maps.filters; package mindustry.maps.filters;
import arc.util.*;
import mindustry.content.Blocks; import mindustry.content.Blocks;
import mindustry.maps.filters.FilterOption.BlockOption; import mindustry.maps.filters.FilterOption.BlockOption;
import mindustry.maps.filters.FilterOption.SliderOption; import mindustry.maps.filters.FilterOption.SliderOption;

1
core/src/mindustry/maps/filters/OreFilter.java
View File

@@ -1,5 +1,6 @@
package mindustry.maps.filters; package mindustry.maps.filters;
import arc.util.*;
import mindustry.content.Blocks; import mindustry.content.Blocks;
import mindustry.maps.filters.FilterOption.SliderOption; import mindustry.maps.filters.FilterOption.SliderOption;
import mindustry.world.Block; import mindustry.world.Block;

1
core/src/mindustry/maps/filters/OreMedianFilter.java
View File

@@ -2,6 +2,7 @@ package mindustry.maps.filters;
import arc.struct.*; import arc.struct.*;
import arc.math.*; import arc.math.*;
import arc.util.*;
import mindustry.*; import mindustry.*;
import mindustry.content.*; import mindustry.content.*;
import mindustry.maps.filters.FilterOption.*; import mindustry.maps.filters.FilterOption.*;

1
core/src/mindustry/maps/filters/RiverNoiseFilter.java
View File

@@ -1,5 +1,6 @@
package mindustry.maps.filters; package mindustry.maps.filters;
import arc.util.*;
import mindustry.content.Blocks; import mindustry.content.Blocks;
import mindustry.maps.filters.FilterOption.BlockOption; import mindustry.maps.filters.FilterOption.BlockOption;
import mindustry.maps.filters.FilterOption.SliderOption; import mindustry.maps.filters.FilterOption.SliderOption;

1
core/src/mindustry/maps/filters/ScatterFilter.java
View File

@@ -1,5 +1,6 @@
package mindustry.maps.filters; package mindustry.maps.filters;
import arc.util.*;
import mindustry.content.Blocks; import mindustry.content.Blocks;
import mindustry.maps.filters.FilterOption.BlockOption; import mindustry.maps.filters.FilterOption.BlockOption;
import mindustry.maps.filters.FilterOption.SliderOption; import mindustry.maps.filters.FilterOption.SliderOption;

1
core/src/mindustry/maps/filters/TerrainFilter.java
View File

@@ -1,6 +1,7 @@
package mindustry.maps.filters; package mindustry.maps.filters;
import arc.math.Mathf; import arc.math.Mathf;
import arc.util.*;
import mindustry.content.Blocks; import mindustry.content.Blocks;
import mindustry.maps.filters.FilterOption.BlockOption; import mindustry.maps.filters.FilterOption.BlockOption;
import mindustry.maps.filters.FilterOption.SliderOption; import mindustry.maps.filters.FilterOption.SliderOption;