chore: use Preconditions

Slimefun · Aug 6, 2023 · 622b3e1 · 622b3e1
1 parent 881ea3f
commit 622b3e1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java
@@ -50,6 +50,8 @@
 import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils;
 import io.github.thebusybiscuit.slimefun4.utils.itemstack.ItemStackWrapper;
 
+import com.google.common.base.Preconditions;
+
 import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker;
 
 /**
@@ -890,9 +892,7 @@ public final void addOfficialWikipage(@Nonnull String page) {
      *            The associated wiki page name.
      */
     public final void addWikiPage(@Nonnull String page) {
-        Validate.notNull(page, "Wiki page cannot be null.");
-        Validate.isTrue(getState() != ItemState.UNREGISTERED, "Wiki page can only be added after item has been registered.");
-        wikiURL = Optional.of(getAddon().getWikiURL().replace("%item%", page));
+        addCustomWikiPage(getAddon().getWikiURL().replace("%item%", page));
     }
 
     /**
@@ -902,8 +902,8 @@ public final void addWikiPage(@Nonnull String page) {
      *            The associated wiki page URL.
      */
     public final void addCustomWikiPage(@Nonnull String url) {
-        Validate.notNull(url, "Wiki URL cannot be null.");
-        Validate.isTrue(getState() != ItemState.UNREGISTERED, "Wiki page can only be added after item has been registered.");
+        Preconditions.checkArgument(url != null, "Wiki page cannot be null.");
+        Preconditions.checkState(getState() != ItemState.UNREGISTERED, "Wiki page can only be added after item has been registered.");
         wikiURL = Optional.of(url);
     }
 

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/WikiUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/WikiUtils.java
@@ -11,12 +11,12 @@
 
 import javax.annotation.Nonnull;
 
-import org.apache.commons.lang.Validate;
 import org.bukkit.plugin.Plugin;
 
 import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon;
 import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
 
+import com.google.common.base.Preconditions;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
@@ -48,8 +48,9 @@ public static void setupWiki(@Nonnull Plugin plugin) {
      *          The formatter to apply to the wiki page name.
      */
     public static void setupWiki(@Nonnull Plugin plugin, @Nonnull UnaryOperator<String> formatter) {
-        Validate.notNull(plugin, "The plugin cannot be null");
-        Validate.isTrue(plugin instanceof SlimefunAddon, "The plugin must be a SlimefunAddon");
+        Preconditions.checkArgument(plugin != null, "The plugin cannot be null");
+        Preconditions.checkArgument(formatter != null, "The formatter cannot be null");
+        Preconditions.checkArgument(plugin instanceof SlimefunAddon, "The plugin must be a SlimefunAddon");
 
         try (BufferedReader reader = new BufferedReader(new InputStreamReader(plugin.getClass().getResourceAsStream("/wiki.json"), StandardCharsets.UTF_8))) {
             JsonElement element = JsonUtils.parseString(reader.lines().collect(Collectors.joining("")));