1.20

MrButtersDEV · Jun 8, 2023 · 398ca40 · 398ca40
1 parent 8fac2e8
commit 398ca40
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -83,7 +83,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.18-R0.1-SNAPSHOT</version>
+            <version>1.20-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/us/thezircon/play/autopickup/AutoPickup.java b/src/main/java/us/thezircon/play/autopickup/AutoPickup.java
@@ -129,6 +129,8 @@ public void onEnable() {
         getServer().getPluginManager().registerEvents(new PlayerDropItemEventListener(), this);
         getServer().getPluginManager().registerEvents(new ItemSpawnEventListener(), this);
 
+
+
         if (usingMythicMobs) {
             getServer().getPluginManager().registerEvents(new MythicMobListener(), this);
         }

diff --git a/src/main/java/us/thezircon/play/autopickup/utils/AutoSmelt.java b/src/main/java/us/thezircon/play/autopickup/utils/AutoSmelt.java
@@ -38,10 +38,12 @@ public static ItemStack smelt(ItemStack itemStack, Player player) {
 
             if (((FurnaceRecipe) recipe).getInput().getType() != itemStack.getType()) continue;
             result = recipe.getResult();
-            player.giveExp((int) ((FurnaceRecipe) recipe).getExperience());
+            player.giveExp(((int) ((FurnaceRecipe) recipe).getExperience())*itemStack.getAmount());
             break;
         }
 
+        result.setAmount(itemStack.getAmount());
+
         return result;
     }
 

diff --git a/src/main/java/us/thezircon/play/autopickup/utils/HexFormat.java b/src/main/java/us/thezircon/play/autopickup/utils/HexFormat.java
@@ -10,8 +10,16 @@ public class HexFormat {
 
     private static final Pattern pattern = Pattern.compile("&#[a-fA-F0-9]{6}");
 
+    public static boolean isAboveMinor(int version) {
+        String[] split = Bukkit.getBukkitVersion().split("-")[0].split("\\.");
+        String minorVer = split[1];
+        return Integer.parseInt(minorVer) >= version;
+    }
+
     public static String format(String msg) {
-        if (Bukkit.getVersion().contains("1.17") || Bukkit.getVersion().contains("1.16") || Bukkit.getVersion().contains("1.18") || Bukkit.getVersion().contains("1.19")) {
+        String[] split = Bukkit.getBukkitVersion().split("-")[0].split("\\.");
+        String minorVer = split[1];
+        if (Integer.parseInt(minorVer) >= 16) {
             Matcher match = pattern.matcher(msg);
             while (match.find()) {
                 String color = msg.substring(match.start(), match.end());