diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index 64f285c15d..47e16db0af 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -119,7 +119,15 @@ public class ContentParser{ } 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) -> { if(data.isString()){ StatusEffect result = locate(ContentType.status, data.asString()); diff --git a/gradle.properties b/gradle.properties index 823e4fa247..eaf93dee38 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,4 +26,4 @@ org.gradle.caching=true org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 android.enableR8.fullMode=false -archash=b82cebe3d8 +archash=2d81a887eb