removed s7a base64 item lib

+ removed s7a base64 item lib
leaderos-net · Oct 14, 2023 · b443fdd · b443fdd
1 parent 0ae82c3
commit b443fdd
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 14 deletions.
diff --git a/bukkit/pom.xml b/bukkit/pom.xml
@@ -79,11 +79,6 @@
             <version>2.11.1</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>dev.s7a</groupId>
-            <artifactId>base64-itemstack</artifactId>
-            <version>1.0.0</version>
-        </dependency>
         <!-- Spigot -->
         <dependency>
             <groupId>org.spigotmc</groupId>

diff --git a/bukkit/src/main/java/net/leaderos/plugin/modules/bazaar/gui/BazaarAddItemGui.java b/bukkit/src/main/java/net/leaderos/plugin/modules/bazaar/gui/BazaarAddItemGui.java
@@ -2,7 +2,6 @@
 
 import com.cryptomorin.xseries.XMaterial;
 import de.themoep.inventorygui.*;
-import dev.s7a.base64.Base64ItemStack;
 import lombok.SneakyThrows;
 import net.leaderos.plugin.Main;
 import net.leaderos.plugin.helpers.ChatUtil;
@@ -102,7 +101,7 @@ public static void showGui(Player player, int itemAmount) {
                 int amount = item.getAmount();
                 int maxDurability = item.getType().getMaxDurability();
                 int durability = ItemUtils.getDurability(item, maxDurability);
-                String base64 = Base64ItemStack.encode(item);
+                String base64 = ItemUtils.toBase64(item);
                 double price = 0.0;
                 String creationDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
                 String modelId = ItemUtils.getModelId(item);

diff --git a/bukkit/src/main/java/net/leaderos/plugin/modules/bazaar/model/PlayerBazaar.java b/bukkit/src/main/java/net/leaderos/plugin/modules/bazaar/model/PlayerBazaar.java
@@ -1,6 +1,5 @@
 package net.leaderos.plugin.modules.bazaar.model;
 
-import dev.s7a.base64.Base64ItemStack;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.SneakyThrows;
@@ -11,7 +10,6 @@
 import net.leaderos.shared.model.Response;
 import net.leaderos.shared.model.request.DeleteRequest;
 import net.leaderos.shared.model.request.GetRequest;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
@@ -61,7 +59,7 @@ public PlayerBazaar(JSONObject response, String userId) {
      * @return ItemStack of bazaar item
      */
     public ItemStack getItem() {
-        ItemStack item = Base64ItemStack.decode(getBase64());
+        ItemStack item = ItemUtils.fromBase64(getBase64());
         ItemMeta meta = item.getItemMeta();
         List<String> lore = new ArrayList<>();
         if (meta != null && meta.getLore() != null)

diff --git a/pom.xml b/pom.xml
@@ -138,10 +138,6 @@
                             <pattern>eu.okaeri</pattern>
                             <shadedPattern>net.leaderos.shades.okaeri</shadedPattern>
                         </relocation>
-                        <relocation>
-                            <pattern>dev.s7a</pattern>
-                            <shadedPattern>net.leaderos.shades.s7a</shadedPattern>
-                        </relocation>
                     </relocations>
                 </configuration>
                 <executions>