Slimefun RC-27

Sefiraat · Sep 4, 2021 · 3dc7dcb · 3dc7dcb
1 parent ac1f6fc
commit 3dc7dcb
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 33 deletions.
diff --git a/EquivalencyTech.iml b/EquivalencyTech.iml
@@ -1,2 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4" />
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="minecraft" name="Minecraft">
+      <configuration>
+        <autoDetectTypes>
+          <platformType>SPIGOT</platformType>
+          <platformType>PAPER</platformType>
+          <platformType>ADVENTURE</platformType>
+        </autoDetectTypes>
+      </configuration>
+    </facet>
+  </component>
+</module>
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.github.sefiraat</groupId>
   <artifactId>EquivalencyTech</artifactId>
-  <version>1.1.5</version>
+  <version>1.1.6</version>
   <build>
     <plugins>
       <plugin>
@@ -126,7 +126,7 @@
     <dependency>
       <groupId>com.github.Slimefun</groupId>
       <artifactId>Slimefun4</artifactId>
-      <version>RC-22</version>
+      <version>RC-27</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.github.sefiraat</groupId>
     <artifactId>EquivalencyTech</artifactId>
-    <version>1.1.5</version>
+    <version>1.1.6</version>
 
     <build>
         <plugins>
@@ -183,7 +183,7 @@
         <dependency>
             <groupId>com.github.Slimefun</groupId>
             <artifactId>Slimefun4</artifactId>
-            <version>RC-22</version>
+            <version>RC-27</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/commands/Commands.java b/src/main/java/io/github/sefiraat/equivalencytech/commands/Commands.java
@@ -12,8 +12,7 @@
 import io.github.sefiraat.equivalencytech.misc.Utils;
 import io.github.sefiraat.equivalencytech.statics.ContainerStorage;
 import io.github.sefiraat.equivalencytech.statics.Messages;
-import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems;
-import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/gui/GuiTransmutationOrb.java b/src/main/java/io/github/sefiraat/equivalencytech/gui/GuiTransmutationOrb.java
@@ -8,7 +8,7 @@
 import io.github.sefiraat.equivalencytech.misc.Utils;
 import io.github.sefiraat.equivalencytech.statics.ContainerStorage;
 import io.github.sefiraat.equivalencytech.statics.Messages;
