Fix Listable data contains not being consistent. Fixed building as well

CraftTweaker · Nov 28, 2022 · d6917ba · d6917ba
1 parent 4da898d
commit d6917ba
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 25 deletions.
diff --git a/...gametest/resources/data/crafttweaker/gametest/scripts/item/ensure_partial_nbt_matching.zs b/...gametest/resources/data/crafttweaker/gametest/scripts/item/ensure_partial_nbt_matching.zs
@@ -6,11 +6,14 @@ val actualSimple = <item:minecraft:apple>;
 val actualHard = <item:minecraft:apple>.withTag({cool: "beans", coll: [1 as int, 2 as int, 3 as int]});
 val actualExact = <item:minecraft:apple>.withTag({cool: "beans"});
 
-val partials = [ partialAll, partialOnly, partialColl ];
-val actuals = [ actualSimple, actualHard, actualExact ];
+println(partialAll.matches(actualSimple)); // false
+println(partialAll.matches(actualHard)); // true
+println(partialAll.matches(actualExact)); // true
 
-for p in partials {
-    for a in actuals {
-        println(p.matches(a));
-    }
-}
+println(partialOnly.matches(actualSimple)); // false
+println(partialOnly.matches(actualHard)); // true
+println(partialOnly.matches(actualExact)); // true
+
+println(partialColl.matches(actualSimple)); // false
+println(partialColl.matches(actualHard));  // true
+println(partialColl.matches(actualExact)); // false
diff --git a/Common/src/main/java/com/blamejared/crafttweaker/api/data/ByteArrayData.java b/Common/src/main/java/com/blamejared/crafttweaker/api/data/ByteArrayData.java
@@ -59,7 +59,12 @@ public void remove(int index) {
 
     @Override
     public boolean contains(IData other) {
-
+
+        if(other.isListable()) {
+            List<IData> dataValues = other.asList();
+            return dataValues != null && containsList(dataValues);
+        }
+
         return getInternal().contains(ByteTag.valueOf(other.asByte()));
     }
 

diff --git a/Common/src/main/java/com/blamejared/crafttweaker/api/data/IData.java b/Common/src/main/java/com/blamejared/crafttweaker/api/data/IData.java
@@ -2,11 +2,15 @@
 
 import com.blamejared.crafttweaker.api.CraftTweakerConstants;
 import com.blamejared.crafttweaker.api.annotation.ZenRegister;
+import com.blamejared.crafttweaker.api.data.converter.tag.TagToDataConverter;
 import com.blamejared.crafttweaker.api.data.visitor.DataToStringVisitor;
 import com.blamejared.crafttweaker.api.data.visitor.DataToTextComponentVisitor;
 import com.blamejared.crafttweaker.api.data.visitor.DataVisitor;
 import com.blamejared.crafttweaker_annotations.annotations.Document;
+import net.minecraft.Util;
+import net.minecraft.nbt.CollectionTag;
 import net.minecraft.nbt.Tag;
+import net.minecraft.world.level.storage.DataVersion;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.openzen.zencode.java.ZenCodeType;
@@ -749,6 +753,23 @@ default boolean isMappable() {
         return false;
     }
 
+    default boolean containsList(List<IData> dataValues) {
+
+        if(getInternal() instanceof CollectionTag<?> internal) {
+            outer:
+            for(IData dataValue : dataValues) {
+                for(Tag value : internal) {
+                    if(TagToDataConverter.convert(value).contains(dataValue)) {
+                        continue outer;
+                    }
+                }
+
+                return false;
+            }
+            return true;
+        }
+        return false;
+    }
 
     /**
      * Used to specify what "type" of IData this is.

diff --git a/Common/src/main/java/com/blamejared/crafttweaker/api/data/IntArrayData.java b/Common/src/main/java/com/blamejared/crafttweaker/api/data/IntArrayData.java
@@ -59,6 +59,11 @@ public void remove(int index) {
 
     @Override
     public boolean contains(IData other) {
+
+        if(other.isListable()) {
+            List<IData> dataValues = other.asList();
+            return dataValues != null && containsList(dataValues);
+        }
 
         return getInternal().contains(IntTag.valueOf(other.asInt()));
     }

diff --git a/Common/src/main/java/com/blamejared/crafttweaker/api/data/ListData.java b/Common/src/main/java/com/blamejared/crafttweaker/api/data/ListData.java
@@ -107,22 +107,6 @@ public boolean contains(IData other) {
         return false;
     }
 
-    private boolean containsList(List<IData> dataValues) {
-
-        outer:
-        for(IData dataValue : dataValues) {
-            for(Tag value : getInternal()) {
-                if(TagToDataConverter.convert(value).contains(dataValue)) {
-                    continue outer;
-                }
-            }
-
-            return false;
-        }
-
-        return true;
-    }
-
     @Override
     public boolean equalTo(IData other) {
 

diff --git a/Common/src/main/java/com/blamejared/crafttweaker/api/data/LongArrayData.java b/Common/src/main/java/com/blamejared/crafttweaker/api/data/LongArrayData.java
@@ -66,7 +66,12 @@ public void remove(int index) {
 
     @Override
     public boolean contains(IData other) {
-
+
+        if(other.isListable()) {
+            List<IData> dataValues = other.asList();
+            return dataValues != null && containsList(dataValues);
+        }
+
         return getInternal().contains(LongTag.valueOf(other.asLong()));
     }