Merge with master-1.21-lts

Author: rubensworks

loader-neoforge/src/main/java/org/cyclops/cyclopscore/nbt/path/parse/NbtPathExpressionParseHandlerBooleanLogicalAdapter.java

@@ -40,7 +40,7 @@ public static boolean isTruthy(Tag tag) {
             return false;
         }
         if (tag.getId() == Tag.TAG_BYTE) {
-            return ((ByteTag) tag).getAsByte() == (byte) 1;
+            return tag.asBoolean().orElse(false);
         }
         // Non-null non-ByteTags are truthy
         return true;

loader-neoforge/src/test/java/org/cyclops/cyclopscore/nbt/path/TestNbtPathLogicalOperators.java

@@ -5,7 +5,7 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.Tag;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.stream.Collectors;

loader-neoforge/src/test/java/org/cyclops/cyclopscore/nbt/path/parse/TestNbtPathExpressionHandlerBooleanLogicalAnd.java

@@ -4,8 +4,8 @@
 import net.minecraft.nbt.ByteTag;
 import net.minecraft.nbt.IntTag;
 import org.cyclops.cyclopscore.nbt.path.INbtPathExpression;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -18,7 +18,7 @@ public class TestNbtPathExpressionHandlerBooleanLogicalAnd {
 
     private NbtPathExpressionParseHandlerBooleanLogicalAnd handler;
 
-    @Before
+    @BeforeEach
     public void beforeEach() {
         handler = new NbtPathExpressionParseHandlerBooleanLogicalAnd();
     }

loader-neoforge/src/test/java/org/cyclops/cyclopscore/nbt/path/parse/TestNbtPathExpressionHandlerBooleanLogicalNot.java

@@ -4,8 +4,8 @@
 import net.minecraft.nbt.ByteTag;
 import net.minecraft.nbt.CompoundTag;
 import org.cyclops.cyclopscore.nbt.path.INbtPathExpression;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -18,7 +18,7 @@ public class TestNbtPathExpressionHandlerBooleanLogicalNot {
 
     private NbtPathExpressionParseHandlerBooleanLogicalNot handler;
 
-    @Before
+    @BeforeEach
     public void beforeEach() {
         handler = new NbtPathExpressionParseHandlerBooleanLogicalNot();
     }

loader-neoforge/src/test/java/org/cyclops/cyclopscore/nbt/path/parse/TestNbtPathExpressionHandlerBooleanLogicalOr.java

@@ -4,8 +4,8 @@
 import net.minecraft.nbt.ByteTag;
 import net.minecraft.nbt.IntTag;
 import org.cyclops.cyclopscore.nbt.path.INbtPathExpression;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -18,7 +18,7 @@ public class TestNbtPathExpressionHandlerBooleanLogicalOr {
 
     private NbtPathExpressionParseHandlerBooleanLogicalOr handler;
 
-    @Before
+    @BeforeEach
     public void beforeEach() {
         handler = new NbtPathExpressionParseHandlerBooleanLogicalOr();
     }

loader-neoforge/src/test/java/org/cyclops/cyclopscore/nbt/path/parse/TestNbtPathExpressionHandlerBooleanRelationalNotEqual.java

@@ -4,8 +4,8 @@
 import net.minecraft.nbt.ByteTag;
 import net.minecraft.nbt.IntTag;
 import org.cyclops.cyclopscore.nbt.path.INbtPathExpression;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -18,7 +18,7 @@ public class TestNbtPathExpressionHandlerBooleanRelationalNotEqual {
 
     private NbtPathExpressionParseHandlerBooleanRelationalNotEqual handler;
 
-    @Before
+    @BeforeEach
     public void beforeEach() {
         handler = new NbtPathExpressionParseHandlerBooleanRelationalNotEqual();
     }