-import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryAction;
@@ -63,7 +63,7 @@ public static GuiTransmutationOrb buildGui(EquivalencyTech plugin, Player player
 
             SlimefunItem sfItem = null;
             if (EquivalencyTech.getInstance().getManagerSupportedPlugins().isInstalledSlimefun()) {
-                sfItem = SlimefunItem.getByID(s);
+                sfItem = SlimefunItem.getById(s);
             }
 
             if (!plugin.getEqItems().getEqItemMap().containsKey(s) && sfItem == null) {

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/item/EQSlimefunItem.java b/src/main/java/io/github/sefiraat/equivalencytech/item/EQSlimefunItem.java
@@ -1,16 +1,16 @@
 package io.github.sefiraat.equivalencytech.item;
 
+import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
+import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
 import io.github.thebusybiscuit.slimefun4.core.attributes.NotConfigurable;
 import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable;
-import me.mrCookieSlime.Slimefun.Lists.RecipeType;
-import me.mrCookieSlime.Slimefun.Objects.Category;
-import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
-import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
 import org.bukkit.inventory.ItemStack;
 
 public class EQSlimefunItem extends SlimefunItem implements NotPlaceable, NotConfigurable {
 
-    public EQSlimefunItem(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
+    public EQSlimefunItem(ItemGroup category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) {
         super(category, item, recipeType, recipe);
         setUseableInWorkbench(true);
     }

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/misc/SlimefunEQAddon.java b/src/main/java/io/github/sefiraat/equivalencytech/misc/SlimefunEQAddon.java
@@ -6,11 +6,11 @@
 import io.github.sefiraat.equivalencytech.recipes.Recipes;
 import io.github.sefiraat.equivalencytech.statics.SkullTextures;
 import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon;
-import me.mrCookieSlime.Slimefun.Lists.RecipeType;
-import me.mrCookieSlime.Slimefun.Objects.Category;
-import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
-import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
-import me.mrCookieSlime.Slimefun.cscorelib2.recipes.MinecraftRecipe;
+import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
+import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
+import io.github.thebusybiscuit.slimefun4.libraries.dough.recipes.MinecraftRecipe;
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
@@ -38,7 +38,7 @@ public SlimefunEQAddon(EquivalencyTech plugin) {
         im.setDisplayName(ChatColor.YELLOW + "EquivalencyTech");
         im.setLore(Collections.singletonList("&a> Click to open"));
         categoryItemMain.setItemMeta(im);
-        Category eqCategory = new Category(categoryIdMain, categoryItemMain);
+        ItemGroup eqCategory = new ItemGroup(categoryIdMain, categoryItemMain);
 
         // Items
         // Coal 1

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/misc/Utils.java b/src/main/java/io/github/sefiraat/equivalencytech/misc/Utils.java
@@ -6,7 +6,7 @@
 import io.github.sefiraat.equivalencytech.item.builders.TransmutationOrb;
 import io.github.sefiraat.equivalencytech.statics.ContainerStorage;
 import io.github.sefiraat.equivalencytech.statics.Messages;
-import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
 import net.md_5.bungee.api.ChatColor;
 import org.apache.commons.lang.WordUtils;
 import org.bukkit.Material;

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/recipes/EmcDefinitions.java b/src/main/java/io/github/sefiraat/equivalencytech/recipes/EmcDefinitions.java
@@ -3,16 +3,11 @@
 import io.github.sefiraat.equivalencytech.EquivalencyTech;
 import io.github.sefiraat.equivalencytech.statics.ContainerStorage;
 import io.github.sefiraat.equivalencytech.statics.DebugLogs;
-import io.github.thebusybiscuit.slimefun4.core.SlimefunRegistry;
-import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems;
-import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
+import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
 import io.github.thebusybiscuit.slimefun4.implementation.items.backpacks.SlimefunBackpack;
-import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
-import me.mrCookieSlime.Slimefun.api.Slimefun;
-import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.event.player.PlayerDropItemEvent;
 import org.bukkit.inventory.FurnaceRecipe;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.Recipe;
@@ -123,7 +118,7 @@ private void fillEQItems(EquivalencyTech plugin) {
 
     private void fillSlimefun(EquivalencyTech plugin) {
         if (EquivalencyTech.getInstance().getManagerSupportedPlugins().isInstalledSlimefun()) {
-            for (SlimefunItem item : SlimefunPlugin.getRegistry().getEnabledSlimefunItems()) {
+            for (SlimefunItem item : Slimefun.getRegistry().getEnabledSlimefunItems()) {
                 if (item instanceof SlimefunBackpack || !item.getAddon().getName().equals("Slimefun")) {
                     continue;
                 }

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/recipes/Recipes.java b/src/main/java/io/github/sefiraat/equivalencytech/recipes/Recipes.java
@@ -1,7 +1,7 @@
 package io.github.sefiraat.equivalencytech.recipes;
 
-import io.github.sefiraat.equivalencytech.EquivalencyTech;
-import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
+import io.github.sefiraat.equivalencytech.EquivalencyTech;;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/runnables/RunnableEQTick.java b/src/main/java/io/github/sefiraat/equivalencytech/runnables/RunnableEQTick.java
@@ -4,7 +4,7 @@
 import io.github.sefiraat.equivalencytech.configuration.ConfigMain;
 import io.github.sefiraat.equivalencytech.misc.Utils;
 import io.github.sefiraat.equivalencytech.statics.ContainerStorage;
-import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
+import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Chest;

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: EquivalencyTech
-version: 1.1.5
+version: 1.1.6
 main: io.github.sefiraat.equivalencytech.EquivalencyTech
 api-version: 1.16
 softdepend: