bugfixes in 1.5.2

Author: GavinGoGaming

.github/workflows/build.yml

@@ -27,7 +27,7 @@ jobs:
       uses: softprops/action-gh-release@v2
       with:
         tag_name: "latest-26.2"
-        name: "[1.5.1 for 26.2] Development Build"
+        name: "[1.5.2 for 26.2] Development Build"
         body: "Push-ly development build for Caramel. Updated on every push - ignore the 'commits to master since this release' if you're on the latest tag."
         prerelease: false
         files: |

docs/index.md

@@ -26,7 +26,7 @@ Caramel is a multipurpose AIO api for PaperAPI plugins. ***Caramel can not and w
 <dependency>
    <groupId>dev.klash</groupId>
    <artifactId>Caramel</artifactId>
-   <version>1.5.1</version>
+   <version>1.5.2</version>
    <scope>provided</scope>
 </dependency>
 ```
@@ -39,7 +39,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly("dev.klash:Caramel:1.5.1")
+    compileOnly("dev.klash:Caramel:1.5.2")
 }
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>dev.klash</groupId>
     <artifactId>Caramel</artifactId>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
     <packaging>jar</packaging>
 
     <name>Caramel</name>

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

@@ -23,9 +23,17 @@ public static ItemStack build(CaramelItem item) {
         m.lore(CaramelUtility.formatLoreString(item.getDetails().lore()));
         m.displayName(item.getDetails().itemName());
 
+        // still used for older resource packs
         if(item.getDetails().modelData() > 0) {
             m.setCustomModelData(item.getDetails().modelData());
         }
+
+
+        m.getPersistentDataContainer().set(Caramel.getInstance().isCaramelKey, PersistentDataType.BOOLEAN, true);
+        m.getPersistentDataContainer().set(Caramel.getInstance().caramelIDKey, PersistentDataType.STRING, item.getDetails().id());
+
+        i.setItemMeta(m);
+
         if(item.getDetails().food() != null) {
             FoodProperties food = FoodProperties.food()
                     .canAlwaysEat(item.getDetails().food().canAlwaysEat())
@@ -44,11 +52,6 @@ public static ItemStack build(CaramelItem item) {
                 i.setData(((CIComponent.CIComponentNonvalued) component).getComponent());
             }
         }
-
-        m.getPersistentDataContainer().set(Caramel.getInstance().isCaramelKey, PersistentDataType.BOOLEAN, true);
-        m.getPersistentDataContainer().set(Caramel.getInstance().caramelIDKey, PersistentDataType.STRING, item.getDetails().id());
-
-        i.setItemMeta(m);
         i.setAmount(item.getDetails().defaultStack());
         return item.modifyBeforeFinalizing(i);
     }

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

@@ -11,13 +11,13 @@
 import java.util.Collections;
 import java.util.List;
 
-public record CaramelItemDetail(String id, Component itemName, List<String> lore, int defaultStack, int modelData, Material itemBase, Key itemModel, FoodProperties food, List<CIComponent> components) {
+public record CaramelItemDetail(String id, Component itemName, List<String> lore, int defaultStack, @Deprecated int modelData, Material itemBase, Key itemModel, FoodProperties food, List<CIComponent> components) {
     public static class Builder {
         private String id;
         private Component itemName = CaramelUtility.colorcomp("No name specified");
         private List<String> lore = Collections.emptyList();
         private int defaultStack = 1;
-        private int modelData = -1;
+        @Deprecated private int modelData = -1;
         private Material itemBase = Material.STICK;
         @ApiStatus.Experimental private Key itemModel = null;
         @ApiStatus.Experimental private FoodProperties food = null;
@@ -54,6 +54,7 @@ public Builder food(FoodProperties food) {
             return this;
         }
 
+        @Deprecated
         public Builder modelData(int modelData) {
             this.modelData = modelData;
             return this;