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

1
android/AndroidManifest.xml
View File

@@ -17,6 +17,7 @@
android:appCategory="game" android:appCategory="game"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/GdxTheme" android:fullBackupContent="@xml/backup_rules"> android:theme="@style/GdxTheme" android:fullBackupContent="@xml/backup_rules">
<meta-data android:name="android.max_aspect" android:value="2.1" />
<activity <activity
android:name="io.anuke.mindustry.AndroidLauncher" android:name="io.anuke.mindustry.AndroidLauncher"
android:label="@string/app_name" android:label="@string/app_name"

1
android/build.gradle
View File

@@ -43,7 +43,6 @@ dependencies {
natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-arm64-v8a" natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-arm64-v8a"
natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86" natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86"
natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86_64" natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86_64"
implementation "com.badlogicgames.gdx:gdx-controllers-android:$gdxVersion"
} }
task deploy(type: Copy){ task deploy(type: Copy){

2
android/src/io/anuke/mindustry/PatchedAndroidApplication.java
View File

@@ -4,7 +4,7 @@ import com.badlogic.gdx.backends.android.AndroidApplication;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
public class PatchedAndroidApplication extends AndroidApplication { public abstract class PatchedAndroidApplication extends AndroidApplication {
private final ExecutorService exec = Executors.newSingleThreadExecutor(); private final ExecutorService exec = Executors.newSingleThreadExecutor();
@Override @Override

20
build.gradle
View File

@@ -168,19 +168,21 @@ project(":core"){
def comp = System.properties["release"] == null || System.properties["release"] == "false" def comp = System.properties["release"] == null || System.properties["release"] == "false"
if(!comp) println("Note: Compiling release build.") if(!comp) println("Note: Compiling release build.")
if(new File(projectDir.parent, '../uCore').exists() && comp){ if(new File(projectDir.parent, '../Arc').exists() && comp){
compile project(":uCore") compile project(":Arc:core")
}else{ }else{
compile "com.github.anuken:ucore:$uCoreVersion" //TODO compile arc from jitpack
//compile 'com.github.Anuken.Arc:arc:-SNAPSHOT'
} }
if(new File(projectDir.parent, '../GDXGifRecorder').exists() && comp){ // if(new File(projectDir.parent, '../GDXGifRecorder').exists() && comp){
compile project(":GDXGifRecorder") // compile project(":GDXGifRecorder")
} // }
compile "com.badlogicgames.gdx:gdx:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-controllers:$gdxVersion" //compile "com.badlogicgames.gdx:gdx:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion" //compile "com.badlogicgames.gdx:gdx-controllers:$gdxVersion"
//compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
compileOnly project(":annotations") compileOnly project(":annotations")
annotationProcessor project(":annotations") annotationProcessor project(":annotations")

16
core/src/io/anuke/mindustry/Vars.java
View File

@@ -1,9 +1,9 @@
package io.anuke.mindustry; package io.anuke.mindustry;
import com.badlogic.gdx.Application.ApplicationType; import io.anuke.arc.Application.ApplicationType;
import com.badlogic.gdx.Gdx; import io.anuke.arc.Core;
import com.badlogic.gdx.files.FileHandle; import io.anuke.arc.files.FileHandle;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.core.*; import io.anuke.mindustry.core.*;
import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.TileEntity;
@@ -128,7 +128,7 @@ public class Vars{
Serialization.init(); Serialization.init();
//load locales //load locales
String[] stra = Gdx.files.internal("locales").readString().split("\n"); String[] stra = Core.files.internal("locales").readString().split("\n");
locales = new Locale[stra.length]; locales = new Locale[stra.length];
for(int i = 0; i < locales.length; i++){ for(int i = 0; i < locales.length; i++){
String code = stra[i]; String code = stra[i];
@@ -169,9 +169,9 @@ public class Vars{
state = new GameState(); state = new GameState();
threads = new ThreadHandler(); threads = new ThreadHandler();
mobile = Gdx.app.getType() == ApplicationType.Android || Gdx.app.getType() == ApplicationType.iOS || testMobile; mobile = Core.app.getType() == ApplicationType.Android || Core.app.getType() == ApplicationType.iOS || testMobile;
ios = Gdx.app.getType() == ApplicationType.iOS; ios = Core.app.getType() == ApplicationType.iOS;
android = Gdx.app.getType() == ApplicationType.Android; android = Core.app.getType() == ApplicationType.Android;
dataDirectory = Settings.getDataDirectory(appName); dataDirectory = Settings.getDataDirectory(appName);
screenshotDirectory = dataDirectory.child("screenshots/"); screenshotDirectory = dataDirectory.child("screenshots/");

4
core/src/io/anuke/mindustry/ai/BlockIndexer.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.ai; package io.anuke.mindustry.ai;
import com.badlogic.gdx.math.Vector2; import io.anuke.arc.math.Vector2;
import com.badlogic.gdx.utils.*; import io.anuke.arc.utils.*;
import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.TileEntity;
import io.anuke.mindustry.game.EventType.TileChangeEvent; import io.anuke.mindustry.game.EventType.TileChangeEvent;

8
core/src/io/anuke/mindustry/ai/Pathfinder.java
View File

@@ -1,9 +1,9 @@
package io.anuke.mindustry.ai; package io.anuke.mindustry.ai;
import com.badlogic.gdx.math.GridPoint2; import io.anuke.arc.math.GridPoint2;
import com.badlogic.gdx.utils.IntArray; import io.anuke.arc.utils.IntArray;
import com.badlogic.gdx.utils.Queue; import io.anuke.arc.utils.Queue;
import com.badlogic.gdx.utils.TimeUtils; import io.anuke.arc.utils.TimeUtils;
import io.anuke.mindustry.game.EventType.TileChangeEvent; import io.anuke.mindustry.game.EventType.TileChangeEvent;
import io.anuke.mindustry.game.EventType.WorldLoadEvent; import io.anuke.mindustry.game.EventType.WorldLoadEvent;
import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Team;

2
core/src/io/anuke/mindustry/ai/WaveSpawner.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.ai; package io.anuke.mindustry.ai;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.entities.units.BaseUnit; import io.anuke.mindustry.entities.units.BaseUnit;
import io.anuke.mindustry.entities.units.Squad; import io.anuke.mindustry.entities.units.Squad;

2
core/src/io/anuke/mindustry/content/Items.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.content; package io.anuke.mindustry.content;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.game.ContentList;
import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.ContentType;
import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item;

2
core/src/io/anuke/mindustry/content/Liquids.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.content; package io.anuke.mindustry.content;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.game.ContentList;
import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.ContentType;
import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.type.Liquid;

6
core/src/io/anuke/mindustry/content/Mechs.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry.content; package io.anuke.mindustry.content;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.arc.graphics.g2d.TextureRegion;
import com.badlogic.gdx.math.Rectangle; import io.anuke.arc.math.Rectangle;
import io.anuke.mindustry.content.fx.BulletFx; import io.anuke.mindustry.content.fx.BulletFx;
import io.anuke.mindustry.content.fx.UnitFx; import io.anuke.mindustry.content.fx.UnitFx;
import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.Player;

4
core/src/io/anuke/mindustry/content/UnitTypes.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.content; package io.anuke.mindustry.content;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.utils.ObjectSet; import io.anuke.arc.utils.ObjectSet;
import io.anuke.mindustry.entities.units.UnitType; import io.anuke.mindustry.entities.units.UnitType;
import io.anuke.mindustry.entities.units.types.*; import io.anuke.mindustry.entities.units.types.*;
import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.game.ContentList;

2
core/src/io/anuke/mindustry/content/blocks/Blocks.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.content.blocks; package io.anuke.mindustry.content.blocks;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.content.Liquids;
import io.anuke.mindustry.content.StatusEffects; import io.anuke.mindustry.content.StatusEffects;

2
core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.content.blocks; package io.anuke.mindustry.content.blocks;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.content.Liquids;
import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.content.fx.BlockFx;

2
core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.content.blocks; package io.anuke.mindustry.content.blocks;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Loc;
import io.anuke.annotations.Annotations.Remote; import io.anuke.annotations.Annotations.Remote;
import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.content.Liquids;

2
core/src/io/anuke/mindustry/content/blocks/OreBlocks.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.content.blocks; package io.anuke.mindustry.content.blocks;
import com.badlogic.gdx.utils.ObjectMap; import io.anuke.arc.utils.ObjectMap;
import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.blocks.Floor; import io.anuke.mindustry.world.blocks.Floor;

2
core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.content.blocks; package io.anuke.mindustry.content.blocks;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.content.Liquids;
import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.content.fx.BlockFx;

4
core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.content.blocks; package io.anuke.mindustry.content.blocks;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.mindustry.content.AmmoTypes; import io.anuke.mindustry.content.AmmoTypes;
import io.anuke.mindustry.content.fx.ShootFx; import io.anuke.mindustry.content.fx.ShootFx;
import io.anuke.mindustry.type.AmmoType; import io.anuke.mindustry.type.AmmoType;

2
core/src/io/anuke/mindustry/content/bullets/MissileBullets.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.content.bullets; package io.anuke.mindustry.content.bullets;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.content.fx.BulletFx; import io.anuke.mindustry.content.fx.BulletFx;
import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.bullet.Bullet;
import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.entities.bullet.BulletType;

2
core/src/io/anuke/mindustry/content/bullets/StandardBullets.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.content.bullets; package io.anuke.mindustry.content.bullets;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.content.fx.BulletFx; import io.anuke.mindustry.content.fx.BulletFx;
import io.anuke.mindustry.entities.bullet.BasicBulletType; import io.anuke.mindustry.entities.bullet.BasicBulletType;
import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.entities.bullet.BulletType;

2
core/src/io/anuke/mindustry/content/bullets/TurretBullets.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.content.bullets; package io.anuke.mindustry.content.bullets;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.content.Liquids;
import io.anuke.mindustry.content.StatusEffects; import io.anuke.mindustry.content.StatusEffects;
import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.content.fx.BlockFx;

2
core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.content.bullets; package io.anuke.mindustry.content.bullets;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.content.Liquids;
import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.content.fx.BlockFx;
import io.anuke.mindustry.content.fx.BulletFx; import io.anuke.mindustry.content.fx.BulletFx;

2
core/src/io/anuke/mindustry/content/fx/BlockFx.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.content.fx; package io.anuke.mindustry.content.fx;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect; import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect;
import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.game.ContentList;

2
core/src/io/anuke/mindustry/content/fx/BulletFx.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.content.fx; package io.anuke.mindustry.content.fx;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.game.ContentList;
import io.anuke.ucore.core.Effects.Effect; import io.anuke.ucore.core.Effects.Effect;

2
core/src/io/anuke/mindustry/content/fx/EnvironmentFx.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.content.fx; package io.anuke.mindustry.content.fx;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.content.Liquids;
import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.game.ContentList;
import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Palette;

2
core/src/io/anuke/mindustry/content/fx/ExplosionFx.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.content.fx; package io.anuke.mindustry.content.fx;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.game.ContentList;
import io.anuke.ucore.core.Effects.Effect; import io.anuke.ucore.core.Effects.Effect;

2
core/src/io/anuke/mindustry/content/fx/Fx.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.content.fx; package io.anuke.mindustry.content.fx;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.game.ContentList;
import io.anuke.ucore.core.Effects.Effect; import io.anuke.ucore.core.Effects.Effect;

2
core/src/io/anuke/mindustry/content/fx/ShootFx.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.content.fx; package io.anuke.mindustry.content.fx;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect; import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect;
import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.game.ContentList;

6
core/src/io/anuke/mindustry/core/ContentLoader.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry.core; package io.anuke.mindustry.core;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import com.badlogic.gdx.utils.ObjectMap; import io.anuke.arc.utils.ObjectMap;
import com.badlogic.gdx.utils.ObjectSet; import io.anuke.arc.utils.ObjectSet;
import io.anuke.mindustry.content.*; import io.anuke.mindustry.content.*;
import io.anuke.mindustry.content.blocks.*; import io.anuke.mindustry.content.blocks.*;
import io.anuke.mindustry.content.bullets.*; import io.anuke.mindustry.content.bullets.*;

8
core/src/io/anuke/mindustry/core/Control.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.core; package io.anuke.mindustry.core;
import com.badlogic.gdx.Gdx; import io.anuke.arc.Core;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.content.Mechs; import io.anuke.mindustry.content.Mechs;
import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.Player;
@@ -54,7 +54,7 @@ public class Control extends Module{
Inputs.useControllers(true); Inputs.useControllers(true);
Gdx.input.setCatchBackKey(true); Core.input.setCatchBackKey(true);
Effects.setShakeFalloff(10000f); Effects.setShakeFalloff(10000f);
@@ -99,7 +99,7 @@ public class Control extends Module{
Events.on(WorldLoadGraphicsEvent.class, event -> { Events.on(WorldLoadGraphicsEvent.class, event -> {
if(mobile){ if(mobile){
Gdx.app.postRunnable(() -> Core.camera.position.set(players[0].x, players[0].y, 0)); Core.app.postRunnable(() -> Core.camera.position.set(players[0].x, players[0].y, 0));
} }
}); });

2
core/src/io/anuke/mindustry/core/Logic.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.core; package io.anuke.mindustry.core;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Loc;
import io.anuke.annotations.Annotations.Remote; import io.anuke.annotations.Annotations.Remote;
import io.anuke.mindustry.Vars; import io.anuke.mindustry.Vars;

12
core/src/io/anuke/mindustry/core/NetClient.java
View File

@@ -1,10 +1,10 @@
package io.anuke.mindustry.core; package io.anuke.mindustry.core;
import com.badlogic.gdx.Gdx; import io.anuke.arc.Core;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.utils.Base64Coder; import io.anuke.arc.utils.Base64Coder;
import com.badlogic.gdx.utils.IntSet; import io.anuke.arc.utils.IntSet;
import com.badlogic.gdx.utils.TimeUtils; import io.anuke.arc.utils.TimeUtils;
import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Loc;
import io.anuke.annotations.Annotations.PacketPriority; import io.anuke.annotations.Annotations.PacketPriority;
import io.anuke.annotations.Annotations.Remote; import io.anuke.annotations.Annotations.Remote;
@@ -369,7 +369,7 @@ public class NetClient extends Module{
ui.loadfrag.hide(); ui.loadfrag.hide();
ui.join.hide(); ui.join.hide();
Net.setClientLoaded(true); Net.setClientLoaded(true);
Gdx.app.postRunnable(Call::connectConfirm); Core.app.postRunnable(Call::connectConfirm);
Timers.runTask(40f, Platform.instance::updateRPC); Timers.runTask(40f, Platform.instance::updateRPC);
} }

16
core/src/io/anuke/mindustry/core/NetServer.java
View File

@@ -1,13 +1,13 @@
package io.anuke.mindustry.core; package io.anuke.mindustry.core;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.graphics.Colors; import io.anuke.arc.graphics.Colors;
import com.badlogic.gdx.math.Rectangle; import io.anuke.arc.math.Rectangle;
import com.badlogic.gdx.math.Vector2; import io.anuke.arc.math.Vector2;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import com.badlogic.gdx.utils.IntMap; import io.anuke.arc.utils.IntMap;
import com.badlogic.gdx.utils.ObjectSet; import io.anuke.arc.utils.ObjectSet;
import com.badlogic.gdx.utils.TimeUtils; import io.anuke.arc.utils.TimeUtils;
import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Loc;
import io.anuke.annotations.Annotations.Remote; import io.anuke.annotations.Annotations.Remote;
import io.anuke.mindustry.content.Mechs; import io.anuke.mindustry.content.Mechs;

16
core/src/io/anuke/mindustry/core/Platform.java
View File

@@ -1,9 +1,9 @@
package io.anuke.mindustry.core; package io.anuke.mindustry.core;
import com.badlogic.gdx.Gdx; import io.anuke.arc.Core;
import com.badlogic.gdx.Input.Keys; import io.anuke.arc.Input.Keys;
import com.badlogic.gdx.files.FileHandle; import io.anuke.arc.files.FileHandle;
import com.badlogic.gdx.utils.Base64Coder; import io.anuke.arc.utils.Base64Coder;
import io.anuke.ucore.core.Core; import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Settings; import io.anuke.ucore.core.Settings;
import io.anuke.ucore.core.Timers; import io.anuke.ucore.core.Timers;
@@ -39,8 +39,8 @@ public abstract class Platform {
.visible(() -> !use[0].getSelection().isEmpty()).width(65f); .visible(() -> !use[0].getSelection().isEmpty()).width(65f);
dialog.content().addImageButton("icon-paste", "clear", 16*3, () -> dialog.content().addImageButton("icon-paste", "clear", 16*3, () ->
use[0].paste(Gdx.app.getClipboard().getContents(), false)) use[0].paste(Core.app.getClipboard().getContents(), false))
.visible(() -> Gdx.app.getClipboard() != null && Gdx.app.getClipboard().getContents() != null && !Gdx.app.getClipboard().getContents().isEmpty()).width(65f); .visible(() -> Core.app.getClipboard() != null && Core.app.getClipboard().getContents() != null && !Core.app.getClipboard().getContents().isEmpty()).width(65f);
TextField to = dialog.content().addField(field.getText(), t-> {}).pad(15).width(250f).get(); TextField to = dialog.content().addField(field.getText(), t-> {}).pad(15).width(250f).get();
to.setMaxLength(maxLength); to.setMaxLength(maxLength);
@@ -53,14 +53,14 @@ public abstract class Platform {
field.appendText(to.getText()); field.appendText(to.getText());
field.change(); field.change();
dialog.hide(); dialog.hide();
Gdx.input.setOnscreenKeyboardVisible(false); Core.input.setOnscreenKeyboardVisible(false);
}).width(90f).name("okb"); }).width(90f).name("okb");
dialog.show(); dialog.show();
Timers.runTask(1f, () -> { Timers.runTask(1f, () -> {
to.setCursorPosition(to.getText().length()); to.setCursorPosition(to.getText().length());
Core.scene.setKeyboardFocus(to); Core.scene.setKeyboardFocus(to);
Gdx.input.setOnscreenKeyboardVisible(true); Core.input.setOnscreenKeyboardVisible(true);
}); });
}); });
} }

28
core/src/io/anuke/mindustry/core/Renderer.java
View File

@@ -1,16 +1,16 @@
package io.anuke.mindustry.core; package io.anuke.mindustry.core;
import com.badlogic.gdx.Gdx; import io.anuke.arc.Core;
import com.badlogic.gdx.files.FileHandle; import io.anuke.arc.files.FileHandle;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.graphics.Pixmap; import io.anuke.arc.graphics.Pixmap;
import com.badlogic.gdx.graphics.PixmapIO; import io.anuke.arc.graphics.PixmapIO;
import com.badlogic.gdx.graphics.g2d.SpriteBatch; import io.anuke.arc.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.math.Rectangle; import io.anuke.arc.math.Rectangle;
import com.badlogic.gdx.math.Vector2; import io.anuke.arc.math.Vector2;
import com.badlogic.gdx.utils.BufferUtils; import io.anuke.arc.utils.BufferUtils;
import com.badlogic.gdx.utils.ScreenUtils; import io.anuke.arc.utils.ScreenUtils;
import com.badlogic.gdx.utils.TimeUtils; import io.anuke.arc.utils.TimeUtils;
import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.content.fx.Fx;
import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.Player;
@@ -173,11 +173,11 @@ public class Renderer extends RendererModule{
camera.position.set((int) camera.position.x, (int) camera.position.y, 0); camera.position.set((int) camera.position.x, (int) camera.position.y, 0);
} }
if(Gdx.graphics.getHeight() / Core.cameraScale % 2 == 1){ if(Core.graphics.getHeight() / Core.cameraScale % 2 == 1){
camera.position.add(0, -0.5f, 0); camera.position.add(0, -0.5f, 0);
} }
if(Gdx.graphics.getWidth() / Core.cameraScale % 2 == 1){ if(Core.graphics.getWidth() / Core.cameraScale % 2 == 1){
camera.position.add(-0.5f, 0, 0); camera.position.add(-0.5f, 0, 0);
} }
@@ -187,7 +187,7 @@ public class Renderer extends RendererModule{
} }
if(!ui.chatfrag.chatOpen()){ if(!ui.chatfrag.chatOpen()){
renderer.record(); //this only does something if GdxGifRecorder is on the class path, which it usually isn't renderer.record(); //this only does something if CoreGifRecorder is on the class path, which it usually isn't
} }
} }

