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

ctrl-shift-f

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

8
core/src/io/anuke/mindustry/game/EventType.java
View File

@@ -43,14 +43,6 @@ public class EventType{
}
/**
* Called after the WorldLoadEvent is, and all logic has been loaded.
* It is safe to intialize graphics here.
*/
public static class WorldLoadGraphicsEvent implements Event{
}
/**Called from the logic thread. Do not access graphics here!*/
public static class TileChangeEvent implements Event{
public final Tile tile;

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

@@ -1,18 +1,17 @@
package io.anuke.mindustry.game;
import io.anuke.arc.files.FileHandle;
import io.anuke.arc.utils.Array;
import io.anuke.arc.utils.IntArray;
import io.anuke.arc.utils.IntMap;
import io.anuke.arc.utils.TimeUtils;
import io.anuke.arc.collection.Array;
import io.anuke.arc.util.IntArray;
import io.anuke.arc.util.IntMap;
import io.anuke.arc.util.Time;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.game.EventType.StateChangeEvent;
import io.anuke.mindustry.io.SaveIO;
import io.anuke.mindustry.io.SaveMeta;
import io.anuke.mindustry.maps.Map;
import io.anuke.arc.core.Events;
import io.anuke.arc.core.Settings;
import io.anuke.arc.core.Timers;
import io.anuke.arc.Events;
import io.anuke.arc.Timers;
import io.anuke.arc.util.Strings;
import io.anuke.arc.util.ThreadArray;
@@ -71,9 +70,9 @@ public class Saves{
if(current != null && !state.is(State.menu)
&& !(state.isPaused() && ui.hasDialog())){
if(lastTimestamp != 0){
totalPlaytime += TimeUtils.timeSinceMillis(lastTimestamp);
totalPlaytime += Time.timeSinceMillis(lastTimestamp);
}
lastTimestamp = TimeUtils.millis();
lastTimestamp = Time.millis();
}
if(!state.is(State.menu) && !state.gameOver && current != null && current.isAutosave()){

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

@@ -1,10 +1,9 @@
package io.anuke.mindustry.game;
import io.anuke.arc.utils.ObjectSet;
import io.anuke.arc.collection.EnumSet;
import io.anuke.arc.collection.ObjectSet;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.world.Tile;
import io.anuke.arc.util.EnumSet;
import io.anuke.arc.util.ThreadSet;
/**
* Class for various team-based utilities.
@@ -52,7 +51,7 @@ public class Teams{
}
public class TeamData{
public final ObjectSet<Tile> cores = new ThreadSet<>();
public final ObjectSet<Tile> cores = new ObjectSet<>();
public final EnumSet<Team> enemies;
public final Team team;

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

@@ -1,11 +1,11 @@
package io.anuke.mindustry.game;
import io.anuke.arc.utils.ObjectMap;
import io.anuke.arc.utils.ObjectSet;
import io.anuke.arc.collection.ObjectMap;
import io.anuke.arc.collection.ObjectSet;
import io.anuke.mindustry.game.EventType.UnlockEvent;
import io.anuke.mindustry.type.ContentType;
import io.anuke.arc.core.Events;
import io.anuke.arc.core.Settings;
import io.anuke.arc.Events;
import io.anuke.arc.Settings;
/**Stores player unlocks. Clientside only.*/
public class Unlocks{

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

@@ -2,8 +2,8 @@ package io.anuke.mindustry.game;
import io.anuke.arc.Core;
import io.anuke.arc.files.FileHandle;
import io.anuke.arc.utils.ObjectMap;
import io.anuke.arc.utils.PropertiesUtils;
import io.anuke.arc.collection.ObjectMap;
import io.anuke.arc.util.PropertiesUtils;
import io.anuke.arc.util.Strings;
import java.io.IOException;

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

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