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

Auto-generated serialization code

Browse Source
This commit is contained in:
Anuken
2018-09-09 16:19:53 -04:00
parent dadc83800b
commit 2cb6e454c8
13 changed files with 160 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,6 @@ import com.badlogic.gdx.Application.ApplicationType;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.utils.Json;
import io.anuke.mindustry.core.*;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.entities.TileEntity;
@@ -16,6 +15,7 @@ import io.anuke.mindustry.entities.traits.SyncTrait;
import io.anuke.mindustry.entities.units.BaseUnit;
import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.game.Version;
import io.anuke.mindustry.gen.Serialization;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.world.blocks.defense.ForceProjector.ShieldEntity;
import io.anuke.ucore.entities.Entities;
@@ -138,9 +138,10 @@ public class Vars{
public static final Translator[] tmptr = new Translator[]{new Translator(), new Translator(), new Translator(), new Translator()};
public static void init(){
Serialization.init();
//load locales
String[] stra = new Json().fromJson(String[].class, Gdx.files.internal("locales.json"));
String[] stra = Gdx.files.internal("locales").readString().split("\n");
locales = new Locale[stra.length];
for(int i = 0; i < locales.length; i++){
String code = stra[i];

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

@@ -51,6 +51,7 @@ public class Control extends Module{
private Throwable error;
public Control(){
saves = new Saves();
db = new ContentDatabase();

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

@@ -68,7 +68,7 @@ public class ContentDatabase{
}
public void load(){
ObjectMap<ContentType, Array<String>> result = Settings.getJson("content-database", ObjectMap.class);
ObjectMap<ContentType, Array<String>> result = Settings.getBinary("content-database", ObjectMap.class, () -> new ObjectMap<>());
for(Entry<ContentType, Array<String>> entry : result.entries()){
ObjectSet<String> set = new ObjectSet<>();
@@ -87,7 +87,7 @@ public class ContentDatabase{
write.put(entry.key, entry.value.iterator().toArray());
}
Settings.putJson("content-database", write);
Settings.putBinary("content-database", write);
Settings.save();
dirty = false;
}

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

@@ -2,6 +2,7 @@ package io.anuke.mindustry.game;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.IntArray;
import com.badlogic.gdx.utils.IntMap;
import com.badlogic.gdx.utils.TimeUtils;
import io.anuke.mindustry.core.GameState.State;
@@ -44,9 +45,10 @@ public class Saves{
public void load(){
saves.clear();
int[] slots = Settings.getJson("save-slots", int[].class);
IntArray slots = Settings.getBinary("save-slots", IntArray.class, IntArray::new);
for(int index : slots){
for(int i = 0; i < slots.size; i ++){
int index = slots.get(i);
if(SaveIO.isSaveValid(index)){
SaveSlot slot = new SaveSlot(index);
saves.add(slot);
@@ -138,11 +140,10 @@ public class Saves{
}
private void saveSlots(){
int[] result = new int[saves.size];
for(int i = 0; i < result.length; i++){
result[i] = saves.get(i).index;
}
Settings.putJson("save-slots", result);
IntArray result = new IntArray(saves.size);
for(int i = 0; i < saves.size; i++) result.add(saves.get(i).index);
Settings.putBinary("save-slots", result);
Settings.save();
}

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

@@ -90,7 +90,7 @@ public class Maps implements Disposable{
Settings.putString("map-data-" + name, new String(Base64Coder.encode(stream.toByteArray())));
if(!customMapNames.contains(name, false)){
customMapNames.add(name);
Settings.putJson("custom-maps", customMapNames);
Settings.putBinary("custom-maps", customMapNames);
}
Settings.save();
}
@@ -130,7 +130,7 @@ public class Maps implements Disposable{
} else {
customMapNames.removeValue(map.name, false);
Settings.putString("map-data-" + map.name, "");
Settings.putJson("custom-maps", customMapNames);
Settings.putBinary("custom-maps", customMapNames);
Settings.save();
}
}
@@ -163,7 +163,7 @@ public class Maps implements Disposable{
}
}else{
customMapNames = Settings.getJson("custom-maps", Array.class);
customMapNames = Settings.getBinary("custom-maps", Array.class, () -> new Array<>());
for(String name : customMapNames){
try{

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

@@ -2,6 +2,7 @@ package io.anuke.mindustry.maps;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.utils.Array;
import io.anuke.annotations.Annotations.Serialize;
import io.anuke.mindustry.game.Difficulty;
import io.anuke.mindustry.game.Saves.SaveSlot;
import io.anuke.mindustry.game.SpawnGroup;
@@ -12,6 +13,7 @@ import io.anuke.ucore.util.Bits;
import static io.anuke.mindustry.Vars.control;
@Serialize
public class Sector{
/**Position on the map, can be positive or negative.*/
public short x, y;

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

@@ -29,10 +29,6 @@ public class Sectors{
private GridMap<Sector> grid = new GridMap<>();
public Sectors(){
Settings.json().addClassTag("Sector", Sector.class);
}
public void playSector(Sector sector){
if(sector.hasSave() && SaveIO.breakingVersions.contains(sector.getSave().getBuild())){
sector.getSave().delete();
@@ -117,7 +113,7 @@ public class Sectors{
}
grid.clear();
Array<Sector> out = Settings.getJson("sectors", Array.class);
Array<Sector> out = Settings.getBinary("sectors", Array.class, () -> new Array<>());
for(Sector sector : out){
createTexture(sector);
@@ -141,7 +137,7 @@ public class Sectors{
out.add(sector);
}
Settings.putJson("sectors", out);
Settings.putBinary("sectors", out);
Settings.save();
}

12
core/src/io/anuke/mindustry/net/Administration.java
View File

@@ -3,6 +3,7 @@ package io.anuke.mindustry.net;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.IntMap;
import com.badlogic.gdx.utils.ObjectMap;
import io.anuke.annotations.Annotations.Serialize;
import io.anuke.ucore.core.Settings;
import static io.anuke.mindustry.Vars.headless;
@@ -276,16 +277,17 @@ public class Administration{
}
public void save(){
Settings.putJson("player-info", playerInfo);
Settings.putJson("banned-ips", bannedIPs);
Settings.putBinary("player-info", playerInfo);
Settings.putBinary("banned-ips", bannedIPs);
Settings.save();
}
private void load(){
playerInfo = Settings.getJson("player-info", ObjectMap.class);
bannedIPs = Settings.getJson("banned-ips", Array.class);
playerInfo = Settings.getBinary("player-info", ObjectMap.class, () -> new ObjectMap<>());
bannedIPs = Settings.getBinary("banned-ips", Array.class, () -> new Array<>());
}
@Serialize
public static class PlayerInfo{
public String id;
public String lastName = "<unknown>", lastIP = "<unknown>";
@@ -303,7 +305,7 @@ public class Administration{
this.id = id;
}
private PlayerInfo(){
public PlayerInfo(){
}
}

15
core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
View File

@@ -3,6 +3,7 @@ package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.utils.Array;
import io.anuke.annotations.Annotations.Serialize;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.Platform;
import io.anuke.mindustry.entities.Player;
@@ -326,22 +327,24 @@ public class JoinDialog extends FloatingDialog{
}
private void loadServers(){
servers = Settings.getJson("server-list", Array.class);
servers = Settings.getBinary("server-list", Array.class, () -> new Array<>());
}
private void saveServers(){
Settings.putJson("server-list", servers);
Settings.putBinary("server-list", servers);
Settings.save();
}
static class Server{
String ip;
int port;
@Serialize
public static class Server{
public String ip;
public int port;
transient Host host;
transient Table content;
void setIP(String ip){
//parse ip:port, if unsuccessful, use default values
if(ip.lastIndexOf(':') != -1 && ip.lastIndexOf(':') != ip.length()-1){
try{
@@ -362,6 +365,6 @@ public class JoinDialog extends FloatingDialog{
return ip + (port != Vars.port ? ":" + port : "");
}
Server(){}
public Server(){}
}
}