10
core/src/io/anuke/mindustry/core/ThreadHandler.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.core; package io.anuke.mindustry.core;
import com.badlogic.gdx.Gdx; import io.anuke.arc.Core;
import com.badlogic.gdx.utils.TimeUtils; import io.anuke.arc.utils.TimeUtils;
import io.anuke.ucore.core.Settings; import io.anuke.ucore.core.Settings;
import io.anuke.ucore.core.Timers; import io.anuke.ucore.core.Timers;
@@ -10,7 +10,7 @@ public class ThreadHandler{
public ThreadHandler(){ public ThreadHandler(){
Timers.setDeltaProvider(() -> { Timers.setDeltaProvider(() -> {
float result = Gdx.graphics.getDeltaTime() * 60f; float result = Core.graphics.getDeltaTime() * 60f;
return Float.isNaN(result) || Float.isInfinite(result) ? 1f : Math.min(result, 60f / 10f); return Float.isNaN(result) || Float.isInfinite(result) ? 1f : Math.min(result, 60f / 10f);
}); });
} }
@@ -24,11 +24,11 @@ public class ThreadHandler{
} }
public void runDelay(Runnable r){ public void runDelay(Runnable r){
Gdx.app.postRunnable(r); Core.app.postRunnable(r);
} }
public long getFrameID(){ public long getFrameID(){
return Gdx.graphics.getFrameId(); return Core.graphics.getFrameId();
} }
public void handleBeginRender(){ public void handleBeginRender(){

26
core/src/io/anuke/mindustry/core/UI.java
View File

@@ -1,14 +1,14 @@
package io.anuke.mindustry.core; package io.anuke.mindustry.core;
import com.badlogic.gdx.Gdx; import io.anuke.arc.Core;
import com.badlogic.gdx.Input.Keys; import io.anuke.arc.Input.Keys;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.graphics.Colors; import io.anuke.arc.graphics.Colors;
import com.badlogic.gdx.graphics.g2d.BitmapFont; import io.anuke.arc.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator; import io.anuke.arc.graphics.g2d.freetype.FreeTypeFontGenerator;
import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFontParameter; import io.anuke.arc.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFontParameter;
import com.badlogic.gdx.math.Interpolation; import io.anuke.arc.math.Interpolation;
import com.badlogic.gdx.utils.Align; import io.anuke.arc.utils.Align;
import io.anuke.mindustry.editor.MapEditorDialog; import io.anuke.mindustry.editor.MapEditorDialog;
import io.anuke.mindustry.game.EventType.ResizeEvent; import io.anuke.mindustry.game.EventType.ResizeEvent;
import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Palette;
@@ -70,7 +70,7 @@ public class UI extends SceneModule{
Dialog.setShowAction(() -> sequence( Dialog.setShowAction(() -> sequence(
alpha(0f), alpha(0f),
originCenter(), originCenter(),
moveToAligned(Gdx.graphics.getWidth() / 2f, Gdx.graphics.getHeight() / 2f, Align.center), moveToAligned(Core.graphics.getWidth() / 2f, Core.graphics.getHeight() / 2f, Align.center),
scaleTo(0.0f, 1f), scaleTo(0.0f, 1f),
parallel( parallel(
scaleTo(1f, 1f, 0.1f, Interpolation.fade), scaleTo(1f, 1f, 0.1f, Interpolation.fade),
@@ -96,7 +96,7 @@ public class UI extends SceneModule{
} }
void generateFonts(){ void generateFonts(){
generator = new FreeTypeFontGenerator(Gdx.files.internal("fonts/pixel.ttf")); generator = new FreeTypeFontGenerator(Core.files.internal("fonts/pixel.ttf"));
FreeTypeFontParameter param = new FreeTypeFontParameter(); FreeTypeFontParameter param = new FreeTypeFontParameter();
param.size = (int)(14*2 * Math.max(Unit.dp.scl(1f), 0.5f)); param.size = (int)(14*2 * Math.max(Unit.dp.scl(1f), 0.5f));
param.shadowColor = Color.DARK_GRAY; param.shadowColor = Color.DARK_GRAY;
@@ -113,7 +113,7 @@ public class UI extends SceneModule{
protected void loadSkin(){ protected void loadSkin(){
skin = new Skin(Core.atlas); skin = new Skin(Core.atlas);
generateFonts(); generateFonts();
skin.load(Gdx.files.internal("ui/uiskin.json")); skin.load(Core.files.internal("ui/uiskin.json"));
for(BitmapFont font : skin.getAll(BitmapFont.class).values()){ for(BitmapFont font : skin.getAll(BitmapFont.class).values()){
font.setUseIntegerPositions(true); font.setUseIntegerPositions(true);
@@ -139,7 +139,7 @@ public class UI extends SceneModule{
float scl = Unit.dp.scl(3f); float scl = Unit.dp.scl(3f);
Draw.rect("controller-cursor", input.getMouseX(), Gdx.graphics.getHeight() - input.getMouseY(), 16 * scl, 16 * scl); Draw.rect("controller-cursor", input.getMouseX(), Core.graphics.getHeight() - input.getMouseY(), 16 * scl, 16 * scl);
} }
} }

6
core/src/io/anuke/mindustry/core/World.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry.core; package io.anuke.mindustry.core;
import com.badlogic.gdx.math.GridPoint2; import io.anuke.arc.math.GridPoint2;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import com.badlogic.gdx.utils.ObjectMap; import io.anuke.arc.utils.ObjectMap;
import io.anuke.mindustry.ai.BlockIndexer; import io.anuke.mindustry.ai.BlockIndexer;
import io.anuke.mindustry.ai.Pathfinder; import io.anuke.mindustry.ai.Pathfinder;
import io.anuke.mindustry.ai.WaveSpawner; import io.anuke.mindustry.ai.WaveSpawner;

4
core/src/io/anuke/mindustry/editor/DrawOperation.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.editor; package io.anuke.mindustry.editor;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import com.badlogic.gdx.utils.IntSet; import io.anuke.arc.utils.IntSet;
import io.anuke.mindustry.maps.MapTileData; import io.anuke.mindustry.maps.MapTileData;
import io.anuke.mindustry.maps.MapTileData.TileDataMarker; import io.anuke.mindustry.maps.MapTileData.TileDataMarker;
import io.anuke.ucore.util.Bits; import io.anuke.ucore.util.Bits;

2
core/src/io/anuke/mindustry/editor/EditorTool.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.editor; package io.anuke.mindustry.editor;
import com.badlogic.gdx.utils.IntArray; import io.anuke.arc.utils.IntArray;
import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.maps.MapTileData; import io.anuke.mindustry.maps.MapTileData;
import io.anuke.mindustry.maps.MapTileData.DataPosition; import io.anuke.mindustry.maps.MapTileData.DataPosition;

2
core/src/io/anuke/mindustry/editor/MapEditor.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.editor; package io.anuke.mindustry.editor;
import com.badlogic.gdx.utils.ObjectMap; import io.anuke.arc.utils.ObjectMap;
import io.anuke.mindustry.Vars; import io.anuke.mindustry.Vars;
import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.editor.DrawOperation.TileOperation; import io.anuke.mindustry.editor.DrawOperation.TileOperation;

24
core/src/io/anuke/mindustry/editor/MapEditorDialog.java
View File

@@ -1,15 +1,15 @@
package io.anuke.mindustry.editor; package io.anuke.mindustry.editor;
import com.badlogic.gdx.Gdx; import io.anuke.arc.Core;
import com.badlogic.gdx.files.FileHandle; import io.anuke.arc.files.FileHandle;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.graphics.Pixmap; import io.anuke.arc.graphics.Pixmap;
import com.badlogic.gdx.graphics.g2d.Batch; import io.anuke.arc.graphics.g2d.Batch;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.arc.graphics.g2d.TextureRegion;
import com.badlogic.gdx.math.Vector2; import io.anuke.arc.math.Vector2;
import com.badlogic.gdx.utils.Align; import io.anuke.arc.utils.Align;
import com.badlogic.gdx.utils.Disposable; import io.anuke.arc.utils.Disposable;
import com.badlogic.gdx.utils.ObjectMap; import io.anuke.arc.utils.ObjectMap;
import io.anuke.mindustry.Vars; import io.anuke.mindustry.Vars;
import io.anuke.mindustry.content.blocks.StorageBlocks; import io.anuke.mindustry.content.blocks.StorageBlocks;
import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.core.Platform;
@@ -341,8 +341,8 @@ public class MapEditorDialog extends Dialog implements Disposable{
public void build(){ public void build(){
float amount = 10f, baseSize = 60f; float amount = 10f, baseSize = 60f;
float size = mobile ? (int) (Math.min(Gdx.graphics.getHeight(), Gdx.graphics.getWidth()) / amount / Unit.dp.scl(1f)) : float size = mobile ? (int) (Math.min(Core.graphics.getHeight(), Core.graphics.getWidth()) / amount / Unit.dp.scl(1f)) :
Math.min(Gdx.graphics.getDisplayMode().height / amount, baseSize); Math.min(Core.graphics.getDisplayMode().height / amount, baseSize);
clearChildren(); clearChildren();
table(cont -> { table(cont -> {

2
core/src/io/anuke/mindustry/editor/MapInfoDialog.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.editor; package io.anuke.mindustry.editor;
import com.badlogic.gdx.utils.ObjectMap; import io.anuke.arc.utils.ObjectMap;
import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.core.Platform;
import io.anuke.mindustry.ui.dialogs.FloatingDialog; import io.anuke.mindustry.ui.dialogs.FloatingDialog;
import io.anuke.ucore.core.Settings; import io.anuke.ucore.core.Settings;

2
core/src/io/anuke/mindustry/editor/MapLoadDialog.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.editor; package io.anuke.mindustry.editor;
import com.badlogic.gdx.utils.Scaling; import io.anuke.arc.utils.Scaling;
import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.maps.Map;
import io.anuke.mindustry.ui.BorderImage; import io.anuke.mindustry.ui.BorderImage;
import io.anuke.mindustry.ui.dialogs.FloatingDialog; import io.anuke.mindustry.ui.dialogs.FloatingDialog;

12
core/src/io/anuke/mindustry/editor/MapRenderer.java
View File

@@ -1,11 +1,11 @@
package io.anuke.mindustry.editor; package io.anuke.mindustry.editor;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.arc.graphics.g2d.TextureRegion;
import com.badlogic.gdx.math.GridPoint2; import io.anuke.arc.math.GridPoint2;
import com.badlogic.gdx.utils.Disposable; import io.anuke.arc.utils.Disposable;
import com.badlogic.gdx.utils.IntSet; import io.anuke.arc.utils.IntSet;
import com.badlogic.gdx.utils.IntSet.IntSetIterator; import io.anuke.arc.utils.IntSet.IntSetIterator;
import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.maps.MapTileData.DataPosition; import io.anuke.mindustry.maps.MapTileData.DataPosition;
import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block;

20
core/src/io/anuke/mindustry/editor/MapView.java
View File

@@ -1,15 +1,15 @@
package io.anuke.mindustry.editor; package io.anuke.mindustry.editor;
import com.badlogic.gdx.Input.Buttons; import io.anuke.arc.Input.Buttons;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.graphics.g2d.Batch; import io.anuke.arc.graphics.g2d.Batch;
import com.badlogic.gdx.input.GestureDetector; import io.anuke.arc.input.GestureDetector;
import com.badlogic.gdx.input.GestureDetector.GestureListener; import io.anuke.arc.input.GestureDetector.GestureListener;
import com.badlogic.gdx.math.Bresenham2; import io.anuke.arc.math.Bresenham2;
import com.badlogic.gdx.math.GridPoint2; import io.anuke.arc.math.GridPoint2;
import com.badlogic.gdx.math.Rectangle; import io.anuke.arc.math.Rectangle;
import com.badlogic.gdx.math.Vector2; import io.anuke.arc.math.Vector2;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import io.anuke.mindustry.editor.DrawOperation.TileOperation; import io.anuke.mindustry.editor.DrawOperation.TileOperation;
import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.ui.GridImage; import io.anuke.mindustry.ui.GridImage;

2
core/src/io/anuke/mindustry/editor/OperationStack.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.editor; package io.anuke.mindustry.editor;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
public class OperationStack{ public class OperationStack{
private final static int maxSize = 10; private final static int maxSize = 10;

6
core/src/io/anuke/mindustry/entities/Damage.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry.entities; package io.anuke.mindustry.entities;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.math.Rectangle; import io.anuke.arc.math.Rectangle;
import com.badlogic.gdx.math.Vector2; import io.anuke.arc.math.Vector2;
import io.anuke.mindustry.content.bullets.TurretBullets; import io.anuke.mindustry.content.bullets.TurretBullets;
import io.anuke.mindustry.content.fx.ExplosionFx; import io.anuke.mindustry.content.fx.ExplosionFx;
import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.content.fx.Fx;

12
core/src/io/anuke/mindustry/entities/Player.java
View File

@@ -1,11 +1,11 @@
package io.anuke.mindustry.entities; package io.anuke.mindustry.entities;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.graphics.g2d.GlyphLayout; import io.anuke.arc.graphics.g2d.GlyphLayout;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.arc.graphics.g2d.TextureRegion;
import com.badlogic.gdx.math.Rectangle; import io.anuke.arc.math.Rectangle;
import com.badlogic.gdx.math.Vector2; import io.anuke.arc.math.Vector2;
import com.badlogic.gdx.utils.Queue; import io.anuke.arc.utils.Queue;
import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Loc;
import io.anuke.annotations.Annotations.Remote; import io.anuke.annotations.Annotations.Remote;
import io.anuke.mindustry.content.Mechs; import io.anuke.mindustry.content.Mechs;

2
core/src/io/anuke/mindustry/entities/Predict.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.entities; package io.anuke.mindustry.entities;
import com.badlogic.gdx.math.Vector2; import io.anuke.arc.math.Vector2;
import io.anuke.mindustry.entities.traits.TargetTrait; import io.anuke.mindustry.entities.traits.TargetTrait;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;

4
core/src/io/anuke/mindustry/entities/StatusController.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.entities; package io.anuke.mindustry.entities;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import io.anuke.mindustry.content.StatusEffects; import io.anuke.mindustry.content.StatusEffects;
import io.anuke.mindustry.entities.traits.Saveable; import io.anuke.mindustry.entities.traits.Saveable;
import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.ContentType;

8
core/src/io/anuke/mindustry/entities/TileEntity.java
View File

@@ -1,9 +1,9 @@
package io.anuke.mindustry.entities; package io.anuke.mindustry.entities;
import com.badlogic.gdx.math.GridPoint2; import io.anuke.arc.math.GridPoint2;
import com.badlogic.gdx.math.Vector2; import io.anuke.arc.math.Vector2;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import com.badlogic.gdx.utils.ObjectSet; import io.anuke.arc.utils.ObjectSet;
import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Loc;
import io.anuke.annotations.Annotations.Remote; import io.anuke.annotations.Annotations.Remote;
import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.content.fx.Fx;

8
core/src/io/anuke/mindustry/entities/Unit.java
View File

@@ -1,9 +1,9 @@
package io.anuke.mindustry.entities; package io.anuke.mindustry.entities;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.arc.graphics.g2d.TextureRegion;
import com.badlogic.gdx.math.Rectangle; import io.anuke.arc.math.Rectangle;
import com.badlogic.gdx.math.Vector2; import io.anuke.arc.math.Vector2;
import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.entities.traits.*; import io.anuke.mindustry.entities.traits.*;
import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Team;

4
core/src/io/anuke/mindustry/entities/Units.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.entities; package io.anuke.mindustry.entities;
import com.badlogic.gdx.math.Rectangle; import io.anuke.arc.math.Rectangle;
import com.badlogic.gdx.math.Vector2; import io.anuke.arc.math.Vector2;
import io.anuke.mindustry.entities.traits.TargetTrait; import io.anuke.mindustry.entities.traits.TargetTrait;
import io.anuke.mindustry.entities.units.BaseUnit; import io.anuke.mindustry.entities.units.BaseUnit;
import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Team;

4
core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.entities.bullet; package io.anuke.mindustry.entities.bullet;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.mindustry.entities.Damage; import io.anuke.mindustry.entities.Damage;
import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.Units;
import io.anuke.mindustry.entities.traits.TargetTrait; import io.anuke.mindustry.entities.traits.TargetTrait;

2
core/src/io/anuke/mindustry/entities/bullet/Bullet.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.entities.bullet; package io.anuke.mindustry.entities.bullet;
import com.badlogic.gdx.math.Vector2; import io.anuke.arc.math.Vector2;
import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Loc;
import io.anuke.annotations.Annotations.Remote; import io.anuke.annotations.Annotations.Remote;
import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.entities.Unit;

2
core/src/io/anuke/mindustry/entities/bullet/FlakBulletType.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.entities.bullet; package io.anuke.mindustry.entities.bullet;
import com.badlogic.gdx.math.Rectangle; import io.anuke.arc.math.Rectangle;
import io.anuke.mindustry.content.fx.BulletFx; import io.anuke.mindustry.content.fx.BulletFx;
import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.Units;
import io.anuke.ucore.core.Timers; import io.anuke.ucore.core.Timers;

4
core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.entities.bullet; package io.anuke.mindustry.entities.bullet;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.math.GridPoint2; import io.anuke.arc.math.GridPoint2;
import io.anuke.mindustry.content.fx.BulletFx; import io.anuke.mindustry.content.fx.BulletFx;
import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.content.fx.Fx;
import io.anuke.mindustry.entities.effect.Fire; import io.anuke.mindustry.entities.effect.Fire;

2
core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.entities.bullet; package io.anuke.mindustry.entities.bullet;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.content.fx.BulletFx; import io.anuke.mindustry.content.fx.BulletFx;
import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Palette;
import io.anuke.ucore.core.Effects; import io.anuke.ucore.core.Effects;

2
core/src/io/anuke/mindustry/entities/effect/Decal.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.entities.effect; package io.anuke.mindustry.entities.effect;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.entities.traits.BelowLiquidTrait; import io.anuke.mindustry.entities.traits.BelowLiquidTrait;
import io.anuke.ucore.entities.EntityGroup; import io.anuke.ucore.entities.EntityGroup;
import io.anuke.ucore.entities.impl.TimedEntity; import io.anuke.ucore.entities.impl.TimedEntity;

6
core/src/io/anuke/mindustry/entities/effect/Fire.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry.entities.effect; package io.anuke.mindustry.entities.effect;
import com.badlogic.gdx.math.GridPoint2; import io.anuke.arc.math.GridPoint2;
import com.badlogic.gdx.utils.IntMap; import io.anuke.arc.utils.IntMap;
import com.badlogic.gdx.utils.Pool.Poolable; import io.anuke.arc.utils.Pool.Poolable;
import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Loc;
import io.anuke.annotations.Annotations.Remote; import io.anuke.annotations.Annotations.Remote;
import io.anuke.mindustry.content.StatusEffects; import io.anuke.mindustry.content.StatusEffects;

4
core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.entities.effect; package io.anuke.mindustry.entities.effect;
import com.badlogic.gdx.math.Interpolation; import io.anuke.arc.math.Interpolation;
import com.badlogic.gdx.math.Vector2; import io.anuke.arc.math.Vector2;
import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Loc;
import io.anuke.annotations.Annotations.Remote; import io.anuke.annotations.Annotations.Remote;
import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.entities.Unit;

8
core/src/io/anuke/mindustry/entities/effect/Lightning.java
View File

@@ -1,9 +1,9 @@
package io.anuke.mindustry.entities.effect; package io.anuke.mindustry.entities.effect;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.math.Rectangle; import io.anuke.arc.math.Rectangle;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import com.badlogic.gdx.utils.IntSet; import io.anuke.arc.utils.IntSet;
import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Loc;
import io.anuke.annotations.Annotations.Remote; import io.anuke.annotations.Annotations.Remote;
import io.anuke.mindustry.content.bullets.TurretBullets; import io.anuke.mindustry.content.bullets.TurretBullets;

10
core/src/io/anuke/mindustry/entities/effect/Puddle.java
View File

@@ -1,10 +1,10 @@
package io.anuke.mindustry.entities.effect; package io.anuke.mindustry.entities.effect;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.math.GridPoint2; import io.anuke.arc.math.GridPoint2;
import com.badlogic.gdx.math.Rectangle; import io.anuke.arc.math.Rectangle;
import com.badlogic.gdx.utils.IntMap; import io.anuke.arc.utils.IntMap;
import com.badlogic.gdx.utils.Pool.Poolable; import io.anuke.arc.utils.Pool.Poolable;
import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Loc;
import io.anuke.annotations.Annotations.Remote; import io.anuke.annotations.Annotations.Remote;
import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.content.Liquids;

2
core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.entities.effect; package io.anuke.mindustry.entities.effect;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.util.Angles; import io.anuke.ucore.util.Angles;

10
core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
View File

@@ -1,9 +1,9 @@
package io.anuke.mindustry.entities.traits; package io.anuke.mindustry.entities.traits;
import com.badlogic.gdx.Gdx; import io.anuke.arc.Core;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import com.badlogic.gdx.utils.Queue; import io.anuke.arc.utils.Queue;
import io.anuke.mindustry.Vars; import io.anuke.mindustry.Vars;
import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.content.fx.BlockFx; import io.anuke.mindustry.content.fx.BlockFx;
@@ -251,7 +251,7 @@ public interface BuilderTrait extends Entity{
} }
if(!current.initialized){ if(!current.initialized){
Gdx.app.postRunnable(() -> Events.fire(new BuildSelectEvent(tile, unit.getTeam(), this, current.breaking))); Core.app.postRunnable(() -> Events.fire(new BuildSelectEvent(tile, unit.getTeam(), this, current.breaking)));
current.initialized = true; current.initialized = true;
} }
} }

4
core/src/io/anuke/mindustry/entities/traits/TypeTrait.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.entities.traits; package io.anuke.mindustry.entities.traits;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import com.badlogic.gdx.utils.ObjectIntMap; import io.anuke.arc.utils.ObjectIntMap;
import io.anuke.ucore.function.Supplier; import io.anuke.ucore.function.Supplier;
public interface TypeTrait{ public interface TypeTrait{

4
core/src/io/anuke/mindustry/entities/units/BaseUnit.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.entities.units; package io.anuke.mindustry.entities.units;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.arc.graphics.g2d.TextureRegion;
import com.badlogic.gdx.math.Rectangle; import io.anuke.arc.math.Rectangle;
import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Loc;
import io.anuke.annotations.Annotations.Remote; import io.anuke.annotations.Annotations.Remote;
import io.anuke.mindustry.Vars; import io.anuke.mindustry.Vars;

2
core/src/io/anuke/mindustry/entities/units/FlyingUnit.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.entities.units; package io.anuke.mindustry.entities.units;
import com.badlogic.gdx.math.Vector2; import io.anuke.arc.math.Vector2;
import io.anuke.mindustry.entities.Predict; import io.anuke.mindustry.entities.Predict;
import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.Units;
import io.anuke.mindustry.entities.traits.CarriableTrait; import io.anuke.mindustry.entities.traits.CarriableTrait;

4
core/src/io/anuke/mindustry/entities/units/GroundUnit.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.entities.units; package io.anuke.mindustry.entities.units;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.math.Vector2; import io.anuke.arc.math.Vector2;
import io.anuke.mindustry.Vars; import io.anuke.mindustry.Vars;
import io.anuke.mindustry.entities.Predict; import io.anuke.mindustry.entities.Predict;
import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.TileEntity;

2
core/src/io/anuke/mindustry/entities/units/Squad.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.entities.units; package io.anuke.mindustry.entities.units;
import com.badlogic.gdx.math.Vector2; import io.anuke.arc.math.Vector2;
import io.anuke.ucore.util.Translator; import io.anuke.ucore.util.Translator;
import static io.anuke.mindustry.Vars.threads; import static io.anuke.mindustry.Vars.threads;

6
core/src/io/anuke/mindustry/entities/units/UnitType.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry.entities.units; package io.anuke.mindustry.entities.units;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.arc.graphics.g2d.TextureRegion;
import com.badlogic.gdx.utils.ObjectSet; import io.anuke.arc.utils.ObjectSet;
import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.content.Weapons; import io.anuke.mindustry.content.Weapons;
import io.anuke.mindustry.entities.traits.TypeTrait; import io.anuke.mindustry.entities.traits.TypeTrait;

2
core/src/io/anuke/mindustry/entities/units/types/AlphaDrone.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.entities.units.types; package io.anuke.mindustry.entities.units.types;
import com.badlogic.gdx.math.Vector2; import io.anuke.arc.math.Vector2;
import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Loc;
import io.anuke.annotations.Annotations.Remote; import io.anuke.annotations.Annotations.Remote;
import io.anuke.mindustry.Vars; import io.anuke.mindustry.Vars;

2
core/src/io/anuke/mindustry/entities/units/types/Drone.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.entities.units.types; package io.anuke.mindustry.entities.units.types;
import com.badlogic.gdx.utils.Queue; import io.anuke.arc.utils.Queue;
import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.TileEntity;

10
core/src/io/anuke/mindustry/game/Saves.java
View File

@@ -1,10 +1,10 @@
package io.anuke.mindustry.game; package io.anuke.mindustry.game;
import com.badlogic.gdx.files.FileHandle; import io.anuke.arc.files.FileHandle;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import com.badlogic.gdx.utils.IntArray; import io.anuke.arc.utils.IntArray;
import com.badlogic.gdx.utils.IntMap; import io.anuke.arc.utils.IntMap;
import com.badlogic.gdx.utils.TimeUtils; import io.anuke.arc.utils.TimeUtils;
import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.game.EventType.StateChangeEvent; import io.anuke.mindustry.game.EventType.StateChangeEvent;
import io.anuke.mindustry.io.SaveIO; import io.anuke.mindustry.io.SaveIO;

2
core/src/io/anuke/mindustry/game/Team.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.game; package io.anuke.mindustry.game;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.ucore.util.Bundles; import io.anuke.ucore.util.Bundles;
public enum Team{ public enum Team{

2
core/src/io/anuke/mindustry/game/Teams.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.game; package io.anuke.mindustry.game;
import com.badlogic.gdx.utils.ObjectSet; import io.anuke.arc.utils.ObjectSet;
import io.anuke.mindustry.Vars; import io.anuke.mindustry.Vars;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.util.EnumSet; import io.anuke.ucore.util.EnumSet;

2
core/src/io/anuke/mindustry/game/UnlockableContent.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.game; package io.anuke.mindustry.game;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.scene.ui.layout.Table;
import static io.anuke.mindustry.Vars.control; import static io.anuke.mindustry.Vars.control;

4
core/src/io/anuke/mindustry/game/Unlocks.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.game; package io.anuke.mindustry.game;
import com.badlogic.gdx.utils.ObjectMap; import io.anuke.arc.utils.ObjectMap;
import com.badlogic.gdx.utils.ObjectSet; import io.anuke.arc.utils.ObjectSet;
import io.anuke.mindustry.game.EventType.UnlockEvent; import io.anuke.mindustry.game.EventType.UnlockEvent;
import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.ContentType;
import io.anuke.ucore.core.Events; import io.anuke.ucore.core.Events;

10
core/src/io/anuke/mindustry/game/Version.java
View File

@@ -1,9 +1,9 @@
package io.anuke.mindustry.game; package io.anuke.mindustry.game;
import com.badlogic.gdx.Gdx; import io.anuke.arc.Core;
import com.badlogic.gdx.files.FileHandle; import io.anuke.arc.files.FileHandle;
import com.badlogic.gdx.utils.ObjectMap; import io.anuke.arc.utils.ObjectMap;
import com.badlogic.gdx.utils.PropertiesUtils; import io.anuke.arc.utils.PropertiesUtils;
import io.anuke.ucore.util.Strings; import io.anuke.ucore.util.Strings;
import java.io.IOException; import java.io.IOException;
@@ -22,7 +22,7 @@ public class Version{
public static void init(){ public static void init(){
try{ try{
FileHandle file = Gdx.files.internal("version.properties"); FileHandle file = Core.files.internal("version.properties");
ObjectMap<String, String> map = new ObjectMap<>(); ObjectMap<String, String> map = new ObjectMap<>();
PropertiesUtils.load(map, file.reader()); PropertiesUtils.load(map, file.reader());

2
core/src/io/anuke/mindustry/game/Waves.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.game; package io.anuke.mindustry.game;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.content.StatusEffects; import io.anuke.mindustry.content.StatusEffects;
import io.anuke.mindustry.content.UnitTypes; import io.anuke.mindustry.content.UnitTypes;

6
core/src/io/anuke/mindustry/graphics/BlockRenderer.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry.graphics; package io.anuke.mindustry.graphics;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import com.badlogic.gdx.utils.IntSet; import io.anuke.arc.utils.IntSet;
import com.badlogic.gdx.utils.Sort; import io.anuke.arc.utils.Sort;
import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.game.EventType.TileChangeEvent; import io.anuke.mindustry.game.EventType.TileChangeEvent;
import io.anuke.mindustry.game.EventType.WorldLoadGraphicsEvent; import io.anuke.mindustry.game.EventType.WorldLoadGraphicsEvent;

2
core/src/io/anuke/mindustry/graphics/CacheLayer.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.graphics; package io.anuke.mindustry.graphics;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.ucore.core.Core; import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Graphics; import io.anuke.ucore.core.Graphics;
import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Draw;

18
core/src/io/anuke/mindustry/graphics/FloorRenderer.java
View File

@@ -1,13 +1,13 @@
package io.anuke.mindustry.graphics; package io.anuke.mindustry.graphics;
import com.badlogic.gdx.Gdx; import io.anuke.arc.Core;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.graphics.GL20; import io.anuke.arc.graphics.GL20;
import com.badlogic.gdx.graphics.OrthographicCamera; import io.anuke.arc.graphics.OrthographicCamera;
import com.badlogic.gdx.utils.IntArray; import io.anuke.arc.utils.IntArray;
import com.badlogic.gdx.utils.IntSet; import io.anuke.arc.utils.IntSet;
import com.badlogic.gdx.utils.IntSet.IntSetIterator; import io.anuke.arc.utils.IntSet.IntSetIterator;
import com.badlogic.gdx.utils.ObjectSet; import io.anuke.arc.utils.ObjectSet;
import io.anuke.mindustry.game.EventType.WorldLoadGraphicsEvent; import io.anuke.mindustry.game.EventType.WorldLoadGraphicsEvent;
import io.anuke.mindustry.maps.Sector; import io.anuke.mindustry.maps.Sector;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
@@ -106,7 +106,7 @@ public class FloorRenderer{
cbatch.setProjectionMatrix(Core.camera.combined); cbatch.setProjectionMatrix(Core.camera.combined);
cbatch.beginDraw(); cbatch.beginDraw();
Gdx.gl.glEnable(GL20.GL_BLEND); Core.gl.glEnable(GL20.GL_BLEND);
} }
public void endDraw(){ public void endDraw(){

24
core/src/io/anuke/mindustry/graphics/FogRenderer.java
View File

@@ -1,14 +1,14 @@
package io.anuke.mindustry.graphics; package io.anuke.mindustry.graphics;
import com.badlogic.gdx.Gdx; import io.anuke.arc.Core;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.graphics.GL20; import io.anuke.arc.graphics.GL20;
import com.badlogic.gdx.graphics.Pixmap.Format; import io.anuke.arc.graphics.Pixmap.Format;
import com.badlogic.gdx.graphics.Texture; import io.anuke.arc.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.arc.graphics.g2d.TextureRegion;
import com.badlogic.gdx.graphics.glutils.FrameBuffer; import io.anuke.arc.graphics.glutils.FrameBuffer;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import com.badlogic.gdx.utils.Disposable; import io.anuke.arc.utils.Disposable;
import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.entities.Unit;
import io.anuke.mindustry.game.EventType.TileChangeEvent; import io.anuke.mindustry.game.EventType.TileChangeEvent;
import io.anuke.mindustry.game.EventType.WorldLoadGraphicsEvent; import io.anuke.mindustry.game.EventType.WorldLoadGraphicsEvent;
@@ -72,8 +72,8 @@ public class FogRenderer implements Disposable{
buffer.begin(); buffer.begin();
pixelBuffer.position(0); pixelBuffer.position(0);
Gdx.gl.glPixelStorei(GL20.GL_PACK_ALIGNMENT, 1); Core.gl.glPixelStorei(GL20.GL_PACK_ALIGNMENT, 1);
Gdx.gl.glReadPixels(0, 0, world.width(), world.height(), GL20.GL_RGBA, GL20.GL_UNSIGNED_BYTE, pixelBuffer); Core.gl.glReadPixels(0, 0, world.width(), world.height(), GL20.GL_RGBA, GL20.GL_UNSIGNED_BYTE, pixelBuffer);
pixelBuffer.position(0); pixelBuffer.position(0);
for(int i = 0; i < world.width() * world.height(); i++){ for(int i = 0; i < world.width() * world.height(); i++){
@@ -162,7 +162,7 @@ public class FogRenderer implements Disposable{
Graphics.shader(); Graphics.shader();
Graphics.setScreen(); Graphics.setScreen();
Core.batch.draw(renderer.pixelSurface.texture(), 0, Gdx.graphics.getHeight(), Gdx.graphics.getWidth(), -Gdx.graphics.getHeight()); Core.batch.draw(renderer.pixelSurface.texture(), 0, Core.graphics.getHeight(), Core.graphics.getWidth(), -Core.graphics.getHeight());
Graphics.end(); Graphics.end();
} }

18
core/src/io/anuke/mindustry/graphics/MinimapRenderer.java
View File

@@ -1,13 +1,13 @@
package io.anuke.mindustry.graphics; package io.anuke.mindustry.graphics;
import com.badlogic.gdx.Gdx; import io.anuke.arc.Core;
import com.badlogic.gdx.graphics.Pixmap; import io.anuke.arc.graphics.Pixmap;
import com.badlogic.gdx.graphics.Pixmap.Format; import io.anuke.arc.graphics.Pixmap.Format;
import com.badlogic.gdx.graphics.Texture; import io.anuke.arc.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.arc.graphics.g2d.TextureRegion;
import com.badlogic.gdx.math.Rectangle; import io.anuke.arc.math.Rectangle;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import com.badlogic.gdx.utils.Disposable; import io.anuke.arc.utils.Disposable;
import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.entities.Unit;
import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.Units;
import io.anuke.mindustry.game.EventType.TileChangeEvent; import io.anuke.mindustry.game.EventType.TileChangeEvent;
@@ -41,7 +41,7 @@ public class MinimapRenderer implements Disposable{
}); });
//make sure to call on the graphics thread //make sure to call on the graphics thread
Events.on(TileChangeEvent.class, event -> Gdx.app.postRunnable(() -> update(event.tile))); Events.on(TileChangeEvent.class, event -> Core.app.postRunnable(() -> update(event.tile)));
} }
public Texture getTexture(){ public Texture getTexture(){

10
core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
View File

@@ -1,10 +1,10 @@
package io.anuke.mindustry.graphics; package io.anuke.mindustry.graphics;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.math.MathUtils; import io.anuke.arc.math.MathUtils;
import com.badlogic.gdx.math.Rectangle; import io.anuke.arc.math.Rectangle;
import com.badlogic.gdx.math.Vector2; import io.anuke.arc.math.Vector2;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.TileEntity;

2
core/src/io/anuke/mindustry/graphics/Palette.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.graphics; package io.anuke.mindustry.graphics;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
public class Palette{ public class Palette{
public static final Color public static final Color

10
core/src/io/anuke/mindustry/graphics/Shaders.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry.graphics; package io.anuke.mindustry.graphics;
import com.badlogic.gdx.Gdx; import io.anuke.arc.Core;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.ucore.core.Core; import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Timers; import io.anuke.ucore.core.Timers;
import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Draw;
@@ -54,8 +54,8 @@ public class Shaders{
public void apply(){ public void apply(){
time = time % 158; time = time % 158;
shader.setUniformf("u_resolution", Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); shader.setUniformf("u_resolution", Core.graphics.getWidth(), Core.graphics.getHeight());
shader.setUniformi("u_time", (int)(time += Gdx.graphics.getDeltaTime() * 60f)); shader.setUniformi("u_time", (int)(time += Core.graphics.getDeltaTime() * 60f));
shader.setUniformf("u_uv", Draw.getBlankRegion().getU(), Draw.getBlankRegion().getV()); shader.setUniformf("u_uv", Draw.getBlankRegion().getU(), Draw.getBlankRegion().getV());
shader.setUniformf("u_scl", Unit.dp.scl(1f)); shader.setUniformf("u_scl", Unit.dp.scl(1f));
shader.setUniformf("u_uv2", Draw.getBlankRegion().getU2(), Draw.getBlankRegion().getV2()); shader.setUniformf("u_uv2", Draw.getBlankRegion().getU2(), Draw.getBlankRegion().getV2());

6
core/src/io/anuke/mindustry/graphics/Trail.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry.graphics; package io.anuke.mindustry.graphics;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.math.Vector2; import io.anuke.arc.math.Vector2;
import com.badlogic.gdx.utils.FloatArray; import io.anuke.arc.utils.FloatArray;
import io.anuke.ucore.core.Timers; import io.anuke.ucore.core.Timers;
import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.graphics.Fill; import io.anuke.ucore.graphics.Fill;

6
core/src/io/anuke/mindustry/input/DefaultKeybinds.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.input; package io.anuke.mindustry.input;
import com.badlogic.gdx.Application.ApplicationType; import io.anuke.arc.Application.ApplicationType;
import com.badlogic.gdx.Gdx; import io.anuke.arc.Core;
import io.anuke.ucore.core.Inputs.Axis; import io.anuke.ucore.core.Inputs.Axis;
import io.anuke.ucore.core.Inputs.DeviceType; import io.anuke.ucore.core.Inputs.DeviceType;
import io.anuke.ucore.core.KeyBinds; import io.anuke.ucore.core.KeyBinds;
@@ -31,7 +31,7 @@ public class DefaultKeybinds{
"zoom_hold", Input.CONTROL_LEFT, "zoom_hold", Input.CONTROL_LEFT,
"zoom", new Axis(Input.SCROLL), "zoom", new Axis(Input.SCROLL),
"zoom_minimap", new Axis(Input.MINUS, Input.PLUS), "zoom_minimap", new Axis(Input.MINUS, Input.PLUS),
"menu", Gdx.app.getType() == ApplicationType.Android ? Input.BACK : Input.ESCAPE, "menu", Core.app.getType() == ApplicationType.Android ? Input.BACK : Input.ESCAPE,
"pause", Input.SPACE, "pause", Input.SPACE,
"toggle_menus", Input.C, "toggle_menus", Input.C,
"screenshot", Input.P, "screenshot", Input.P,

38
core/src/io/anuke/mindustry/input/DesktopInput.java
View File

@@ -1,7 +1,7 @@
package io.anuke.mindustry.input; package io.anuke.mindustry.input;
import com.badlogic.gdx.Gdx; import io.anuke.arc.Core;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.Player;
@@ -71,8 +71,8 @@ public class DesktopInput extends InputHandler{
@Override @Override
public void drawOutlined(){ public void drawOutlined(){
int cursorX = tileX(Gdx.input.getX()); int cursorX = tileX(Core.input.getX());
int cursorY = tileY(Gdx.input.getY()); int cursorY = tileY(Core.input.getY());
//draw selection(s) //draw selection(s)
if(mode == placing && recipe != null){ if(mode == placing && recipe != null){
@@ -169,7 +169,7 @@ public class DesktopInput extends InputHandler{
rotation = Mathf.mod(rotation + (int) Inputs.getAxisTapped(section, "rotate"), 4); rotation = Mathf.mod(rotation + (int) Inputs.getAxisTapped(section, "rotate"), 4);
Tile cursor = tileAt(Gdx.input.getX(), Gdx.input.getY()); Tile cursor = tileAt(Core.input.getX(), Core.input.getY());
if(player.isDead()){ if(player.isDead()){
cursorType = normal; cursorType = normal;
@@ -199,9 +199,9 @@ public class DesktopInput extends InputHandler{
} }
void pollInput(){ void pollInput(){
Tile selected = tileAt(Gdx.input.getX(), Gdx.input.getY()); Tile selected = tileAt(Core.input.getX(), Core.input.getY());
int cursorX = tileX(Gdx.input.getX()); int cursorX = tileX(Core.input.getX());
int cursorY = tileY(Gdx.input.getY()); int cursorY = tileY(Core.input.getY());
if(Inputs.keyTap(section, "deselect")){ if(Inputs.keyTap(section, "deselect")){
player.setMineTile(null); player.setMineTile(null);
@@ -232,8 +232,8 @@ public class DesktopInput extends InputHandler{
}else if(Inputs.keyTap(section, "break") && !ui.hasMouse()){ }else if(Inputs.keyTap(section, "break") && !ui.hasMouse()){
//is recalculated because setting the mode to breaking removes potential multiblock cursor offset //is recalculated because setting the mode to breaking removes potential multiblock cursor offset
mode = breaking; mode = breaking;
selectX = tileX(Gdx.input.getX()); selectX = tileX(Core.input.getX());
selectY = tileY(Gdx.input.getY()); selectY = tileY(Core.input.getY());
} }
@@ -278,12 +278,12 @@ public class DesktopInput extends InputHandler{
@Override @Override
public float getMouseX(){ public float getMouseX(){
return !controlling ? Gdx.input.getX() : controlx; return !controlling ? Core.input.getX() : controlx;
} }
@Override @Override
public float getMouseY(){ public float getMouseY(){
return !controlling ? Gdx.input.getY() : controly; return !controlling ? Core.input.getY() : controly;
} }
@Override @Override
@@ -295,7 +295,7 @@ public class DesktopInput extends InputHandler{
public void updateController(){ public void updateController(){
//TODO no controller support //TODO no controller support
//TODO move controller input to new class, ControllerInput //TODO move controller input to new class, ControllerInput
boolean mousemove = Gdx.input.getDeltaX() > 1 || Gdx.input.getDeltaY() > 1; boolean mousemove = Core.input.getDeltaX() > 1 || Core.input.getDeltaY() > 1;
if(state.is(State.menu)){ if(state.is(State.menu)){
droppingItem = false; droppingItem = false;
@@ -316,22 +316,22 @@ public class DesktopInput extends InputHandler{
controlling = true; controlling = true;
if(player.playerIndex == 0){ if(player.playerIndex == 0){
Gdx.input.setCursorCatched(true); Core.input.setCursorCatched(true);
} }
Inputs.getProcessor().touchDragged((int) getMouseX(), (int) getMouseY(), player.playerIndex); Inputs.getProcessor().touchDragged((int) getMouseX(), (int) getMouseY(), player.playerIndex);
} }
controlx = Mathf.clamp(controlx, 0, Gdx.graphics.getWidth()); controlx = Mathf.clamp(controlx, 0, Core.graphics.getWidth());
controly = Mathf.clamp(controly, 0, Gdx.graphics.getHeight()); controly = Mathf.clamp(controly, 0, Core.graphics.getHeight());
}else{ }else{
controlling = false; controlling = false;
Gdx.input.setCursorCatched(false); Core.input.setCursorCatched(false);
} }
if(!controlling){ if(!controlling){
controlx = Gdx.input.getX(); controlx = Core.input.getX();
controly = Gdx.input.getY(); controly = Core.input.getY();
} }
} }

12
core/src/io/anuke/mindustry/input/InputHandler.java
View File

@@ -1,9 +1,9 @@
package io.anuke.mindustry.input; package io.anuke.mindustry.input;
import com.badlogic.gdx.Gdx; import io.anuke.arc.Core;
import com.badlogic.gdx.InputAdapter; import io.anuke.arc.InputAdapter;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.math.Vector2; import io.anuke.arc.math.Vector2;
import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Loc;
import io.anuke.annotations.Annotations.Remote; import io.anuke.annotations.Annotations.Remote;
import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.content.blocks.Blocks;
@@ -130,11 +130,11 @@ public abstract class InputHandler extends InputAdapter{
} }
public float getMouseX(){ public float getMouseX(){
return Gdx.input.getX(); return Core.input.getX();
} }
public float getMouseY(){ public float getMouseY(){
return Gdx.input.getY(); return Core.input.getY();
} }
public void resetCursor(){ public void resetCursor(){

40
core/src/io/anuke/mindustry/input/MobileInput.java
View File

@@ -1,16 +1,16 @@
package io.anuke.mindustry.input; package io.anuke.mindustry.input;
import com.badlogic.gdx.Gdx; import io.anuke.arc.Core;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.arc.graphics.g2d.TextureRegion;
import com.badlogic.gdx.input.GestureDetector; import io.anuke.arc.input.GestureDetector;
import com.badlogic.gdx.input.GestureDetector.GestureListener; import io.anuke.arc.input.GestureDetector.GestureListener;
import com.badlogic.gdx.math.Interpolation; import io.anuke.arc.math.Interpolation;
import com.badlogic.gdx.math.Rectangle; import io.anuke.arc.math.Rectangle;
import com.badlogic.gdx.math.Vector2; import io.anuke.arc.math.Vector2;
import com.badlogic.gdx.utils.Align; import io.anuke.arc.utils.Align;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import com.badlogic.gdx.utils.ObjectSet; import io.anuke.arc.utils.ObjectSet;
import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.content.fx.Fx;
import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.GameState.State;
@@ -321,8 +321,8 @@ public class MobileInput extends InputHandler implements GestureListener{
//Draw lines //Draw lines
if(lineMode){ if(lineMode){
int tileX = tileX(Gdx.input.getX()); int tileX = tileX(Core.input.getX());
int tileY = tileY(Gdx.input.getY()); int tileY = tileY(Core.input.getY());
//draw placing //draw placing
if(mode == placing && recipe != null){ if(mode == placing && recipe != null){
@@ -615,7 +615,7 @@ public class MobileInput extends InputHandler implements GestureListener{
lineScale = Mathf.lerpDelta(lineScale, 1f, 0.1f); lineScale = Mathf.lerpDelta(lineScale, 1f, 0.1f);
//When in line mode, pan when near screen edges automatically //When in line mode, pan when near screen edges automatically
if(Gdx.input.isTouched(0) && lineMode){ if(Core.input.isTouched(0) && lineMode){
float screenX = Graphics.mouse().x, screenY = Graphics.mouse().y; float screenX = Graphics.mouse().x, screenY = Graphics.mouse().y;
float panX = 0, panY = 0; float panX = 0, panY = 0;
@@ -624,19 +624,19 @@ public class MobileInput extends InputHandler implements GestureListener{
panX = -(edgePan - screenX); panX = -(edgePan - screenX);
} }
if(screenX >= Gdx.graphics.getWidth() - edgePan){ if(screenX >= Core.graphics.getWidth() - edgePan){
panX = (screenX - Gdx.graphics.getWidth()) + edgePan; panX = (screenX - Core.graphics.getWidth()) + edgePan;
} }
if(screenY <= edgePan){ if(screenY <= edgePan){
panY = -(edgePan - screenY); panY = -(edgePan - screenY);
} }
if(screenY >= Gdx.graphics.getHeight() - edgePan){ if(screenY >= Core.graphics.getHeight() - edgePan){
panY = (screenY - Gdx.graphics.getHeight()) + edgePan; panY = (screenY - Core.graphics.getHeight()) + edgePan;
} }
vector.set(panX, panY).scl((Core.camera.viewportWidth * Core.camera.zoom) / Gdx.graphics.getWidth()); vector.set(panX, panY).scl((Core.camera.viewportWidth * Core.camera.zoom) / Core.graphics.getWidth());
vector.limit(maxPanSpeed); vector.limit(maxPanSpeed);
//pan view //pan view
@@ -663,7 +663,7 @@ public class MobileInput extends InputHandler implements GestureListener{
if(!canPan) return false; if(!canPan) return false;
//can't pan in line mode with one finger or while dropping items! //can't pan in line mode with one finger or while dropping items!
if((lineMode && !Gdx.input.isTouched(1)) || droppingItem){ if((lineMode && !Core.input.isTouched(1)) || droppingItem){
return false; return false;
} }

10
core/src/io/anuke/mindustry/io/BundleLoader.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry.io; package io.anuke.mindustry.io;
import com.badlogic.gdx.Gdx; import io.anuke.arc.Core;
import com.badlogic.gdx.files.FileHandle; import io.anuke.arc.files.FileHandle;
import com.badlogic.gdx.utils.I18NBundle; import io.anuke.arc.utils.I18NBundle;
import io.anuke.mindustry.Vars; import io.anuke.mindustry.Vars;
import io.anuke.ucore.core.Core; import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Settings; import io.anuke.ucore.core.Settings;
@@ -42,7 +42,7 @@ public class BundleLoader{
I18NBundle.setExceptionOnMissingKey(false); I18NBundle.setExceptionOnMissingKey(false);
try{ try{
//try loading external bundle //try loading external bundle
FileHandle handle = Gdx.files.local("bundle"); FileHandle handle = Core.files.local("bundle");
Locale locale = Locale.ENGLISH; Locale locale = Locale.ENGLISH;
Core.bundle = I18NBundle.createBundle(handle, locale); Core.bundle = I18NBundle.createBundle(handle, locale);
@@ -54,7 +54,7 @@ public class BundleLoader{
}catch(Throwable e){ }catch(Throwable e){
//no external bundle found //no external bundle found
FileHandle handle = Gdx.files.internal("bundles/bundle"); FileHandle handle = Core.files.internal("bundles/bundle");
Locale locale = getLocale(); Locale locale = getLocale();
Locale.setDefault(locale); Locale.setDefault(locale);

6
core/src/io/anuke/mindustry/io/Changelogs.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry.io; package io.anuke.mindustry.io;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import com.badlogic.gdx.utils.JsonReader; import io.anuke.arc.utils.JsonReader;
import com.badlogic.gdx.utils.JsonValue; import io.anuke.arc.utils.JsonValue;
import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Net;
import io.anuke.ucore.function.Consumer; import io.anuke.ucore.function.Consumer;

6
core/src/io/anuke/mindustry/io/Contributors.java
View File

@@ -1,8 +1,8 @@
package io.anuke.mindustry.io; package io.anuke.mindustry.io;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import com.badlogic.gdx.utils.JsonReader; import io.anuke.arc.utils.JsonReader;
import com.badlogic.gdx.utils.JsonValue; import io.anuke.arc.utils.JsonValue;
import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Net;
import io.anuke.ucore.function.Consumer; import io.anuke.ucore.function.Consumer;

12
core/src/io/anuke/mindustry/io/MapIO.java
View File

@@ -1,11 +1,11 @@
package io.anuke.mindustry.io; package io.anuke.mindustry.io;
import com.badlogic.gdx.graphics.Color; import io.anuke.arc.graphics.Color;
import com.badlogic.gdx.graphics.Pixmap; import io.anuke.arc.graphics.Pixmap;
import com.badlogic.gdx.graphics.Pixmap.Format; import io.anuke.arc.graphics.Pixmap.Format;
import com.badlogic.gdx.utils.IntIntMap; import io.anuke.arc.utils.IntIntMap;
import com.badlogic.gdx.utils.ObjectMap; import io.anuke.arc.utils.ObjectMap;
import com.badlogic.gdx.utils.ObjectMap.Entry; import io.anuke.arc.utils.ObjectMap.Entry;
import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.content.blocks.StorageBlocks; import io.anuke.mindustry.content.blocks.StorageBlocks;
import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Team;

2
core/src/io/anuke/mindustry/io/SaveFileVersion.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.io; package io.anuke.mindustry.io;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.content.blocks.StorageBlocks; import io.anuke.mindustry.content.blocks.StorageBlocks;
import io.anuke.mindustry.entities.traits.SaveTrait; import io.anuke.mindustry.entities.traits.SaveTrait;

8
core/src/io/anuke/mindustry/io/SaveIO.java
View File

@@ -1,9 +1,9 @@
package io.anuke.mindustry.io; package io.anuke.mindustry.io;
import com.badlogic.gdx.files.FileHandle; import io.anuke.arc.files.FileHandle;
import com.badlogic.gdx.utils.Array; import io.anuke.arc.utils.Array;
import com.badlogic.gdx.utils.IntArray; import io.anuke.arc.utils.IntArray;
import com.badlogic.gdx.utils.IntMap; import io.anuke.arc.utils.IntMap;
import io.anuke.mindustry.Vars; import io.anuke.mindustry.Vars;
import io.anuke.mindustry.io.versions.Save16; import io.anuke.mindustry.io.versions.Save16;

Some files were not shown because too many files have changed in this diff Show More