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

Patcher fixes

Browse Source
This commit is contained in:
Anuken
2025-10-22 07:01:26 -04:00
parent 49bbd0b593
commit 45db096f0f
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,6 +97,7 @@ public class ContentParser{
} }
} }
}); });
put(TextureRegion.class, (type, data) -> Core.atlas.find(data.asString()));
put(Color.class, (type, data) -> Color.valueOf(data.asString())); put(Color.class, (type, data) -> Color.valueOf(data.asString()));
put(StatusEffect.class, (type, data) -> { put(StatusEffect.class, (type, data) -> {
if(data.isString()){ if(data.isString()){

5
core/src/mindustry/mod/ContentPatcher.java
View File

@@ -242,6 +242,11 @@ public class ContentPatcher{
if(value instanceof JsonValue jsv){ //setting values from object if(value instanceof JsonValue jsv){ //setting values from object
if(prevValue == null || !jsv.isObject() || jsv.has("type")){ if(prevValue == null || !jsv.isObject() || jsv.has("type")){
if(UnlockableContent.class.isAssignableFrom(metadata.type) && (jsv.isObject())){
warn("New content must not be instantiated: @", jsv);
return;
}
if(modify) modifiedField(object, field, getter.get()); if(modify) modifiedField(object, field, getter.get());
try{ try{
setter.get(json.readValue(metadata.type, metadata.elementType, jsv)); setter.get(json.readValue(metadata.type, metadata.elementType, jsv));