Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 08:48: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

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

@ -32,8 +32,6 @@ 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>();
@ -44,7 +42,7 @@ public class WorldData extends WorldSavedData{
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;
} }
@ -53,19 +51,17 @@ public class WorldData extends WorldSavedData{
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!");
} }
@ -84,32 +80,16 @@ public class WorldData extends WorldSavedData{
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){
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(); 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
if(!merge){
this.playerSaveData.clear(); 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);
@ -123,11 +103,6 @@ public class WorldData extends WorldSavedData{
} }
} }
@Override
public void readFromNBT(NBTTagCompound compound){
this.readFromNBT(compound, false);
}
@Override @Override
public NBTTagCompound writeToNBT(NBTTagCompound compound) { public NBTTagCompound writeToNBT(NBTTagCompound compound) {
//Laser World Data //Laser World Data