From 2c5eae6c6c4fae4f5f663859b76dfbb889972dc8 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 15 Jun 2021 09:35:12 +0100 Subject: [PATCH] Removed unused imports --- .../eco/internal/config/ConfigWrapper.java | 2 +- .../internal/config/JSONConfigSection.java | 1 - .../internal/config/JSONConfigWrapper.java | 25 +++++-------------- .../internal/config/LoadableJsonConfig.java | 11 -------- 4 files changed, 7 insertions(+), 32 deletions(-) diff --git a/eco-api/src/main/java/com/willfp/eco/internal/config/ConfigWrapper.java b/eco-api/src/main/java/com/willfp/eco/internal/config/ConfigWrapper.java index dfbdc707..ba9c710f 100644 --- a/eco-api/src/main/java/com/willfp/eco/internal/config/ConfigWrapper.java +++ b/eco-api/src/main/java/com/willfp/eco/internal/config/ConfigWrapper.java @@ -1,7 +1,7 @@ package com.willfp.eco.internal.config; -import com.willfp.eco.util.StringUtils; import com.willfp.eco.core.config.Config; +import com.willfp.eco.util.StringUtils; import lombok.Getter; import org.apache.commons.lang.Validate; import org.bukkit.configuration.ConfigurationSection; diff --git a/eco-api/src/main/java/com/willfp/eco/internal/config/JSONConfigSection.java b/eco-api/src/main/java/com/willfp/eco/internal/config/JSONConfigSection.java index a05f6cfb..0fe11ad0 100644 --- a/eco-api/src/main/java/com/willfp/eco/internal/config/JSONConfigSection.java +++ b/eco-api/src/main/java/com/willfp/eco/internal/config/JSONConfigSection.java @@ -1,6 +1,5 @@ package com.willfp.eco.internal.config; -import org.bukkit.configuration.ConfigurationSection; import org.jetbrains.annotations.NotNull; import java.util.Map; diff --git a/eco-api/src/main/java/com/willfp/eco/internal/config/JSONConfigWrapper.java b/eco-api/src/main/java/com/willfp/eco/internal/config/JSONConfigWrapper.java index b8f222c0..42c509d8 100644 --- a/eco-api/src/main/java/com/willfp/eco/internal/config/JSONConfigWrapper.java +++ b/eco-api/src/main/java/com/willfp/eco/internal/config/JSONConfigWrapper.java @@ -2,35 +2,17 @@ package com.willfp.eco.internal.config; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.willfp.eco.core.EcoPlugin; import com.willfp.eco.core.config.Config; -import com.willfp.eco.util.StringUtils; -import lombok.AccessLevel; import lombok.Getter; import org.apache.commons.lang.Validate; import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.configuration.InvalidConfigurationException; -import org.bukkit.configuration.file.YamlConfiguration; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.StandardOpenOption; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Objects; @SuppressWarnings({"unchecked", "unused"}) public abstract class JSONConfigWrapper implements Config { @@ -97,7 +79,12 @@ public abstract class JSONConfigWrapper implements Config { @Override @Nullable public Config getSubsectionOrNull(@NotNull final String path) { - + if (values.containsKey(path)) { + Map subsection = (Map) values.get(path); + return new JSONConfigSection(subsection); + } else { + return null; + } } @Override diff --git a/eco-api/src/main/java/com/willfp/eco/internal/config/LoadableJsonConfig.java b/eco-api/src/main/java/com/willfp/eco/internal/config/LoadableJsonConfig.java index a838c38d..fbfad714 100644 --- a/eco-api/src/main/java/com/willfp/eco/internal/config/LoadableJsonConfig.java +++ b/eco-api/src/main/java/com/willfp/eco/internal/config/LoadableJsonConfig.java @@ -1,18 +1,11 @@ package com.willfp.eco.internal.config; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import com.willfp.eco.core.EcoPlugin; -import com.willfp.eco.core.config.Config; -import com.willfp.eco.util.StringUtils; import lombok.AccessLevel; import lombok.Getter; -import org.apache.commons.lang.Validate; -import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.io.BufferedReader; import java.io.File; @@ -26,11 +19,7 @@ import java.io.OutputStream; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.StandardOpenOption; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; @SuppressWarnings({"unchecked", "unused"}) public abstract class LoadableJsonConfig extends JSONConfigWrapper implements LoadableConfig {