other filters expect non-null tag

GregTechCEu · Jan 23, 2025 · 2920203 · 2920203
1 parent 810d1db
commit 2920203
Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/main/java/com/gregtechceu/gtceu/api/cover/filter/TagFluidFilter.java b/src/main/java/com/gregtechceu/gtceu/api/cover/filter/TagFluidFilter.java
@@ -10,6 +10,7 @@
 import it.unimi.dsi.fastutil.objects.Object2BooleanMap;
 import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap;
 
+import java.util.Objects;
 import java.util.function.Consumer;
 
 /**
@@ -24,13 +25,11 @@ public class TagFluidFilter extends TagFilter<FluidStack, FluidFilter> implement
     protected TagFluidFilter() {}
 
     public static TagFluidFilter loadFilter(ItemStack itemStack) {
-        return loadFilter(itemStack.getTag(), filter -> itemStack.setTag(filter.saveFilter()));
+        return loadFilter(Objects.requireNonNullElseGet(itemStack.getTag(), CompoundTag::new), 
+                filter -> itemStack.setTag(filter.saveFilter()));
     }
 
     private static TagFluidFilter loadFilter(CompoundTag tag, Consumer<FluidFilter> itemWriter) {
-        if (tag == null) {
-            tag = new CompoundTag();
-        }
         var handler = new TagFluidFilter();
         handler.itemWriter = itemWriter;
         handler.oreDictFilterExpression = tag.getString("oreDict");

diff --git a/src/main/java/com/gregtechceu/gtceu/api/cover/filter/TagItemFilter.java b/src/main/java/com/gregtechceu/gtceu/api/cover/filter/TagItemFilter.java
@@ -9,6 +9,7 @@
 import it.unimi.dsi.fastutil.objects.Object2BooleanMap;
 import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap;
 
+import java.util.Objects;
 import java.util.function.Consumer;
 
 /**
@@ -23,13 +24,11 @@ public class TagItemFilter extends TagFilter<ItemStack, ItemFilter> implements I
     protected TagItemFilter() {}
 
     public static TagItemFilter loadFilter(ItemStack itemStack) {
-        return loadFilter(itemStack.getTag(), filter -> itemStack.setTag(filter.saveFilter()));
+        return loadFilter(Objects.requireNonNullElseGet(itemStack.getTag(), CompoundTag::new), 
+                filter -> itemStack.setTag(filter.saveFilter()));
     }
 
     private static TagItemFilter loadFilter(CompoundTag tag, Consumer<ItemFilter> itemWriter) {
-        if (tag == null) {
-            tag = new CompoundTag();
-        }
         var handler = new TagItemFilter();
         handler.itemWriter = itemWriter;
         handler.oreDictFilterExpression = tag.getString("oreDict");