fix refinement saving

TeamLapen · Jun 8, 2024 · 84e8c87 · 84e8c87
1 parent c47b92f
commit 84e8c87
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/main/java/de/teamlapen/vampirism/entity/player/skills/SkillHandler.java b/src/main/java/de/teamlapen/vampirism/entity/player/skills/SkillHandler.java
@@ -315,7 +315,7 @@ public void deserializeNBT(HolderLookup.@NotNull Provider provider, @NotNull Com
             for (int i = 0; i < refinements.size(); i++) {
                 CompoundTag stackNbt = refinements.getCompound(i);
                 int slot = stackNbt.getInt("slot");
-                ItemStack stack = ItemStack.parseOptional(provider, stackNbt);
+                ItemStack stack = ItemStack.parseOptional(provider, stackNbt.getCompound("stack"));
                 if (stack.getItem() instanceof IRefinementItem refinementItem) {
                     IFaction<?> exclusiveFaction = refinementItem.getExclusiveFaction(stack);
                     if (exclusiveFaction == null || this.faction.equals(exclusiveFaction)) {
@@ -360,11 +360,11 @@ public void deserializeUpdateNBT(HolderLookup.Provider provider, @NotNull Compou
         }
 
         if (nbt.contains("refinement_items", Tag.TAG_LIST)) {
-            ListTag refinements = nbt.getList("refinement_items", 10);
+            ListTag refinements = nbt.getList("refinement_items", Tag.TAG_LIST);
             for (int i = 0; i < refinements.size(); i++) {
                 CompoundTag stackNbt = refinements.getCompound(i);
                 int slot = stackNbt.getInt("slot");
-                ItemStack stack = ItemStack.parseOptional(provider, stackNbt);
+                ItemStack stack = ItemStack.parseOptional(provider, stackNbt.getCompound("stack"));
                 if (stack.getItem() instanceof IRefinementItem refinementItem) {
                     IFaction<?> exclusiveFaction = refinementItem.getExclusiveFaction(stack);
                     if (exclusiveFaction == null || this.faction.equals(exclusiveFaction)) {
@@ -384,7 +384,11 @@ public void deserializeUpdateNBT(HolderLookup.Provider provider, @NotNull Compou
 
     @Override
     public void resetRefinements() {
+        for (int i = 0; i < this.refinementItems.size(); i++) {
+            removeRefinementItem(i);
+        }
         this.refinementItems.clear();
+        this.dirty = true;
     }
 
     public void resetSkills() {
@@ -405,7 +409,8 @@ public void resetSkills() {
             if (!stack.isEmpty()) {
                 CompoundTag stackNbt = new CompoundTag();
                 stackNbt.putInt("slot", i);
-                stack.save(provider, stackNbt);
+                var tag = stack.save(provider);
+                stackNbt.put("stack", tag);
                 refinements.add(stackNbt);
             }
         }
@@ -432,7 +437,8 @@ public void resetSkills() {
             if (!stack.isEmpty()) {
                 CompoundTag stackNbt = new CompoundTag();
                 stackNbt.putInt("slot", i);
-                stack.save(provider, stackNbt);
+                var tag = stack.save(provider);
+                stackNbt.put("stack", tag);
                 refinementItems.add(stackNbt);
             }
         }