Update to 1.21.1

.github/workflows/build.yml

@@ -8,20 +8,20 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 17 ]
+        java: [ 21 ]
       fail-fast: true
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
           cache: 'gradle'
       - name: Build with Gradle
         run: ./gradlew build --stacktrace
       - name: Upload build artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ github.event.repository.name }}-${{ github.sha }}
           path: |

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     `java-library`
-    id("net.minecrell.plugin-yml.bukkit") version "0.6.0" // Generates plugin.yml
-    id("com.github.johnrengelman.shadow") version "8.1.1" // Shades and relocates dependencies into our plugin jar
+    id("net.minecrell.plugin-yml.paper") version "0.6.0" // Generates plugin.yml
+    id("com.gradleup.shadow") version "8.3.9" // Shades and relocates dependencies into our plugin jar
     id("xyz.jpenilla.run-paper") version "2.3.0" // Adds runServer and runMojangMappedServer tasks for testing
 }
 
@@ -11,7 +11,7 @@ description = "A plugin for HoloCons SMP that adds a ton of custom items and blo
 
 java {
     // Configure the java toolchain. This allows gradle to auto-provision JDK 17 on systems that only have JDK 8 installed for example.
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 }
 
 repositories {
@@ -21,10 +21,10 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT")
-    compileOnly("com.comphenix.protocol:ProtocolLib:5.2.0-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT")
     compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.9")
-    implementation("com.github.stefvanschie.inventoryframework:IF:0.10.13")
+    implementation("com.github.stefvanschie.inventoryframework:IF:0.11.3")
+    implementation("com.typesafe:config:1.4.4")
 }
 
 tasks {
@@ -38,7 +38,7 @@ tasks {
 
         // Set the release flag. This configures what version bytecode the compiler will emit, as well as what JDK APIs are usable.
         // See https://openjdk.java.net/jeps/247 for more information.
-        options.release.set(17)
+        options.release.set(21)
     }
     javadoc {
         options.encoding = Charsets.UTF_8.name() // We want UTF-8 for everything
@@ -57,31 +57,44 @@ tasks {
     // https://github.com/johnrengelman/shadow
     shadowJar {
         relocate("com.github.stefvanschie.inventoryframework", "shadow.inventoryframework")
+        relocate("com.typesafe.config", "shadow.lightbend")
 
         archiveClassifier.set("")
     }
 
     // Configure the Minecraft version for runServer task
     // https://github.com/jpenilla/run-paper
     runServer {
-        minecraftVersion("1.20.1")
+        dependsOn("copyDatapack")
+        minecraftVersion("1.21.1")
+    }
+}
+
+tasks.register("copyDatapack") {
+    // Not sure what group to make this
+    description = "Copies the datapack into the world's datapacks folder"
+
+    delete("./run/world/datapacks/holoitems_datapack")
+
+    copy {
+        from("./holoitems_datapack")
+        into("./run/world/datapacks/holoitems_datapack")
     }
 }
 
 // Configure plugin.yml generation
 // https://github.com/Minecrell/plugin-yml
-bukkit {
+paper {
     main = "xyz.holocons.mc.holoitemsrevamp.HoloItemsRevamp"
-    apiVersion = "1.20"
+    bootstrapper = "xyz.holocons.mc.holoitemsrevamp.HoloItemsBootstrap"
+    apiVersion = "1.21.1"
     authors = listOf("TraceL", "dlee13")
     website = "holocons.xyz"
-    depend = listOf("ProtocolLib")
-    softDepend = listOf("WorldGuard")
     prefix = "HoloItems"
 
-    commands {
-        register("holoitems") {
-            usage = "/holoitems"
+    serverDependencies {
+        register("WorldGuard") {
+            required = false
         }
     }
 }

holoitems_datapack/data/holoitems/enchantment/backdash.json

@@ -0,0 +1,17 @@
+{
+    "description": "Backdash",
+    "supported_items": "#minecraft:enchantable/foot_armor",
+    "primary_items": [],
+    "weight": 1,
+    "max_level": 1,
+    "min_cost": {
+        "base": 100,
+        "per_level_above_first": 100
+    },
+    "max_cost": {
+        "base": 100,
+        "per_level_above_first": 100
+    },
+    "anvil_cost": 20,
+    "slots": ["feet"]
+}

holoitems_datapack/data/holoitems/enchantment/magnet.json

@@ -0,0 +1,17 @@
+{
+    "description": "Magnet",
+    "supported_items": "#minecraft:pickaxes",
+    "primary_items": [],
+    "weight": 1,
+    "max_level": 1,
+    "min_cost": {
+        "base": 100,
+        "per_level_above_first": 100
+    },
+    "max_cost": {
+        "base": 100,
+        "per_level_above_first": 100
+    },
+    "anvil_cost": 39,
+    "slots": ["mainhand"]
+}

holoitems_datapack/data/holoitems/enchantment/memento.json

@@ -0,0 +1,17 @@
+{
+    "description": "Memento",
+    "supported_items": "minecraft:ender_chest",
+    "primary_items": [],
+    "weight": 1,
+    "max_level": 1,
+    "min_cost": {
+        "base": 100,
+        "per_level_above_first": 100
+    },
+    "max_cost": {
+        "base": 100,
+        "per_level_above_first": 100
+    },
+    "anvil_cost": 30,
+    "slots": ["any"]
+}

holoitems_datapack/data/holoitems/enchantment/plow.json

@@ -0,0 +1,17 @@
+{
+    "description": "Plow",
+    "supported_items": "#minecraft:shovels",
+    "primary_items": [],
+    "weight": 1,
+    "max_level": 1,
+    "min_cost": {
+        "base": 100,
+        "per_level_above_first": 100
+    },
+    "max_cost": {
+        "base": 100,
+        "per_level_above_first": 100
+    },
+    "anvil_cost": 32,
+    "slots": ["mainhand"]
+}

holoitems_datapack/data/holoitems/enchantment/tide_rider.json

@@ -0,0 +1,17 @@
+{
+    "description": "Tide Rider",
+    "supported_items": "#minecraft:enchantable/trident",
+    "primary_items": [],
+    "weight": 1,
+    "max_level": 1,
+    "min_cost": {
+        "base": 100,
+        "per_level_above_first": 100
+    },
+    "max_cost": {
+        "base": 100,
+        "per_level_above_first": 100
+    },
+    "anvil_cost": 20,
+    "slots": ["mainhand"]
+}

holoitems_datapack/data/holoitems/tags/enchantment/holoenchantments.json

@@ -0,0 +1,9 @@
+{
+  "values": [
+    "holoitems:backdash",
+    "holoitems:magnet",
+    "holoitems:memento",
+    "holoitems:plow",
+    "holoitems:tide_rider"
+  ]
+}

holoitems_datapack/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 48,
+    "description": "HoloItems"
+  }
+}

src/main/java/com/strangeone101/holoitemsapi/Keys.java

@@ -4,39 +4,21 @@
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+
 import java.util.UUID;
 
 public class Keys {
 
-    public static Property<UUID> OWNER;
     public static Property<Long> COOLDOWN;
-    public static Property<Boolean> UNSTACKABLE;
     public static Property<String> ITEM_ID;
+    /**
+     * Used to represent an item that can also be used "like" an enchantment book.
+     * The first example of this is Backdash, which is both boots and applicable to other boots.
+     */
+    public static Property<Boolean> BOOK_LIKE;
 
     public static void fillKeys(Plugin plugin) {
-        OWNER = new Property<UUID>(plugin, "owner") {
-
-            @Override
-            public boolean has(PersistentDataContainer data) {
-                return data.has(getKey(), DataType.UUID);
-            }
-
-            @Override
-            public UUID get(PersistentDataContainer data) {
-                return data.get(getKey(), DataType.UUID);
-            }
-
-            @Override
-            public void set(PersistentDataContainer data, UUID value) {
-                data.set(getKey(), DataType.UUID, value);
-            }
-
-            @Override
-            public String getPropertyName() {
-                return "Owner";
-            }
-        };
-
         COOLDOWN = new Property<Long>(plugin, "cooldown") {
 
             @Override
@@ -60,53 +42,52 @@ public String getPropertyName() {
             }
         };
 
-        UNSTACKABLE = new Property<Boolean>(plugin, "unstackable") {
+        ITEM_ID = new Property<String>(plugin, "item_id") {
 
             @Override
             public boolean has(PersistentDataContainer data) {
-                return data.has(getKey(), PersistentDataType.INTEGER);
+                return data.has(getKey(), PersistentDataType.STRING);
             }
 
             @Override
-            public Boolean get(PersistentDataContainer data) {
-                return has(data);
+            public String get(PersistentDataContainer data) {
+                return data.get(getKey(), PersistentDataType.STRING);
             }
 
             @Override
-            public void set(PersistentDataContainer data, Boolean value) {
-                if (value) {
-                    data.set(getKey(), PersistentDataType.INTEGER, Bukkit.getCurrentTick());
-                } else {
-                    data.remove(getKey());
-                }
+            public void set(PersistentDataContainer data, String value) {
+                data.set(getKey(), PersistentDataType.STRING, value);
             }
 
             @Override
             public String getPropertyName() {
-                return "Unstackable";
+                return "Item ID";
             }
         };
 
-        ITEM_ID = new Property<String>(plugin, "item_id") {
-
+        BOOK_LIKE = new Property<Boolean>(plugin, "book_like") {
             @Override
             public boolean has(PersistentDataContainer data) {
-                return data.has(getKey(), PersistentDataType.STRING);
+                return data.has(getKey(), PersistentDataType.BOOLEAN);
             }
 
             @Override
-            public String get(PersistentDataContainer data) {
-                return data.get(getKey(), PersistentDataType.STRING);
+            public Boolean get(PersistentDataContainer data) {
+                return data.getOrDefault(getKey(), PersistentDataType.BOOLEAN, false);
             }
 
             @Override
-            public void set(PersistentDataContainer data, String value) {
-                data.set(getKey(), PersistentDataType.STRING, value);
+            public void set(PersistentDataContainer data, Boolean value) {
+                if (value == null || !value) {
+                    data.remove(getKey());
+                } else {
+                    data.set(getKey(), PersistentDataType.BOOLEAN, true);
+                }
             }
 
             @Override
             public String getPropertyName() {
-                return "Item ID";
+                return "Book-like";
             }
         };
     }