get rid of deprecated classes

This commit is contained in:
2026-03-26 17:41:12 +01:00
parent 51c720abce
commit 2cc51bd8d5
2 changed files with 8 additions and 8 deletions
@@ -10,8 +10,9 @@ import com.hypixel.hytale.protocol.InteractionType;
import com.hypixel.hytale.protocol.packets.interface_.NotificationStyle; import com.hypixel.hytale.protocol.packets.interface_.NotificationStyle;
import com.hypixel.hytale.server.core.entity.InteractionContext; import com.hypixel.hytale.server.core.entity.InteractionContext;
import com.hypixel.hytale.server.core.entity.entities.Player; 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.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.container.SimpleItemContainer;
import com.hypixel.hytale.server.core.inventory.transaction.ItemStackTransaction; import com.hypixel.hytale.server.core.inventory.transaction.ItemStackTransaction;
import com.hypixel.hytale.server.core.inventory.transaction.ListTransaction; 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()); ItemContainerBlock containerBlock = blockRef.getStore().getComponent(blockRef, ItemContainerBlock.getComponentType());
if (containerBlock == null) return; if (containerBlock == null) return;
SimpleItemContainer container = containerBlock.getItemContainer(); SimpleItemContainer container = containerBlock.getItemContainer();
Inventory playerInventory = player.getInventory(); CombinedItemContainer playerInventory = InventoryComponent.getCombined(commandBuffer, ref, InventoryComponent.HOTBAR_FIRST);
if (playerInventory == null) return; ListTransaction<MoveTransaction<ItemStackTransaction>> transaction = playerInventory.quickStackTo(container);
ListTransaction<MoveTransaction<ItemStackTransaction>> transaction = playerInventory.getCombinedHotbarFirst().quickStackTo(container);
if (transaction.size() <= 0) return; if (transaction.size() <= 0) return;
PlayerRef playerRef = ref.getStore().getComponent(ref, PlayerRef.getComponentType()); PlayerRef playerRef = ref.getStore().getComponent(ref, PlayerRef.getComponentType());
if (playerRef == null) return; if (playerRef == null) return;
@@ -12,8 +12,9 @@ import com.hypixel.hytale.protocol.InteractionType;
import com.hypixel.hytale.protocol.packets.interface_.NotificationStyle; import com.hypixel.hytale.protocol.packets.interface_.NotificationStyle;
import com.hypixel.hytale.server.core.entity.InteractionContext; import com.hypixel.hytale.server.core.entity.InteractionContext;
import com.hypixel.hytale.server.core.entity.entities.Player; 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.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.container.ItemContainer;
import com.hypixel.hytale.server.core.inventory.transaction.ItemStackTransaction; import com.hypixel.hytale.server.core.inventory.transaction.ItemStackTransaction;
import com.hypixel.hytale.server.core.inventory.transaction.ListTransaction; import com.hypixel.hytale.server.core.inventory.transaction.ListTransaction;
@@ -52,12 +53,11 @@ public class QuickStackToNearbyChestsInteraction extends SimpleBlockInteraction
if (targetBlockPosition == null) return; if (targetBlockPosition == null) return;
Collection<ItemContainerBlock> nearbyContainers = getNearbyContainers(world, ref, ref.getStore(), 10); Collection<ItemContainerBlock> nearbyContainers = getNearbyContainers(world, ref, ref.getStore(), 10);
if (nearbyContainers.isEmpty()) return; if (nearbyContainers.isEmpty()) return;
Inventory playerInventory = player.getInventory(); CombinedItemContainer playerInventory = InventoryComponent.getCombined(commandBuffer, ref, InventoryComponent.HOTBAR_FIRST);
if (playerInventory == null) return;
int itemsMoved = 0; int itemsMoved = 0;
for (ItemContainerBlock containerState : nearbyContainers) { for (ItemContainerBlock containerState : nearbyContainers) {
ItemContainer itemContainer = containerState.getItemContainer(); ItemContainer itemContainer = containerState.getItemContainer();
ListTransaction<MoveTransaction<ItemStackTransaction>> transaction = playerInventory.getCombinedHotbarFirst().quickStackTo(itemContainer); ListTransaction<MoveTransaction<ItemStackTransaction>> transaction = playerInventory.quickStackTo(itemContainer);
for (var tr : transaction.getList()) { for (var tr : transaction.getList()) {
ItemStack item = tr.getAddTransaction().getQuery(); ItemStack item = tr.getAddTransaction().getQuery();
if (item == null) continue; if (item == null) continue;