diff --git a/pom.xml b/pom.xml index 16309bb..50f3417 100644 --- a/pom.xml +++ b/pom.xml @@ -20,8 +20,8 @@ 25 25 UTF-8 - 2026.03.26-89796e57b - 1.4.2 + 0.5.1 + 1.5.0 diff --git a/src/main/java/me/youhavetrouble/quickerstacker/QuickerStacker.java b/src/main/java/me/youhavetrouble/quickerstacker/QuickerStacker.java index aa48af7..e5e3afa 100644 --- a/src/main/java/me/youhavetrouble/quickerstacker/QuickerStacker.java +++ b/src/main/java/me/youhavetrouble/quickerstacker/QuickerStacker.java @@ -3,7 +3,6 @@ package me.youhavetrouble.quickerstacker; import com.hypixel.hytale.component.Ref; import com.hypixel.hytale.event.EventPriority; -import com.hypixel.hytale.math.vector.Vector3i; import com.hypixel.hytale.protocol.InteractionType; import com.hypixel.hytale.server.core.asset.type.blocktype.config.BlockType; import com.hypixel.hytale.server.core.entity.InteractionContext; @@ -24,6 +23,7 @@ import me.youhavetrouble.quickerstacker.interaction.QuickStackToChestInteraction import me.youhavetrouble.quickerstacker.interaction.QuickStackToNearbyChestsInteraction; import org.checkerframework.checker.nullness.compatqual.NonNullDecl; import com.hypixel.hytale.server.core.universe.world.storage.EntityStore; +import org.joml.Vector3i; import java.lang.reflect.Field; import java.util.HashMap; @@ -94,7 +94,7 @@ public class QuickerStacker extends JavaPlugin { Player player = ref.getStore().getComponent(ref, Player.getComponentType()); if (player == null) return false; PlayerRef playerRef = ref.getStore().getComponent(ref, PlayerRef.getComponentType()); - InteractionManager interactionManager = new InteractionManager(player, playerRef, new InteractionSimulationHandler()); + InteractionManager interactionManager = new InteractionManager(playerRef, new InteractionSimulationHandler()); BlockType blockType = world.getBlockType(x, y, z); if (blockType == null) return false; var event = new UseBlockEvent.Pre(InteractionType.Use, InteractionContext.forProxyEntity(interactionManager, ref, ref, ref.getStore()), new Vector3i(x, y, z), blockType); diff --git a/src/main/java/me/youhavetrouble/quickerstacker/interaction/QuickStackToChestInteraction.java b/src/main/java/me/youhavetrouble/quickerstacker/interaction/QuickStackToChestInteraction.java index d6e03c4..f383357 100644 --- a/src/main/java/me/youhavetrouble/quickerstacker/interaction/QuickStackToChestInteraction.java +++ b/src/main/java/me/youhavetrouble/quickerstacker/interaction/QuickStackToChestInteraction.java @@ -4,7 +4,6 @@ import com.hypixel.hytale.codec.builder.BuilderCodec; import com.hypixel.hytale.component.CommandBuffer; import com.hypixel.hytale.component.Ref; import com.hypixel.hytale.math.util.ChunkUtil; -import com.hypixel.hytale.math.vector.Vector3i; import com.hypixel.hytale.protocol.BlockPosition; import com.hypixel.hytale.protocol.InteractionType; import com.hypixel.hytale.protocol.packets.interface_.NotificationStyle; @@ -29,6 +28,7 @@ import com.hypixel.hytale.server.core.util.NotificationUtil; import me.youhavetrouble.quickerstacker.QuickerStacker; import org.checkerframework.checker.nullness.compatqual.NonNullDecl; import org.checkerframework.checker.nullness.compatqual.NullableDecl; +import org.joml.Vector3i; public class QuickStackToChestInteraction extends SimpleBlockInteraction { @@ -36,6 +36,11 @@ public class QuickStackToChestInteraction extends SimpleBlockInteraction { .builder(QuickStackToChestInteraction.class, QuickStackToChestInteraction::new) .build(); + @Override + protected void simulateInteractWithBlock(@NonNullDecl InteractionType interactionType, @NonNullDecl InteractionContext interactionContext, @NullableDecl ItemStack itemStack, @NonNullDecl World world, @NonNullDecl Vector3i vector3i) { + + } + @Override protected void interactWithBlock(@NonNullDecl World world, @NonNullDecl CommandBuffer commandBuffer, @NonNullDecl InteractionType interactionType, @NonNullDecl InteractionContext interactionContext, @NullableDecl ItemStack itemStack, @NonNullDecl Vector3i vector3i, @NonNullDecl CooldownHandler cooldownHandler) { Ref ref = interactionContext.getEntity(); @@ -68,9 +73,4 @@ public class QuickStackToChestInteraction extends SimpleBlockInteraction { if (itemsMoved <= 0) return; NotificationUtil.sendNotification(playerRef.getPacketHandler(), "Quick stacked "+ itemsMoved +" items", NotificationStyle.Success); } - - @Override - protected void simulateInteractWithBlock(@NonNullDecl InteractionType interactionType, @NonNullDecl InteractionContext interactionContext, @NullableDecl ItemStack itemStack, @NonNullDecl World world, @NonNullDecl Vector3i vector3i) { - - } } diff --git a/src/main/java/me/youhavetrouble/quickerstacker/interaction/QuickStackToNearbyChestsInteraction.java b/src/main/java/me/youhavetrouble/quickerstacker/interaction/QuickStackToNearbyChestsInteraction.java index 6b14c02..7484022 100644 --- a/src/main/java/me/youhavetrouble/quickerstacker/interaction/QuickStackToNearbyChestsInteraction.java +++ b/src/main/java/me/youhavetrouble/quickerstacker/interaction/QuickStackToNearbyChestsInteraction.java @@ -5,8 +5,6 @@ import com.hypixel.hytale.component.CommandBuffer; import com.hypixel.hytale.component.Ref; import com.hypixel.hytale.component.Store; import com.hypixel.hytale.math.util.ChunkUtil; -import com.hypixel.hytale.math.vector.Vector3d; -import com.hypixel.hytale.math.vector.Vector3i; import com.hypixel.hytale.protocol.BlockPosition; import com.hypixel.hytale.protocol.InteractionType; import com.hypixel.hytale.protocol.packets.interface_.NotificationStyle; @@ -32,6 +30,8 @@ import com.hypixel.hytale.server.core.util.NotificationUtil; import me.youhavetrouble.quickerstacker.QuickerStacker; import org.checkerframework.checker.nullness.compatqual.NonNullDecl; import org.checkerframework.checker.nullness.compatqual.NullableDecl; +import org.joml.Vector3d; +import org.joml.Vector3i; import java.util.ArrayList; import java.util.Collection; @@ -76,7 +76,6 @@ public class QuickStackToNearbyChestsInteraction extends SimpleBlockInteraction /** * Search for nearby item containers within the given range * @param world World to search in - * @param ref * @param store entity store * @param range Range to search in * @return Collection of found item containers @@ -92,13 +91,13 @@ public class QuickStackToNearbyChestsInteraction extends SimpleBlockInteraction if (!QuickerStacker.canInteractWithBlock( ref, world, - (int) (position.getX() + x), - (int) (position.getY() + y), - (int) (position.getZ() + z)) + (int) (position.x + x), + (int) (position.y + y), + (int) (position.z + z)) ) continue; - WorldChunk chunk = world.getChunk(ChunkUtil.indexChunkFromBlock(position.getX() + x, position.getZ() + z)); + WorldChunk chunk = world.getChunk(ChunkUtil.indexChunkFromBlock(position.x + x, position.z + z)); if (chunk == null) continue; - Ref blockRef = chunk.getBlockComponentEntity((int) position.getX() + x, (int) position.getY() + y, (int) position.getZ() + z); + Ref blockRef = chunk.getBlockComponentEntity((int) position.x + x, (int) position.y + y, (int) position.z + z); if (blockRef == null) continue; ItemContainerBlock containerBlock = blockRef.getStore().getComponent(blockRef, ItemContainerBlock.getComponentType()); if (containerBlock == null) continue; diff --git a/src/main/resources/manifest.json b/src/main/resources/manifest.json index 9aa3ea4..d747e1d 100644 --- a/src/main/resources/manifest.json +++ b/src/main/resources/manifest.json @@ -10,7 +10,8 @@ "Url": "https://yht.one" } ], - "ServerVersion": "${hytale.version}", + "Website": "https://www.curseforge.com/hytale/mods/quickerstacker", + "ServerVersion": "=${hytale.version}", "Dependencies": {}, "OptionalDependencies": {}, "DisabledByDefault": false,