Update to 1.20.6

World1-6 · May 3, 2024 · 9ec93a5 · 9ec93a5
1 parent b697e30
commit 9ec93a5
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 14 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,7 +2,8 @@ import java.text.SimpleDateFormat
 import java.util.*
 
 plugins {
-    id("com.github.johnrengelman.shadow") version "8.1.1" // https://github.com/johnrengelman/shadow
+//    id("com.github.johnrengelman.shadow") version "8.1.1" // https://github.com/johnrengelman/shadow
+    id("io.github.goooler.shadow") version "8.1.7" // https://github.com/johnrengelman/shadow/pull/876 https://github.com/Goooler/shadow https://plugins.gradle.org/plugin/io.github.goooler.shadow
     id("net.kyori.blossom") version "2.1.0" // https://github.com/KyoriPowered/blossom
     `java-library`
     `maven-publish`
@@ -12,8 +13,8 @@ group = "com.andrew121410.mc"
 version = "1.0"
 description = "World1-6Essentials"
 
-java.sourceCompatibility = JavaVersion.VERSION_17
-java.targetCompatibility = JavaVersion.VERSION_17
+java.sourceCompatibility = JavaVersion.VERSION_21
+java.targetCompatibility = JavaVersion.VERSION_21
 
 tasks {
     build {
@@ -46,6 +47,10 @@ repositories {
         url = uri("https://repo.papermc.io/repository/maven-public/")
     }
 
+    maven {
+        url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+    }
+
     maven {
         url = uri("https://jitpack.io")
     }
@@ -69,11 +74,11 @@ repositories {
 
 dependencies {
     api("org.bstats:bstats-bukkit:3.0.2")
-    compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT")
-    compileOnly("com.github.World1-6.World1-6Utils:World1-6Utils-Plugin:0c7e98a71f")
-    compileOnly("com.github.World1-6.World1-6Utils:World1-6Utils_CMI_API:0c7e98a71f")
+    compileOnly("io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT")
+    compileOnly("com.github.World1-6.World1-6Utils:World1-6Utils-Plugin:b50561b638")
+    compileOnly("com.github.World1-6.World1-6Utils:World1-6Utils_CMI_API:b50561b638")
     compileOnly("net.essentialsx:EssentialsX:2.21.0-SNAPSHOT")
-    compileOnly("org.geysermc.floodgate:api:2.2.2-SNAPSHOT")
+    compileOnly("org.geysermc.floodgate:api:2.2.3-SNAPSHOT")
 }
 
 publishing {

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/main/java/com/andrew121410/mc/world16essentials/commands/CommandBlockCMD.java b/src/main/java/com/andrew121410/mc/world16essentials/commands/CommandBlockCMD.java
@@ -37,7 +37,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
         }
 
         ItemStack item = InventoryUtils.createItem(Material.COMMAND_BLOCK, 1, "&cCommand Block&r", "New Fresh Command Block");
-        item.addUnsafeEnchantment(Enchantment.DAMAGE_ALL, 1);
+        item.addUnsafeEnchantment(Enchantment.SHARPNESS, 1);
         p.getInventory().addItem(item);
         return true;
     }

diff --git a/src/main/java/com/andrew121410/mc/world16essentials/commands/SignCMD.java b/src/main/java/com/andrew121410/mc/world16essentials/commands/SignCMD.java
@@ -69,7 +69,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
 
         if (args.length == 1 && args[0].equalsIgnoreCase("give")) {
             ItemStack itemStack = new ItemStack(Material.OAK_SIGN, 1);
-            itemStack.addUnsafeEnchantment(Enchantment.DAMAGE_ALL, 1);
+            itemStack.addUnsafeEnchantment(Enchantment.SHARPNESS, 1);
             player.getInventory().addItem(itemStack);
             return true;
         } else if (args.length >= 1 && args[0].equalsIgnoreCase("edit")) {

diff --git a/src/main/java/com/andrew121410/mc/world16essentials/managers/HomeManager.java b/src/main/java/com/andrew121410/mc/world16essentials/managers/HomeManager.java
@@ -3,13 +3,13 @@
 import com.andrew121410.mc.world16essentials.World16Essentials;
 import com.andrew121410.mc.world16utils.config.UnlinkedWorldLocation;
 import com.andrew121410.mc.world16utils.utils.Utils;
+import com.andrew121410.mc.world16utils.utils.ccutils.dependencies.google.common.collect.ArrayListMultimap;
+import com.andrew121410.mc.world16utils.utils.ccutils.dependencies.google.common.collect.Multimap;
 import com.andrew121410.mc.world16utils.utils.ccutils.storage.ISQL;
 import com.andrew121410.mc.world16utils.utils.ccutils.storage.SQLite;
 import com.andrew121410.mc.world16utils.utils.ccutils.storage.easy.EasySQL;
 import com.andrew121410.mc.world16utils.utils.ccutils.storage.easy.MultiTableEasySQL;
 import com.andrew121410.mc.world16utils.utils.ccutils.storage.easy.SQLDataStore;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionAttachmentInfo;

diff --git a/src/main/java/com/andrew121410/mc/world16essentials/managers/KitManager.java b/src/main/java/com/andrew121410/mc/world16essentials/managers/KitManager.java
@@ -3,12 +3,12 @@
 import com.andrew121410.mc.world16essentials.World16Essentials;
 import com.andrew121410.mc.world16essentials.objects.KitObject;
 import com.andrew121410.mc.world16utils.utils.BukkitSerialization;
+import com.andrew121410.mc.world16utils.utils.ccutils.dependencies.google.common.collect.Multimap;
 import com.andrew121410.mc.world16utils.utils.ccutils.storage.ISQL;
 import com.andrew121410.mc.world16utils.utils.ccutils.storage.SQLite;
 import com.andrew121410.mc.world16utils.utils.ccutils.storage.easy.EasySQL;
 import com.andrew121410.mc.world16utils.utils.ccutils.storage.easy.MultiTableEasySQL;
 import com.andrew121410.mc.world16utils.utils.ccutils.storage.easy.SQLDataStore;
-import com.google.common.collect.Multimap;
 import org.bukkit.entity.Player;
 
 import java.sql.SQLException;

diff --git a/src/main/java/com/andrew121410/mc/world16essentials/managers/SavedInventoriesManager.java b/src/main/java/com/andrew121410/mc/world16essentials/managers/SavedInventoriesManager.java
@@ -2,12 +2,12 @@
 
 import com.andrew121410.mc.world16essentials.World16Essentials;
 import com.andrew121410.mc.world16essentials.objects.SavedInventoryObject;
+import com.andrew121410.mc.world16utils.utils.ccutils.dependencies.google.common.collect.Multimap;
 import com.andrew121410.mc.world16utils.utils.ccutils.storage.ISQL;
 import com.andrew121410.mc.world16utils.utils.ccutils.storage.SQLite;
 import com.andrew121410.mc.world16utils.utils.ccutils.storage.easy.EasySQL;
 import com.andrew121410.mc.world16utils.utils.ccutils.storage.easy.MultiTableEasySQL;
 import com.andrew121410.mc.world16utils.utils.ccutils.storage.easy.SQLDataStore;
-import com.google.common.collect.Multimap;
 
 import java.sql.SQLException;
 import java.util.*;