chore: updated Minestom version

Took 1 hour 58 minutes

anticheat/build.gradle.kts

@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation("net.minestom:minestom-snapshots:12794d4263") {
+    implementation("net.minestom:minestom-snapshots:4553d3c574") {
         exclude(group = "org.jboss.shrinkwrap.resolver", module = "shrinkwrap-resolver-depchain")
     }
 }

commons/build.gradle.kts

@@ -16,7 +16,7 @@ java {
 
 dependencies {
     implementation(project(":packer"))
-    implementation("net.minestom:minestom-snapshots:12794d4263") {
+    implementation("net.minestom:minestom-snapshots:4553d3c574") {
         exclude(group = "org.jboss.shrinkwrap.resolver", module = "shrinkwrap-resolver-depchain")
     }
 }

loader/build.gradle.kts

@@ -32,7 +32,7 @@ dependencies {
     implementation(project(":spark"))
     implementation(project(":anticheat"))
     implementation("org.slf4j:slf4j-api:2.0.13")
-    implementation("net.minestom:minestom-snapshots:12794d4263") {
+    implementation("net.minestom:minestom-snapshots:4553d3c574") {
         exclude(group = "org.jboss.shrinkwrap.resolver", module = "shrinkwrap-resolver-depchain")
     }
     implementation("dev.hollowcube:polar:1.10.0")

proxy.api/build.gradle.kts

@@ -21,7 +21,7 @@ repositories {
 dependencies {
     implementation(project(":commons"))
     implementation("com.github.Swofty-Developments:AtlasRedisAPI:1.1.2")
-    implementation("net.minestom:minestom-snapshots:12794d4263") {
+    implementation("net.minestom:minestom-snapshots:4553d3c574") {
         exclude(group = "org.jboss.shrinkwrap.resolver", module = "shrinkwrap-resolver-depchain")
     }
     implementation("net.kyori:adventure-api:4.17.0")

spark/build.gradle.kts

@@ -22,7 +22,7 @@ repositories {
 }
 
 dependencies {
-    implementation("net.minestom:minestom-snapshots:12794d4263") {
+    implementation("net.minestom:minestom-snapshots:4553d3c574") {
         exclude(group = "org.jboss.shrinkwrap.resolver", module = "shrinkwrap-resolver-depchain")
     }
     implementation(files("dependencies/spark-1.10.1.10-minestom.jar"))

type.generic/build.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
     implementation(project(":commons"))
     implementation(project(":packer"))
     implementation(project(":proxy.api"))
-    implementation("net.minestom:minestom-snapshots:12794d4263") {
+    implementation("net.minestom:minestom-snapshots:4553d3c574") {
         exclude(group = "org.jboss.shrinkwrap.resolver", module = "shrinkwrap-resolver-depchain")
     }
     implementation("dev.hollowcube:polar:1.10.0")

type.generic/src/main/java/net/swofty/types/generic/entity/ArrowEntityImpl.java

@@ -2,9 +2,7 @@
 
 import lombok.Getter;
 import net.minestom.server.MinecraftServer;
-import net.minestom.server.collision.CollisionUtils;
-import net.minestom.server.collision.PhysicsResult;
-import net.minestom.server.collision.ShapeImpl;
+import net.minestom.server.collision.*;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.coordinate.Vec;
 import net.minestom.server.entity.Entity;
@@ -16,6 +14,9 @@
 import net.minestom.server.timer.TaskSchedule;
 import net.swofty.types.generic.item.SkyBlockItem;
 import net.swofty.types.generic.utility.MathUtility;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
 
 public class ArrowEntityImpl extends LivingEntity {
     private long cooldown = 0;
@@ -72,35 +73,37 @@ public void tick(long time) {
             cooldown = System.currentTimeMillis();
         }
 
-        PhysicsResult collided = CollisionUtils.checkEntityCollisions(instance, this.getBoundingBox(), posBefore, diff, 3, (e) -> e != this, result);
-        if (collided != null && collided.collisionShapes()[0] != shooter) {
-            if (collided.collisionShapes()[0] instanceof Entity entity) {
-                EntityType entityType = entity.getEntityType();
-                if (entityType == EntityType.PLAYER ||
-                        entityType == EntityType.ARMOR_STAND) {
+        @NotNull Collection<EntityCollisionResult> collided = CollisionUtils.checkEntityCollisions(instance, this.getBoundingBox(), posBefore, diff, 3, (e) -> e != this, result);
+        for (EntityCollisionResult collisionResult : collided) {
+            if (collisionResult != null && collisionResult.entity() != shooter) {
+                if (collisionResult.entity() instanceof Entity entity) {
+                    EntityType entityType = entity.getEntityType();
+                    if (entityType == EntityType.PLAYER ||
+                            entityType == EntityType.ARMOR_STAND) {
+                        return;
+                    }
+
+                    var e = new ProjectileCollideWithEntityEvent(
+                            this,
+                            Pos.fromPoint(collisionResult.collisionPoint()),
+                            entity
+                    );
+                    MinecraftServer.getGlobalEventHandler().call(e);
+                    if (!e.isCancelled()) {
+                        remove();
+                        kill();
+                    }
                     return;
                 }
-
-                var e = new ProjectileCollideWithEntityEvent(this, collided.newPosition(), entity);
-                MinecraftServer.getGlobalEventHandler().call(e);
-                if (!e.isCancelled()) {
-                    remove();
-                    kill();
-                }
-                return;
             }
         }
 
         if (result.hasCollision()) {
             Block hitBlock = null;
-            if (result.collisionShapes()[0] instanceof ShapeImpl block) {
-                hitBlock = block.block();
-            }
-            if (result.collisionShapes()[1] instanceof ShapeImpl block) {
-                hitBlock = block.block();
-            }
-            if (result.collisionShapes()[2] instanceof ShapeImpl block) {
-                hitBlock = block.block();
+            for (Shape shape : result.collisionShapes()) {
+                if (shape instanceof ShapeImpl block) {
+                    hitBlock = getInstance().getBlock(block.relativeEnd());
+                }
             }
 
             if (hitBlock == null) return;

type.generic/src/main/java/net/swofty/types/generic/entity/mob/SkyBlockMob.java

@@ -145,7 +145,7 @@ public void kill() {
 
             SkyBlockItem item = new SkyBlockItem(itemType, record.getAmount());
             ItemTypeLinker droppedItemLinker = item.getAttributeHandler().getPotentialClassLinker();
-            if (player.canInsertItem(droppedItemLinker, record.getAmount())) {
+            if (player.canInsertItemIntoSacks(droppedItemLinker, record.getAmount())) {
                 player.getSackItems().increase(droppedItemLinker, record.getAmount());
             } else if (player.getSkyBlockExperience().getLevel().asInt() >= 6) {
                 player.addAndUpdateItem(item);

type.generic/src/main/java/net/swofty/types/generic/event/SkyBlockEventHandler.java

@@ -28,7 +28,9 @@ public class SkyBlockEventHandler {
     private static final ArrayList<EventMethodEntry> cachedCustomEvents = new ArrayList<>();
     private static final EventNode<Event> customEventNode = (EventNode<Event>) EventNodes.CUSTOM.eventNode;
 
-    private record EventMethodEntry(Method method, Object instance, SkyBlockEvent skyBlockEvent) { }
+    private record EventMethodEntry(Method method,
+                                    Object instance,
+                                    SkyBlockEvent skyBlockEvent) { }
 
     public static void registerEventMethods(Object instance) {
         Class<?> clazz = instance.getClass();

type.generic/src/main/java/net/swofty/types/generic/event/actions/item/ActionPlayerItemPickup.java

@@ -23,7 +23,7 @@ public void run(PlayerMoveEvent event) {
                     player.sendPacket(new CollectItemPacket(item.getEntityId(), player.getEntityId(),
                             item.getItem().getAmount()));
 
-                    if (player.canInsertItem(item.getItem().getAttributeHandler().getPotentialClassLinker(), item.getItem().getAmount())) {
+                    if (player.canInsertItemIntoSacks(item.getItem().getAttributeHandler().getPotentialClassLinker(), item.getItem().getAmount())) {
                         player.getSackItems().increase(item.getItem().getAttributeHandler().getPotentialClassLinker(), item.getItem().getAmount());
                     } else {
                         player.addAndUpdateItem(item.getItem());

type.generic/src/main/java/net/swofty/types/generic/event/actions/player/region/ActionRegionBlockBreak.java

@@ -88,7 +88,7 @@ public void run(PlayerBlockBreakEvent event) {
              */
             SkyBlockItem skyBlockItem = new SkyBlockItem(item.getItemStackBuilder().amount(dropAmount).build());
             ItemTypeLinker droppedItemLinker = skyBlockItem.getAttributeHandler().getPotentialClassLinker();
-            if (player.canInsertItem(droppedItemLinker, dropAmount)) {
+            if (player.canInsertItemIntoSacks(droppedItemLinker, dropAmount)) {
                 player.getSackItems().increase(droppedItemLinker, dropAmount);
             } else if (player.getSkyBlockExperience().getLevel().asInt() >= 6) {
                 player.addAndUpdateItem(skyBlockItem);

type.generic/src/main/java/net/swofty/types/generic/gui/SkyBlockSignGUI.java

@@ -10,6 +10,7 @@
 import net.minestom.server.network.packet.server.play.BlockChangePacket;
 import net.minestom.server.network.packet.server.play.BlockEntityDataPacket;
 import net.minestom.server.network.packet.server.play.OpenSignEditorPacket;
+import net.minestom.server.tag.Tag;
 import net.minestom.server.timer.TaskSchedule;
 import net.swofty.types.generic.user.SkyBlockPlayer;
 

type.generic/src/main/java/net/swofty/types/generic/gui/inventory/inventories/sbmenu/bags/GUISackOfSacks.java

@@ -113,7 +113,7 @@ public void run(InventoryPreClickEvent e, SkyBlockPlayer player) {
                 for (ItemStack itemStack : player.getInventory().getItemStacks()) {
                     SkyBlockItem item = new SkyBlockItem(itemStack);
                     ItemTypeLinker linker = item.getAttributeHandler().getPotentialClassLinker();
-                    if (player.canInsertItem(linker)) {
+                    if (player.canInsertItemIntoSacks(linker)) {
                         player.getSackItems().increase(linker, item.getAmount());
                         player.getInventory().setItemStack(slot, ItemStack.AIR);
                     }

type.generic/src/main/java/net/swofty/types/generic/noteblock/SkyBlockSongsHandler.java

@@ -4,6 +4,7 @@
 import net.kyori.adventure.sound.Sound;
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.entity.Player;
+import net.minestom.server.tag.Tag;
 import net.minestom.server.timer.Task;
 import net.minestom.server.timer.TaskSchedule;
 import net.swofty.types.generic.user.SkyBlockPlayer;

type.generic/src/main/java/net/swofty/types/generic/user/SkyBlockPlayer.java

@@ -502,7 +502,7 @@ public int getMaxSackStorage(ItemTypeLinker sack) {
         return maxStorage;
     }
 
-    public boolean canInsertItem(ItemTypeLinker item) {
+    public boolean canInsertItemIntoSacks(ItemTypeLinker item) {
         for (SkyBlockItem sack : getAllSacks()) {
             if (sack.getGenericInstance() instanceof Sack sackInstance) {
                 for (ItemTypeLinker linker : sackInstance.getSackItems()) {
@@ -514,8 +514,8 @@ public boolean canInsertItem(ItemTypeLinker item) {
         }
         return false;
     }
-    public boolean canInsertItem(ItemTypeLinker item, Integer amount) {
-        if (!canInsertItem(item)) return false;
+    public boolean canInsertItemIntoSacks(ItemTypeLinker item, Integer amount) {
+        if (!canInsertItemIntoSacks(item)) return false;
 
         List<Map<SkyBlockItem, Integer>> maxStorages = new ArrayList<>();
         for (SkyBlockItem sack : getAllSacks()) {

type.hub/build.gradle.kts

@@ -17,7 +17,7 @@ dependencies {
     implementation(project(":type.generic"))
     implementation(project(":commons"))
     implementation(project(":proxy.api"))
-    implementation("net.minestom:minestom-snapshots:12794d4263") {
+    implementation("net.minestom:minestom-snapshots:4553d3c574") {
         exclude(group = "org.jboss.shrinkwrap.resolver", module = "shrinkwrap-resolver-depchain")
     }
 }

type.island/build.gradle.kts

@@ -17,7 +17,7 @@ dependencies {
     implementation(project(":type.generic"))
     implementation(project(":commons"))
     implementation(project(":proxy.api"))
-    implementation("net.minestom:minestom-snapshots:12794d4263") {
+    implementation("net.minestom:minestom-snapshots:4553d3c574") {
         exclude(group = "org.jboss.shrinkwrap.resolver", module = "shrinkwrap-resolver-depchain")
     }
 }

type.thefarmingislands/build.gradle.kts

@@ -17,7 +17,7 @@ dependencies {
     implementation(project(":type.generic"))
     implementation(project(":commons"))
     implementation(project(":proxy.api"))
-    implementation("net.minestom:minestom-snapshots:12794d4263") {
+    implementation("net.minestom:minestom-snapshots:4553d3c574") {
         exclude(group = "org.jboss.shrinkwrap.resolver", module = "shrinkwrap-resolver-depchain")
     }
 }