From 2968f77ed08e4ebe111ec63201ea1a5203613c3d Mon Sep 17 00:00:00 2001 From: gnembon Date: Sun, 23 Feb 2020 02:40:48 -0400 Subject: [PATCH] affixed ROOT locale, should fix #151 --- src/main/java/carpet/script/CarpetExpression.java | 6 +++--- src/main/java/carpet/script/Expression.java | 2 +- src/main/java/carpet/script/value/LazyListValue.java | 4 ++-- src/main/java/carpet/script/value/NumericValue.java | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index e12fae08..cf6efa92 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -2860,7 +2860,7 @@ public class CarpetExpression @Override public String getString() { - return String.format("rect[(%d,%d,%d),..,(%d,%d,%d)]",minx, miny, minz, maxx, maxy, maxz); + return String.format(Locale.ROOT, "rect[(%d,%d,%d),..,(%d,%d,%d)]",minx, miny, minz, maxx, maxy, maxz); } }; }); @@ -2957,7 +2957,7 @@ public class CarpetExpression @Override public String getString() { - return String.format("diamond[(%d,%d,%d),%d,0]",cx, cy, cz, width); + return String.format(Locale.ROOT, "diamond[(%d,%d,%d),%d,0]",cx, cy, cz, width); } }; } @@ -3019,7 +3019,7 @@ public class CarpetExpression @Override public String getString() { - return String.format("diamond[(%d,%d,%d),%d,%d]",cx, cy, cz, width, height); + return String.format(Locale.ROOT, "diamond[(%d,%d,%d),%d,%d]",cx, cy, cz, width, height); } }; } diff --git a/src/main/java/carpet/script/Expression.java b/src/main/java/carpet/script/Expression.java index 37f90bc6..acef00cd 100644 --- a/src/main/java/carpet/script/Expression.java +++ b/src/main/java/carpet/script/Expression.java @@ -2944,7 +2944,7 @@ public class Expression } try { - return new StringValue(String.format(format, args.toArray())); + return new StringValue(String.format(Locale.ROOT, format, args.toArray())); } catch (IllegalFormatException ife) { diff --git a/src/main/java/carpet/script/value/LazyListValue.java b/src/main/java/carpet/script/value/LazyListValue.java index 127c79e9..55df4ae5 100644 --- a/src/main/java/carpet/script/value/LazyListValue.java +++ b/src/main/java/carpet/script/value/LazyListValue.java @@ -3,9 +3,9 @@ package carpet.script.value; import carpet.script.exception.InternalExpressionException; import java.util.ArrayList; -import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.Locale; public abstract class LazyListValue extends AbstractListValue implements Iterator { @@ -48,7 +48,7 @@ public abstract class LazyListValue extends AbstractListValue implements Iterato @Override public String getString() { - return String.format("[%d, %d, ..., %d]",start, start+stepp, limit); + return String.format(Locale.ROOT, "[%d, %d, ..., %d]",start, start+stepp, limit); } }; } diff --git a/src/main/java/carpet/script/value/NumericValue.java b/src/main/java/carpet/script/value/NumericValue.java index 5d31654b..a402e151 100644 --- a/src/main/java/carpet/script/value/NumericValue.java +++ b/src/main/java/carpet/script/value/NumericValue.java @@ -4,6 +4,7 @@ import carpet.script.exception.InternalExpressionException; import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; +import java.util.Locale; import static java.lang.Math.abs; @@ -42,7 +43,7 @@ public class NumericValue extends Value } else { - return String.format("%.1f..", getDouble()); + return String.format(Locale.ROOT, "%.1f..", getDouble()); } }