From b159df01cfc7362219c9a029abe5613e91603d1a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 28 Jun 2020 22:29:09 -0500 Subject: [PATCH] Remove usages of forge ItemHandlerHelper that can be done using vanilla --- src/main/java/vazkii/botania/common/block/BlockAltar.java | 2 +- src/main/java/vazkii/botania/common/block/BlockAvatar.java | 2 +- src/main/java/vazkii/botania/common/block/BlockHourglass.java | 2 +- .../java/vazkii/botania/common/block/BlockIncensePlate.java | 2 +- .../java/vazkii/botania/common/block/BlockSparkChanger.java | 2 +- .../vazkii/botania/common/block/decor/BlockManaFlame.java | 2 +- .../java/vazkii/botania/common/block/mana/BlockEnchanter.java | 2 +- .../java/vazkii/botania/common/block/mana/BlockPrism.java | 2 +- .../java/vazkii/botania/common/block/mana/BlockSpreader.java | 4 ++-- .../common/block/subtile/generating/SubTileGourmaryllis.java | 2 +- .../java/vazkii/botania/common/block/tile/TileTinyPotato.java | 2 +- .../vazkii/botania/common/core/helper/InventoryHelper.java | 2 +- .../java/vazkii/botania/common/item/ItemCraftingHalo.java | 4 ++-- .../vazkii/botania/common/item/material/ItemEnderAir.java | 2 +- .../java/vazkii/botania/common/world/SkyblockWorldEvents.java | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 7ffe0ea5e..0b1b80a7f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -117,7 +117,7 @@ public class BlockAltar extends BlockMod implements ITileEntityProvider { if (stack.getCount() == 1) { player.setHeldItem(hand, fill(tile.getFluid(), stack)); } else { - ItemHandlerHelper.giveItemToPlayer(player, fill(tile.getFluid(), new ItemStack(stack.getItem()))); + player.inventory.placeItemBackInInventory(player.world, new ItemStack(stack.getItem())); stack.shrink(1); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 6013b326b..834973a3f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -67,7 +67,7 @@ public class BlockAvatar extends BlockModWaterloggable implements ITileEntityPro ItemStack stackOnPlayer = player.getHeldItem(hand); if (!stackOnAvatar.isEmpty()) { avatar.getItemHandler().setInventorySlotContents(0, ItemStack.EMPTY); - ItemHandlerHelper.giveItemToPlayer(player, stackOnAvatar); + player.inventory.placeItemBackInInventory(player.world, stackOnAvatar); return ActionResultType.SUCCESS; } else if (!stackOnPlayer.isEmpty() && stackOnPlayer.getItem() instanceof IAvatarWieldable) { avatar.getItemHandler().setInventorySlotContents(0, stackOnPlayer.split(1)); diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 08894ea7f..8330367ed 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -92,7 +92,7 @@ public class BlockHourglass extends BlockModWaterloggable implements IManaTrigge stack.setCount(0); return ActionResultType.SUCCESS; } else if (!hgStack.isEmpty()) { - ItemHandlerHelper.giveItemToPlayer(player, hgStack); + player.inventory.placeItemBackInInventory(player.world, hgStack); hourglass.getItemHandler().setInventorySlotContents(0, ItemStack.EMPTY); return ActionResultType.SUCCESS; } diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 74c4d0e05..42a486a56 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -79,7 +79,7 @@ public class BlockIncensePlate extends BlockModWaterloggable implements ITileEnt stack.damageItem(1, player, e -> e.sendBreakAnimation(hand)); did = true; } else { - ItemHandlerHelper.giveItemToPlayer(player, plateStack); + player.inventory.placeItemBackInInventory(player.world, plateStack); plate.getItemHandler().setInventorySlotContents(0, ItemStack.EMPTY); did = true; diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 15a91f490..f8a5adfdd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -74,7 +74,7 @@ public class BlockSparkChanger extends BlockModWaterloggable implements ITileEnt ItemStack cstack = changer.getItemHandler().getStackInSlot(0); if (!cstack.isEmpty()) { changer.getItemHandler().setInventorySlotContents(0, ItemStack.EMPTY); - ItemHandlerHelper.giveItemToPlayer(player, cstack); + player.inventory.placeItemBackInInventory(player.world, cstack); return ActionResultType.SUCCESS; } else if (!pstack.isEmpty() && pstack.getItem() instanceof ItemSparkUpgrade) { changer.getItemHandler().setInventorySlotContents(0, pstack.split(1)); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index 9658c96b1..526fc40ba 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -59,7 +59,7 @@ public class BlockManaFlame extends BlockMod implements ITileEntityProvider { if (!stack.isEmpty() && ItemTags.SAPLINGS.func_230235_a_(stack.getItem()) && !player.inventory.hasItemStack(new ItemStack(ModItems.lexicon))) { if (!world.isRemote) { stack.shrink(1); - ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(ModItems.lexicon)); + player.inventory.placeItemBackInInventory(player.world, new ItemStack(ModItems.lexicon)); } return ActionResultType.SUCCESS; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index b02706d94..fa4b970e3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -80,7 +80,7 @@ public class BlockEnchanter extends BlockMod implements ITileEntityProvider, IWa return ActionResultType.PASS; } } else if (enchanter.stage == TileEnchanter.State.IDLE) { - ItemHandlerHelper.giveItemToPlayer(player, enchanter.itemToEnchant.copy()); + player.inventory.placeItemBackInInventory(player.world, enchanter.itemToEnchant.copy()); enchanter.itemToEnchant = ItemStack.EMPTY; enchanter.sync(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index 75994a5e7..e13ded6b5 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -79,7 +79,7 @@ public class BlockPrism extends BlockModWaterloggable implements ITileEntityProv prism.getItemHandler().setInventorySlotContents(0, heldItem.copy()); } else if (!lens.isEmpty()) { - ItemHandlerHelper.giveItemToPlayer(player, lens); + player.inventory.placeItemBackInInventory(player.world, lens); prism.getItemHandler().setInventorySlotContents(0, ItemStack.EMPTY); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index a67069cb3..e8f34264d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -148,7 +148,7 @@ public class BlockSpreader extends BlockModWaterloggable implements ITileEntityP spreader.getItemHandler().setInventorySlotContents(0, heldItem.copy()); } else if (!lens.isEmpty() && !wool) { - ItemHandlerHelper.giveItemToPlayer(player, lens); + player.inventory.placeItemBackInInventory(player.world, lens); spreader.getItemHandler().setInventorySlotContents(0, ItemStack.EMPTY); } @@ -161,7 +161,7 @@ public class BlockSpreader extends BlockModWaterloggable implements ITileEntityP } } else if (heldItem.isEmpty() && spreader.paddingColor != null && lens.isEmpty()) { ItemStack pad = new ItemStack(ColorHelper.WOOL_MAP.get(spreader.paddingColor).get()); - ItemHandlerHelper.giveItemToPlayer(player, pad); + player.inventory.placeItemBackInInventory(player.world, pad); spreader.paddingColor = null; spreader.markDirty(); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java index 1cfa4be23..567247841 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java @@ -76,7 +76,7 @@ public class SubTileGourmaryllis extends TileEntityGeneratingFlower { for (ListIterator it = lastFoods.listIterator(); it.hasNext();) { int index = it.nextIndex(); ItemStack streakFood = it.next(); - if (ItemHandlerHelper.canItemStacksStack(streakFood, food)) { + if (streakFood.isItemEqual(food) && ItemStack.areItemStackTagsEqual(streakFood, food)) { it.remove(); lastFoods.add(0, streakFood); return index; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index 0aa1968ad..f00447969 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -57,7 +57,7 @@ public class TileTinyPotato extends TileExposedSimpleInventory implements ITicka if (stack.isEmpty()) { player.setHeldItem(hand, stackAt); } else if (!stackAt.isEmpty()) { - ItemHandlerHelper.giveItemToPlayer(player, stackAt); + player.inventory.placeItemBackInInventory(player.world, stackAt); } getItemHandler().setInventorySlotContents(index, copy); diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index 211bebe3c..3bece6c48 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -67,7 +67,7 @@ public class InventoryHelper { ItemStack stackAt = inv.getItemHandler().getStackInSlot(i); if (!stackAt.isEmpty()) { ItemStack copy = stackAt.copy(); - ItemHandlerHelper.giveItemToPlayer(player, copy); + player.inventory.placeItemBackInInventory(player.world, copy); inv.getItemHandler().setInventorySlotContents(i, ItemStack.EMPTY); player.world.updateComparatorOutputLevel(inv.getPos(), null); break; diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 5672d0708..802b2f0b2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -198,7 +198,7 @@ public class ItemCraftingHalo extends Item { private static void doCraft(PlayerEntity player, ItemStack[] recipe, boolean particles) { consumeRecipeIngredients(recipe, player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, Direction.UP).orElse(EmptyHandler.INSTANCE), player); - ItemHandlerHelper.giveItemToPlayer(player, recipe[9]); + player.inventory.placeItemBackInInventory(player.world, recipe[9]); if (!particles) { return; @@ -238,7 +238,7 @@ public class ItemCraftingHalo extends Item { if (player == null) { ItemHandlerHelper.insertItem(inv, container, false); } else { - ItemHandlerHelper.giveItemToPlayer(player, container); + player.inventory.placeItemBackInInventory(player.world, container); } } } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemEnderAir.java b/src/main/java/vazkii/botania/common/item/material/ItemEnderAir.java index c91fe1a5f..4092d8100 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemEnderAir.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemEnderAir.java @@ -47,7 +47,7 @@ public class ItemEnderAir extends Item { if (!world.isRemote) { ItemStack enderAir = new ItemStack(ModItems.enderAirBottle); - ItemHandlerHelper.giveItemToPlayer(event.getPlayer(), enderAir); + event.getPlayer().inventory.placeItemBackInInventory(world, enderAir); stack.shrink(1); world.playSound(null, event.getPos(), SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.NEUTRAL, 0.5F, 1F); } diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 2cde1d4a8..9bc440c99 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -111,7 +111,7 @@ public final class SkyblockWorldEvents { if (equipped.isEmpty()) { player.setHeldItem(event.getHand(), new ItemStack(ModItems.waterBowl)); } else { - ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(ModItems.waterBowl)); + player.inventory.placeItemBackInInventory(player.world, new ItemStack(ModItems.waterBowl)); } }