1.17, Slimefun and bugfixes

Sefiraat · Jun 23, 2021 · ac1f6fc · ac1f6fc
1 parent ab245b3
commit ac1f6fc
Show file tree

Hide file tree

Showing 15 changed files with 289 additions and 62 deletions.
diff --git a/.idea/discord.xml b/.idea/discord.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
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-SNAPSHOT</version>
+  <version>1.1.5</version>
   <build>
     <plugins>
       <plugin>
@@ -20,7 +20,7 @@
         <configuration>
           <relocations>
             <relocation>
-              <pattern>me.mattstudios.mfgui</pattern>
+              <pattern>dev.triumphteam.gui</pattern>
               <shadedPattern>io.github.sefiraat.equivalencytech.mfgui</shadedPattern>
             </relocation>
             <relocation>
@@ -85,6 +85,10 @@
       <id>spigot-repo</id>
       <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
     </repository>
+    <repository>
+      <id>papermc</id>
+      <url>https://papermc.io/repo/repository/maven-public/</url>
+    </repository>
     <repository>
       <id>jitpack.io</id>
       <url>https://jitpack.io</url>
@@ -101,11 +105,21 @@
       <id>skullcreator-repo</id>
       <url>https://github.com/deanveloper/SkullCreator/raw/mvn-repo/</url>
     </repository>
+    <repository>
+      <id>repo</id>
+      <url>https://repo.mattstudios.me/artifactory/public/</url>
+    </repository>
   </repositories>
   <dependencies>
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
+      <version>1.17-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.destroystokyo.paper</groupId>
+      <artifactId>paper-api</artifactId>
       <version>1.16.5-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.github.sefiraat</groupId>
     <artifactId>EquivalencyTech</artifactId>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>1.1.5</version>
 
     <build>
         <plugins>
@@ -17,7 +17,7 @@
                 <configuration>
                     <relocations>
                         <relocation>
-                            <pattern>me.mattstudios.mfgui</pattern>
+                            <pattern>dev.triumphteam.gui</pattern>
                             <shadedPattern>io.github.sefiraat.equivalencytech.mfgui</shadedPattern>
                         </relocation>
                         <relocation>
@@ -120,6 +120,10 @@
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
+        <repository>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
+        </repository>
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
@@ -136,19 +140,29 @@
             <id>skullcreator-repo</id>
             <url>https://github.com/deanveloper/SkullCreator/raw/mvn-repo/</url>
         </repository>
+        <repository>
+            <id>repo</id>
+            <url>https://repo.mattstudios.me/artifactory/public/</url>
+        </repository>
     </repositories>
 
     <dependencies>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
+            <version>1.17-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.destroystokyo.paper</groupId>
+            <artifactId>paper-api</artifactId>
             <version>1.16.5-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>me.mattstudios.utils</groupId>
-            <artifactId>matt-framework-gui</artifactId>
-            <version>2.0.2</version>
+            <groupId>dev.triumphteam</groupId>
+            <artifactId>triumph-gui</artifactId>
+            <version>3.0.3</version>
         </dependency>
         <dependency>
             <groupId>org.bstats</groupId>
@@ -184,11 +198,6 @@
             <version>3.0.1</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-text</artifactId>
