From 2cc51bd8d54e51668c5402b076f01498921fe563 Mon Sep 17 00:00:00 2001 From: YouHaveTrouble Date: Thu, 26 Mar 2026 17:41:12 +0100 Subject: [PATCH] get rid of deprecated classes --- .../interaction/QuickStackToChestInteraction.java | 8 ++++---- .../interaction/QuickStackToNearbyChestsInteraction.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/me/youhavetrouble/quickerstacker/interaction/QuickStackToChestInteraction.java b/src/main/java/me/youhavetrouble/quickerstacker/interaction/QuickStackToChestInteraction.java index fcad3f4..d6e03c4 100644 --- a/src/main/java/me/youhavetrouble/quickerstacker/interaction/QuickStackToChestInteraction.java +++ b/src/main/java/me/youhavetrouble/quickerstacker/interaction/QuickStackToChestInteraction.java @@ -10,8 +10,9 @@ import com.hypixel.hytale.protocol.InteractionType; import com.hypixel.hytale.protocol.packets.interface_.NotificationStyle; import com.hypixel.hytale.server.core.entity.InteractionContext; import com.hypixel.hytale.server.core.entity.entities.Player; -import com.hypixel.hytale.server.core.inventory.Inventory; +import com.hypixel.hytale.server.core.inventory.InventoryComponent; import com.hypixel.hytale.server.core.inventory.ItemStack; +import com.hypixel.hytale.server.core.inventory.container.CombinedItemContainer; import com.hypixel.hytale.server.core.inventory.container.SimpleItemContainer; import com.hypixel.hytale.server.core.inventory.transaction.ItemStackTransaction; import com.hypixel.hytale.server.core.inventory.transaction.ListTransaction; @@ -53,9 +54,8 @@ public class QuickStackToChestInteraction extends SimpleBlockInteraction { ItemContainerBlock containerBlock = blockRef.getStore().getComponent(blockRef, ItemContainerBlock.getComponentType()); if (containerBlock == null) return; SimpleItemContainer container = containerBlock.getItemContainer(); - Inventory playerInventory = player.getInventory(); - if (playerInventory == null) return; - ListTransaction> transaction = playerInventory.getCombinedHotbarFirst().quickStackTo(container); + CombinedItemContainer playerInventory = InventoryComponent.getCombined(commandBuffer, ref, InventoryComponent.HOTBAR_FIRST); + ListTransaction> transaction = playerInventory.quickStackTo(container); if (transaction.size() <= 0) return; PlayerRef playerRef = ref.getStore().getComponent(ref, PlayerRef.getComponentType()); if (playerRef == null) return; diff --git a/src/main/java/me/youhavetrouble/quickerstacker/interaction/QuickStackToNearbyChestsInteraction.java b/src/main/java/me/youhavetrouble/quickerstacker/interaction/QuickStackToNearbyChestsInteraction.java index c4eff98..6b14c02 100644 --- a/src/main/java/me/youhavetrouble/quickerstacker/interaction/QuickStackToNearbyChestsInteraction.java +++ b/src/main/java/me/youhavetrouble/quickerstacker/interaction/QuickStackToNearbyChestsInteraction.java @@ -12,8 +12,9 @@ import com.hypixel.hytale.protocol.InteractionType; import com.hypixel.hytale.protocol.packets.interface_.NotificationStyle; import com.hypixel.hytale.server.core.entity.InteractionContext; import com.hypixel.hytale.server.core.entity.entities.Player; -import com.hypixel.hytale.server.core.inventory.Inventory; +import com.hypixel.hytale.server.core.inventory.InventoryComponent; import com.hypixel.hytale.server.core.inventory.ItemStack; +import com.hypixel.hytale.server.core.inventory.container.CombinedItemContainer; import com.hypixel.hytale.server.core.inventory.container.ItemContainer; import com.hypixel.hytale.server.core.inventory.transaction.ItemStackTransaction; import com.hypixel.hytale.server.core.inventory.transaction.ListTransaction; @@ -52,12 +53,11 @@ public class QuickStackToNearbyChestsInteraction extends SimpleBlockInteraction if (targetBlockPosition == null) return; Collection nearbyContainers = getNearbyContainers(world, ref, ref.getStore(), 10); if (nearbyContainers.isEmpty()) return; - Inventory playerInventory = player.getInventory(); - if (playerInventory == null) return; + CombinedItemContainer playerInventory = InventoryComponent.getCombined(commandBuffer, ref, InventoryComponent.HOTBAR_FIRST); int itemsMoved = 0; for (ItemContainerBlock containerState : nearbyContainers) { ItemContainer itemContainer = containerState.getItemContainer(); - ListTransaction> transaction = playerInventory.getCombinedHotbarFirst().quickStackTo(itemContainer); + ListTransaction> transaction = playerInventory.quickStackTo(itemContainer); for (var tr : transaction.getList()) { ItemStack item = tr.getAddTransaction().getQuery(); if (item == null) continue;