OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 16:19:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix number parsing (#8013)

Browse source
This commit is contained in:
Jake Potrebic 2022-06-17 11:28:18 -07:00
parent efcee6889d
commit c517b28adc
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
patches/server/Paper-config-files.patch
View file

@ -3565,6 +3565,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+import java.util.OptionalDouble; +import java.util.OptionalDouble;
+import java.util.function.Predicate; +import java.util.function.Predicate;
+ +
+@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
+public final class DoubleOrDefault { +public final class DoubleOrDefault {
+ private static final String DEFAULT_VALUE = "default"; + private static final String DEFAULT_VALUE = "default";
+ public static final DoubleOrDefault USE_DEFAULT = new DoubleOrDefault(OptionalDouble.empty()); + public static final DoubleOrDefault USE_DEFAULT = new DoubleOrDefault(OptionalDouble.empty());
@ -3602,10 +3603,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ if (NumberUtils.isParsable(string)) { + if (NumberUtils.isParsable(string)) {
+ return new DoubleOrDefault(OptionalDouble.of(Double.parseDouble(string))); + return new DoubleOrDefault(OptionalDouble.of(Double.parseDouble(string)));
+ } + }
+ } else if (obj instanceof Double num) { + } else if (obj instanceof Number num) {
+ return new DoubleOrDefault(OptionalDouble.of(num)); + return new DoubleOrDefault(OptionalDouble.of(num.doubleValue()));
+ } + }
+ throw new SerializationException(obj + " is of an unexpected type " + type); + throw new SerializationException(obj + "(" + type + ") is not a double or '" + DEFAULT_VALUE + "'");
+ } + }
+ +
+ @Override + @Override
@ -3730,15 +3731,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
+package io.papermc.paper.configuration.type; +package io.papermc.paper.configuration.type;
+ +
+import java.lang.reflect.Type; +import com.mojang.logging.LogUtils;
+import java.util.OptionalInt;
+import java.util.function.Predicate;
+import org.apache.commons.lang3.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils;
+import org.slf4j.Logger;
+import org.spongepowered.configurate.serialize.ScalarSerializer; +import org.spongepowered.configurate.serialize.ScalarSerializer;
+import org.spongepowered.configurate.serialize.SerializationException; +import org.spongepowered.configurate.serialize.SerializationException;
+ +
+import java.lang.reflect.Type;
+import java.util.OptionalInt;
+import java.util.function.Predicate;
+
+public record IntOrDefault(OptionalInt value) { +public record IntOrDefault(OptionalInt value) {
+ private static final String DEFAULT_VALUE = "default"; + private static final String DEFAULT_VALUE = "default";
+ private static final Logger LOGGER = LogUtils.getLogger();
+ public static final IntOrDefault USE_DEFAULT = new IntOrDefault(OptionalInt.empty()); + public static final IntOrDefault USE_DEFAULT = new IntOrDefault(OptionalInt.empty());
+ public static final ScalarSerializer<IntOrDefault> SERIALIZER = new Serializer(); + public static final ScalarSerializer<IntOrDefault> SERIALIZER = new Serializer();
+ +
@ -3760,8 +3765,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ if (NumberUtils.isParsable(string)) { + if (NumberUtils.isParsable(string)) {
+ return new IntOrDefault(OptionalInt.of(Integer.parseInt(string))); + return new IntOrDefault(OptionalInt.of(Integer.parseInt(string)));
+ } + }
+ } else if (obj instanceof Integer num) { + } else if (obj instanceof Number num) {
+ return new IntOrDefault(OptionalInt.of(num)); + if (num.intValue() != num.doubleValue() || num.intValue() != num.longValue()) {
+ LOGGER.error("{} cannot be converted to an integer without losing information", num);
+ }
+ return new IntOrDefault(OptionalInt.of(num.intValue()));
+ } + }
+ throw new SerializationException(obj + "(" + type + ") is not a integer or '" + DEFAULT_VALUE + "'"); + throw new SerializationException(obj + "(" + type + ") is not a integer or '" + DEFAULT_VALUE + "'");
+ } + }
@ -3886,6 +3894,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+import java.util.Set; +import java.util.Set;
+import java.util.function.Supplier; +import java.util.function.Supplier;
+ +
+@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
+public sealed abstract class FallbackValue permits FallbackValue.Int { +public sealed abstract class FallbackValue permits FallbackValue.Int {
+ +
+ private static final String DEFAULT_VALUE = "default"; + private static final String DEFAULT_VALUE = "default";