-            <version>1.4</version>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/src/main/java/io/github/sefiraat/equivalencytech/EquivalencyTech.java b/src/main/java/io/github/sefiraat/equivalencytech/EquivalencyTech.java
@@ -19,7 +19,7 @@
 
 public class EquivalencyTech extends JavaPlugin {
 
-    private EquivalencyTech instance;
+    private static EquivalencyTech instance;
     private PaperCommandManager commandManager;
 
     private ConfigMain configMainClass;
@@ -36,7 +36,7 @@ public PaperCommandManager getCommandManager() {
         return commandManager;
     }
 
-    public EquivalencyTech getInstance() {
+    public static EquivalencyTech getInstance() {
         return instance;
     }
 
@@ -81,21 +81,19 @@ protected EquivalencyTech(JavaPluginLoader loader, PluginDescriptionFile descrip
     public void onEnable() {
 
         getLogger().info("########################################");
-        getLogger().info("");
         getLogger().info("             EquivalencyTech            ");
         getLogger().info("           Created by Sefiraat          ");
-        getLogger().info("");
         getLogger().info("########################################");
 
         instance = this;
 
-        configMainClass = new ConfigMain(this.getInstance());
-        eqItems = new EQItems(this.getInstance());
-        emcDefinitions = new EmcDefinitions(this.getInstance());
-        managerSupportedPlugins = new ManagerSupportedPlugins(this.getInstance());
-        recipes = new Recipes(this.getInstance());
-        managerEvents = new ManagerEvents(this.getInstance());
-        managerRunnables = new ManagerRunnables(this.getInstance());
+        configMainClass = new ConfigMain(this);
+        eqItems = new EQItems(this);
+        managerSupportedPlugins = new ManagerSupportedPlugins(this);
+        emcDefinitions = new EmcDefinitions(this);
+        recipes = new Recipes(this);
+        managerEvents = new ManagerEvents(this);
+        managerRunnables = new ManagerRunnables(this);
 
         registerCommands();
 
@@ -115,8 +113,8 @@ public void onDisable() {
     }
 
     private void registerCommands() {
-        commandManager = new PaperCommandManager(this.getInstance());
-        commandManager.registerCommand(new Commands(this.getInstance()));
+        commandManager = new PaperCommandManager(this);
+        commandManager.registerCommand(new Commands(this));
     }
 
 

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/commands/Commands.java b/src/main/java/io/github/sefiraat/equivalencytech/commands/Commands.java
@@ -1,12 +1,19 @@
 package io.github.sefiraat.equivalencytech.commands;
 
 import co.aikar.commands.BaseCommand;
-import co.aikar.commands.annotation.*;
+import co.aikar.commands.annotation.CommandAlias;
+import co.aikar.commands.annotation.CommandCompletion;
+import co.aikar.commands.annotation.CommandPermission;
+import co.aikar.commands.annotation.Default;
+import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Subcommand;
 import co.aikar.commands.bukkit.contexts.OnlinePlayer;
 import io.github.sefiraat.equivalencytech.EquivalencyTech;
 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 org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -42,6 +49,19 @@ public void onDefault(CommandSender sender) {
             if (sender instanceof Player) {
                 Player player = (Player) sender;
                 ItemStack i = player.getInventory().getItemInMainHand();
+                SlimefunItem sfItem = null;
+                if (EquivalencyTech.getInstance().getManagerSupportedPlugins().isInstalledSlimefun()) {
+                    sfItem = SlimefunItem.getByItem(i);
+                }
+                if (sfItem != null) {
+                    if (plugin.getEmcDefinitions().getEmcSlimefun().containsKey(sfItem.getId())) {
+                        player.sendMessage(Messages.msgCmdEmcDisplay(sfItem.getId(), Utils.getEMC(plugin, i)));
+                        player.sendMessage(Messages.msgCmdEmcDisplayStack(sfItem.getId(), i.getAmount(), Utils.getEMC(plugin, i) * i.getAmount()));
+                    } else {
+                        player.sendMessage(Messages.msgCmdEmcNone(plugin));
+                    }
+                    return;
+                }
                 if (i.getType() != Material.AIR) {
                     if (ContainerStorage.isCraftable(i, plugin)) {
                         if (plugin.getEmcDefinitions().getEmcEQ().containsKey(i.getItemMeta().getDisplayName())) {

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/configuration/ConfigEMC.java b/src/main/java/io/github/sefiraat/equivalencytech/configuration/ConfigEMC.java
@@ -22,6 +22,17 @@ public Map<String, Double> getEmcBaseValues() {
         return h;
     }
 
+    public Map<String, Double> getEmcSlimefunValues() {
+        Map<String, Double> h = new HashMap<>();
+        ConfigurationSection c = configuration.getConfigurationSection("EMC_VALUES.SLIMEFUN");
+        assert c != null;
+        for (String s : c.getKeys(false)) {
+            Double emcValue = c.getDouble(s);
+            h.put(s, emcValue);
+        }
+        return h;
+    }
+
     public int getBurnRate() {
         return configuration.getInt("EMC_VALUES.BURN_RATE");
     }

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/gui/GUIItems.java b/src/main/java/io/github/sefiraat/equivalencytech/gui/GUIItems.java
@@ -1,13 +1,13 @@
 package io.github.sefiraat.equivalencytech.gui;
 
 import dev.dbassett.skullcreator.SkullCreator;
+import dev.triumphteam.gui.guis.GuiItem;
 import io.github.sefiraat.equivalencytech.EquivalencyTech;
 import io.github.sefiraat.equivalencytech.configuration.ConfigMain;
 import io.github.sefiraat.equivalencytech.configuration.ConfigStrings;
 import io.github.sefiraat.equivalencytech.misc.Utils;
 import io.github.sefiraat.equivalencytech.statics.Messages;
 import io.github.sefiraat.equivalencytech.statics.SkullTextures;
-import me.mattstudios.mfgui.gui.guis.GuiItem;
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;