Remove the number_classes set in favour of ClassUtils (#860)

This commit is contained in:
altrisi authored and GitHub committed 2021-05-15 18:53:50 -03:00
1 parent fd492f334c
commit 69e9e9b0bb
1 file changed
+3 -4
@@ -3,7 +3,6 @@ package carpet.settings;
import carpet.utils.Translations;
import carpet.utils.Messenger;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Sets;
import net.minecraft.server.command.ServerCommandSource;
import java.lang.reflect.Constructor;
@@ -12,7 +11,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import org.apache.commons.lang3.ClassUtils;
import static carpet.utils.Translations.tr;
@@ -39,7 +39,6 @@ public final class ParsedRule<T> implements Comparable<ParsedRule> {
public final T defaultValue;
public final String defaultAsString;
public final SettingsManager settingsManager;
private static final Set<Class<?>> NUMBER_CLASSES = Sets.newHashSet(byte.class, short.class, int.class, long.class, float.class, double.class);
ParsedRule(Field field, Rule rule, SettingsManager settingsManager)
{
@@ -216,7 +215,7 @@ public final class ParsedRule<T> implements Comparable<ParsedRule> {
public boolean getBoolValue()
{
if (type == boolean.class) return (Boolean) get();
if (NUMBER_CLASSES.contains(type)) return ((Number) get()).doubleValue() > 0;
if (ClassUtils.primitiveToWrapper(type).isAssignableFrom(Number.class)) return ((Number) get()).doubleValue() > 0;
return false;
}