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

Fixed #11548

Browse Source
This commit is contained in:
Anuken
2026-01-09 19:42:03 -05:00
parent fc1bfe0b24
commit ac2401daf1
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,7 +119,15 @@ public class ContentParser{
} }
return result; return result;
}); });
put(Color.class, (type, data) -> Color.valueOf(data.asString())); put(Color.class, (type, data) -> {
if(data.isNumber()){
int len = data.asString().length();
if(len != 6 && len != 8){
warn("@Colors should strings, not numbers. Make sure you have quotes around the value, or they will not be parsed correctly: '@'", currentContent == null ? "" : "[" + currentContent.minfo.sourceFile.name() + "]: ", data);
}
}
return Color.valueOf(data.asString());
});
put(StatusEffect.class, (type, data) -> { put(StatusEffect.class, (type, data) -> {
if(data.isString()){ if(data.isString()){
StatusEffect result = locate(ContentType.status, data.asString()); StatusEffect result = locate(ContentType.status, data.asString());

2
gradle.properties
View File

@@ -26,4 +26,4 @@ org.gradle.caching=true
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
android.enableR8.fullMode=false android.enableR8.fullMode=false
archash=b82cebe3d8 archash=2d81a887eb