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

Fixed JSON sector preset files failing to load

Browse Source
This commit is contained in:
Anuken
2023-05-10 15:57:43 -04:00
parent e60fff43bd
commit 51daa82a1b
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/mindustry/maps/generators/FileMapGenerator.java
View File

@@ -1,6 +1,7 @@
package mindustry.maps.generators; package mindustry.maps.generators;
import arc.math.geom.*; import arc.math.geom.*;
import mindustry.*;
import mindustry.content.*; import mindustry.content.*;
import mindustry.game.*; import mindustry.game.*;
import mindustry.io.*; import mindustry.io.*;
@@ -16,7 +17,13 @@ public class FileMapGenerator implements WorldGenerator{
public final SectorPreset preset; public final SectorPreset preset;
public FileMapGenerator(String mapName, SectorPreset preset){ public FileMapGenerator(String mapName, SectorPreset preset){
this.map = maps != null ? maps.loadInternalMap(mapName) : null; //try to look for the prefixed map first, then the mod-specific one
this.map = maps != null ? maps.loadInternalMap(
preset.minfo.mod == null || Vars.tree.get("maps/" + mapName + "." + mapExtension).exists() ?
mapName :
mapName.substring(1 + preset.minfo.mod.name.length())
) : null;
this.preset = preset; this.preset = preset;
} }

2
core/src/mindustry/mod/ContentParser.java
View File

@@ -575,7 +575,7 @@ public class ContentParser{
if(!value.has("sector") || !value.get("sector").isNumber()) throw new RuntimeException("SectorPresets must have a sector number."); if(!value.has("sector") || !value.get("sector").isNumber()) throw new RuntimeException("SectorPresets must have a sector number.");
SectorPreset out = new SectorPreset(mod + "-" + name); SectorPreset out = new SectorPreset(mod + "-" + name, currentMod);
currentContent = out; currentContent = out;
read(() -> { read(() -> {

9
core/src/mindustry/type/SectorPreset.java
View File

@@ -5,6 +5,7 @@ import mindustry.ctype.*;
import mindustry.game.*; import mindustry.game.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.maps.generators.*; import mindustry.maps.generators.*;
import mindustry.mod.Mods.*;
public class SectorPreset extends UnlockableContent{ public class SectorPreset extends UnlockableContent{
public FileMapGenerator generator; public FileMapGenerator generator;
@@ -36,11 +37,17 @@ public class SectorPreset extends UnlockableContent{
} }
/** Internal use only! */ /** Internal use only! */
public SectorPreset(String name){ public SectorPreset(String name, LoadedMod mod){
super(name); super(name);
this.minfo.mod = mod;
this.generator = new FileMapGenerator(name, this); this.generator = new FileMapGenerator(name, this);
} }
/** Internal use only! */
public SectorPreset(String name){
this(name, null);
}
public void initialize(Planet planet, int sector){ public void initialize(Planet planet, int sector){
this.planet = planet; this.planet = planet;
sector %= planet.sectors.size; sector %= planet.sectors.size;