mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-04 15:27:19 +07:00
Code Issues Packages Projects Releases Wiki Activity

Better mod parsing

Browse Source
This commit is contained in:
Anuken
2019-11-20 18:09:43 -05:00
parent 8be948300e
commit 968f3ace33
4 changed files with 55 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
core/src/io/anuke/mindustry/mod/ContentParser.java
View File

@ -104,7 +104,7 @@ public class ContentParser{
return t;
}
private <T> T internalRead(Class<T> type, Class elementType, JsonValue jsonData, Class keyType){
private <T> T internalRead(Class<T> type, Class elementType, JsonValue jsonData, Class keyType){
if(type != null){
if(classParsers.containsKey(type)){
try{
@ -114,6 +114,29 @@ public class ContentParser{
}
}
//try to parse "item/amount" syntax
try{
if(type == ItemStack.class && jsonData.isString() && jsonData.asString().contains("/")){
String[] split = jsonData.asString().split("/");
return (T)fromJson(ItemStack.class, "{item: " + split[0] + ", amount: " + split[1] + "}");
}
}catch(Throwable ignored){
}
//try to parse "liquid/amount" syntax
try{
if(jsonData.isString() && jsonData.asString().contains("/")){
String[] split = jsonData.asString().split("/");
if(type == LiquidStack.class){
return (T)fromJson(LiquidStack.class, "{liquid: " + split[0] + ", amount: " + split[1] + "}");
}else if(type == ConsumeLiquid.class){
return (T)fromJson(ConsumeLiquid.class, "{liquid: " + split[0] + ", amount: " + split[1] + "}");
}
}
}catch(Throwable ignored){
}
if(Content.class.isAssignableFrom(type)){
ContentType ctype = contentTypes.getThrow(type, () -> new IllegalArgumentException("No content type for class: " + type.getSimpleName()));
String prefix = currentMod != null ? currentMod.name + "-" : "";
@ -342,7 +365,22 @@ public class ContentParser{
init();
}
JsonValue value = parser.fromJson(null, Jval.read(json).toString(Jformat.plain));
JsonValue value;
try{
//try to read hjson, bail out if it doesn't work
value = parser.fromJson(null, Jval.read(json).toString(Jformat.plain));
}catch(Throwable t){
try{
value = parser.fromJson(null, json);
}catch(Throwable extra){
if(t instanceof RuntimeException){
throw t;
}else{
throw new RuntimeException(t);
}
}
}
if(!parsers.containsKey(type)){
throw new SerializationException("No parsers for content type '" + type + "'");
}

17
core/src/io/anuke/mindustry/mod/Mods.java
View File

@ -14,6 +14,7 @@ import io.anuke.arc.util.ArcAnnotate.*;
import io.anuke.arc.util.*;
import io.anuke.arc.util.io.*;
import io.anuke.arc.util.serialization.*;
import io.anuke.arc.util.serialization.Jval.*;
import io.anuke.mindustry.core.*;
import io.anuke.mindustry.ctype.*;
import io.anuke.mindustry.game.EventType.*;
@ -172,8 +173,7 @@ public class Mods implements Loadable{
/** Loads all mods from the folder, but does not call any methods on them.*/
public void load(){
for(FileHandle file : modDirectory.list()){
if(!file.extension().equals("jar") && !file.extension().equals("zip") && !(file.isDirectory() && file.child("mod.json").exists())) continue;
if(!file.extension().equals("jar") && !file.extension().equals("zip") && !(file.isDirectory() && (file.child("mod.json").exists() || file.child("mod.js").exists()))) continue;
Log.debug("[Mods] Loading mod {0}", file);
try{
@ -482,13 +482,22 @@ public class Mods implements Loadable{
zip = zip.list()[0];
}
FileHandle metaf = zip.child("mod.json").exists() ? zip.child("mod.json") : zip.child("plugin.json");
FileHandle metaf = zip.child("mod.json").exists() ? zip.child("mod.json") : zip.child("mod.js").exists() ? zip.child("mod.js") : zip.child("plugin.json");
if(!metaf.exists()){
Log.warn("Mod {0} doesn't have a 'mod.json'/'plugin.json' file, skipping.", sourceFile);
throw new IllegalArgumentException("No mod.json found.");
}
ModMeta meta = json.fromJson(ModMeta.class, metaf.readString());
//try to read as hjson if possible
String readString = metaf.readString();
try{
readString = Jval.read(readString).toString(Jformat.plain);
}catch(Throwable e){
e.printStackTrace();
readString = metaf.readString();
}
ModMeta meta = json.fromJson(ModMeta.class, readString);
String camelized = meta.name.replace(" ", "");
String mainClass = meta.main == null ? camelized.toLowerCase() + "." + camelized + "Mod" : meta.main;
String baseName = meta.name.toLowerCase().replace(" ", "-");

2
desktop/src/io/anuke/mindustry/desktop/steam/SWorkshop.java
View File

@ -39,7 +39,7 @@ public class SWorkshop implements SteamUGCCallback{
workshopFiles.put(Map.class, folders.select(f -> f.list().length == 1 && f.list()[0].extension().equals(mapExtension)).map(f -> f.list()[0]));
workshopFiles.put(Schematic.class, folders.select(f -> f.list().length == 1 && f.list()[0].extension().equals(schematicExtension)).map(f -> f.list()[0]));
workshopFiles.put(LoadedMod.class, folders.select(f -> f.child("mod.json").exists()));
workshopFiles.put(LoadedMod.class, folders.select(f -> f.child("mod.json").exists() || f.child("mod.js").exists()));
if(!workshopFiles.get(Map.class).isEmpty()){
SAchievement.downloadMapWorkshop.complete();

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=e9f5ea632c36a9890d6a96c7e9f1cef62ad92b54
archash=