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

Initial creation of Arc port

Browse Source
This commit is contained in:
Anuken
2018-12-20 11:49:32 -05:00
parent 6dc64cf2f6
commit cabcfc7136
235 changed files with 698 additions and 695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
package io.anuke.mindustry.maps;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.utils.ObjectMap;
import io.anuke.arc.graphics.Texture;
import io.anuke.arc.utils.ObjectMap;
import io.anuke.ucore.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 com.badlogic.gdx.utils.IntIntMap;
import com.badlogic.gdx.utils.ObjectMap;
import io.anuke.arc.utils.IntIntMap;
import io.anuke.arc.utils.ObjectMap;
import io.anuke.ucore.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 com.badlogic.gdx.utils.IntIntMap;
import io.anuke.arc.utils.IntIntMap;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.world.Block;

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

@@ -1,11 +1,11 @@
package io.anuke.mindustry.maps;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.Disposable;
import com.badlogic.gdx.utils.ObjectMap;
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.mindustry.io.MapIO;
import io.anuke.ucore.function.Supplier;
import io.anuke.ucore.util.Log;
@@ -62,7 +62,7 @@ public class Maps implements Disposable{
public void load(){
try {
for (String name : defaultMapNames) {
FileHandle file = Gdx.files.internal("maps/" + name + "." + mapExtension);
FileHandle file = Core.files.internal("maps/" + name + "." + mapExtension);
loadMap(file.nameWithoutExtension(), file::read, false);
}
}catch (IOException e){

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

@@ -1,7 +1,7 @@
package io.anuke.mindustry.maps;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.utils.Array;
import io.anuke.arc.graphics.Texture;
import io.anuke.arc.utils.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 com.badlogic.gdx.utils.Array;
import io.anuke.arc.utils.Array;
import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.content.Liquids;
import io.anuke.mindustry.content.Mechs;

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

@@ -1,13 +1,13 @@
package io.anuke.mindustry.maps;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Pixmap;
import com.badlogic.gdx.graphics.Pixmap.Format;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.math.GridPoint2;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.Array.ArrayIterable;
import com.badlogic.gdx.utils.async.AsyncExecutor;
import io.anuke.arc.Core;
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.mindustry.content.Items;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.game.Difficulty;
@@ -307,7 +307,7 @@ public class Sectors{
}
}
Gdx.app.postRunnable(() -> {
Core.app.postRunnable(() -> {
sector.texture = new Texture(pixmap);
pixmap.dispose();
});

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

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

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

@@ -1,10 +1,10 @@
package io.anuke.mindustry.maps.generation;
import com.badlogic.gdx.math.GridPoint2;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.IntIntMap;
import com.badlogic.gdx.utils.Predicate;
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.mindustry.content.Items;
import io.anuke.mindustry.content.Liquids;
import io.anuke.mindustry.content.blocks.*;

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

@@ -1,10 +1,10 @@
package io.anuke.mindustry.maps.generation;
import com.badlogic.gdx.math.GridPoint2;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.IntArray;
import com.badlogic.gdx.utils.ObjectMap;
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.mindustry.content.Items;
import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.content.blocks.OreBlocks;

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

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

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

@@ -1,8 +1,8 @@
package io.anuke.mindustry.maps.missions;
import com.badlogic.gdx.math.Bresenham2;
import com.badlogic.gdx.math.GridPoint2;
import com.badlogic.gdx.utils.Array;
import io.anuke.arc.math.Bresenham2;
import io.anuke.arc.math.GridPoint2;
import io.anuke.arc.utils.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,7 +1,7 @@
package io.anuke.mindustry.maps.missions;
import com.badlogic.gdx.math.GridPoint2;
import com.badlogic.gdx.utils.Array;
import io.anuke.arc.math.GridPoint2;
import io.anuke.arc.utils.Array;
import io.anuke.mindustry.game.GameMode;
import io.anuke.mindustry.game.SpawnGroup;
import io.anuke.mindustry.game.UnlockableContent;

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

@@ -1,7 +1,7 @@
package io.anuke.mindustry.maps.missions;
import com.badlogic.gdx.math.GridPoint2;
import com.badlogic.gdx.utils.Array;
import io.anuke.arc.math.GridPoint2;
import io.anuke.arc.utils.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 com.badlogic.gdx.utils.Array;
import io.anuke.arc.utils.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 com.badlogic.gdx.utils.Array;
import io.anuke.arc.utils.Array;
import io.anuke.mindustry.game.GameMode;
import io.anuke.mindustry.game.SpawnGroup;
import io.anuke.mindustry.game.Team;