Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

remove legacy load

Browse source
This commit is contained in:
Shadows_of_Fire 2018-07-07 05:35:39 -04:00
parent 61e3f2c9fe
commit fb6cedbb71
1 changed files with 25 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
src/main/java/de/ellpeck/actuallyadditions/mod/data/WorldData.java
View file

@ -29,43 +29,39 @@ import java.util.List;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
public class WorldData extends WorldSavedData{ public class WorldData extends WorldSavedData {
public static final String DATA_TAG = ActuallyAdditions.MODID+"data"; public static final String DATA_TAG = ActuallyAdditions.MODID + "data";
//TODO Remove this as well
public static List<File> legacyLoadWorlds = new ArrayList<File>();
private static WorldData data; private static WorldData data;
public final ConcurrentSet<Network> laserRelayNetworks = new ConcurrentSet<Network>(); public final ConcurrentSet<Network> laserRelayNetworks = new ConcurrentSet<Network>();
public final ConcurrentHashMap<UUID, PlayerSave> playerSaveData = new ConcurrentHashMap<UUID, PlayerSave>(); public final ConcurrentHashMap<UUID, PlayerSave> playerSaveData = new ConcurrentHashMap<UUID, PlayerSave>();
public WorldData(String name){ public WorldData(String name) {
super(name); super(name);
} }
public static WorldData get(World world, boolean forceLoad){ public static WorldData get(World world, boolean forceLoad) {
WorldData w = getInternal(world, forceLoad); WorldData w = getInternal(world, forceLoad);
if(w == null) ActuallyAdditions.LOGGER.error("What the hell how is this stupid thing null again AEWBFINCEMR"); if (w == null) ActuallyAdditions.LOGGER.error("An impossible bug has occured.");
return w == null ? new WorldData(DATA_TAG) : w; return w == null ? new WorldData(DATA_TAG) : w;
} }
private static WorldData getInternal(World world, boolean forceLoad){ private static WorldData getInternal(World world, boolean forceLoad) {
if(forceLoad || data == null){ if (forceLoad || data == null) {
if(!world.isRemote){ if (!world.isRemote) {
WorldSavedData savedData = world.loadData(WorldData.class, DATA_TAG); WorldSavedData savedData = world.loadData(WorldData.class, DATA_TAG);
if(!(savedData instanceof WorldData)){ if (savedData == null) {
ActuallyAdditions.LOGGER.info("No WorldData found, creating..."); ActuallyAdditions.LOGGER.info("No WorldData found, creating...");
WorldData newData = new WorldData(DATA_TAG); WorldData newData = new WorldData(DATA_TAG);
world.setData(DATA_TAG, newData); world.setData(DATA_TAG, newData);
data = newData; data = newData;
} } else {
else{
data = (WorldData) savedData; data = (WorldData) savedData;
ActuallyAdditions.LOGGER.info("Successfully loaded WorldData!"); ActuallyAdditions.LOGGER.info("Successfully loaded WorldData!");
} }
} } else {
else{
data = new WorldData(DATA_TAG); data = new WorldData(DATA_TAG);
ActuallyAdditions.LOGGER.info("Created temporary WorldData to cache data on the client!"); ActuallyAdditions.LOGGER.info("Created temporary WorldData to cache data on the client!");
} }
@ -73,45 +69,29 @@ public class WorldData extends WorldSavedData{
return data; return data;
} }
public static void clear(){ public static void clear() {
if(data != null){ if (data != null) {
data = null; data = null;
ActuallyAdditions.LOGGER.info("Unloaded WorldData!"); ActuallyAdditions.LOGGER.info("Unloaded WorldData!");
} }
} }
public static WorldData get(World world){ public static WorldData get(World world) {
return get(world, false); return get(world, false);
} }
//TODO Remove old loading mechanic after a while because it's legacy @Override
public static void loadLegacy(World world){ public void readFromNBT(NBTTagCompound compound) {
if(!world.isRemote && world instanceof WorldServer){ this.laserRelayNetworks.clear();
int dim = world.provider.getDimension();
ISaveHandler handler = new WorldSpecificSaveHandler((WorldServer)world, world.getSaveHandler());
File dataFile = handler.getMapFileFromName(DATA_TAG+dim);
legacyLoadWorlds.add(dataFile);
}
}
//TODO Remove merging once removing old save handler
private void readFromNBT(NBTTagCompound compound, boolean merge){
//Laser World Data
if(!merge){
this.laserRelayNetworks.clear();
}
NBTTagList networkList = compound.getTagList("Networks", 10); NBTTagList networkList = compound.getTagList("Networks", 10);
for(int i = 0; i < networkList.tagCount(); i++){ for (int i = 0; i < networkList.tagCount(); i++) {
Network network = LaserRelayConnectionHandler.readNetworkFromNBT(networkList.getCompoundTagAt(i)); Network network = LaserRelayConnectionHandler.readNetworkFromNBT(networkList.getCompoundTagAt(i));
this.laserRelayNetworks.add(network); this.laserRelayNetworks.add(network);
} }
//Player Data this.playerSaveData.clear();
if(!merge){
this.playerSaveData.clear();
}
NBTTagList playerList = compound.getTagList("PlayerData", 10); NBTTagList playerList = compound.getTagList("PlayerData", 10);
for(int i = 0; i < playerList.tagCount(); i++){ for (int i = 0; i < playerList.tagCount(); i++) {
NBTTagCompound player = playerList.getCompoundTagAt(i); NBTTagCompound player = playerList.getCompoundTagAt(i);
UUID id = player.getUniqueId("UUID"); UUID id = player.getUniqueId("UUID");
@ -124,22 +104,17 @@ public class WorldData extends WorldSavedData{
} }
@Override @Override
public void readFromNBT(NBTTagCompound compound){ public NBTTagCompound writeToNBT(NBTTagCompound compound) {
this.readFromNBT(compound, false);
}
@Override
public NBTTagCompound writeToNBT(NBTTagCompound compound){
//Laser World Data //Laser World Data
NBTTagList networkList = new NBTTagList(); NBTTagList networkList = new NBTTagList();
for(Network network : this.laserRelayNetworks){ for (Network network : this.laserRelayNetworks) {
networkList.appendTag(LaserRelayConnectionHandler.writeNetworkToNBT(network)); networkList.appendTag(LaserRelayConnectionHandler.writeNetworkToNBT(network));
} }
compound.setTag("Networks", networkList); compound.setTag("Networks", networkList);
//Player Data //Player Data
NBTTagList playerList = new NBTTagList(); NBTTagList playerList = new NBTTagList();
for(PlayerSave save : this.playerSaveData.values()){ for (PlayerSave save : this.playerSaveData.values()) {
NBTTagCompound player = new NBTTagCompound(); NBTTagCompound player = new NBTTagCompound();
player.setUniqueId("UUID", save.id); player.setUniqueId("UUID", save.id);