Fix removable tags not working properly

FrozenBlock · Jun 24, 2024 · c521b11 · c521b11
1 parent 9601498
commit c521b11
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/main/java/net/frozenblock/lib/item/mixin/ItemStackMixin.java b/src/main/java/net/frozenblock/lib/item/mixin/ItemStackMixin.java
@@ -46,9 +46,7 @@ public final class ItemStackMixin implements ItemStackExtension {
 
 		// Removable Item Tags
 
-		CustomData data = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY);
-
-		data.update(compound -> {
+		CustomData.update(DataComponents.CUSTOM_DATA, stack, compound -> {
 			for (String key : RemovableItemTags.keys()) {
 				if (RemovableItemTags.canRemoveTag(key, level, entity, slot, selected)) {
 					compound.remove(key);
@@ -86,8 +84,7 @@ public final class ItemStackMixin implements ItemStackExtension {
 
 	@Unique
 	private static void frozenLib$fixEmptyTags(ItemStack stack) {
-		CustomData data = stack.getOrDefault(DataComponents.CUSTOM_DATA, CustomData.EMPTY);
-		data.update(compound -> {
+		CustomData.update(DataComponents.CUSTOM_DATA, stack, compound -> {
 			for (String key : RemovableItemTags.keys()) {
 				if (RemovableItemTags.shouldRemoveTagOnStackMerge(key)) {
 					compound.remove(key);