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

Remapping fixes

Browse Source
This commit is contained in:
Anuken
2025-05-22 18:55:36 -04:00
parent 268a87a6c0
commit 9c807cb82c
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/mindustry/game/Saves.java
View File

@@ -86,13 +86,13 @@ public class Saves{
if(!name.isEmpty()){ //if this save had a preset defined... if(!name.isEmpty()){ //if this save had a preset defined...
SectorPreset preset = content.sector(name); SectorPreset preset = content.sector(name);
//...place it in the right sector according to its preset //...place it in the right sector according to its preset
if(preset != null && preset.sector != sector){ if(preset != null && preset.sector != sector && preset.requireUnlock){
remapTarget = preset.sector; remapTarget = preset.sector;
} }
} }
}else{ //there was no sector preset in the meta at all, which means this is a legacy save that may need mapping }else{ //there was no sector preset in the meta at all, which means this is a legacy save that may need mapping
SectorPreset target = content.sectors().find(s -> s.planet == sector.planet && s.originalPosition == sector.id); SectorPreset target = content.sectors().find(s -> s.planet == sector.planet && s.originalPosition == sector.id);
if(target != null && target.sector != sector){ //there is indeed a sector preset that used to have this ID, and it needs remapping! if(target != null && target.sector != sector && target.requireUnlock){ //there is indeed a sector preset that used to have this ID, and it needs remapping!
remapTarget = target.sector; remapTarget = target.sector;
} }
} }
@@ -100,8 +100,9 @@ public class Saves{
if(remapTarget != null){ if(remapTarget != null){
//if the file name matches the destination of the remap, assume it has already been remapped, and skip the file movement procedure //if the file name matches the destination of the remap, assume it has already been remapped, and skip the file movement procedure
if(!slot.file.equals(getSectorFile(remapTarget))){ if(!slot.file.equals(getSectorFile(remapTarget))){
Log.info("Remapping sectors: @: @ -> @", sector.id, remapTarget.id); Log.info("Remapping sector: @ -> @ (@)", sector.id, remapTarget.id, remapTarget.preset);
sector.loadInfo();
//overwrite the target sector's info with the save's info //overwrite the target sector's info with the save's info
Core.settings.putJson(remapTarget.planet.name + "-s-" + remapTarget.id + "-info", sector.info); Core.settings.putJson(remapTarget.planet.name + "-s-" + remapTarget.id + "-info", sector.info);
remapTarget.loadInfo(); remapTarget.loadInfo();
@@ -113,8 +114,10 @@ public class Saves{
remapTarget.save = slot; remapTarget.save = slot;
try{ try{
Fi target = getSectorFile(remapTarget);
//move over save file //move over save file
slot.file.moveTo(getSectorFile(remapTarget)); slot.file.moveTo(target);
slot.file = target;
}catch(Exception e){ }catch(Exception e){
Log.err("Failed to move sector files when remapping: " + sector.id + " -> " + remapTarget.id, e); Log.err("Failed to move sector files when remapping: " + sector.id + " -> " + remapTarget.id, e);
} }
@@ -244,7 +247,7 @@ public class Saves{
} }
public class SaveSlot{ public class SaveSlot{
public final Fi file; public Fi file;
boolean requestedPreview; boolean requestedPreview;
public SaveMeta meta; public SaveMeta meta;