diff --git a/common-files/src/main/resources/config.yml b/common-files/src/main/resources/config.yml index ac123e9ba..a3e6d2400 100644 --- a/common-files/src/main/resources/config.yml +++ b/common-files/src/main/resources/config.yml @@ -97,7 +97,7 @@ resource-pack: enable: true # Use Zopfli for PNG compression (very slow). More iterations = smaller files. # In fact, setting the number of iterations between 4 and 8 is generally sufficient. Increasing it further rarely leads to significant optimization in size. - zopfli-iterations: 6 # 0 = disable + zopfli-iterations: 0 # 0 = disable # If your image is special, for example, containing color pixels that need to be specifically recognized by a shader, the optimization might break it. You can add exclusions here. exclude: - assets/minecraft/textures/block/do_not_optimize.png diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/condition/ExpressionCondition.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/condition/ExpressionCondition.java index 3dc4a67e2..b378df015 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/condition/ExpressionCondition.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/condition/ExpressionCondition.java @@ -27,7 +27,7 @@ public class ExpressionCondition implements Condition @Override public boolean test(CTX ctx) { - String exp = this.expression.get(ctx); + String exp = this.expression.get(ctx).replace("\\<", "<"); // fixme minimessage added a \ before < Expression expr = new Expression(exp); try { return expr.evaluate().getBooleanValue(); diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/text/TextProviders.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/text/TextProviders.java index b55de1e34..8e60616f6 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/context/text/TextProviders.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/context/text/TextProviders.java @@ -7,9 +7,9 @@ public class TextProviders { public static final Key TAG = Key.of("craftengine:tag"); public static TextProvider fromString(String string) { - if (!string.contains("<") || !string.contains(">")) { - return PlainTextProvider.of(string); + if (string.contains("<") && string.contains(">")) { + return TagTextProvider.of(string); } - return TagTextProvider.of(string); + return PlainTextProvider.of(string); } }