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

ctrl-shift-f

Browse Source
This commit is contained in:
Anuken
2018-12-21 21:33:05 -05:00
parent 94908bc599
commit 3abfaf1bca
244 changed files with 976 additions and 999 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/maps/Map.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.maps;
import io.anuke.arc.graphics.Texture;
import io.anuke.arc.utils.ObjectMap;
import io.anuke.arc.collection.ObjectMap;
import io.anuke.arc.function.Supplier;
import java.io.InputStream;

4
core/src/io/anuke/mindustry/maps/MapMeta.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.maps;
import io.anuke.arc.utils.IntIntMap;
import io.anuke.arc.utils.ObjectMap;
import io.anuke.arc.util.IntIntMap;
import io.anuke.arc.collection.ObjectMap;
import io.anuke.arc.util.Bundles;
public class MapMeta{

2
core/src/io/anuke/mindustry/maps/MapTileData.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.maps;
import io.anuke.arc.utils.IntIntMap;
import io.anuke.arc.util.IntIntMap;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.world.Block;

6
core/src/io/anuke/mindustry/maps/Maps.java
View File

@@ -3,9 +3,9 @@ package io.anuke.mindustry.maps;
import io.anuke.arc.Core;
import io.anuke.arc.files.FileHandle;
import io.anuke.arc.graphics.Texture;
import io.anuke.arc.utils.Array;
import io.anuke.arc.utils.Disposable;
import io.anuke.arc.utils.ObjectMap;
import io.anuke.arc.collection.Array;
import io.anuke.arc.util.Disposable;
import io.anuke.arc.collection.ObjectMap;
import io.anuke.mindustry.io.MapIO;
import io.anuke.arc.function.Supplier;
import io.anuke.arc.util.Log;

2
core/src/io/anuke/mindustry/maps/Sector.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.maps;
import io.anuke.arc.graphics.Texture;
import io.anuke.arc.utils.Array;
import io.anuke.arc.collection.Array;
import io.anuke.annotations.Annotations.Serialize;
import io.anuke.mindustry.game.Saves.SaveSlot;
import io.anuke.mindustry.game.SpawnGroup;

2
core/src/io/anuke/mindustry/maps/SectorPresets.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.maps;
import io.anuke.arc.utils.Array;
import io.anuke.arc.collection.Array;
import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.content.Liquids;
import io.anuke.mindustry.content.Mechs;

7
core/src/io/anuke/mindustry/maps/Sectors.java
View File

@@ -5,9 +5,9 @@ import io.anuke.arc.graphics.Pixmap;
import io.anuke.arc.graphics.Pixmap.Format;
import io.anuke.arc.graphics.Texture;
import io.anuke.arc.math.GridPoint2;
import io.anuke.arc.utils.Array;
import io.anuke.arc.utils.Array.ArrayIterable;
import io.anuke.arc.utils.async.AsyncExecutor;
import io.anuke.arc.collection.Array;
import io.anuke.arc.util.Array.ArrayIterable;
import io.anuke.arc.util.async.AsyncExecutor;
import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.game.Difficulty;
@@ -27,7 +27,6 @@ import io.anuke.mindustry.type.Recipe.RecipeVisibility;
import io.anuke.mindustry.world.ColorMapper;
import io.anuke.mindustry.world.blocks.Floor;
import io.anuke.mindustry.world.blocks.defense.Wall;
import io.anuke.arc.core.Settings;
import io.anuke.arc.util.*;
import static io.anuke.mindustry.Vars.*;

2
core/src/io/anuke/mindustry/maps/TutorialSector.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.maps;
import io.anuke.arc.utils.Array;
import io.anuke.arc.collection.Array;
import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.content.blocks.CraftingBlocks;
import io.anuke.mindustry.content.blocks.ProductionBlocks;

8
core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
View File

@@ -2,9 +2,9 @@ package io.anuke.mindustry.maps.generation;
import io.anuke.arc.math.GridPoint2;
import io.anuke.arc.math.Vector2;
import io.anuke.arc.utils.Array;
import io.anuke.arc.utils.IntIntMap;
import io.anuke.arc.utils.Predicate;
import io.anuke.arc.collection.Array;
import io.anuke.arc.util.IntIntMap;
import io.anuke.arc.util.Predicate;
import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.content.Liquids;
import io.anuke.mindustry.content.blocks.*;
@@ -33,7 +33,7 @@ import io.anuke.arc.function.BiFunction;
import io.anuke.arc.function.IntPositionConsumer;
import io.anuke.arc.function.TriFunction;
import io.anuke.arc.util.Geometry;
import io.anuke.arc.util.Mathf;
import io.anuke.arc.math.Mathf;
import static io.anuke.mindustry.Vars.content;

8
core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java
View File

@@ -2,9 +2,9 @@ package io.anuke.mindustry.maps.generation;
import io.anuke.arc.math.GridPoint2;
import io.anuke.arc.math.Vector2;
import io.anuke.arc.utils.Array;
import io.anuke.arc.utils.IntArray;
import io.anuke.arc.utils.ObjectMap;
import io.anuke.arc.collection.Array;
import io.anuke.arc.util.IntArray;
import io.anuke.arc.collection.ObjectMap;
import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.content.blocks.OreBlocks;
@@ -24,7 +24,7 @@ import io.anuke.mindustry.world.blocks.OreBlock;
import io.anuke.arc.noise.RidgedPerlin;
import io.anuke.arc.noise.Simplex;
import io.anuke.arc.util.Geometry;
import io.anuke.arc.util.Mathf;
import io.anuke.arc.math.Mathf;
import io.anuke.arc.util.SeedRandom;
import io.anuke.arc.util.Structs;

2
core/src/io/anuke/mindustry/maps/missions/BattleMission.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.maps.missions;
import io.anuke.arc.math.GridPoint2;
import io.anuke.arc.utils.Array;
import io.anuke.arc.collection.Array;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.game.GameMode;
import io.anuke.mindustry.game.Team;

4
core/src/io/anuke/mindustry/maps/missions/BlockLocMission.java
View File

@@ -2,12 +2,12 @@ package io.anuke.mindustry.maps.missions;
import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.world.Block;
import io.anuke.arc.core.Timers;
import io.anuke.arc.Timers;
import io.anuke.arc.graphics.Draw;
import io.anuke.arc.graphics.Lines;
import io.anuke.arc.util.Angles;
import io.anuke.arc.util.Bundles;
import io.anuke.arc.util.Mathf;
import io.anuke.arc.math.Mathf;
import static io.anuke.mindustry.Vars.players;
import static io.anuke.mindustry.Vars.tilesize;

2
core/src/io/anuke/mindustry/maps/missions/LineBlockMission.java
View File

@@ -2,7 +2,7 @@ package io.anuke.mindustry.maps.missions;
import io.anuke.arc.math.Bresenham2;
import io.anuke.arc.math.GridPoint2;
import io.anuke.arc.utils.Array;
import io.anuke.arc.collection.Array;
import io.anuke.mindustry.world.Block;
public class LineBlockMission extends Mission{

4
core/src/io/anuke/mindustry/maps/missions/Mission.java
View File

@@ -1,13 +1,13 @@
package io.anuke.mindustry.maps.missions;
import io.anuke.arc.math.GridPoint2;
import io.anuke.arc.utils.Array;
import io.anuke.arc.collection.Array;
import io.anuke.mindustry.game.GameMode;
import io.anuke.mindustry.game.SpawnGroup;
import io.anuke.mindustry.game.UnlockableContent;
import io.anuke.mindustry.maps.Sector;
import io.anuke.mindustry.maps.generation.Generation;
import io.anuke.arc.core.Timers;
import io.anuke.arc.Timers;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.util.Bundles;

2
core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.maps.missions;
import io.anuke.arc.math.GridPoint2;
import io.anuke.arc.utils.Array;
import io.anuke.arc.collection.Array;
import io.anuke.mindustry.content.blocks.StorageBlocks;
import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.maps.generation.Generation;

2
core/src/io/anuke/mindustry/maps/missions/Missions.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.maps.missions;
import io.anuke.arc.utils.Array;
import io.anuke.arc.collection.Array;
import io.anuke.mindustry.type.ItemStack;
import io.anuke.mindustry.type.Recipe;
import io.anuke.mindustry.world.Block;

2
core/src/io/anuke/mindustry/maps/missions/WaveMission.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.maps.missions;
import io.anuke.arc.utils.Array;
import io.anuke.arc.collection.Array;
import io.anuke.mindustry.game.GameMode;
import io.anuke.mindustry.game.SpawnGroup;
import io.anuke.mindustry.game.Team;