4.18

Author: petulikan1

build.gradle.kts

@@ -26,7 +26,7 @@ plugins {
     `java-library`
     `maven-publish`
     id("io.github.goooler.shadow") version "8.1.7"
-    id("com.wolfyscript.devtools.docker.minecraft_servers") version "2.0-SNAPSHOT"
+    //id("com.wolfyscript.devtools.docker.minecraft_servers") version "2.0-SNAPSHOT"
     id("com.jfrog.artifactory") version "5.2.0"
 }
 
@@ -71,14 +71,17 @@ tasks.withType<Javadoc> {
 
 val debugPort: String = "5006"
 
+/*
 minecraftDockerRun {
     val customEnv = env.get().toMutableMap()
     customEnv["MEMORY"] = "2G"
     customEnv["JVM_OPTS"] = "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:${debugPort}"
     env.set(customEnv)
     arguments("--cpus", "2", "-it") // Constrain to only use 2 cpus, and allow for console interactivity with 'docker attach'
 }
+*/
 
+/*
 minecraftServers {
     serversDir.set(file("${System.getProperty("user.home")}${File.separator}minecraft${File.separator}test_servers_v4"))
     libName.set("${project.name}-${version}.jar")
@@ -138,6 +141,7 @@ minecraftServers {
         }
     }
 }
+*/
 
 artifactory {
     publish {

gradle.properties

@@ -21,4 +21,4 @@
 #
 
 group = com.wolfyscript.customcrafting
-version = 4.17-beta.5
+version = 4.18-petu

gradle/wrapper/gradle-wrapper.properties

@@ -22,7 +22,7 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -26,7 +26,7 @@ plugins {
     `java-library`
     `maven-publish`
     id("io.github.goooler.shadow") version "8.1.7"
-    id("com.wolfyscript.devtools.docker.minecraft_servers") version "2.0-SNAPSHOT"
+//    id("com.wolfyscript.devtools.docker.minecraft_servers") version "2.0-SNAPSHOT"
     id("com.jfrog.artifactory") version "5.2.0"
 }
 
@@ -43,19 +43,19 @@ repositories {
 }
 
 dependencies {
-    api("com.comphenix.protocol:ProtocolLib:5.0.0-SNAPSHOT")
-    api("org.bstats:bstats-bukkit:3.0.0")
+    //api("com.comphenix.protocol:ProtocolLib:5.0.0-SNAPSHOT")
+    api("org.bstats:bstats-bukkit:3.0.2")
     compileOnly("io.lumine:Mythic-Dist:5.3.5")
-    compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.21.3-R0.1-SNAPSHOT")
     compileOnly("com.mojang:authlib:3.11.50")
-    compileOnly("org.jetbrains:annotations:23.0.0")
-    compileOnly("io.netty:netty-all:4.1.85.Final")
-    compileOnly("me.clip:placeholderapi:2.10.4")
+    compileOnly("org.jetbrains:annotations:24.1.0")
+    compileOnly("io.netty:netty-all:4.1.111.Final")
+    compileOnly("me.clip:placeholderapi:2.11.1")
     compileOnly("io.th0rgal:oraxen:1.170.0")
-    compileOnly("com.wolfyscript.wolfyutils.spigot:wolfyutils-spigot:4.17-beta.2-SNAPSHOT")
+    compileOnly("com.wolfyscript.wolfyutils.spigot:wolfyutils-spigot:4.18-petu")
 }
 
-java.sourceCompatibility = JavaVersion.VERSION_17
+java.sourceCompatibility = JavaVersion.VERSION_21
 
 tasks.named<ProcessResources>("processResources") {
     duplicatesStrategy = DuplicatesStrategy.INCLUDE

spigot/build.gradle.kts

@@ -23,7 +23,7 @@
 package me.wolfyscript.customcrafting.compatibility;
 
 import me.wolfyscript.customcrafting.CustomCrafting;
-import me.wolfyscript.customcrafting.compatibility.protocollib.ProtocolLib;
+//import me.wolfyscript.customcrafting.compatibility.protocollib.ProtocolLib;
 import me.wolfyscript.customcrafting.placeholderapi.PlaceHolder;
 import me.wolfyscript.utilities.api.WolfyUtilities;
 import me.wolfyscript.utilities.util.version.WUVersion;
@@ -34,14 +34,14 @@ public class PluginCompatibility {
 
     private final CustomCrafting plugin;
 
-    private ProtocolLib protocolLib = null;
+    //private ProtocolLib protocolLib = null;
 
     public PluginCompatibility(CustomCrafting plugin) {
         this.plugin = plugin;
     }
 
     public void init() {
-        Plugin protocolLibPlugin = Bukkit.getPluginManager().getPlugin("ProtocolLib");
+        /*Plugin protocolLibPlugin = Bukkit.getPluginManager().getPlugin("ProtocolLib");
         if (protocolLibPlugin != null) {
             String verString = protocolLibPlugin.getDescription().getVersion();
             WUVersion version = WUVersion.parse(verString);
@@ -59,7 +59,7 @@ public void init() {
             }
             plugin.getLogger().info("Detected ProtocolLib... initiating additional features.");
             this.protocolLib = new ProtocolLib(plugin);
-        }
+        }*/
         if (WolfyUtilities.hasPlugin("PlaceholderAPI")) {
             plugin.getApi().getConsole().info("$msg.startup.placeholder$");
             new PlaceHolder(plugin).register();

spigot/src/main/java/me/wolfyscript/customcrafting/compatibility/PluginCompatibility.java

@@ -20,6 +20,8 @@
  *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/*
+
 package me.wolfyscript.customcrafting.compatibility.protocollib;
 
 import com.comphenix.protocol.PacketType;
@@ -30,13 +32,7 @@
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.reflect.EquivalentConverter;
-import com.comphenix.protocol.reflect.FuzzyReflection;
 import com.comphenix.protocol.reflect.StructureModifier;
-import com.comphenix.protocol.reflect.accessors.Accessors;
-import com.comphenix.protocol.reflect.accessors.MethodAccessor;
-import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
-import com.comphenix.protocol.utility.MinecraftReflection;
-import com.comphenix.protocol.wrappers.Converters;
 import com.comphenix.protocol.wrappers.MinecraftKey;
 import java.util.HashMap;
 import java.util.List;
@@ -173,10 +169,12 @@ public Class<RecipeWrapper> getSpecificType() {
         });
     }
 
-    /**
+    */
+/**
      * This wrapper contains data read from a packet using the {@link EquivalentConverter} from {@link #getRecipeKeyConverter()}.
      * It will cache the handle of the recipe, and will be reapplied to the packet.
-     */
+     *//*
+
     private record RecipeWrapper(MinecraftKey key, Object recipe) {
 
         public MinecraftKey getKey() {
@@ -189,3 +187,4 @@ public Object getRecipe() {
     }
 
 }
+*/

spigot/src/main/java/me/wolfyscript/customcrafting/compatibility/protocollib/ProtocolLib.java

@@ -199,7 +199,7 @@ public void tick() {
 
             if (recipe.checkRecipeStatus(status)) {
                 spawnBubbles(world, loc, level);
-                world.spawnParticle(Particle.REDSTONE, loc.add(particleLevel(level)), 1, 0.17, 0.2, 0.17, 4.0, new Particle.DustOptions(Color.fromBGR(random.nextInt(255), random.nextInt(255), random.nextInt(255)), random.nextInt(2)));
+                world.spawnParticle(Particle.DUST, loc.add(particleLevel(level)), 1, 0.17, 0.2, 0.17, 4.0, new Particle.DustOptions(Color.fromBGR(random.nextInt(255), random.nextInt(255), random.nextInt(255)), random.nextInt(2)));
                 passedTicks++;
             } else {
                 //The cauldron doesn't fulfill the requirements of the recipe. Perhaps water level changed or the campfire was extinguished.

spigot/src/main/java/me/wolfyscript/customcrafting/data/persistent/CauldronBlockData.java

@@ -46,7 +46,7 @@ public ButtonArmorSlotToggle(EquipmentSlot slot, Material material) {
         super(key(slot), (cache, guiHandler, player, guiInventory, i) -> {
             CustomItem item = cache.getItems().getItem();
             return !ItemUtils.isAirOrNull(item) && item.hasEquipmentSlot(slot);
-        }, new ButtonState<>(key(slot) + ".enabled", new ItemBuilder(material).addEnchantment(Enchantment.DURABILITY, 1).addItemFlags(ItemFlag.HIDE_ENCHANTS).create(), (ItemsButtonAction) (cache, items, guiHandler, player, inventory, i, event) -> {
+        }, new ButtonState<>(key(slot) + ".enabled", new ItemBuilder(material).addEnchantment(Enchantment.UNBREAKING, 1).addItemFlags(ItemFlag.HIDE_ENCHANTS).create(), (ItemsButtonAction) (cache, items, guiHandler, player, inventory, i, event) -> {
             items.getItem().removeEquipmentSlots(slot);
             return true;
         }), new ButtonState<>(key(slot) + ".disabled", material, (ItemsButtonAction) (cache, items, guiHandler, player, inventory, i, event) -> {

spigot/src/main/java/me/wolfyscript/customcrafting/gui/item_creator/ButtonArmorSlotToggle.java

@@ -42,7 +42,7 @@ public ButtonAttributeSlot(EquipmentSlot equipmentSlot, Material material) {
             return true;
         }, (hashMap, cache, guiHandler, player, inventory, itemStack, slot, help) -> {
             if (guiHandler.getCustomCache().getItems().isAttributeSlot(equipmentSlot)) {
-                return new ItemBuilder(itemStack).addEnchantment(Enchantment.DURABILITY, 1).addItemFlags(ItemFlag.HIDE_ENCHANTS).create();
+                return new ItemBuilder(itemStack).addEnchantment(Enchantment.UNBREAKING, 1).addItemFlags(ItemFlag.HIDE_ENCHANTS).create();
             }
             return itemStack;
         });