Refactor ItemStack and Behavior API

pom.xml

@@ -10,7 +10,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <junit.jupiter.version>5.7.1</junit.jupiter.version>
-        <jackson.version>2.13.1</jackson.version>
+        <jackson.version>2.13.2</jackson.version>
         <checkerframework.version>3.18.1</checkerframework.version>
     </properties>
 
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.22</version>
+            <version>1.18.24</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
+            <version>2.13.2.2</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
@@ -103,13 +103,19 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>29.0-jre</version>
+            <version>30.0-android</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.checkerframework</groupId>
+                    <artifactId>checker-compat-qual</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>com.nukkitx</groupId>
-            <artifactId>math</artifactId>
-            <version>1.1.1</version>
+            <groupId>org.cloudburstmc.math</groupId>
+            <artifactId>immutable</artifactId>
+            <version>2.0</version>
         </dependency>
 
         <dependency>
@@ -138,9 +144,15 @@
                         <path>
                             <groupId>org.projectlombok</groupId>
                             <artifactId>lombok</artifactId>
-                            <version>1.18.22</version>
+                            <version>1.18.24</version>
                         </path>
                     </annotationProcessorPaths>
+                    <compilerArgs>
+                        <arg>-Xmaxerrs</arg>
+                        <arg>1000</arg>
+                        <arg>-Xmaxwarns</arg>
+                        <arg>2000</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
         </plugins>

src/main/java/module-info.java

@@ -10,7 +10,7 @@
     requires static javax.inject;
     requires java.desktop;
     requires static lombok;
-    requires com.nukkitx.math;
+    requires org.cloudburstmc.math.immutable;
     requires org.slf4j;
 
     exports org.cloudburstmc.api;
@@ -21,6 +21,7 @@
     exports org.cloudburstmc.api.blockentity;
     exports org.cloudburstmc.api.command;
     exports org.cloudburstmc.api.crafting;
+    exports org.cloudburstmc.api.data;
     exports org.cloudburstmc.api.enchantment;
     exports org.cloudburstmc.api.enchantment.behavior;
     exports org.cloudburstmc.api.entity;
@@ -57,5 +58,7 @@
     exports org.cloudburstmc.api.potion;
     exports org.cloudburstmc.api.registry;
     exports org.cloudburstmc.api.util;
+    exports org.cloudburstmc.api.util.behavior;
     exports org.cloudburstmc.api.util.data;
-}
+    exports org.cloudburstmc.api.inventory.screen;
+}

src/main/java/org/cloudburstmc/api/block/Block.java

@@ -1,10 +1,11 @@
 package org.cloudburstmc.api.block;
 
-import com.nukkitx.math.vector.Vector3i;
-import com.nukkitx.math.vector.Vector4i;
 import org.cloudburstmc.api.level.Level;
 import org.cloudburstmc.api.level.chunk.Chunk;
 import org.cloudburstmc.api.util.Direction;
+import org.cloudburstmc.api.util.behavior.BehaviorCollection;
+import org.cloudburstmc.math.vector.Vector3i;
+import org.cloudburstmc.math.vector.Vector4i;
 
 public interface Block extends BlockSnapshot {
 
@@ -18,6 +19,10 @@ public interface Block extends BlockSnapshot {
 
     Vector3i getPosition();
 
+    BehaviorCollection getBehaviors();
+
+    int getBrightness();
+
     default int getX() {
         return getPosition().getX();
     }
@@ -34,102 +39,10 @@ default Block up() {
         return getSide(Direction.UP, 1);
     }
 
-    default Block up(int step) {
-        return getSide(Direction.UP, step);
-    }
-
-    default Block down() {
-        return getSide(Direction.DOWN, 1);
-    }
-
-    default Block down(int step) {
-        return getSide(Direction.DOWN, step);
-    }
-
-    default Block north() {
-        return getSide(Direction.NORTH, 1);
-    }
-
-    default Block north(int step) {
-        return getSide(Direction.NORTH, step);
-    }
-
-    default Block east() {
-        return getSide(Direction.EAST, 1);
-    }
-
-    default Block east(int step) {
-        return getSide(Direction.EAST, step);
-    }
-
-    default Block south() {
-        return getSide(Direction.SOUTH, 1);
-    }
-
-    default Block south(int step) {
-        return getSide(Direction.SOUTH, step);
-    }
-
-    default Block west() {
-        return getSide(Direction.WEST, 1);
-    }
-
-    default Block west(int step) {
-        return getSide(Direction.WEST, step);
-    }
-
     default Block getSide(Direction face) {
         return getSide(face, 1);
     }
 
-    default BlockState upState() {
-        return getSideState(Direction.UP, 1);
-    }
-
-    default BlockState upState(int step) {
-        return getSideState(Direction.UP, step);
-    }
-
-    default BlockState downState() {
-        return getSideState(Direction.DOWN, 1);
-    }
-
-    default BlockState downState(int step) {
-        return getSideState(Direction.DOWN, step);
-    }
-
-    default BlockState northState() {
-        return getSideState(Direction.NORTH, 1);
-    }
-
-    default BlockState northState(int step) {
-        return getSideState(Direction.NORTH, step);
-    }
-
-    default BlockState eastState() {
-        return getSideState(Direction.EAST, 1);
-    }
-
-    default BlockState eastState(int step) {
-        return getSideState(Direction.EAST, step);
-    }
-
-    default BlockState southState() {
-        return getSideState(Direction.SOUTH, 1);
-    }
-
-    default BlockState southState(int step) {
-        return getSideState(Direction.SOUTH, step);
-    }
-
-    default BlockState westState() {
-        return getSideState(Direction.WEST, 1);
-    }
-
-    default BlockState westState(int step) {
-        return getSideState(Direction.WEST, step);
-    }
-
     default BlockState getSideState(Direction face) {
         return getSideState(face, 1);
     }