1.21.4 BABYYY

Author: GavinGoGaming

.github/workflows/build.yml

@@ -26,8 +26,8 @@ jobs:
     - name: Release
       uses: softprops/action-gh-release@v2
       with:
-        tag_name: "latest-1.21"
-        name: "[1.1.0 for 1.21] Development Build"
+        tag_name: "latest-1.21.4"
+        name: "[1.3.0 for 1.21.4] Development Build"
         body: "Push-ly development build for Caramel. Updated on every push - ignore the 'commits to master since this release', github works weird."
         prerelease: false
         files: |

docs/index.md

@@ -12,10 +12,9 @@ Caramel is a multipurpose AIO api for PaperAPI plugins. ***Caramel can not and w
 - Simply drop in the latest Caramel jarfile from [here](https://github.com/klashdevelopment/Caramel/releases/tag/latest-1.21)
 
 ## Quickstart (Developer)
+- Make sure you have Paper API 1.21.4 in your pom
 - Add Caramel to your maven:
 
-LATEST VERSION: 1.2.0
-
 ```xml
 <repository>
    <id>klashdevelopment</id>
@@ -25,7 +24,7 @@ LATEST VERSION: 1.2.0
 <dependency>
    <groupId>dev.klash</groupId>
    <artifactId>Caramel</artifactId>
-   <version>VERSION</version>
+   <version>1.3.1</version>
    <scope>provided</scope>
 </dependency>
 ```

docs/items.md

@@ -9,11 +9,12 @@ The documentation for items are WIP, but here's a simple implementation while yo
         public CaramelItemDetail getDetails() {
             return CaramelItemDetail.builder()
                     .id("item_identifier") // Required
-                    .defaultStack(1) // Required
+                    .defaultStack(1) // Optional
                     .modelData(0) // Optional - Custom Model Data
                     .itemBase(Material.PAPER) // Required
                     .itemName(CaramelUtility.colorcomp("<gold><bold>Supports miniMessage")) // Required
                     .lore(Arrays.asList("Lore <red>is cool<yellow>!")) // Required
+					.components(...) // Optional, see below
                     .build();
         }
 
@@ -34,3 +35,15 @@ The documentation for items are WIP, but here's a simple implementation while yo
 ```
 
 Please see Commands for registering, but use `Caramel.getInstance().items` and define it as a `CaramelItem`.
+
+
+### Item components
+As of caramel 1.3.1 (1.21.4) you can add item components!
+
+```java
+/// builder stuff
+.components(
+	CIComponent.of(DataComponentType.EXAMPLE, example), // valued
+	CIComponent.of(DataComponentType.EXAMPLE) // non valued
+)
+```

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>dev.klash</groupId>
     <artifactId>Caramel</artifactId>
-    <version>1.2.0</version>
+    <version>1.3.1</version>
     <packaging>jar</packaging>
 
     <name>Caramel</name>
@@ -28,7 +28,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>21</source>
                     <target>21</target>
@@ -50,7 +50,7 @@
                     <relocations>
                         <relocation>
                             <pattern>net.wesjd.anvilgui</pattern>
-                            <shadedPattern>dev.klash.dependencies.anvilgui</shadedPattern> <!-- Replace [YOUR_PLUGIN_PACKAGE] with your namespace -->
+                            <shadedPattern>dev.klash.dependencies.anvilgui</shadedPattern>
                         </relocation>
                     </relocations>
                     <filters>
@@ -75,7 +75,7 @@
 
     <repositories>
         <repository>
-            <id>papermc-repo</id>
+            <id>papermc</id>
             <url>https://repo.papermc.io/repository/maven-public/</url>
         </repository>
         <repository>
@@ -86,24 +86,27 @@
             <id>codemc-snapshots</id>
             <url>https://repo.codemc.io/repository/maven-snapshots/</url>
         </repository>
+        <repository>
+            <id>klashdevelopment</id>
+            <url>https://raw.githubusercontent.com/klashdevelopment/mvn/main/repository/</url>
+        </repository>
     </repositories>
-
     <dependencies>
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.21-R0.1-SNAPSHOT</version>
+            <version>1.21.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.samjakob</groupId>
             <artifactId>SpiGUI</artifactId>
-            <version>1.3.1</version>
+            <version>1.4.0-recomp</version>
         </dependency>
         <dependency>
             <groupId>net.wesjd</groupId>
             <artifactId>anvilgui</artifactId>
-            <version>1.10.2-SNAPSHOT</version>
+            <version>1.10.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

src/main/java/dev/klash/caramel/items/CaramelFactory.java

@@ -3,14 +3,20 @@
 import com.samjakob.spigui.item.ItemBuilder;
 import dev.klash.caramel.Caramel;
 import dev.klash.caramel.CaramelUtility;
+import dev.klash.caramel.items.components.CIComponent;
+import io.papermc.paper.datacomponent.DataComponentTypes;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.inventory.meta.components.FoodComponent;
+import io.papermc.paper.datacomponent.item.FoodProperties;
 import org.bukkit.persistence.PersistentDataType;
 
 public class CaramelFactory {
+    // Allow using <T> parameter
+    private static <T> void setDataHelper(ItemStack i, CIComponent.CIComponentValued<T> component) {
+        i.setData(component.getComponent(), component.getValue());
+    }
     public static ItemStack build(CaramelItem item) {
         ItemStack i = new ItemStack(item.getDetails().itemBase());
         ItemMeta m = i.getItemMeta();
@@ -19,15 +25,19 @@ public static ItemStack build(CaramelItem item) {
         m.setCustomModelData(item.getDetails().modelData());
 
         if(item.getDetails().food() != null) {
-            FoodComponent food = m.getFood();
-            food.setCanAlwaysEat(item.getDetails().food().canAlwaysEat());
-            food.setNutrition(item.getDetails().food().nutrition());
-            food.setSaturation(item.getDetails().food().saturation());
-            food.setEatSeconds(item.getDetails().food().eatTime());
-            for(FoodEffectProperties fep : item.getDetails().food().effects()) {
-                food.addEffect(fep.effect(), fep.chance());
+            FoodProperties food = FoodProperties.food()
+                    .canAlwaysEat(item.getDetails().food().canAlwaysEat())
+                    .nutrition(item.getDetails().food().nutrition())
+                    .saturation(item.getDetails().food().saturation())
+                    .build();
+            i.setData(DataComponentTypes.FOOD, food);
+        }
+        for (CIComponent component : item.getDetails().components()) {
+            if(component instanceof CIComponent.CIComponentValued<?> valuedComponent) {
+                setDataHelper(i, valuedComponent);
+            } else {
+                i.setData(((CIComponent.CIComponentNonvalued) component).getComponent());
             }
-            m.setFood(food);
         }
 
         m.getPersistentDataContainer().set(Caramel.getInstance().isCaramelKey, PersistentDataType.BOOLEAN, true);

src/main/java/dev/klash/caramel/items/CaramelItemDetail.java

@@ -1,20 +1,24 @@
 package dev.klash.caramel.items;
 
+import dev.klash.caramel.items.components.CIComponent;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Material;
+import org.jetbrains.annotations.ApiStatus;
 
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
-public record CaramelItemDetail(String id, Component itemName, List<String> lore, int defaultStack, int modelData, Material itemBase, FoodProperties food) {
-
+public record CaramelItemDetail(String id, Component itemName, List<String> lore, int defaultStack, int modelData, Material itemBase, FoodProperties food, List<CIComponent> components) {
     public static class Builder {
         private String id;
         private Component itemName;
         private List<String> lore;
-        private int defaultStack;
+        private int defaultStack = 1;
         private int modelData;
         private Material itemBase;
-        private FoodProperties food = null;
+        @ApiStatus.Experimental private FoodProperties food = null;
+        @ApiStatus.Experimental private List<CIComponent> components = Collections.emptyList();
 
         public Builder id(String id) {
             this.id = id;
@@ -36,6 +40,7 @@ public Builder defaultStack(int defaultStack) {
             return this;
         }
 
+        @ApiStatus.Experimental
         public Builder food(FoodProperties food) {
             this.food = food;
             return this;
@@ -51,8 +56,20 @@ public Builder itemBase(Material itemBase) {
             return this;
         }
 
+        @ApiStatus.Experimental
+        public Builder components(List<CIComponent> components) {
+            this.components = components;
+            return this;
+        }
+
+        @ApiStatus.Experimental
+        public Builder components(CIComponent... components) {
+            this.components = Arrays.asList(components);
+            return this;
+        }
+
         public CaramelItemDetail build() {
-            return new CaramelItemDetail(id, itemName, lore, defaultStack, modelData, itemBase, food);
+            return new CaramelItemDetail(id, itemName, lore, defaultStack, modelData, itemBase, food, components);
         }
     }
 

src/main/java/dev/klash/caramel/items/FoodEffectProperties.java

@@ -1,6 +1,12 @@
 package dev.klash.caramel.items;
 
 import org.bukkit.potion.PotionEffect;
+import org.jetbrains.annotations.ApiStatus;
 
+@ApiStatus.Experimental
+/*
+ * This class is a WIP and will be added in a future update
+ * Do not use this in production, it wont apply to the item as of Caramel 1.21.4 (we swapped to data components)
+ */
 public record FoodEffectProperties(PotionEffect effect, float chance) {
 }

src/main/java/dev/klash/caramel/items/FoodProperties.java

@@ -1,12 +1,15 @@
 package dev.klash.caramel.items;
 
-public record FoodProperties(int saturation, int nutrition, boolean canAlwaysEat, float eatTime, FoodEffectProperties... effects) {
+import org.jetbrains.annotations.ApiStatus;
+
+@ApiStatus.Experimental
+public record FoodProperties(int saturation, int nutrition, boolean canAlwaysEat/*, int eatTime, FoodEffectProperties... effects*/) {
     public static class Builder {
         private int saturation = -1;
         private int nutrition = -1;
         private boolean canAlwaysEat = false;
-        private int eatTime = 32;
-        private FoodEffectProperties[] effects = new FoodEffectProperties[0];
+//        private int eatTime = 32;
+//        private FoodEffectProperties[] effects = new FoodEffectProperties[0];
 
         public Builder saturation(int saturation) {
             this.saturation = saturation;
@@ -23,21 +26,21 @@ public Builder canAlwaysEat(boolean canAlwaysEat) {
             return this;
         }
 
-        public Builder eatTime(int eatTime) {
-            this.eatTime = eatTime;
-            return this;
-        }
-
-        public Builder effects(FoodEffectProperties... effects) {
-            this.effects = effects;
-            return this;
-        }
+//        public Builder eatTime(int eatTime) {
+//            this.eatTime = eatTime;
+//            return this;
+//        }
+//
+//        public Builder effects(FoodEffectProperties... effects) {
+//            this.effects = effects;
+//            return this;
+//        }
 
         public FoodProperties build() {
             if(nutrition == -1 || saturation == -1) {
                 throw new IllegalStateException("Nutrition and saturation must be set on Caramel food properties");
             }
-            return new FoodProperties(saturation, nutrition, canAlwaysEat, eatTime, effects);
+            return new FoodProperties(saturation, nutrition, canAlwaysEat/*, eatTime, effects*/);
         }
     }
 

src/main/java/dev/klash/caramel/items/components/CIComponent.java

@@ -0,0 +1,35 @@
+package dev.klash.caramel.items.components;
+
+import io.papermc.paper.datacomponent.DataComponentType;
+
+public abstract class CIComponent {
+    public static class CIComponentNonvalued extends CIComponent {
+        private DataComponentType.NonValued component;
+        private CIComponentNonvalued(DataComponentType.NonValued component) {
+            this.component = component;
+        }
+        public DataComponentType.NonValued getComponent() {
+            return component;
+        }
+    }
+    public static class CIComponentValued<T> extends CIComponent {
+        private DataComponentType.Valued<T> component;
+        private T value;
+        private CIComponentValued(DataComponentType.Valued<T> component, T value) {
+            this.component = component;
+            this.value = value;
+        }
+        public DataComponentType.Valued<T> getComponent() {
+            return component;
+        }
+        public T getValue() {
+            return value;
+        }
+    }
+    public static CIComponent of(DataComponentType.NonValued component) {
+        return new CIComponentNonvalued(component);
+    }
+    public static <T> CIComponent of(DataComponentType.Valued<T> component, T value) {
+        return new CIComponentValued<T>(component, value);
+    }
+}

src/main/java/dev/klash/caramel/plugin/ImplCaramelDefault.java

@@ -190,7 +190,7 @@ public void whenAnyRun(CommandSender sender, List<String> args) {
                             }));
                         }
                         ((Player)sender).openInventory(menu.getInventory());
-                    }else {
+                    } else {
                         sender.sendMessage(CaramelUtility.colorcomp(Caramel.getInstance().getPrefix() + " Listing items"));
                         for(CaramelItem item : Caramel.getInstance().items.getItemList()) {
                             sender.sendMessage(CaramelUtility.colorcomp(Caramel.getInstance().getPrefix() + "<green> ID <red>" + item.getDetails().id() +" <green> with name <red>" + item.getDetails().itemName()));
@@ -208,7 +208,7 @@ public void whenAnyRun(CommandSender sender, List<String> args) {
                             }));
                         }
                         ((Player)sender).openInventory(menu.getInventory());
-                    }else {
+                    } else {
                         sender.sendMessage(CaramelUtility.colorcomp(Caramel.getInstance().getPrefix() + " Listing guis"));
                         for(CaramelGui gui : Caramel.getInstance().guis.getGuis()) {
                             sender.sendMessage(CaramelUtility.colorcomp(Caramel.getInstance().getPrefix() + "<green> Title <red>" + gui.title +" <green> with override <red>" + (gui.override==null?"none":gui.override.name())));

src/main/java/dev/klash/caramel/sql/CaramelSQL.java

@@ -1,9 +1,12 @@
 package dev.klash.caramel.sql;
 
+import org.jetbrains.annotations.ApiStatus;
+
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
+@ApiStatus.Experimental
 public class CaramelSQL {
 
     public String host, port, database, username, password;

src/main/java/dev/klash/caramel/sql/CaramelSQLHelper.java

@@ -1,12 +1,14 @@
 package dev.klash.caramel.sql;
 
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.ApiStatus;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.UUID;
 
+@ApiStatus.Experimental
 public class CaramelSQLHelper {
 
     private CaramelSQL sql;

src/main/resources/config.yml

@@ -1,5 +1,5 @@
 messages:
-  # If a user is denied permission.
+  # If a user is denied permission. API forces this to use colorcodes and not minimessage sadly :/
   no-permission: "&aYou have no permission to use this command."
   # The caramel prefix only shows on /caramel.
   caramel-prefix: "<yellow>[<gold>Caramel<yellow>]<green>"