From 556a8bcfce58217686ec10dd1afaf94296b048e8 Mon Sep 17 00:00:00 2001 From: Jikoo Date: Sat, 16 Oct 2021 16:23:26 -0400 Subject: [PATCH] Drop 1.16.5 support to use Mojang mappings Because there is no option to create a `remapped-mojang` artifact for 1.16.5 and the whole point of the scripts is to save me time, 1.16.5 support is being removed earlier than usual. Also fixes issues with NMS-based shulker collision check. Closes #36 --- .../openinv/internal/IAnySilentContainer.java | 26 +- .../lishid/openinv/util/InventoryAccess.java | 21 +- .../lishid/openinv/util/ReflectionHelper.java | 75 ++ internal/v1_16_R3/pom.xml | 64 -- .../internal/v1_16_R3/AnySilentContainer.java | 265 ------ .../openinv/internal/v1_16_R3/OpenPlayer.java | 78 -- .../internal/v1_16_R3/PlayerDataManager.java | 235 ------ .../internal/v1_16_R3/SpecialEnderChest.java | 261 ------ .../v1_16_R3/SpecialPlayerInventory.java | 738 ---------------- internal/v1_17_R1/pom.xml | 33 + .../internal/v1_17_R1/AnySilentContainer.java | 260 +++--- .../openinv/internal/v1_17_R1/OpenPlayer.java | 44 +- .../internal/v1_17_R1/PlayerDataManager.java | 63 +- .../internal/v1_17_R1/SpecialEnderChest.java | 369 ++++---- .../v1_17_R1/SpecialPlayerInventory.java | 796 +++++++++--------- .../lishid/openinv/util/InternalAccessor.java | 2 + pom.xml | 7 +- scripts/get_spigot_versions.sh | 4 +- scripts/install_spigot_dependencies.sh | 4 +- 19 files changed, 889 insertions(+), 2456 deletions(-) create mode 100644 api/src/main/java/com/lishid/openinv/util/ReflectionHelper.java delete mode 100644 internal/v1_16_R3/pom.xml delete mode 100644 internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/AnySilentContainer.java delete mode 100644 internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/OpenPlayer.java delete mode 100644 internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/PlayerDataManager.java delete mode 100644 internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/SpecialEnderChest.java delete mode 100644 internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/SpecialPlayerInventory.java diff --git a/api/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java b/api/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java index ef78c76..62b95e4 100644 --- a/api/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java +++ b/api/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java @@ -24,7 +24,6 @@ import org.bukkit.block.BlockState; import org.bukkit.block.EnderChest; import org.bukkit.block.ShulkerBox; import org.bukkit.block.data.BlockData; -import org.bukkit.block.data.Directional; import org.bukkit.block.data.type.Chest; import org.bukkit.entity.Cat; import org.bukkit.entity.Player; @@ -84,30 +83,9 @@ public interface IAnySilentContainer { // Shulker boxes require 1/2 a block clear in the direction they open. if (blockState instanceof ShulkerBox) { - BoundingBox boundingBox = block.getBoundingBox(); - if (boundingBox.getVolume() > 1) { - // Shulker box is already open. - return false; - } - - BlockData blockData = block.getBlockData(); - if (!(blockData instanceof Directional)) { - // Shouldn't be possible. Just in case, demand AnyChest. + if (isShulkerBlocked((ShulkerBox) blockState)) { return true; } - - Directional directional = (Directional) blockData; - BlockFace face = directional.getFacing(); - Block relative = block.getRelative(face, 1); - - if (isShulkerIgnoreBoundingBox(relative)) { - // Certain special cases are ignored. Signs, simple redstone, etc. - return false; - } - - boundingBox.expand(face.getDirection(), 0.5); - // Return whether or not bounding boxes overlap. - return relative.getBoundingBox().overlaps(boundingBox); } if (!(blockState instanceof org.bukkit.block.Chest)) { @@ -146,7 +124,7 @@ public interface IAnySilentContainer { return isChestBlocked(relative); } - boolean isShulkerIgnoreBoundingBox(Block block); + boolean isShulkerBlocked(ShulkerBox block); /** * Determine whether or not a chest is blocked. diff --git a/api/src/main/java/com/lishid/openinv/util/InventoryAccess.java b/api/src/main/java/com/lishid/openinv/util/InventoryAccess.java index 90885da..1de0d85 100644 --- a/api/src/main/java/com/lishid/openinv/util/InventoryAccess.java +++ b/api/src/main/java/com/lishid/openinv/util/InventoryAccess.java @@ -20,7 +20,6 @@ import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialInventory; import com.lishid.openinv.internal.ISpecialPlayerInventory; -import java.lang.reflect.Field; import java.lang.reflect.Method; import org.bukkit.Bukkit; import org.bukkit.inventory.Inventory; @@ -81,7 +80,8 @@ public class InventoryAccess implements IInventoryAccess { } catch (ReflectiveOperationException ignored) {} } - inv = grabFieldOfTypeFromObject(expected, inventory); + // Use reflection to find the IInventory + inv = ReflectionHelper.grabObjectByType(inventory, expected); if (expected.isInstance(inv)) { return expected.cast(inv); @@ -90,23 +90,6 @@ public class InventoryAccess implements IInventoryAccess { return null; } - private static @Nullable T grabFieldOfTypeFromObject(final Class type, final Object object) { - // Use reflection to find the IInventory - Class clazz = object.getClass(); - T result = null; - for (Field f : clazz.getDeclaredFields()) { - f.setAccessible(true); - if (type.isAssignableFrom(f.getDeclaringClass())) { - try { - result = type.cast(f.get(object)); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - return result; - } - @Deprecated @Override public @Nullable ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) { diff --git a/api/src/main/java/com/lishid/openinv/util/ReflectionHelper.java b/api/src/main/java/com/lishid/openinv/util/ReflectionHelper.java new file mode 100644 index 0000000..7c28374 --- /dev/null +++ b/api/src/main/java/com/lishid/openinv/util/ReflectionHelper.java @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2011-2021 lishid. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.lishid.openinv.util; + +import java.lang.reflect.Field; +import org.jetbrains.annotations.Nullable; + +/** + * A utility for making reflection easier. + */ +public final class ReflectionHelper { + + private ReflectionHelper() {} + + /** + * Grab an {@link Object} stored in a {@link Field} of another {@code Object}. + * + *

This casts the field to the correct class. Any issues will result in a {@code null} return value. + * + * @param fieldType the {@link Class} of {@code Object} stored in the {@code Field} + * @param holder the containing {@code Object} + * @param the type of stored {@code Object} + * @return the first matching {@code Object} or {@code null} if none match + */ + public static @Nullable T grabObjectByType(final Object holder, final Class fieldType) { + Field field = grabFieldByType(holder.getClass(), fieldType); + + if (field != null) { + try { + return fieldType.cast(field.get(holder)); + } catch (IllegalAccessException ignored) { + // Ignore issues obtaining field + } + } + + return null; + } + + /** + * Grab a {@link Field} of an {@link Object} + * + * @param fieldType the {@link Class} of the object + * @param holderType the containing {@code Class} + * @return the first matching object or {@code null} if none match + */ + public static @Nullable Field grabFieldByType(Class holderType, Class fieldType) { + for (Field field : holderType.getDeclaredFields()) { + field.setAccessible(true); + if (fieldType.isAssignableFrom(field.getType())) { + return field; + } + } + + if (holderType.getSuperclass() != null) { + return grabFieldByType(fieldType, holderType.getSuperclass()); + } + + return null; + } + +} diff --git a/internal/v1_16_R3/pom.xml b/internal/v1_16_R3/pom.xml deleted file mode 100644 index 90b9458..0000000 --- a/internal/v1_16_R3/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - 4.0.0 - - - openinvparent - com.lishid - ../../pom.xml - 4.1.9-SNAPSHOT - - - openinvadapter1_16_R3 - OpenInvAdapter1_16_R3 - - - - spigot - org.spigotmc - provided - 1.16.5-R0.1-SNAPSHOT - - - openinvapi - com.lishid - - - openinvplugincore - com.lishid - - - annotations - org.jetbrains - - - - - - - maven-shade-plugin - - - maven-compiler-plugin - - - - - diff --git a/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/AnySilentContainer.java b/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/AnySilentContainer.java deleted file mode 100644 index 03a9173..0000000 --- a/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/AnySilentContainer.java +++ /dev/null @@ -1,265 +0,0 @@ -/* - * Copyright (C) 2011-2021 lishid. All rights reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.lishid.openinv.internal.v1_16_R3; - -import com.lishid.openinv.OpenInv; -import com.lishid.openinv.internal.IAnySilentContainer; -import java.lang.reflect.Field; -import java.util.logging.Level; -import net.minecraft.server.v1_16_R3.Block; -import net.minecraft.server.v1_16_R3.BlockBarrel; -import net.minecraft.server.v1_16_R3.BlockChest; -import net.minecraft.server.v1_16_R3.BlockChestTrapped; -import net.minecraft.server.v1_16_R3.BlockPosition; -import net.minecraft.server.v1_16_R3.BlockPropertyChestType; -import net.minecraft.server.v1_16_R3.BlockShulkerBox; -import net.minecraft.server.v1_16_R3.ChatMessage; -import net.minecraft.server.v1_16_R3.Container; -import net.minecraft.server.v1_16_R3.ContainerChest; -import net.minecraft.server.v1_16_R3.Containers; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntityPlayer; -import net.minecraft.server.v1_16_R3.EnumGamemode; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.IChatBaseComponent; -import net.minecraft.server.v1_16_R3.ITileInventory; -import net.minecraft.server.v1_16_R3.InventoryEnderChest; -import net.minecraft.server.v1_16_R3.InventoryLargeChest; -import net.minecraft.server.v1_16_R3.PlayerInteractManager; -import net.minecraft.server.v1_16_R3.PlayerInventory; -import net.minecraft.server.v1_16_R3.TileEntity; -import net.minecraft.server.v1_16_R3.TileEntityChest; -import net.minecraft.server.v1_16_R3.TileEntityEnderChest; -import net.minecraft.server.v1_16_R3.TileEntityLootable; -import net.minecraft.server.v1_16_R3.TileInventory; -import net.minecraft.server.v1_16_R3.World; -import org.bukkit.Bukkit; -import org.bukkit.Material; -import org.bukkit.Statistic; -import org.bukkit.craftbukkit.v1_16_R3.CraftWorld; -import org.bukkit.entity.Player; -import org.bukkit.inventory.InventoryView; -import org.jetbrains.annotations.NotNull; - -public class AnySilentContainer implements IAnySilentContainer { - - private Field playerInteractManagerGamemode; - - public AnySilentContainer() { - try { - this.playerInteractManagerGamemode = PlayerInteractManager.class.getDeclaredField("gamemode"); - this.playerInteractManagerGamemode.setAccessible(true); - } catch (NoSuchFieldException | SecurityException e) { - System.err.println("[OpenInv] Unable to directly write player gamemode! SilentChest will fail."); - e.printStackTrace(); - } - } - - @Override - public boolean isShulkerIgnoreBoundingBox(org.bukkit.block.Block bukkitBlock) { - org.bukkit.World bukkitWorld = bukkitBlock.getWorld(); - if (!(bukkitWorld instanceof CraftWorld)) { - bukkitWorld = Bukkit.getWorld(bukkitWorld.getUID()); - } - if (!(bukkitWorld instanceof CraftWorld)) { - Exception exception = new IllegalStateException("AnySilentContainer access attempted on an unknown world!"); - OpenInv.getPlugin(OpenInv.class).getLogger().log(Level.WARNING, exception.getMessage(), exception); - return false; - } - - final World world = ((CraftWorld) bukkitWorld).getHandle(); - final BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ()); - return world.getType(blockPosition).d(); - } - - @Override - public boolean activateContainer(@NotNull final Player bukkitPlayer, final boolean silentchest, - @NotNull final org.bukkit.block.Block bukkitBlock) { - - // Silent ender chest is API-only - if (silentchest && bukkitBlock.getType() == Material.ENDER_CHEST) { - bukkitPlayer.openInventory(bukkitPlayer.getEnderChest()); - bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED); - return true; - } - - EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer); - - final World world = player.world; - final BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ()); - final TileEntity tile = world.getTileEntity(blockPosition); - - if (tile == null) { - return false; - } - - if (tile instanceof TileEntityEnderChest) { - // Anychest ender chest. See net.minecraft.server.BlockEnderChest - InventoryEnderChest enderChest = player.getEnderChest(); - enderChest.a((TileEntityEnderChest) tile); - player.openContainer(new TileInventory((containerCounter, playerInventory, ignored) -> { - Containers containers = PlayerDataManager.getContainers(enderChest.getSize()); - int rows = enderChest.getSize() / 9; - return new ContainerChest(containers, containerCounter, playerInventory, enderChest, rows); - }, new ChatMessage("container.enderchest"))); - bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED); - return true; - } - - if (!(tile instanceof ITileInventory)) { - return false; - } - - ITileInventory tileInventory = (ITileInventory) tile; - IBlockData blockData = world.getType(blockPosition); - Block block = blockData.getBlock(); - - if (block instanceof BlockChest) { - - BlockPropertyChestType chestType = blockData.get(BlockChest.c); - - if (chestType != BlockPropertyChestType.SINGLE) { - - BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.h(blockData)); - IBlockData adjacentBlockData = world.getType(adjacentBlockPosition); - - if (adjacentBlockData.getBlock() == block) { - - BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.c); - - if (adjacentChestType != BlockPropertyChestType.SINGLE && chestType != adjacentChestType - && adjacentBlockData.get(BlockChest.FACING) == blockData.get(BlockChest.FACING)) { - - TileEntity adjacentTile = world.getTileEntity(adjacentBlockPosition); - - if (adjacentTile instanceof TileEntityChest && tileInventory instanceof TileEntityChest) { - TileEntityChest rightChest = chestType == BlockPropertyChestType.RIGHT ? ((TileEntityChest) tileInventory) : (TileEntityChest) adjacentTile; - TileEntityChest leftChest = chestType == BlockPropertyChestType.RIGHT ? (TileEntityChest) adjacentTile : ((TileEntityChest) tileInventory); - - if (silentchest && (rightChest.lootTable != null || leftChest.lootTable != null)) { - OpenInv.getPlugin(OpenInv.class).sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated"); - return false; - } - - tileInventory = new ITileInventory() { - public Container createMenu(int containerCounter, PlayerInventory playerInventory, EntityHuman entityHuman) { - leftChest.d(playerInventory.player); - rightChest.d(playerInventory.player); - return ContainerChest.b(containerCounter, playerInventory, new InventoryLargeChest(rightChest, leftChest)); - } - - public IChatBaseComponent getScoreboardDisplayName() { - if (leftChest.hasCustomName()) { - return leftChest.getScoreboardDisplayName(); - } - if (rightChest.hasCustomName()) { - return rightChest.getScoreboardDisplayName(); - } - return new ChatMessage("container.chestDouble"); - } - }; - } - } - } - } - - if (block instanceof BlockChestTrapped) { - bukkitPlayer.incrementStatistic(Statistic.TRAPPED_CHEST_TRIGGERED); - } else { - bukkitPlayer.incrementStatistic(Statistic.CHEST_OPENED); - } - } - - if (block instanceof BlockShulkerBox) { - bukkitPlayer.incrementStatistic(Statistic.SHULKER_BOX_OPENED); - } - - if (block instanceof BlockBarrel) { - bukkitPlayer.incrementStatistic(Statistic.OPEN_BARREL); - } - - // AnyChest only - SilentChest not active, container unsupported, or unnecessary. - if (!silentchest || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) { - player.openContainer(tileInventory); - return true; - } - - // SilentChest requires access to setting players' gamemode directly. - if (this.playerInteractManagerGamemode == null) { - return false; - } - - if (tile instanceof TileEntityLootable) { - TileEntityLootable lootable = (TileEntityLootable) tile; - if (lootable.lootTable != null) { - OpenInv.getPlugin(OpenInv.class).sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated"); - return false; - } - } - - EnumGamemode gamemode = player.playerInteractManager.getGameMode(); - this.forceGameMode(player, EnumGamemode.SPECTATOR); - player.openContainer(tileInventory); - this.forceGameMode(player, gamemode); - return true; - } - - @Override - public void deactivateContainer(@NotNull final Player bukkitPlayer) { - if (this.playerInteractManagerGamemode == null) { - return; - } - - InventoryView view = bukkitPlayer.getOpenInventory(); - switch (view.getType()) { - case CHEST: - case ENDER_CHEST: - case SHULKER_BOX: - case BARREL: - break; - default: - return; - } - - EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer); - - EnumGamemode gamemode = player.playerInteractManager.getGameMode(); - this.forceGameMode(player, EnumGamemode.SPECTATOR); - player.activeContainer.b(player); - player.activeContainer.a(player, false); - player.activeContainer.transferTo(player.defaultContainer, player.getBukkitEntity()); - player.activeContainer = player.defaultContainer; - this.forceGameMode(player, gamemode); - } - - private void forceGameMode(final EntityPlayer player, final EnumGamemode gameMode) { - if (this.playerInteractManagerGamemode == null) { - // No need to warn repeatedly, error on startup and lack of function should be enough. - return; - } - try { - if (!this.playerInteractManagerGamemode.isAccessible()) { - // Just in case, ensure accessible. - this.playerInteractManagerGamemode.setAccessible(true); - } - this.playerInteractManagerGamemode.set(player.playerInteractManager, gameMode); - } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); - } - } - -} diff --git a/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/OpenPlayer.java b/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/OpenPlayer.java deleted file mode 100644 index ec87e3b..0000000 --- a/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/OpenPlayer.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) 2011-2021 lishid. All rights reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.lishid.openinv.internal.v1_16_R3; - -import java.io.File; -import java.io.FileOutputStream; -import net.minecraft.server.v1_16_R3.EntityPlayer; -import net.minecraft.server.v1_16_R3.NBTCompressedStreamTools; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.WorldNBTStorage; -import org.apache.logging.log4j.LogManager; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer; - -public class OpenPlayer extends CraftPlayer { - - public OpenPlayer(CraftServer server, EntityPlayer entity) { - super(server, entity); - } - - @Override - public void loadData() { - // See CraftPlayer#loadData - NBTTagCompound loaded = this.server.getHandle().playerFileData.load(this.getHandle()); - if (loaded != null) { - readExtraData(loaded); - } - } - - @Override - public void saveData() { - EntityPlayer player = this.getHandle(); - // See net.minecraft.server.WorldNBTStorage#save(EntityPlayer) - try { - WorldNBTStorage worldNBTStorage = player.server.getPlayerList().playerFileData; - - NBTTagCompound playerData = player.save(new NBTTagCompound()); - setExtraData(playerData); - - if (!isOnline()) { - // Special case: save old vehicle data - NBTTagCompound oldData = worldNBTStorage.load(player); - - if (oldData != null && oldData.hasKeyOfType("RootVehicle", 10)) { - // See net.minecraft.server.PlayerList#a(NetworkManager, EntityPlayer) and net.minecraft.server.EntityPlayer#b(NBTTagCompound) - playerData.set("RootVehicle", oldData.getCompound("RootVehicle")); - } - } - - File file = new File(worldNBTStorage.getPlayerDir(), player.getUniqueIDString() + ".dat.tmp"); - File file1 = new File(worldNBTStorage.getPlayerDir(), player.getUniqueIDString() + ".dat"); - - NBTCompressedStreamTools.a(playerData, new FileOutputStream(file)); - - if (file1.exists() && !file1.delete() || !file.renameTo(file1)) { - LogManager.getLogger().warn("Failed to save player data for {}", player.getDisplayName().getString()); - } - - } catch (Exception e) { - LogManager.getLogger().warn("Failed to save player data for {}", player.getDisplayName().getString()); - } - } - -} diff --git a/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/PlayerDataManager.java b/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/PlayerDataManager.java deleted file mode 100644 index 56490ec..0000000 --- a/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/PlayerDataManager.java +++ /dev/null @@ -1,235 +0,0 @@ -/* - * Copyright (C) 2011-2021 lishid. All rights reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.lishid.openinv.internal.v1_16_R3; - -import com.lishid.openinv.internal.IPlayerDataManager; -import com.lishid.openinv.internal.ISpecialInventory; -import com.lishid.openinv.internal.OpenInventoryView; -import com.mojang.authlib.GameProfile; -import java.lang.reflect.Field; -import net.minecraft.server.v1_16_R3.ChatComponentText; -import net.minecraft.server.v1_16_R3.Container; -import net.minecraft.server.v1_16_R3.Containers; -import net.minecraft.server.v1_16_R3.Entity; -import net.minecraft.server.v1_16_R3.EntityPlayer; -import net.minecraft.server.v1_16_R3.MinecraftServer; -import net.minecraft.server.v1_16_R3.PacketPlayOutOpenWindow; -import net.minecraft.server.v1_16_R3.PlayerInteractManager; -import net.minecraft.server.v1_16_R3.World; -import net.minecraft.server.v1_16_R3.WorldServer; -import org.bukkit.Bukkit; -import org.bukkit.OfflinePlayer; -import org.bukkit.Server; -import org.bukkit.craftbukkit.v1_16_R3.CraftServer; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_16_R3.event.CraftEventFactory; -import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftContainer; -import org.bukkit.entity.Player; -import org.bukkit.inventory.InventoryView; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -public class PlayerDataManager implements IPlayerDataManager { - - private @Nullable Field bukkitEntity; - - public PlayerDataManager() { - try { - bukkitEntity = Entity.class.getDeclaredField("bukkitEntity"); - } catch (NoSuchFieldException e) { - System.out.println("Unable to obtain field to inject custom save process - players' mounts may be deleted when loaded."); - e.printStackTrace(); - bukkitEntity = null; - } - } - - public static @NotNull EntityPlayer getHandle(final Player player) { - if (player instanceof CraftPlayer) { - return ((CraftPlayer) player).getHandle(); - } - - Server server = player.getServer(); - EntityPlayer nmsPlayer = null; - - if (server instanceof CraftServer) { - nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName()); - } - - if (nmsPlayer == null) { - // Could use reflection to examine fields, but it's honestly not worth the bother. - throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation"); - } - - return nmsPlayer; - } - - @Override - public @Nullable Player loadPlayer(@NotNull final OfflinePlayer offline) { - // Ensure player has data - if (!offline.hasPlayedBefore()) { - return null; - } - - // Create a profile and entity to load the player data - // See net.minecraft.server.PlayerList#attemptLogin - GameProfile profile = new GameProfile(offline.getUniqueId(), - offline.getName() != null ? offline.getName() : offline.getUniqueId().toString()); - MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer(); - WorldServer worldServer = server.getWorldServer(World.OVERWORLD); - - if (worldServer == null) { - return null; - } - - EntityPlayer entity = new EntityPlayer(server, worldServer, profile, new PlayerInteractManager(worldServer)); - - try { - injectPlayer(entity); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - - // Get the bukkit entity - Player target = entity.getBukkitEntity(); - if (target != null) { - // Load data - target.loadData(); - } - // Return the entity - return target; - } - - void injectPlayer(EntityPlayer player) throws IllegalAccessException { - if (bukkitEntity == null) { - return; - } - - bukkitEntity.setAccessible(true); - - bukkitEntity.set(player, new OpenPlayer(player.server.server, player)); - } - - @NotNull - @Override - public Player inject(@NotNull Player player) { - try { - EntityPlayer nmsPlayer = getHandle(player); - injectPlayer(nmsPlayer); - return nmsPlayer.getBukkitEntity(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - return player; - } - } - - @Nullable - @Override - public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) { - - EntityPlayer nmsPlayer = getHandle(player); - - if (nmsPlayer.playerConnection == null) { - return null; - } - - InventoryView view = getView(player, inventory); - - if (view == null) { - return player.openInventory(inventory.getBukkitInventory()); - } - - Container container = new CraftContainer(view, nmsPlayer, nmsPlayer.nextContainerCounter()) { - @Override - public Containers getType() { - return getContainers(inventory.getBukkitInventory().getSize()); - } - }; - - container.setTitle(new ChatComponentText(view.getTitle())); - container = CraftEventFactory.callInventoryOpenEvent(nmsPlayer, container); - - if (container == null) { - return null; - } - - nmsPlayer.playerConnection.sendPacket(new PacketPlayOutOpenWindow(container.windowId, container.getType(), - new ChatComponentText(container.getBukkitView().getTitle()))); - nmsPlayer.activeContainer = container; - container.addSlotListener(nmsPlayer); - - return container.getBukkitView(); - - } - - private @Nullable InventoryView getView(Player player, ISpecialInventory inventory) { - if (inventory instanceof SpecialEnderChest) { - return new OpenInventoryView(player, inventory, "container.enderchest", "'s Ender Chest"); - } else if (inventory instanceof SpecialPlayerInventory) { - return new OpenInventoryView(player, inventory, "container.player", "'s Inventory"); - } else { - return null; - } - } - - static @NotNull Containers getContainers(int inventorySize) { - switch (inventorySize) { - case 9: - return Containers.GENERIC_9X1; - case 18: - return Containers.GENERIC_9X2; - case 36: - return Containers.GENERIC_9X4; - case 41: // PLAYER - case 45: - return Containers.GENERIC_9X5; - case 54: - return Containers.GENERIC_9X6; - case 27: - default: - return Containers.GENERIC_9X3; - } - } - - @Override - public int convertToPlayerSlot(InventoryView view, int rawSlot) { - int topSize = view.getTopInventory().getSize(); - if (topSize <= rawSlot) { - // Slot is not inside special inventory, use Bukkit logic. - return view.convertSlot(rawSlot); - } - - // Main inventory, slots 0-26 -> 9-35 - if (rawSlot < 27) { - return rawSlot + 9; - } - // Hotbar, slots 27-35 -> 0-8 - if (rawSlot < 36) { - return rawSlot - 27; - } - // Armor, slots 36-39 -> 39-36 - if (rawSlot < 40) { - return 36 + (39 - rawSlot); - } - // Off hand - if (rawSlot == 40) { - return 40; - } - // Drop slots, "out of inventory" - return -1; - } - -} diff --git a/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/SpecialEnderChest.java b/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/SpecialEnderChest.java deleted file mode 100644 index c2bf061..0000000 --- a/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/SpecialEnderChest.java +++ /dev/null @@ -1,261 +0,0 @@ -/* - * Copyright (C) 2011-2021 lishid. All rights reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.lishid.openinv.internal.v1_16_R3; - -import com.lishid.openinv.internal.ISpecialEnderChest; -import java.util.List; -import net.minecraft.server.v1_16_R3.AutoRecipeStackManager; -import net.minecraft.server.v1_16_R3.ContainerUtil; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntityPlayer; -import net.minecraft.server.v1_16_R3.IInventoryListener; -import net.minecraft.server.v1_16_R3.InventoryEnderChest; -import net.minecraft.server.v1_16_R3.ItemStack; -import net.minecraft.server.v1_16_R3.NonNullList; -import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftHumanEntity; -import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftInventory; -import org.bukkit.entity.HumanEntity; -import org.bukkit.entity.Player; -import org.bukkit.inventory.InventoryHolder; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEnderChest { - - private final CraftInventory inventory; - private EntityPlayer owner; - private NonNullList items; - private boolean playerOnline; - - public SpecialEnderChest(final Player player, final Boolean online) { - super(PlayerDataManager.getHandle(player)); - this.inventory = new CraftInventory(this); - this.owner = PlayerDataManager.getHandle(player); - this.playerOnline = online; - this.items = this.owner.getEnderChest().items; - } - - @Override - public @NotNull CraftInventory getBukkitInventory() { - return inventory; - } - - @Override - public boolean isInUse() { - return !this.getViewers().isEmpty(); - } - - @Override - public void setPlayerOffline() { - this.playerOnline = false; - } - - @Override - public void setPlayerOnline(@NotNull final Player player) { - if (!this.playerOnline) { - try { - this.owner = PlayerDataManager.getHandle(player); - InventoryEnderChest enderChest = owner.getEnderChest(); - for (int i = 0; i < enderChest.getSize(); ++i) { - enderChest.setItem(i, this.items.get(i)); - } - this.items = enderChest.items; - } catch (Exception ignored) {} - this.playerOnline = true; - } - } - - @Override - public @NotNull Player getPlayer() { - return owner.getBukkitEntity(); - } - - @Override - public void update() { - this.owner.getEnderChest().update(); - } - - @Override - public List getContents() { - return this.items; - } - - @Override - public void onOpen(CraftHumanEntity who) { - this.owner.getEnderChest().onOpen(who); - } - - @Override - public void onClose(CraftHumanEntity who) { - this.owner.getEnderChest().onClose(who); - } - - @Override - public List getViewers() { - return this.owner.getEnderChest().getViewers(); - } - - @Override - public void setMaxStackSize(int i) { - this.owner.getEnderChest().setMaxStackSize(i); - } - - @Override - public InventoryHolder getOwner() { - return this.owner.getEnderChest().getOwner(); - } - - @Override - public @Nullable Location getLocation() { - return null; - } - - @Override - public void a(IInventoryListener iinventorylistener) { - this.owner.getEnderChest().a(iinventorylistener); - } - - @Override - public void b(IInventoryListener iinventorylistener) { - this.owner.getEnderChest().b(iinventorylistener); - } - - @Override - public ItemStack getItem(int i) { - return i >= 0 && i < this.items.size() ? this.items.get(i) : ItemStack.b; - } - - @Override - public ItemStack splitStack(int i, int j) { - ItemStack itemstack = ContainerUtil.a(this.items, i, j); - if (!itemstack.isEmpty()) { - this.update(); - } - - return itemstack; - } - - @Override - public ItemStack a(ItemStack itemstack) { - ItemStack itemstack1 = itemstack.cloneItemStack(); - - for (int i = 0; i < this.getSize(); ++i) { - ItemStack itemstack2 = this.getItem(i); - if (itemstack2.isEmpty()) { - this.setItem(i, itemstack1); - this.update(); - return ItemStack.b; - } - - if (ItemStack.c(itemstack2, itemstack1)) { - int j = Math.min(this.getMaxStackSize(), itemstack2.getMaxStackSize()); - int k = Math.min(itemstack1.getCount(), j - itemstack2.getCount()); - if (k > 0) { - itemstack2.add(k); - itemstack1.subtract(k); - if (itemstack1.isEmpty()) { - this.update(); - return ItemStack.b; - } - } - } - } - - if (itemstack1.getCount() != itemstack.getCount()) { - this.update(); - } - - return itemstack1; - } - - @Override - public ItemStack splitWithoutUpdate(int i) { - ItemStack itemstack = this.items.get(i); - if (itemstack.isEmpty()) { - return ItemStack.b; - } else { - this.items.set(i, ItemStack.b); - return itemstack; - } - } - - @Override - public void setItem(int i, ItemStack itemstack) { - this.items.set(i, itemstack); - if (!itemstack.isEmpty() && itemstack.getCount() > this.getMaxStackSize()) { - itemstack.setCount(this.getMaxStackSize()); - } - - this.update(); - } - - @Override - public int getSize() { - return this.owner.getEnderChest().getSize(); - } - - @Override - public boolean isEmpty() { - - for (ItemStack itemstack : this.items) { - if (!itemstack.isEmpty()) { - return false; - } - } - - return true; - } - - @Override - public int getMaxStackSize() { - return 64; - } - - @Override - public boolean a(EntityHuman entityhuman) { - return true; - } - - @Override - public void startOpen(EntityHuman entityhuman) { - } - - @Override - public void closeContainer(EntityHuman entityhuman) { - } - - @Override - public boolean b(int i, ItemStack itemstack) { - return true; - } - - @Override - public void clear() { - this.items.clear(); - } - - @Override - public void a(AutoRecipeStackManager autorecipestackmanager) { - - for (ItemStack itemstack : this.items) { - autorecipestackmanager.b(itemstack); - } - - } - -} diff --git a/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/SpecialPlayerInventory.java b/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/SpecialPlayerInventory.java deleted file mode 100644 index df9325c..0000000 --- a/internal/v1_16_R3/src/main/java/com/lishid/openinv/internal/v1_16_R3/SpecialPlayerInventory.java +++ /dev/null @@ -1,738 +0,0 @@ -/* - * Copyright (C) 2011-2021 lishid. All rights reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.lishid.openinv.internal.v1_16_R3; - -import com.google.common.collect.ImmutableList; -import com.lishid.openinv.internal.ISpecialPlayerInventory; -import java.util.Iterator; -import java.util.List; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import net.minecraft.server.v1_16_R3.AutoRecipeStackManager; -import net.minecraft.server.v1_16_R3.ChatMessage; -import net.minecraft.server.v1_16_R3.ContainerUtil; -import net.minecraft.server.v1_16_R3.CrashReport; -import net.minecraft.server.v1_16_R3.CrashReportSystemDetails; -import net.minecraft.server.v1_16_R3.DamageSource; -import net.minecraft.server.v1_16_R3.EntityHuman; -import net.minecraft.server.v1_16_R3.EntityPlayer; -import net.minecraft.server.v1_16_R3.EnumItemSlot; -import net.minecraft.server.v1_16_R3.IBlockData; -import net.minecraft.server.v1_16_R3.IChatBaseComponent; -import net.minecraft.server.v1_16_R3.IInventory; -import net.minecraft.server.v1_16_R3.Item; -import net.minecraft.server.v1_16_R3.ItemArmor; -import net.minecraft.server.v1_16_R3.ItemStack; -import net.minecraft.server.v1_16_R3.NBTTagCompound; -import net.minecraft.server.v1_16_R3.NBTTagList; -import net.minecraft.server.v1_16_R3.NonNullList; -import net.minecraft.server.v1_16_R3.PacketPlayOutSetSlot; -import net.minecraft.server.v1_16_R3.PlayerInventory; -import net.minecraft.server.v1_16_R3.ReportedException; -import net.minecraft.server.v1_16_R3.World; -import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftHumanEntity; -import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftInventory; -import org.bukkit.entity.HumanEntity; -import org.bukkit.entity.Player; -import org.bukkit.inventory.InventoryHolder; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory { - - private final CraftInventory inventory; - private boolean playerOnline; - private EntityHuman player; - private NonNullList items, armor, extraSlots; - private List> f; - - public SpecialPlayerInventory(final Player bukkitPlayer, final Boolean online) { - super(PlayerDataManager.getHandle(bukkitPlayer)); - this.inventory = new CraftInventory(this); - this.playerOnline = online; - this.player = super.player; - this.items = this.player.inventory.items; - this.armor = this.player.inventory.armor; - this.extraSlots = this.player.inventory.extraSlots; - this.f = ImmutableList.of(this.items, this.armor, this.extraSlots); - } - - @Override - public void setPlayerOnline(@NotNull final Player player) { - if (!this.playerOnline) { - EntityPlayer entityPlayer = PlayerDataManager.getHandle(player); - entityPlayer.inventory.transaction.addAll(this.transaction); - this.player = entityPlayer; - for (int i = 0; i < getSize(); ++i) { - this.player.inventory.setItem(i, getRawItem(i)); - } - this.player.inventory.itemInHandIndex = this.itemInHandIndex; - this.items = this.player.inventory.items; - this.armor = this.player.inventory.armor; - this.extraSlots = this.player.inventory.extraSlots; - this.f = ImmutableList.of(this.items, this.armor, this.extraSlots); - this.playerOnline = true; - } - } - - @Override - public boolean a(final EntityHuman entityhuman) { - return true; - } - - @Override - public @NotNull CraftInventory getBukkitInventory() { - return this.inventory; - } - - @Override - public ItemStack getItem(int i) { - List list = this.items; - - if (i >= list.size()) { - i -= list.size(); - list = this.armor; - } else { - i = this.getReversedItemSlotNum(i); - } - - if (i >= list.size()) { - i -= list.size(); - list = this.extraSlots; - } else if (list == this.armor) { - i = this.getReversedArmorSlotNum(i); - } - - if (i >= list.size()) { - return ItemStack.b; - } - - return list.get(i); - } - - private ItemStack getRawItem(int i) { - NonNullList list = null; - for (NonNullList next : this.f) { - if (i < next.size()) { - list = next; - break; - } - i -= next.size(); - } - - return list == null ? ItemStack.b : list.get(i); - } - - @Override - public IChatBaseComponent getDisplayName() { - return new ChatMessage(this.player.getName()); - } - - @Override - public boolean hasCustomName() { - return false; - } - - private int getReversedArmorSlotNum(final int i) { - if (i == 0) { - return 3; - } - if (i == 1) { - return 2; - } - if (i == 2) { - return 1; - } - if (i == 3) { - return 0; - } - return i; - } - - private int getReversedItemSlotNum(final int i) { - if (i >= 27) { - return i - 27; - } - return i + 9; - } - - @Override - public int getSize() { - return 45; - } - - @Override - public boolean isInUse() { - return !this.getViewers().isEmpty(); - } - - @Override - public void setItem(int i, final ItemStack itemstack) { - List list = this.items; - - if (i >= list.size()) { - i -= list.size(); - list = this.armor; - } else { - i = this.getReversedItemSlotNum(i); - } - - if (i >= list.size()) { - i -= list.size(); - list = this.extraSlots; - } else if (list == this.armor) { - i = this.getReversedArmorSlotNum(i); - } - - if (i >= list.size()) { - this.player.drop(itemstack, true); - return; - } - - list.set(i, itemstack); - } - - @Override - public void setPlayerOffline() { - this.playerOnline = false; - } - - @Override - public @NotNull HumanEntity getPlayer() { - return this.player.getBukkitEntity(); - } - - @Override - public ItemStack splitStack(int i, final int j) { - List list = this.items; - - if (i >= list.size()) { - i -= list.size(); - list = this.armor; - } else { - i = this.getReversedItemSlotNum(i); - } - - if (i >= list.size()) { - i -= list.size(); - list = this.extraSlots; - } else if (list == this.armor) { - i = this.getReversedArmorSlotNum(i); - } - - if (i >= list.size()) { - return ItemStack.b; - } - - return list.get(i).isEmpty() ? ItemStack.b : ContainerUtil.a(list, i, j); - } - - @Override - public ItemStack splitWithoutUpdate(int i) { - List list = this.items; - - if (i >= list.size()) { - i -= list.size(); - list = this.armor; - } else { - i = this.getReversedItemSlotNum(i); - } - - if (i >= list.size()) { - i -= list.size(); - list = this.extraSlots; - } else if (list == this.armor) { - i = this.getReversedArmorSlotNum(i); - } - - if (i >= list.size()) { - return ItemStack.b; - } - - if (!list.get(i).isEmpty()) { - ItemStack itemstack = list.get(i); - - list.set(i, ItemStack.b); - return itemstack; - } - - return ItemStack.b; - } - - @Override - public List getContents() { - return this.f.stream().flatMap(List::stream).collect(Collectors.toList()); - } - - @Override - public List getArmorContents() { - return this.armor; - } - - @Override - public void onOpen(CraftHumanEntity who) { - this.transaction.add(who); - } - - @Override - public void onClose(CraftHumanEntity who) { - this.transaction.remove(who); - } - - @Override - public List getViewers() { - return this.transaction; - } - - @Override - public InventoryHolder getOwner() { - return this.player.getBukkitEntity(); - } - - @Override - public Location getLocation() { - return this.player.getBukkitEntity().getLocation(); - } - - @Override - public ItemStack getItemInHand() { - return d(this.itemInHandIndex) ? this.items.get(this.itemInHandIndex) : ItemStack.b; - } - - private boolean isSimilarAndNotFull(ItemStack itemstack, ItemStack itemstack1) { - return !itemstack.isEmpty() && this.b(itemstack, itemstack1) && itemstack.isStackable() && itemstack.getCount() < itemstack.getMaxStackSize() && itemstack.getCount() < this.getMaxStackSize(); - } - - private boolean b(ItemStack itemstack, ItemStack itemstack1) { - return itemstack.getItem() == itemstack1.getItem() && ItemStack.equals(itemstack, itemstack1); - } - - @Override - public int canHold(ItemStack itemstack) { - int remains = itemstack.getCount(); - - for (int i = 0; i < this.items.size(); ++i) { - ItemStack itemstack1 = this.getItem(i); - if (itemstack1.isEmpty()) { - return itemstack.getCount(); - } - - if (!this.isSimilarAndNotFull(itemstack, itemstack1)) { - remains -= Math.min(itemstack1.getMaxStackSize(), this.getMaxStackSize()) - itemstack1.getCount(); - } - - if (remains <= 0) { - return itemstack.getCount(); - } - } - - ItemStack offhandItemStack = this.getItem(this.items.size() + this.armor.size()); - if (this.isSimilarAndNotFull(offhandItemStack, itemstack)) { - remains -= Math.min(offhandItemStack.getMaxStackSize(), this.getMaxStackSize()) - offhandItemStack.getCount(); - } - - return itemstack.getCount() - remains; - } - - @Override - public int getFirstEmptySlotIndex() { - for (int i = 0; i < this.items.size(); ++i) { - if (this.items.get(i).isEmpty()) { - return i; - } - } - - return -1; - } - - @Override - public void c(int i) { - this.itemInHandIndex = this.i(); - ItemStack itemstack = this.items.get(this.itemInHandIndex); - this.items.set(this.itemInHandIndex, this.items.get(i)); - this.items.set(i, itemstack); - } - - @Override - public int c(ItemStack itemstack) { - for (int i = 0; i < this.items.size(); ++i) { - ItemStack itemstack1 = this.items.get(i); - if (!this.items.get(i).isEmpty() && this.b(itemstack, this.items.get(i)) && !this.items.get(i).f() && !itemstack1.hasEnchantments() && !itemstack1.hasName()) { - return i; - } - } - - return -1; - } - - @Override - public int i() { - int i; - int j; - for (j = 0; j < 9; ++j) { - i = (this.itemInHandIndex + j) % 9; - if (this.items.get(i).isEmpty()) { - return i; - } - } - - for (j = 0; j < 9; ++j) { - i = (this.itemInHandIndex + j) % 9; - if (!this.items.get(i).hasEnchantments()) { - return i; - } - } - - return this.itemInHandIndex; - } - - @Override - public int a(Predicate predicate, int i, IInventory iinventory) { - byte b0 = 0; - boolean flag = i == 0; - int j = b0 + ContainerUtil.a(this, predicate, i - b0, flag); - j += ContainerUtil.a(iinventory, predicate, i - j, flag); - j += ContainerUtil.a(this.getCarried(), predicate, i - j, flag); - if (this.getCarried().isEmpty()) { - this.setCarried(ItemStack.b); - } - - return j; - } - - private int i(ItemStack itemstack) { - int i = this.firstPartial(itemstack); - if (i == -1) { - i = this.getFirstEmptySlotIndex(); - } - - return i == -1 ? itemstack.getCount() : this.d(i, itemstack); - } - - private int d(int i, ItemStack itemstack) { - Item item = itemstack.getItem(); - int j = itemstack.getCount(); - ItemStack itemstack1 = this.getItem(i); - if (itemstack1.isEmpty()) { - itemstack1 = new ItemStack(item, 0); - NBTTagCompound tag = itemstack.getTag(); - if (tag != null) { - itemstack1.setTag(tag.clone()); - } - - this.setItem(i, itemstack1); - } - - int k = j; - if (j > itemstack1.getMaxStackSize() - itemstack1.getCount()) { - k = itemstack1.getMaxStackSize() - itemstack1.getCount(); - } - - if (k > this.getMaxStackSize() - itemstack1.getCount()) { - k = this.getMaxStackSize() - itemstack1.getCount(); - } - - if (k != 0) { - j -= k; - itemstack1.add(k); - itemstack1.d(5); - } - return j; - } - - @Override - public int firstPartial(ItemStack itemstack) { - if (this.isSimilarAndNotFull(this.getItem(this.itemInHandIndex), itemstack)) { - return this.itemInHandIndex; - } else if (this.isSimilarAndNotFull(this.getItem(40), itemstack)) { - return 40; - } else { - for (int i = 0; i < this.items.size(); ++i) { - if (this.isSimilarAndNotFull(this.items.get(i), itemstack)) { - return i; - } - } - - return -1; - } - } - - @Override - public void j() { - - for (List itemStacks : this.f) { - for (int i = 0; i < itemStacks.size(); ++i) { - if (!itemStacks.get(i).isEmpty()) { - itemStacks.get(i).a(this.player.world, this.player, i, this.itemInHandIndex == i); - } - } - } - - } - - @Override - public boolean pickup(ItemStack itemstack) { - return this.c(-1, itemstack); - } - - @Override - public boolean c(int i, ItemStack itemstack) { - if (itemstack.isEmpty()) { - return false; - } else { - try { - if (itemstack.f()) { - if (i == -1) { - i = this.getFirstEmptySlotIndex(); - } - - if (i >= 0) { - this.items.set(i, itemstack.cloneItemStack()); - this.items.get(i).d(5); - itemstack.setCount(0); - return true; - } else if (this.player.abilities.canInstantlyBuild) { - itemstack.setCount(0); - return true; - } else { - return false; - } - } else { - int j; - do { - j = itemstack.getCount(); - if (i == -1) { - itemstack.setCount(this.i(itemstack)); - } else { - itemstack.setCount(this.d(i, itemstack)); - } - } while(!itemstack.isEmpty() && itemstack.getCount() < j); - - if (itemstack.getCount() == j && this.player.abilities.canInstantlyBuild) { - itemstack.setCount(0); - return true; - } else { - return itemstack.getCount() < j; - } - } - } catch (Throwable var6) { - CrashReport crashreport = CrashReport.a(var6, "Adding item to inventory"); - CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Item being added"); - crashreportsystemdetails.a("Item ID", Item.getId(itemstack.getItem())); - crashreportsystemdetails.a("Item data", itemstack.getDamage()); - crashreportsystemdetails.a("Item name", () -> itemstack.getName().getString()); - throw new ReportedException(crashreport); - } - } - } - - @Override - public void a(World world, ItemStack itemstack) { - if (!world.isClientSide) { - while(!itemstack.isEmpty()) { - int i = this.firstPartial(itemstack); - if (i == -1) { - i = this.getFirstEmptySlotIndex(); - } - - if (i == -1) { - this.player.drop(itemstack, false); - break; - } - - int j = itemstack.getMaxStackSize() - this.getItem(i).getCount(); - if (this.c(i, itemstack.cloneAndSubtract(j))) { - ((EntityPlayer)this.player).playerConnection.sendPacket(new PacketPlayOutSetSlot(-2, i, this.getItem(i))); - } - } - } - - } - - @Override - public void f(ItemStack itemstack) { - - for (List list : this.f) { - for (int i = 0; i < list.size(); ++i) { - if (list.get(i) == itemstack) { - list.set(i, ItemStack.b); - break; - } - } - } - } - - @Override - public float a(IBlockData iblockdata) { - return this.items.get(this.itemInHandIndex).a(iblockdata); - } - - @Override - public NBTTagList a(NBTTagList nbttaglist) { - NBTTagCompound nbttagcompound; - int i; - for (i = 0; i < this.items.size(); ++i) { - if (!this.items.get(i).isEmpty()) { - nbttagcompound = new NBTTagCompound(); - nbttagcompound.setByte("Slot", (byte) i); - this.items.get(i).save(nbttagcompound); - nbttaglist.add(nbttagcompound); - } - } - - for (i = 0; i < this.armor.size(); ++i) { - if (!this.armor.get(i).isEmpty()) { - nbttagcompound = new NBTTagCompound(); - nbttagcompound.setByte("Slot", (byte) (i + 100)); - this.armor.get(i).save(nbttagcompound); - nbttaglist.add(nbttagcompound); - } - } - - for (i = 0; i < this.extraSlots.size(); ++i) { - if (!this.extraSlots.get(i).isEmpty()) { - nbttagcompound = new NBTTagCompound(); - nbttagcompound.setByte("Slot", (byte) (i + 150)); - this.extraSlots.get(i).save(nbttagcompound); - nbttaglist.add(nbttagcompound); - } - } - - return nbttaglist; - } - - @Override - public void b(NBTTagList nbttaglist) { - this.items.clear(); - this.armor.clear(); - this.extraSlots.clear(); - - for(int i = 0; i < nbttaglist.size(); ++i) { - NBTTagCompound nbttagcompound = nbttaglist.getCompound(i); - int j = nbttagcompound.getByte("Slot") & 255; - ItemStack itemstack = ItemStack.a(nbttagcompound); - if (!itemstack.isEmpty()) { - if (j < this.items.size()) { - this.items.set(j, itemstack); - } else if (j >= 100 && j < this.armor.size() + 100) { - this.armor.set(j - 100, itemstack); - } else if (j >= 150 && j < this.extraSlots.size() + 150) { - this.extraSlots.set(j - 150, itemstack); - } - } - } - - } - - @Override - public boolean isEmpty() { - Iterator iterator = this.items.iterator(); - - ItemStack itemstack; - while (iterator.hasNext()) { - itemstack = iterator.next(); - if (!itemstack.isEmpty()) { - return false; - } - } - - iterator = this.armor.iterator(); - - while (iterator.hasNext()) { - itemstack = iterator.next(); - if (!itemstack.isEmpty()) { - return false; - } - } - - iterator = this.extraSlots.iterator(); - - while (iterator.hasNext()) { - itemstack = iterator.next(); - if (!itemstack.isEmpty()) { - return false; - } - } - - return true; - } - - @Nullable - @Override - public IChatBaseComponent getCustomName() { - return null; - } - - @Override - public void a(DamageSource damagesource, float f) { - if (f > 0.0F) { - f /= 4.0F; - if (f < 1.0F) { - f = 1.0F; - } - - for (int i = 0; i < this.armor.size(); ++i) { - ItemStack itemstack = this.armor.get(0); - int index = i; - if ((!damagesource.isFire() || !itemstack.getItem().u()) && itemstack.getItem() instanceof ItemArmor) { - itemstack.damage((int) f, this.player, (entityHuman) -> entityHuman.broadcastItemBreak(EnumItemSlot.a(EnumItemSlot.Function.ARMOR, index))); - } - } - } - } - - @Override - public void dropContents() { - for (List itemStacks : this.f) { - for (int i = 0; i < itemStacks.size(); ++i) { - ItemStack itemstack = itemStacks.get(i); - if (!itemstack.isEmpty()) { - itemStacks.set(i, ItemStack.b); - this.player.a(itemstack, true, false); - } - } - } - } - - @Override - public boolean h(ItemStack itemstack) { - return this.f.stream().flatMap(List::stream).anyMatch(itemStack1 -> !itemStack1.isEmpty() && itemStack1.doMaterialsMatch(itemstack)); - } - - @Override - public void a(PlayerInventory playerinventory) { - for (int i = 0; i < playerinventory.getSize(); ++i) { - this.setItem(i, playerinventory.getItem(i)); - } - - this.itemInHandIndex = playerinventory.itemInHandIndex; - } - - @Override - public void clear() { - this.f.forEach(List::clear); - } - - @Override - public void a(AutoRecipeStackManager autorecipestackmanager) { - for (ItemStack itemstack : this.items) { - autorecipestackmanager.a(itemstack); - } - } - -} diff --git a/internal/v1_17_R1/pom.xml b/internal/v1_17_R1/pom.xml index 2c06c72..613aa38 100644 --- a/internal/v1_17_R1/pom.xml +++ b/internal/v1_17_R1/pom.xml @@ -40,6 +40,7 @@ org.spigotmc provided 1.17.1-R0.1-SNAPSHOT + remapped-mojang openinvapi @@ -67,6 +68,38 @@ maven-compiler-plugin + + net.md-5 + specialsource-maven-plugin + + + package + + remap + + remap-obf + + org.spigotmc:minecraft-server:1.17.1-R0.1-SNAPSHOT:txt:maps-mojang + true + org.spigotmc:spigot:1.17.1-R0.1-SNAPSHOT:jar:remapped-mojang + true + remapped-obf + + + + package + + remap + + remap-spigot + + ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar + org.spigotmc:minecraft-server:1.17.1-R0.1-SNAPSHOT:csrg:maps-spigot + org.spigotmc:spigot:1.17.1-R0.1-SNAPSHOT:jar:remapped-obf + + + + diff --git a/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/AnySilentContainer.java b/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/AnySilentContainer.java index 672e890..514aa92 100644 --- a/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/AnySilentContainer.java +++ b/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/AnySilentContainer.java @@ -18,75 +18,102 @@ package com.lishid.openinv.internal.v1_17_R1; import com.lishid.openinv.OpenInv; import com.lishid.openinv.internal.IAnySilentContainer; +import com.lishid.openinv.util.ReflectionHelper; import java.lang.reflect.Field; +import java.util.Optional; import java.util.logging.Level; import java.util.logging.Logger; -import net.minecraft.core.BlockPosition; -import net.minecraft.network.chat.ChatMessage; -import net.minecraft.network.chat.IChatBaseComponent; -import net.minecraft.server.level.EntityPlayer; -import net.minecraft.server.level.PlayerInteractManager; -import net.minecraft.world.ITileInventory; -import net.minecraft.world.InventoryLargeChest; -import net.minecraft.world.TileInventory; -import net.minecraft.world.entity.player.EntityHuman; -import net.minecraft.world.entity.player.PlayerInventory; -import net.minecraft.world.inventory.Container; -import net.minecraft.world.inventory.ContainerChest; -import net.minecraft.world.inventory.Containers; -import net.minecraft.world.inventory.InventoryEnderChest; -import net.minecraft.world.level.EnumGamemode; -import net.minecraft.world.level.World; +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.TextComponent; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.server.level.ServerPlayerGameMode; +import net.minecraft.world.CompoundContainer; +import net.minecraft.world.MenuProvider; +import net.minecraft.world.SimpleMenuProvider; +import net.minecraft.world.entity.monster.Shulker; +import net.minecraft.world.inventory.ChestMenu; +import net.minecraft.world.inventory.MenuType; +import net.minecraft.world.inventory.PlayerEnderChestContainer; +import net.minecraft.world.level.GameType; +import net.minecraft.world.level.block.BarrelBlock; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.BlockBarrel; -import net.minecraft.world.level.block.BlockChest; -import net.minecraft.world.level.block.BlockChestTrapped; -import net.minecraft.world.level.block.BlockShulkerBox; -import net.minecraft.world.level.block.entity.TileEntity; -import net.minecraft.world.level.block.entity.TileEntityChest; -import net.minecraft.world.level.block.entity.TileEntityEnderChest; -import net.minecraft.world.level.block.entity.TileEntityLootable; -import net.minecraft.world.level.block.state.IBlockData; -import net.minecraft.world.level.block.state.properties.BlockPropertyChestType; +import net.minecraft.world.level.block.ChestBlock; +import net.minecraft.world.level.block.DoubleBlockCombiner; +import net.minecraft.world.level.block.ShulkerBoxBlock; +import net.minecraft.world.level.block.TrappedChestBlock; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.ChestBlockEntity; +import net.minecraft.world.level.block.entity.EnderChestBlockEntity; +import net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity; +import net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.AABB; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.Statistic; +import org.bukkit.block.ShulkerBox; import org.bukkit.craftbukkit.v1_17_R1.CraftWorld; import org.bukkit.entity.Player; import org.bukkit.inventory.InventoryView; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; public class AnySilentContainer implements IAnySilentContainer { - private Field playerInteractManagerGamemode; + private @Nullable Field serverPlayerGameModeGameType; public AnySilentContainer() { try { - this.playerInteractManagerGamemode = PlayerInteractManager.class.getDeclaredField("b"); - this.playerInteractManagerGamemode.setAccessible(true); - } catch (NoSuchFieldException | SecurityException e) { + try { + // IDE warns about field not existing, but SpecialSource does not remap strings used in reflection. + // The warning is not suppressed as a reminder that it must manually be checked on updates. + this.serverPlayerGameModeGameType = ServerPlayerGameMode.class.getDeclaredField("b"); + this.serverPlayerGameModeGameType.setAccessible(true); + } catch (NoSuchFieldException e) { + Logger logger = OpenInv.getPlugin(OpenInv.class).getLogger(); + logger.warning("ServerPlayerGameMode#gameModeForPlayer's obfuscated name has changed!"); + logger.warning("Please report this at https://github.com/Jikoo/OpenInv/issues"); + logger.warning("Attempting to fall through using reflection. Please verify that SilentContainer does not fail."); + // N.B. gameModeForPlayer is (for now) declared before previousGameModeForPlayer so silent shouldn't break. + this.serverPlayerGameModeGameType = ReflectionHelper.grabFieldByType(ServerPlayerGameMode.class, GameType.class); + } + } catch (SecurityException e) { Logger logger = OpenInv.getPlugin(OpenInv.class).getLogger(); - logger.warning("Unable to directly write player gamemode! SilentChest will fail."); - logger.log(Level.WARNING, "Error obtaining gamemode field", e); + logger.warning("Unable to directly write player game mode! SilentContainer will fail."); + logger.log(Level.WARNING, "Error obtaining GameType field", e); } } @Override - public boolean isShulkerIgnoreBoundingBox(org.bukkit.block.Block bukkitBlock) { - org.bukkit.World bukkitWorld = bukkitBlock.getWorld(); + public boolean isShulkerBlocked(ShulkerBox box) { + org.bukkit.World bukkitWorld = box.getWorld(); if (!(bukkitWorld instanceof CraftWorld)) { bukkitWorld = Bukkit.getWorld(bukkitWorld.getUID()); } - if (!(bukkitWorld instanceof CraftWorld)) { + + if (!(bukkitWorld instanceof CraftWorld craftWorld)) { Exception exception = new IllegalStateException("AnySilentContainer access attempted on an unknown world!"); OpenInv.getPlugin(OpenInv.class).getLogger().log(Level.WARNING, exception.getMessage(), exception); return false; } - final World world = ((CraftWorld) bukkitWorld).getHandle(); - final BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ()); - // isLargeVoxelShape - return world.getType(blockPosition).d(); + final ServerLevel world = craftWorld.getHandle(); + final BlockPos blockPosition = new BlockPos(box.getX(), box.getY(), box.getZ()); + final BlockEntity tile = world.getBlockEntity(blockPosition); + + if (!(tile instanceof ShulkerBoxBlockEntity shulkerBoxBlockEntity) + || shulkerBoxBlockEntity.getAnimationStatus() != ShulkerBoxBlockEntity.AnimationStatus.CLOSED) { + return false; + } + + BlockState blockState = world.getBlockState(blockPosition); + + // See net.minecraft.world.level.block.ShulkerBoxBlock#canOpen + AABB boundingBox = Shulker.getProgressDeltaAabb(blockState.getValue(ShulkerBoxBlock.FACING), 0.0F, 0.5F) + .move(blockPosition) + .deflate(1.0E-6D); + return !world.noCollision(boundingBox); } @Override @@ -102,128 +129,109 @@ public class AnySilentContainer implements IAnySilentContainer { return true; } - EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer); + ServerPlayer player = PlayerDataManager.getHandle(bukkitPlayer); - final World world = player.getWorld(); - final BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ()); - final TileEntity tile = world.getTileEntity(blockPosition); + final ServerLevel level = player.getLevel(); + final BlockPos blockPos = new BlockPos(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ()); + final BlockEntity blockEntity = level.getBlockEntity(blockPos); - if (tile == null) { + if (blockEntity == null) { return false; } - if (tile instanceof TileEntityEnderChest) { + if (blockEntity instanceof EnderChestBlockEntity enderChestTile) { // Anychest ender chest. See net.minecraft.world.level.block.BlockEnderChest - InventoryEnderChest enderChest = player.getEnderChest(); - enderChest.a((TileEntityEnderChest) tile); - player.openContainer(new TileInventory((containerCounter, playerInventory, ignored) -> { - Containers containers = PlayerDataManager.getContainers(enderChest.getSize()); - int rows = enderChest.getSize() / 9; - return new ContainerChest(containers, containerCounter, playerInventory, enderChest, rows); - }, new ChatMessage("container.enderchest"))); + PlayerEnderChestContainer enderChest = player.getEnderChestInventory(); + enderChest.setActiveChest(enderChestTile); + player.openMenu(new SimpleMenuProvider((containerCounter, playerInventory, ignored) -> { + MenuType containers = PlayerDataManager.getContainers(enderChest.getContainerSize()); + int rows = enderChest.getContainerSize() / 9; + return new ChestMenu(containers, containerCounter, playerInventory, enderChest, rows); + }, new TextComponent("container.enderchest"))); bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED); return true; } - if (!(tile instanceof ITileInventory tileInventory)) { + if (!(blockEntity instanceof MenuProvider menuProvider)) { return false; } - IBlockData blockData = world.getType(blockPosition); - Block block = blockData.getBlock(); + BlockState blockState = level.getBlockState(blockPos); + Block block = blockState.getBlock(); - if (block instanceof BlockChest) { + if (block instanceof ChestBlock chestBlock) { - BlockPropertyChestType chestType = blockData.get(BlockChest.c); - - if (chestType != BlockPropertyChestType.a) { - - BlockPosition adjacentBlockPosition = blockPosition.shift(BlockChest.h(blockData)); - IBlockData adjacentBlockData = world.getType(adjacentBlockPosition); - - if (adjacentBlockData.getBlock() == block) { - - BlockPropertyChestType adjacentChestType = adjacentBlockData.get(BlockChest.c); - - if (adjacentChestType != BlockPropertyChestType.a && chestType != adjacentChestType - && adjacentBlockData.get(BlockChest.b) == blockData.get(BlockChest.b)) { - - TileEntity adjacentTile = world.getTileEntity(adjacentBlockPosition); - - if (adjacentTile instanceof TileEntityChest && tileInventory instanceof TileEntityChest) { - TileEntityChest rightChest = chestType == BlockPropertyChestType.c ? ((TileEntityChest) tileInventory) : (TileEntityChest) adjacentTile; - TileEntityChest leftChest = chestType == BlockPropertyChestType.c ? (TileEntityChest) adjacentTile : ((TileEntityChest) tileInventory); - - if (silentchest && (rightChest.g != null || leftChest.g != null)) { - OpenInv.getPlugin(OpenInv.class).sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated"); - return false; - } - - tileInventory = new ITileInventory() { - public Container createMenu(int containerCounter, PlayerInventory playerInventory, EntityHuman entityHuman) { - leftChest.d(playerInventory.l); - rightChest.d(playerInventory.l); - return ContainerChest.b(containerCounter, playerInventory, new InventoryLargeChest(rightChest, leftChest)); - } - - public IChatBaseComponent getScoreboardDisplayName() { - if (leftChest.hasCustomName()) { - return leftChest.getScoreboardDisplayName(); - } - if (rightChest.hasCustomName()) { - return rightChest.getScoreboardDisplayName(); - } - return new ChatMessage("container.chestDouble"); - } - }; + // boolean flag: check if chest is blocked + Optional menuOptional = chestBlock.combine(blockState, level, blockPos, false).apply( + // Combiner is a copy of private ChestBlock.MENU_PROVIDER_COMBINER + new DoubleBlockCombiner.Combiner>() { + @Override + public Optional acceptDouble(ChestBlockEntity localChest1, ChestBlockEntity localChest2) { + CompoundContainer doubleChest = new CompoundContainer(localChest1, localChest2); + return Optional.of(new ChestBlock.DoubleInventory(localChest1, localChest2, doubleChest)); } - } - } + + @Override + public Optional acceptSingle(ChestBlockEntity localChest) { + return Optional.of(localChest); + } + + @Override + public Optional acceptNone() { + return Optional.empty(); + } + }); + + if (menuOptional.isEmpty()) { + OpenInv.getPlugin(OpenInv.class).sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated"); + return false; } - if (block instanceof BlockChestTrapped) { + menuProvider = menuOptional.get(); + + if (block instanceof TrappedChestBlock) { bukkitPlayer.incrementStatistic(Statistic.TRAPPED_CHEST_TRIGGERED); } else { bukkitPlayer.incrementStatistic(Statistic.CHEST_OPENED); } } - if (block instanceof BlockShulkerBox) { + if (block instanceof ShulkerBoxBlock) { bukkitPlayer.incrementStatistic(Statistic.SHULKER_BOX_OPENED); } - if (block instanceof BlockBarrel) { + if (block instanceof BarrelBlock) { bukkitPlayer.incrementStatistic(Statistic.OPEN_BARREL); } // AnyChest only - SilentChest not active, container unsupported, or unnecessary. - if (!silentchest || player.d.getGameMode() == EnumGamemode.d) { - player.openContainer(tileInventory); + if (!silentchest || player.gameMode.getGameModeForPlayer() == GameType.SPECTATOR) { + player.openMenu(menuProvider); return true; } - // SilentChest requires access to setting players' gamemode directly. - if (this.playerInteractManagerGamemode == null) { + // SilentChest requires access to setting players' game mode directly. + if (this.serverPlayerGameModeGameType == null) { return false; } - if (tile instanceof TileEntityLootable lootable) { - if (lootable.g != null) { + if (blockEntity instanceof RandomizableContainerBlockEntity lootable) { + if (lootable.lootTable != null) { OpenInv.getPlugin(OpenInv.class).sendSystemMessage(bukkitPlayer, "messages.error.lootNotGenerated"); return false; } } - EnumGamemode gamemode = player.d.getGameMode(); - this.forceGameMode(player, EnumGamemode.d); - player.openContainer(tileInventory); - this.forceGameMode(player, gamemode); + GameType gameType = player.gameMode.getGameModeForPlayer(); + this.forceGameType(player, GameType.SPECTATOR); + player.openMenu(menuProvider); + this.forceGameType(player, gameType); return true; } @Override public void deactivateContainer(@NotNull final Player bukkitPlayer) { - if (this.playerInteractManagerGamemode == null) { + if (this.serverPlayerGameModeGameType == null) { return; } @@ -238,29 +246,29 @@ public class AnySilentContainer implements IAnySilentContainer { return; } - EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer); + ServerPlayer player = PlayerDataManager.getHandle(bukkitPlayer); // Force game mode change without informing plugins or players. - EnumGamemode gamemode = player.d.getGameMode(); - this.forceGameMode(player, EnumGamemode.d); + // Regular game mode set calls GameModeChangeEvent and is cancellable. + GameType gameType = player.gameMode.getGameModeForPlayer(); + this.forceGameType(player, GameType.SPECTATOR); - // See EntityPlayer#closeInventory - can't call or we'd recursively deactivate. - player.bV.b(player); - player.bU.a(player.bV); - player.bV = player.bU; + // Close container - note that this is very different from ServerPlayer#closeContainer! + // Triggering event must not be re-called or we'll enter an infinite loop. + player.doCloseContainer(); // Revert forced game mode. - this.forceGameMode(player, gamemode); + this.forceGameType(player, gameType); } - private void forceGameMode(final EntityPlayer player, final EnumGamemode gameMode) { - if (this.playerInteractManagerGamemode == null) { + private void forceGameType(final ServerPlayer player, final GameType gameMode) { + if (this.serverPlayerGameModeGameType == null) { // No need to warn repeatedly, error on startup and lack of function should be enough. return; } try { - this.playerInteractManagerGamemode.setAccessible(true); - this.playerInteractManagerGamemode.set(player.d, gameMode); + this.serverPlayerGameModeGameType.setAccessible(true); + this.serverPlayerGameModeGameType.set(player.gameMode, gameMode); } catch (IllegalArgumentException | IllegalAccessException e) { e.printStackTrace(); } diff --git a/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/OpenPlayer.java b/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/OpenPlayer.java index cf420ea..c4c17e8 100644 --- a/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/OpenPlayer.java +++ b/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/OpenPlayer.java @@ -17,25 +17,25 @@ package com.lishid.openinv.internal.v1_17_R1; import java.io.File; -import java.io.FileOutputStream; -import net.minecraft.nbt.NBTCompressedStreamTools; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.level.EntityPlayer; -import net.minecraft.world.level.storage.WorldNBTStorage; +import net.minecraft.Util; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.NbtIo; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.level.storage.PlayerDataStorage; import org.apache.logging.log4j.LogManager; import org.bukkit.craftbukkit.v1_17_R1.CraftServer; import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer; public class OpenPlayer extends CraftPlayer { - public OpenPlayer(CraftServer server, EntityPlayer entity) { + public OpenPlayer(CraftServer server, ServerPlayer entity) { super(server, entity); } @Override public void loadData() { // See CraftPlayer#loadData - NBTTagCompound loaded = this.server.getHandle().r.load(this.getHandle()); + CompoundTag loaded = this.server.getHandle().playerIo.load(this.getHandle()); if (loaded != null) { readExtraData(loaded); } @@ -43,35 +43,31 @@ public class OpenPlayer extends CraftPlayer { @Override public void saveData() { - EntityPlayer player = this.getHandle(); - // See net.minecraft.world.level.storage.WorldNBTStorage#save(EntityHuman) + ServerPlayer player = this.getHandle(); + // See net.minecraft.world.level.storage.PlayerDataStorage#save(EntityHuman) try { - WorldNBTStorage worldNBTStorage = player.c.getPlayerList().r; + PlayerDataStorage worldNBTStorage = player.server.getPlayerList().playerIo; - NBTTagCompound playerData = player.save(new NBTTagCompound()); + CompoundTag playerData = player.saveWithoutId(new CompoundTag()); setExtraData(playerData); if (!isOnline()) { // Special case: save old vehicle data - NBTTagCompound oldData = worldNBTStorage.load(player); + CompoundTag oldData = worldNBTStorage.load(player); - if (oldData != null && oldData.hasKeyOfType("RootVehicle", 10)) { + if (oldData != null && oldData.contains("RootVehicle", 10)) { // See net.minecraft.server.PlayerList#a(NetworkManager, EntityPlayer) and net.minecraft.server.EntityPlayer#b(NBTTagCompound) - playerData.set("RootVehicle", oldData.getCompound("RootVehicle")); + playerData.put("RootVehicle", oldData.getCompound("RootVehicle")); } } - File file = new File(worldNBTStorage.getPlayerDir(), player.getUniqueIDString() + ".dat.tmp"); - File file1 = new File(worldNBTStorage.getPlayerDir(), player.getUniqueIDString() + ".dat"); - - NBTCompressedStreamTools.a(playerData, new FileOutputStream(file)); - - if (file1.exists() && !file1.delete() || !file.renameTo(file1)) { - LogManager.getLogger().warn("Failed to save player data for {}", player.getDisplayName().getString()); - } - + File file = File.createTempFile(player.getStringUUID() + "-", ".dat", worldNBTStorage.getPlayerDir()); + NbtIo.writeCompressed(playerData, file); + File file1 = new File(worldNBTStorage.getPlayerDir(), player.getStringUUID() + ".dat"); + File file2 = new File(worldNBTStorage.getPlayerDir(), player.getStringUUID() + ".dat_old"); + Util.safeReplaceFile(file1, file, file2); } catch (Exception e) { - LogManager.getLogger().warn("Failed to save player data for {}", player.getDisplayName().getString()); + LogManager.getLogger().warn("Failed to save player data for {}", player.getName().getString()); } } diff --git a/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/PlayerDataManager.java b/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/PlayerDataManager.java index 4071eec..df7697e 100644 --- a/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/PlayerDataManager.java +++ b/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/PlayerDataManager.java @@ -22,17 +22,16 @@ import com.lishid.openinv.internal.ISpecialInventory; import com.lishid.openinv.internal.OpenInventoryView; import com.mojang.authlib.GameProfile; import java.lang.reflect.Field; -import java.util.logging.Level; import java.util.logging.Logger; -import net.minecraft.network.chat.ChatComponentText; -import net.minecraft.network.protocol.game.PacketPlayOutOpenWindow; +import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket; import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.EntityPlayer; -import net.minecraft.server.level.WorldServer; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.Entity; -import net.minecraft.world.inventory.Container; -import net.minecraft.world.inventory.Containers; -import net.minecraft.world.level.World; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.MenuType; +import net.minecraft.world.level.Level; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.Server; @@ -55,21 +54,21 @@ public class PlayerDataManager implements IPlayerDataManager { } catch (NoSuchFieldException e) { Logger logger = OpenInv.getPlugin(OpenInv.class).getLogger(); logger.warning("Unable to obtain field to inject custom save process - players' mounts may be deleted when loaded."); - logger.log(Level.WARNING, e.getMessage(), e); + logger.log(java.util.logging.Level.WARNING, e.getMessage(), e); bukkitEntity = null; } } - public static @NotNull EntityPlayer getHandle(final Player player) { + public static @NotNull ServerPlayer getHandle(final Player player) { if (player instanceof CraftPlayer) { return ((CraftPlayer) player).getHandle(); } Server server = player.getServer(); - EntityPlayer nmsPlayer = null; + ServerPlayer nmsPlayer = null; if (server instanceof CraftServer) { - nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName()); + nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getUniqueId()); } if (nmsPlayer == null) { @@ -92,13 +91,13 @@ public class PlayerDataManager implements IPlayerDataManager { GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName() != null ? offline.getName() : offline.getUniqueId().toString()); MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer(); - WorldServer worldServer = server.getWorldServer(World.f); + ServerLevel worldServer = server.getLevel(Level.OVERWORLD); if (worldServer == null) { return null; } - EntityPlayer entity = new EntityPlayer(server, worldServer, profile); + ServerPlayer entity = new ServerPlayer(server, worldServer, profile); try { injectPlayer(entity); @@ -116,21 +115,21 @@ public class PlayerDataManager implements IPlayerDataManager { return target; } - void injectPlayer(EntityPlayer player) throws IllegalAccessException { + void injectPlayer(ServerPlayer player) throws IllegalAccessException { if (bukkitEntity == null) { return; } bukkitEntity.setAccessible(true); - bukkitEntity.set(player, new OpenPlayer(player.c.server, player)); + bukkitEntity.set(player, new OpenPlayer(player.server.server, player)); } @NotNull @Override public Player inject(@NotNull Player player) { try { - EntityPlayer nmsPlayer = getHandle(player); + ServerPlayer nmsPlayer = getHandle(player); injectPlayer(nmsPlayer); return nmsPlayer.getBukkitEntity(); } catch (IllegalAccessException e) { @@ -143,9 +142,9 @@ public class PlayerDataManager implements IPlayerDataManager { @Override public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) { - EntityPlayer nmsPlayer = getHandle(player); + ServerPlayer nmsPlayer = getHandle(player); - if (nmsPlayer.b == null) { + if (nmsPlayer.connection == null) { return null; } @@ -155,23 +154,23 @@ public class PlayerDataManager implements IPlayerDataManager { return player.openInventory(inventory.getBukkitInventory()); } - Container container = new CraftContainer(view, nmsPlayer, nmsPlayer.nextContainerCounter()) { + AbstractContainerMenu container = new CraftContainer(view, nmsPlayer, nmsPlayer.nextContainerCounter()) { @Override - public Containers getType() { + public MenuType getType() { return getContainers(inventory.getBukkitInventory().getSize()); } }; - container.setTitle(new ChatComponentText(view.getTitle())); + container.setTitle(new TextComponent(view.getTitle())); container = CraftEventFactory.callInventoryOpenEvent(nmsPlayer, container); if (container == null) { return null; } - nmsPlayer.b.sendPacket(new PacketPlayOutOpenWindow(container.j, container.getType(), - new ChatComponentText(container.getBukkitView().getTitle()))); - nmsPlayer.bV = container; + nmsPlayer.connection.send(new ClientboundOpenScreenPacket(container.containerId, container.getType(), + new TextComponent(container.getBukkitView().getTitle()))); + nmsPlayer.containerMenu = container; nmsPlayer.initMenu(container); return container.getBukkitView(); @@ -188,15 +187,15 @@ public class PlayerDataManager implements IPlayerDataManager { } } - static @NotNull Containers getContainers(int inventorySize) { + static @NotNull MenuType getContainers(int inventorySize) { return switch (inventorySize) { - case 9 -> Containers.a; - case 18 -> Containers.b; - case 36 -> Containers.d; // PLAYER - case 41, 45 -> Containers.e; - case 54 -> Containers.f; - default -> Containers.c; // 9x3 + case 9 -> MenuType.GENERIC_9x1; + case 18 -> MenuType.GENERIC_9x2; + case 36 -> MenuType.GENERIC_9x4; // PLAYER + case 41, 45 -> MenuType.GENERIC_9x5; + case 54 -> MenuType.GENERIC_9x6; + default -> MenuType.GENERIC_9x3; // Default 27-slot inventory }; } diff --git a/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/SpecialEnderChest.java b/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/SpecialEnderChest.java index 6a6a592..fed9b56 100644 --- a/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/SpecialEnderChest.java +++ b/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/SpecialEnderChest.java @@ -21,38 +21,38 @@ import java.util.List; import java.util.function.Predicate; import java.util.stream.Collectors; import net.minecraft.core.NonNullList; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.server.level.EntityPlayer; -import net.minecraft.world.ContainerUtil; -import net.minecraft.world.IInventoryListener; -import net.minecraft.world.entity.player.AutoRecipeStackManager; -import net.minecraft.world.entity.player.EntityHuman; -import net.minecraft.world.inventory.InventoryEnderChest; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.ContainerHelper; +import net.minecraft.world.ContainerListener; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.player.StackedContents; +import net.minecraft.world.inventory.PlayerEnderChestContainer; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.entity.TileEntityEnderChest; +import net.minecraft.world.level.block.entity.EnderChestBlockEntity; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_17_R1.entity.CraftHumanEntity; import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftInventory; import org.bukkit.entity.HumanEntity; -import org.bukkit.entity.Player; import org.bukkit.inventory.InventoryHolder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEnderChest { +public class SpecialEnderChest extends PlayerEnderChestContainer implements ISpecialEnderChest { private final CraftInventory inventory; - private EntityPlayer owner; - private NonNullList c; + private ServerPlayer owner; + private NonNullList items; private boolean playerOnline; - public SpecialEnderChest(final Player player, final Boolean online) { + public SpecialEnderChest(final org.bukkit.entity.Player player, final Boolean online) { super(PlayerDataManager.getHandle(player)); this.inventory = new CraftInventory(this); this.owner = PlayerDataManager.getHandle(player); this.playerOnline = online; - this.c = this.owner.getEnderChest().c; + this.items = this.owner.getEnderChestInventory().items; } @Override @@ -71,15 +71,15 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn } @Override - public void setPlayerOnline(@NotNull final Player player) { + public void setPlayerOnline(@NotNull final org.bukkit.entity.Player player) { if (!this.playerOnline) { try { this.owner = PlayerDataManager.getHandle(player); - InventoryEnderChest enderChest = owner.getEnderChest(); - for (int i = 0; i < enderChest.getSize(); ++i) { - enderChest.setItem(i, this.c.get(i)); + PlayerEnderChestContainer enderChest = owner.getEnderChestInventory(); + for (int i = 0; i < enderChest.getContainerSize(); ++i) { + enderChest.setItem(i, this.items.get(i)); } - this.c = enderChest.c; + this.items = enderChest.items; enderChest.transaction.addAll(this.transaction); } catch (Exception ignored) {} this.playerOnline = true; @@ -87,65 +87,63 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn } @Override - public @NotNull Player getPlayer() { + public @NotNull org.bukkit.entity.Player getPlayer() { return owner.getBukkitEntity(); } @Override - public void update() { - this.owner.getEnderChest().update(); + public void setChanged() { + this.owner.getEnderChestInventory().setChanged(); } @Override public List getContents() { - return this.c; + return this.items; } @Override public void onOpen(CraftHumanEntity who) { - super.onOpen(who); - this.owner.getEnderChest().onOpen(who); + this.owner.getEnderChestInventory().onOpen(who); } @Override public void onClose(CraftHumanEntity who) { - super.onClose(who); - this.owner.getEnderChest().onClose(who); + this.owner.getEnderChestInventory().onClose(who); } @Override public List getViewers() { - return this.owner.getEnderChest().getViewers(); + return this.owner.getEnderChestInventory().getViewers(); } @Override - public boolean a(EntityHuman entityhuman) { + public boolean stillValid(Player player) { return true; } @Override - public void a(TileEntityEnderChest tileentityenderchest) { - this.owner.getEnderChest().a(tileentityenderchest); + public void setActiveChest(EnderChestBlockEntity enderChest) { + this.owner.getEnderChestInventory().setActiveChest(enderChest); } @Override - public boolean b(TileEntityEnderChest tileentityenderchest) { - return this.owner.getEnderChest().b(tileentityenderchest); + public boolean isActiveChest(EnderChestBlockEntity enderChest) { + return this.owner.getEnderChestInventory().isActiveChest(enderChest); } @Override public int getMaxStackSize() { - return this.owner.getEnderChest().getMaxStackSize(); + return this.owner.getEnderChestInventory().getMaxStackSize(); } @Override public void setMaxStackSize(int i) { - this.owner.getEnderChest().setMaxStackSize(i); + this.owner.getEnderChestInventory().setMaxStackSize(i); } @Override public InventoryHolder getOwner() { - return this.owner.getEnderChest().getOwner(); + return this.owner.getEnderChestInventory().getOwner(); } @Override @@ -154,167 +152,46 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn } @Override - public void a(IInventoryListener iinventorylistener) { - this.owner.getEnderChest().a(iinventorylistener); + public void addListener(ContainerListener listener) { + this.owner.getEnderChestInventory().addListener(listener); } @Override - public void b(IInventoryListener iinventorylistener) { - this.owner.getEnderChest().b(iinventorylistener); + public void removeListener(ContainerListener listener) { + this.owner.getEnderChestInventory().removeListener(listener); } @Override public ItemStack getItem(int i) { - return i >= 0 && i < this.c.size() ? this.c.get(i) : ItemStack.b; + return i >= 0 && i < this.items.size() ? this.items.get(i) : ItemStack.EMPTY; } @Override - public ItemStack splitStack(int i, int j) { - ItemStack itemstack = ContainerUtil.a(this.c, i, j); + public ItemStack removeItem(int i, int j) { + ItemStack itemstack = ContainerHelper.removeItem(this.items, i, j); if (!itemstack.isEmpty()) { - this.update(); + this.setChanged(); } return itemstack; } @Override - public ItemStack a(ItemStack itemstack) { - ItemStack itemstack1 = itemstack.cloneItemStack(); - this.d(itemstack1); - if (itemstack1.isEmpty()) { - return ItemStack.b; + public ItemStack addItem(ItemStack itemstack) { + ItemStack localItem = itemstack.copy(); + this.moveItemToOccupiedSlotsWithSameType(localItem); + if (localItem.isEmpty()) { + return ItemStack.EMPTY; } else { - this.c(itemstack1); - return itemstack1.isEmpty() ? ItemStack.b : itemstack1; - } - } - - private void c(ItemStack itemstack) { - for(int i = 0; i < this.getSize(); ++i) { - ItemStack itemstack1 = this.getItem(i); - if (itemstack1.isEmpty()) { - this.setItem(i, itemstack.cloneItemStack()); - itemstack.setCount(0); - return; - } - } - } - - private void d(ItemStack itemstack) { - for(int i = 0; i < this.getSize(); ++i) { - ItemStack itemstack1 = this.getItem(i); - if (ItemStack.e(itemstack1, itemstack)) { - this.a(itemstack, itemstack1); - if (itemstack.isEmpty()) { - return; - } - } - } - } - - private void a(ItemStack itemstack, ItemStack itemstack1) { - int i = Math.min(this.getMaxStackSize(), itemstack1.getMaxStackSize()); - int j = Math.min(itemstack.getCount(), i - itemstack1.getCount()); - if (j > 0) { - itemstack1.add(j); - itemstack.subtract(j); - this.update(); + this.moveItemToEmptySlots(localItem); + return localItem.isEmpty() ? ItemStack.EMPTY : localItem; } } @Override - public ItemStack splitWithoutUpdate(int i) { - ItemStack itemstack = this.c.get(i); - if (itemstack.isEmpty()) { - return ItemStack.b; - } else { - this.c.set(i, ItemStack.b); - return itemstack; - } - } - - @Override - public void setItem(int i, ItemStack itemstack) { - this.c.set(i, itemstack); - if (!itemstack.isEmpty() && itemstack.getCount() > this.getMaxStackSize()) { - itemstack.setCount(this.getMaxStackSize()); - } - - this.update(); - } - - @Override - public int getSize() { - return this.owner.getEnderChest().getSize(); - } - - @Override - public boolean isEmpty() { - return this.c.stream().allMatch(ItemStack::isEmpty); - } - - @Override - public void startOpen(EntityHuman entityhuman) { - } - - @Override - public void closeContainer(EntityHuman entityhuman) { - } - - @Override - public boolean b(int i, ItemStack itemstack) { - return true; - } - - @Override - public void clear() { - this.c.clear(); - this.update(); - } - - @Override - public void a(AutoRecipeStackManager autorecipestackmanager) { - for (ItemStack itemstack : this.c) { - autorecipestackmanager.b(itemstack); - } - - } - - @Override - public List f() { - List list = this.c.stream().filter(Predicate.not(ItemStack::isEmpty)).collect(Collectors.toList()); - this.clear(); - return list; - } - - @Override - public ItemStack a(Item item, int i) { - ItemStack itemstack = new ItemStack(item, 0); - - for(int j = this.getSize() - 1; j >= 0; --j) { - ItemStack itemstack1 = this.getItem(j); - if (itemstack1.getItem().equals(item)) { - int k = i - itemstack.getCount(); - ItemStack itemstack2 = itemstack1.cloneAndSubtract(k); - itemstack.add(itemstack2.getCount()); - if (itemstack.getCount() == i) { - break; - } - } - } - - if (!itemstack.isEmpty()) { - this.update(); - } - - return itemstack; - } - - @Override - public boolean b(ItemStack itemStack) { - for (ItemStack itemStack1 : this.c) { - if (itemStack1.isEmpty() || ItemStack.e(itemStack1, itemStack) && itemStack1.getCount() < itemStack1.getMaxStackSize()) { + public boolean canAddItem(ItemStack itemstack) { + for (ItemStack itemstack1 : this.items) { + if (itemstack1.isEmpty() || ItemStack.isSameItemSameTags(itemstack1, itemstack) && itemstack1.getCount() < itemstack1.getMaxStackSize()) { return true; } } @@ -322,17 +199,143 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn return false; } - @Override - public String toString() { - return this.c.stream().filter((itemStack) -> !itemStack.isEmpty()).collect(Collectors.toList()).toString(); + private void moveItemToEmptySlots(ItemStack itemstack) { + for(int i = 0; i < this.getContainerSize(); ++i) { + ItemStack localItem = this.getItem(i); + if (localItem.isEmpty()) { + this.setItem(i, itemstack.copy()); + itemstack.setCount(0); + return; + } + } + } + + private void moveItemToOccupiedSlotsWithSameType(ItemStack itemstack) { + for(int i = 0; i < this.getContainerSize(); ++i) { + ItemStack localItem = this.getItem(i); + if (ItemStack.isSameItemSameTags(localItem, itemstack)) { + this.moveItemsBetweenStacks(itemstack, localItem); + if (itemstack.isEmpty()) { + return; + } + } + } + } + + private void moveItemsBetweenStacks(ItemStack itemstack, ItemStack itemstack1) { + int i = Math.min(this.getMaxStackSize(), itemstack1.getMaxStackSize()); + int j = Math.min(itemstack.getCount(), i - itemstack1.getCount()); + if (j > 0) { + itemstack1.grow(j); + itemstack.shrink(j); + this.setChanged(); + } } @Override - public void a(NBTTagList nbttaglist) { - for(int i = 0; i < nbttaglist.size(); ++i) { - ItemStack itemstack = ItemStack.a(nbttaglist.getCompound(i)); - if (!itemstack.isEmpty()) { - this.a(itemstack); + public ItemStack removeItemNoUpdate(int i) { + ItemStack itemstack = this.items.get(i); + if (itemstack.isEmpty()) { + return ItemStack.EMPTY; + } else { + this.items.set(i, ItemStack.EMPTY); + return itemstack; + } + } + + @Override + public void setItem(int i, ItemStack itemstack) { + this.items.set(i, itemstack); + if (!itemstack.isEmpty() && itemstack.getCount() > this.getMaxStackSize()) { + itemstack.setCount(this.getMaxStackSize()); + } + + this.setChanged(); + } + + @Override + public int getContainerSize() { + return this.owner.getEnderChestInventory().getContainerSize(); + } + + @Override + public boolean isEmpty() { + return this.items.stream().allMatch(ItemStack::isEmpty); + } + + @Override + public void startOpen(Player player) { + } + + @Override + public void stopOpen(Player player) { + } + + @Override + public boolean canPlaceItem(int i, ItemStack itemstack) { + return true; + } + + @Override + public void clearContent() { + this.items.clear(); + this.setChanged(); + } + + @Override + public void fillStackedContents(StackedContents stackedContents) { + for (ItemStack itemstack : this.items) { + stackedContents.accountStack(itemstack); + } + + } + + @Override + public List removeAllItems() { + List list = this.items.stream().filter(Predicate.not(ItemStack::isEmpty)).collect(Collectors.toList()); + this.clearContent(); + return list; + } + + @Override + public ItemStack removeItemType(Item item, int i) { + ItemStack itemstack = new ItemStack(item, 0); + + for(int j = this.getContainerSize() - 1; j >= 0; --j) { + ItemStack localItem = this.getItem(j); + if (localItem.getItem().equals(item)) { + int k = i - itemstack.getCount(); + ItemStack splitItem = localItem.split(k); + itemstack.grow(splitItem.getCount()); + if (itemstack.getCount() == i) { + break; + } + } + } + + if (!itemstack.isEmpty()) { + this.setChanged(); + } + + return itemstack; + } + + @Override + public String toString() { + return this.items.stream().filter((itemStack) -> !itemStack.isEmpty()).collect(Collectors.toList()).toString(); + } + + @Override + public void fromTag(ListTag listTag) { + for (int i = 0; i < this.getContainerSize(); ++i) { + this.setItem(i, ItemStack.EMPTY); + } + + for (int i = 0; i < listTag.size(); ++i) { + CompoundTag compoundTag = listTag.getCompound(i); + int j = compoundTag.getByte("Slot") & 255; + if (j < this.getContainerSize()) { + this.setItem(j, ItemStack.of(compoundTag)); } } diff --git a/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/SpecialPlayerInventory.java b/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/SpecialPlayerInventory.java index 0cf6972..8b2f24a 100644 --- a/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/SpecialPlayerInventory.java +++ b/internal/v1_17_R1/src/main/java/com/lishid/openinv/internal/v1_17_R1/SpecialPlayerInventory.java @@ -20,134 +20,128 @@ import com.google.common.collect.ImmutableList; import com.lishid.openinv.internal.ISpecialPlayerInventory; import java.util.Collection; import java.util.List; -import java.util.Objects; +import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; import net.minecraft.CrashReport; -import net.minecraft.CrashReportSystemDetails; +import net.minecraft.CrashReportCategory; import net.minecraft.ReportedException; import net.minecraft.core.NonNullList; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.network.chat.ChatMessage; -import net.minecraft.network.chat.IChatBaseComponent; -import net.minecraft.network.protocol.game.PacketPlayOutSetSlot; -import net.minecraft.server.level.EntityPlayer; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.network.chat.Component; +import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.tags.Tag; -import net.minecraft.world.ContainerUtil; -import net.minecraft.world.IInventory; +import net.minecraft.world.Container; +import net.minecraft.world.ContainerHelper; import net.minecraft.world.damagesource.DamageSource; -import net.minecraft.world.entity.EnumItemSlot; -import net.minecraft.world.entity.player.AutoRecipeStackManager; -import net.minecraft.world.entity.player.EntityHuman; -import net.minecraft.world.entity.player.PlayerInventory; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.player.StackedContents; +import net.minecraft.world.item.ArmorItem; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemArmor; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.state.IBlockData; +import net.minecraft.world.level.block.state.BlockState; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_17_R1.entity.CraftHumanEntity; import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftInventory; import org.bukkit.entity.HumanEntity; -import org.bukkit.entity.Player; import org.bukkit.inventory.InventoryHolder; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; -public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory { +public class SpecialPlayerInventory extends Inventory implements ISpecialPlayerInventory { private final CraftInventory inventory; private boolean playerOnline; - private EntityHuman l; - private NonNullList h; - private NonNullList i; - private NonNullList j; - private List> n; + private Player player; + private NonNullList items; + private NonNullList armor; + private NonNullList offhand; + private List> compartments; - public SpecialPlayerInventory(final Player bukkitPlayer, final Boolean online) { + public SpecialPlayerInventory(@NotNull org.bukkit.entity.Player bukkitPlayer, @NotNull Boolean online) { super(PlayerDataManager.getHandle(bukkitPlayer)); this.inventory = new CraftInventory(this); this.playerOnline = online; - this.l = super.l; - this.h = this.l.getInventory().h; - this.i = this.l.getInventory().i; - this.j = this.l.getInventory().j; - this.n = ImmutableList.of(this.h, this.i, this.j); + this.player = super.player; + this.selected = player.getInventory().selected; + this.items = this.player.getInventory().items; + this.armor = this.player.getInventory().armor; + this.offhand = this.player.getInventory().offhand; + this.compartments = ImmutableList.of(this.items, this.armor, this.offhand); } @Override - public void setPlayerOnline(@NotNull final Player player) { + public void setPlayerOnline(@NotNull org.bukkit.entity.Player player) { if (!this.playerOnline) { - EntityPlayer entityPlayer = PlayerDataManager.getHandle(player); + Player entityPlayer = PlayerDataManager.getHandle(player); entityPlayer.getInventory().transaction.addAll(this.transaction); - this.l = entityPlayer; - for (int i = 0; i < getSize(); ++i) { - this.l.getInventory().setItem(i, getRawItem(i)); + this.player = entityPlayer; + for (int i = 0; i < getContainerSize(); ++i) { + this.player.getInventory().setItem(i, getRawItem(i)); } - this.l.getInventory().k = this.k; - this.h = this.l.getInventory().h; - this.i = this.l.getInventory().i; - this.j = this.l.getInventory().j; - this.n = ImmutableList.of(this.h, this.i, this.j); + this.player.getInventory().selected = this.selected; + this.items = this.player.getInventory().items; + this.armor = this.player.getInventory().armor; + this.offhand = this.player.getInventory().offhand; + this.compartments = ImmutableList.of(this.items, this.armor, this.offhand); this.playerOnline = true; } } - @Override - public boolean a(final EntityHuman entityhuman) { - return true; - } - @Override public @NotNull CraftInventory getBukkitInventory() { return this.inventory; } @Override - public ItemStack getItem(int i) { - List list = this.h; - - if (i >= list.size()) { - i -= list.size(); - list = this.i; - } else { - i = this.getReversedItemSlotNum(i); - } - - if (i >= list.size()) { - i -= list.size(); - list = this.j; - } else if (list == this.i) { - i = this.getReversedArmorSlotNum(i); - } - - if (i >= list.size()) { - return ItemStack.b; - } - - return list.get(i); - } - - private ItemStack getRawItem(int i) { - NonNullList list = null; - for (NonNullList next : this.n) { - if (i < next.size()) { - list = next; - break; - } - i -= next.size(); - } - - return list == null ? ItemStack.b : list.get(i); + public void setPlayerOffline() { + this.playerOnline = false; } @Override - public IChatBaseComponent getDisplayName() { - return new ChatMessage(this.l.getName()); + public boolean isInUse() { + return !this.getViewers().isEmpty(); } @Override - public boolean hasCustomName() { - return false; + public @NotNull HumanEntity getPlayer() { + return this.player.getBukkitEntity(); + } + + private @NotNull ItemStack getRawItem(int i) { + return super.getItem(i); + } + + private void setRawItem(int i, @NotNull ItemStack itemStack) { + super.setItem(i, itemStack); + } + + private static record IndexedCompartment(@Nullable NonNullList compartment, int index) {} + + private @NotNull SpecialPlayerInventory.IndexedCompartment getIndexedContent(int index) { + if (index < items.size()) { + return new IndexedCompartment(items, getReversedItemSlotNum(index)); + } + + index -= items.size(); + + if (index < armor.size()) { + return new IndexedCompartment(armor, getReversedArmorSlotNum(index)); + } + + index -= armor.size(); + + if (index < offhand.size()) { + return new IndexedCompartment(offhand, index); + } + + index -= offhand.size(); + + return new IndexedCompartment(null, index); } private int getReversedArmorSlotNum(final int i) { @@ -173,173 +167,81 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP return i + 9; } - @Override - public int getSize() { - return 45; - } - - @Override - public boolean isInUse() { - return !this.getViewers().isEmpty(); - } - - @Override - public void setItem(int i, final ItemStack itemstack) { - List list = this.h; - - if (i >= list.size()) { - i -= list.size(); - list = this.i; - } else { - i = this.getReversedItemSlotNum(i); - } - - if (i >= list.size()) { - i -= list.size(); - list = this.j; - } else if (list == this.i) { - i = this.getReversedArmorSlotNum(i); - } - - if (i >= list.size()) { - this.l.drop(itemstack, true); - return; - } - - list.set(i, itemstack); - } - - @Override - public void setPlayerOffline() { - this.playerOnline = false; - } - - @Override - public @NotNull HumanEntity getPlayer() { - return this.l.getBukkitEntity(); - } - - @Override - public ItemStack splitStack(int i, final int j) { - List list = this.h; - - if (i >= list.size()) { - i -= list.size(); - list = this.i; - } else { - i = this.getReversedItemSlotNum(i); - } - - if (i >= list.size()) { - i -= list.size(); - list = this.j; - } else if (list == this.i) { - i = this.getReversedArmorSlotNum(i); - } - - if (i >= list.size()) { - return ItemStack.b; - } - - return list.get(i).isEmpty() ? ItemStack.b : ContainerUtil.a(list, i, j); - } - - @Override - public ItemStack splitWithoutUpdate(int i) { - List list = this.h; - - if (i >= list.size()) { - i -= list.size(); - list = this.i; - } else { - i = this.getReversedItemSlotNum(i); - } - - if (i >= list.size()) { - i -= list.size(); - list = this.j; - } else if (list == this.i) { - i = this.getReversedArmorSlotNum(i); - } - - if (i >= list.size()) { - return ItemStack.b; - } - - if (!list.get(i).isEmpty()) { - ItemStack itemstack = list.get(i); - - list.set(i, ItemStack.b); - return itemstack; - } - - return ItemStack.b; - } - - @Override - public List getContents() { - return this.n.stream().flatMap(Collection::stream).collect(Collectors.toList()); - } - - @Override - public boolean isEmpty() { - return this.n.stream().flatMap(Collection::stream).allMatch(ItemStack::isEmpty); + private boolean contains(Predicate predicate) { + return this.compartments.stream().flatMap(NonNullList::stream).anyMatch(predicate); } @Override public List getArmorContents() { - return this.i; + return this.armor; } @Override public void onOpen(CraftHumanEntity who) { - this.transaction.add(who); - this.l.getInventory().transaction.add(who); + this.player.getInventory().onOpen(who); } @Override public void onClose(CraftHumanEntity who) { - this.transaction.remove(who); - this.l.getInventory().transaction.remove(who); + this.player.getInventory().onClose(who); } @Override public List getViewers() { - return this.transaction; + return this.player.getInventory().getViewers(); } @Override public InventoryHolder getOwner() { - return this.l.getBukkitEntity(); + return this.player.getBukkitEntity(); } - public Location getLocation() { - return this.l.getBukkitEntity().getLocation(); - } - - /* Below this point largely just copied out of NMS to redirect to our overridden variables. */ - @Override - public ItemStack getItemInHand() { - return d(this.k) ? this.h.get(this.k) : ItemStack.b; + public int getMaxStackSize() { + return this.player.getInventory().getMaxStackSize(); } - private boolean isSimilarAndNotFull(ItemStack itemstack, ItemStack itemstack1) { - return !itemstack.isEmpty() && ItemStack.e(itemstack, itemstack1) && itemstack.isStackable() && itemstack.getCount() < itemstack.getMaxStackSize() && itemstack.getCount() < this.getMaxStackSize(); + @Override + public void setMaxStackSize(int size) { + this.player.getInventory().setMaxStackSize(size); + } + + @Override + public Location getLocation() { + return this.player.getBukkitEntity().getLocation(); + } + + @Override + public boolean hasCustomName() { + return false; + } + + @Override + public List getContents() { + return this.compartments.stream().flatMap(Collection::stream).collect(Collectors.toList()); + } + + @Override + public ItemStack getSelected() { + return isHotbarSlot(this.selected) ? this.items.get(this.selected) : ItemStack.EMPTY; + } + + private boolean hasRemainingSpaceForItem(ItemStack itemstack, ItemStack itemstack1) { + return !itemstack.isEmpty() && ItemStack.isSameItemSameTags(itemstack, itemstack1) && itemstack.isStackable() && itemstack.getCount() < itemstack.getMaxStackSize() && itemstack.getCount() < this.getMaxStackSize(); } @Override public int canHold(ItemStack itemstack) { int remains = itemstack.getCount(); - for(int i = 0; i < this.h.size(); ++i) { - ItemStack itemstack1 = this.getItem(i); + for (int i = 0; i < this.items.size(); ++i) { + ItemStack itemstack1 = this.getRawItem(i); if (itemstack1.isEmpty()) { return itemstack.getCount(); } - if (this.isSimilarAndNotFull(itemstack1, itemstack)) { - remains -= (Math.min(itemstack1.getMaxStackSize(), this.getMaxStackSize())) - itemstack1.getCount(); + if (this.hasRemainingSpaceForItem(itemstack1, itemstack)) { + remains -= (itemstack1.getMaxStackSize() < this.getMaxStackSize() ? itemstack1.getMaxStackSize() : this.getMaxStackSize()) - itemstack1.getCount(); } if (remains <= 0) { @@ -347,18 +249,18 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP } } - ItemStack offhandItemStack = this.getItem(this.h.size() + this.i.size()); - if (this.isSimilarAndNotFull(offhandItemStack, itemstack)) { - remains -= (Math.min(offhandItemStack.getMaxStackSize(), this.getMaxStackSize())) - offhandItemStack.getCount(); + ItemStack offhandItemStack = this.getRawItem(this.items.size() + this.armor.size()); + if (this.hasRemainingSpaceForItem(offhandItemStack, itemstack)) { + remains -= (offhandItemStack.getMaxStackSize() < this.getMaxStackSize() ? offhandItemStack.getMaxStackSize() : this.getMaxStackSize()) - offhandItemStack.getCount(); } return remains <= 0 ? itemstack.getCount() : itemstack.getCount() - remains; } @Override - public int getFirstEmptySlotIndex() { - for(int i = 0; i < this.h.size(); ++i) { - if (this.h.get(i).isEmpty()) { + public int getFreeSlot() { + for(int i = 0; i < this.items.size(); ++i) { + if (this.items.get(i).isEmpty()) { return i; } } @@ -367,38 +269,38 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP } @Override - public void a(ItemStack itemstack) { - int i = this.b(itemstack); - if (d(i)) { - this.k = i; + public void setPickedItem(ItemStack itemstack) { + int i = this.findSlotMatchingItem(itemstack); + if (isHotbarSlot(i)) { + this.selected = i; } else if (i == -1) { - this.k = this.i(); - if (!this.h.get(this.k).isEmpty()) { - int j = this.getFirstEmptySlotIndex(); + this.selected = this.getSuitableHotbarSlot(); + if (!this.items.get(this.selected).isEmpty()) { + int j = this.getFreeSlot(); if (j != -1) { - this.h.set(j, this.h.get(this.k)); + this.items.set(j, this.items.get(this.selected)); } } - this.h.set(this.k, itemstack); + this.items.set(this.selected, itemstack); } else { - this.c(i); + this.pickSlot(i); } } @Override - public void c(int i) { - this.k = this.i(); - ItemStack itemstack = this.h.get(this.k); - this.h.set(this.k, this.h.get(i)); - this.h.set(i, itemstack); + public void pickSlot(int i) { + this.selected = this.getSuitableHotbarSlot(); + ItemStack itemstack = this.items.get(this.selected); + this.items.set(this.selected, this.items.get(i)); + this.items.set(i, itemstack); } @Override - public int b(ItemStack itemstack) { - for (int i = 0; i < this.h.size(); ++i) { - if (!this.h.get(i).isEmpty() && ItemStack.e(itemstack, this.h.get(i))) { + public int findSlotMatchingItem(ItemStack itemstack) { + for(int i = 0; i < this.items.size(); ++i) { + if (!this.items.get(i).isEmpty() && ItemStack.isSameItemSameTags(itemstack, this.items.get(i))) { return i; } } @@ -407,10 +309,10 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP } @Override - public int c(ItemStack itemstack) { - for (int i = 0; i < this.h.size(); ++i) { - ItemStack itemstack1 = this.h.get(i); - if (!this.h.get(i).isEmpty() && ItemStack.e(itemstack, this.h.get(i)) && !this.h.get(i).g() && !itemstack1.hasEnchantments() && !itemstack1.hasName()) { + public int findSlotMatchingUnusedItem(ItemStack itemStack) { + for(int i = 0; i < this.items.size(); ++i) { + ItemStack localItem = this.items.get(i); + if (!this.items.get(i).isEmpty() && ItemStack.isSameItemSameTags(itemStack, this.items.get(i)) && !this.items.get(i).isDamaged() && !localItem.isEnchanted() && !localItem.hasCustomHoverName()) { return i; } } @@ -419,28 +321,28 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP } @Override - public int i() { + public int getSuitableHotbarSlot() { int i; int j; - for (j = 0; j < 9; ++j) { - i = (this.k + j) % 9; - if (this.h.get(i).isEmpty()) { + for(j = 0; j < 9; ++j) { + i = (this.selected + j) % 9; + if (this.items.get(i).isEmpty()) { return i; } } - for (j = 0; j < 9; ++j) { - i = (this.k + j) % 9; - if (!this.h.get(i).hasEnchantments()) { + for(j = 0; j < 9; ++j) { + i = (this.selected + j) % 9; + if (!this.items.get(i).isEnchanted()) { return i; } } - return this.k; + return this.selected; } @Override - public void a(double d0) { + public void swapPaint(double d0) { if (d0 > 0.0D) { d0 = 1.0D; } @@ -449,79 +351,80 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP d0 = -1.0D; } - this.k = (int) (this.k - d0); + this.selected = (int) (this.selected - d0); - while (this.k < 0) { - this.k += 9; + while (this.selected < 0) { + this.selected += 9; } - while (this.k >= 9) { - this.k -= 9; + while(this.selected >= 9) { + this.selected -= 9; } - } @Override - public int a(Predicate predicate, int i, IInventory iinventory) { + public int clearOrCountMatchingItems(Predicate predicate, int i, Container container) { byte b0 = 0; boolean flag = i == 0; - int j = b0 + ContainerUtil.a(this, predicate, i - b0, flag); - j += ContainerUtil.a(iinventory, predicate, i - j, flag); - ItemStack itemstack = this.l.bV.getCarried(); - j += ContainerUtil.a(itemstack, predicate, i - j, flag); + int j = b0 + ContainerHelper.clearOrCountMatchingItems(this, predicate, i - b0, flag); + j += ContainerHelper.clearOrCountMatchingItems(container, predicate, i - j, flag); + ItemStack itemstack = this.player.containerMenu.getCarried(); + j += ContainerHelper.clearOrCountMatchingItems(itemstack, predicate, i - j, flag); if (itemstack.isEmpty()) { - this.l.bV.setCarried(ItemStack.b); + this.player.containerMenu.setCarried(ItemStack.EMPTY); } return j; } - private int i(ItemStack itemstack) { - int i = this.firstPartial(itemstack); + private int addResource(ItemStack itemstack) { + int i = this.getSlotWithRemainingSpace(itemstack); if (i == -1) { - i = this.getFirstEmptySlotIndex(); + i = this.getFreeSlot(); } - return i == -1 ? itemstack.getCount() : this.d(i, itemstack); + return i == -1 ? itemstack.getCount() : this.addResource(i, itemstack); } - private int d(int i, ItemStack itemstack) { + private int addResource(int i, ItemStack itemstack) { Item item = itemstack.getItem(); int j = itemstack.getCount(); - ItemStack itemstack1 = this.getItem(i); - if (itemstack1.isEmpty()) { - itemstack1 = new ItemStack(item, 0); + ItemStack localItemStack = this.getRawItem(i); + if (localItemStack.isEmpty()) { + localItemStack = new ItemStack(item, 0); if (itemstack.hasTag()) { - itemstack1.setTag(Objects.requireNonNull(itemstack.getTag()).clone()); + // hasTag ensures tag not null + //noinspection ConstantConditions + localItemStack.setTag(itemstack.getTag().copy()); } - this.setItem(i, itemstack1); + this.setRawItem(i, localItemStack); } - k = Math.min(j, itemstack1.getMaxStackSize() - itemstack1.getCount()); + int k = Math.min(j, localItemStack.getMaxStackSize() - localItemStack.getCount()); - if (k > this.getMaxStackSize() - itemstack1.getCount()) { - k = this.getMaxStackSize() - itemstack1.getCount(); + if (k > this.getMaxStackSize() - localItemStack.getCount()) { + k = this.getMaxStackSize() - localItemStack.getCount(); } if (k != 0) { j -= k; - itemstack1.add(k); - itemstack1.d(5); + localItemStack.grow(k); + localItemStack.setPopTime(5); } return j; } @Override - public int firstPartial(ItemStack itemstack) { - if (this.isSimilarAndNotFull(this.getItem(this.k), itemstack)) { - return this.k; - } else if (this.isSimilarAndNotFull(this.getItem(40), itemstack)) { + public int getSlotWithRemainingSpace(ItemStack itemstack) { + if (this.hasRemainingSpaceForItem(this.getRawItem(this.selected), itemstack)) { + return this.selected; + } else if (this.hasRemainingSpaceForItem(this.getRawItem(40), itemstack)) { return 40; } else { - for(int i = 0; i < this.h.size(); ++i) { - if (this.isSimilarAndNotFull(this.h.get(i), itemstack)) { + for(int i = 0; i < this.items.size(); ++i) { + if (this.hasRemainingSpaceForItem(this.items.get(i), itemstack)) { return i; } } @@ -531,11 +434,11 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP } @Override - public void j() { - for (NonNullList nonNullList : this.n) { - for (int i = 0; i < nonNullList.size(); ++i) { - if (!nonNullList.get(i).isEmpty()) { - nonNullList.get(i).a(this.l.t, this.l, i, this.k == i); + public void tick() { + for (NonNullList compartment : this.compartments) { + for (int i = 0; i < compartment.size(); ++i) { + if (!compartment.get(i).isEmpty()) { + compartment.get(i).inventoryTick(this.player.level, this.player, i, this.selected == i); } } } @@ -543,27 +446,27 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP } @Override - public boolean pickup(ItemStack itemStack) { - return this.c(-1, itemStack); + public boolean add(ItemStack itemStack) { + return this.add(-1, itemStack); } @Override - public boolean c(int i, ItemStack itemStack) { + public boolean add(int i, ItemStack itemStack) { if (itemStack.isEmpty()) { return false; } else { try { - if (itemStack.g()) { + if (itemStack.isDamaged()) { if (i == -1) { - i = this.getFirstEmptySlotIndex(); + i = this.getFreeSlot(); } if (i >= 0) { - this.h.set(i, itemStack.cloneItemStack()); - this.h.get(i).d(5); + this.items.set(i, itemStack.copy()); + this.items.get(i).setPopTime(5); itemStack.setCount(0); return true; - } else if (this.l.getAbilities().d) { + } else if (this.player.getAbilities().instabuild) { itemStack.setCount(0); return true; } else { @@ -574,13 +477,13 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP do { j = itemStack.getCount(); if (i == -1) { - itemStack.setCount(this.i(itemStack)); + itemStack.setCount(this.addResource(itemStack)); } else { - itemStack.setCount(this.d(i, itemStack)); + itemStack.setCount(this.addResource(i, itemStack)); } } while(!itemStack.isEmpty() && itemStack.getCount() < j); - if (itemStack.getCount() == j && this.l.getAbilities().d) { + if (itemStack.getCount() == j && this.player.getAbilities().instabuild) { itemStack.setCount(0); return true; } else { @@ -588,39 +491,39 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP } } } catch (Throwable var6) { - CrashReport crashreport = CrashReport.a(var6, "Adding item to inventory"); - CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Item being added"); - crashreportsystemdetails.a("Item ID", Item.getId(itemStack.getItem())); - crashreportsystemdetails.a("Item data", itemStack.getDamage()); - crashreportsystemdetails.a("Item name", () -> itemStack.getName().getString()); - throw new ReportedException(crashreport); + CrashReport crashReport = CrashReport.forThrowable(var6, "Adding item to inventory"); + CrashReportCategory crashReportCategory = crashReport.addCategory("Item being added"); + crashReportCategory.setDetail("Item ID", Item.getId(itemStack.getItem())); + crashReportCategory.setDetail("Item data", itemStack.getDamageValue()); + crashReportCategory.setDetail("Item name", () -> itemStack.getHoverName().getString()); + throw new ReportedException(crashReport); } } } @Override - public void f(ItemStack itemStack) { - this.a(itemStack, true); + public void placeItemBackInInventory(ItemStack itemStack) { + this.placeItemBackInInventory(itemStack, true); } @Override - public void a(ItemStack itemStack, boolean flag) { + public void placeItemBackInInventory(ItemStack itemStack, boolean flag) { while(true) { if (!itemStack.isEmpty()) { - int i = this.firstPartial(itemStack); + int i = this.getSlotWithRemainingSpace(itemStack); if (i == -1) { - i = this.getFirstEmptySlotIndex(); + i = this.getFreeSlot(); } if (i != -1) { - int j = itemStack.getMaxStackSize() - this.getItem(i).getCount(); - if (this.c(i, itemStack.cloneAndSubtract(j)) && flag && this.l instanceof EntityPlayer) { - ((EntityPlayer)this.l).b.sendPacket(new PacketPlayOutSetSlot(-2, i, this.getItem(i))); + int j = itemStack.getMaxStackSize() - this.getRawItem(i).getCount(); + if (this.add(i, itemStack.split(j)) && flag && this.player instanceof ServerPlayer) { + ((ServerPlayer)this.player).connection.send(new ClientboundContainerSetSlotPacket(-2, 0, i, this.getRawItem(i))); } continue; } - this.l.drop(itemStack, false); + this.player.drop(itemStack, false); } return; @@ -628,11 +531,23 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP } @Override - public void g(ItemStack itemStack) { - for (NonNullList nonNullList : this.n) { - for (int i = 0; i < nonNullList.size(); ++i) { - if (nonNullList.get(i) == itemStack) { - nonNullList.set(i, ItemStack.b); + public ItemStack removeItem(int rawIndex, final int j) { + IndexedCompartment indexedCompartment = getIndexedContent(rawIndex); + + if (indexedCompartment.compartment() == null + || indexedCompartment.compartment().get(indexedCompartment.index()).isEmpty()) { + return ItemStack.EMPTY; + } + + return ContainerHelper.removeItem(indexedCompartment.compartment(), indexedCompartment.index(), j); + } + + @Override + public void removeItem(ItemStack itemStack) { + for (NonNullList compartment : this.compartments) { + for (int i = 0; i < compartment.size(); ++i) { + if (compartment.get(i) == itemStack) { + compartment.set(i, ItemStack.EMPTY); break; } } @@ -640,61 +555,88 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP } @Override - public float a(IBlockData iBlockData) { - return this.h.get(this.k).a(iBlockData); + public ItemStack removeItemNoUpdate(int rawIndex) { + IndexedCompartment indexedCompartment = getIndexedContent(rawIndex); + + if (indexedCompartment.compartment() == null) { + return ItemStack.EMPTY; + } + + ItemStack removed = indexedCompartment.compartment().set(indexedCompartment.index(), ItemStack.EMPTY); + + if (removed.isEmpty()) { + return ItemStack.EMPTY; + } + + return removed; } @Override - public NBTTagList a(NBTTagList nbtTagList) { - NBTTagCompound nbttagcompound; - int i; - for(i = 0; i < this.h.size(); ++i) { - if (!this.h.get(i).isEmpty()) { - nbttagcompound = new NBTTagCompound(); - nbttagcompound.setByte("Slot", (byte)i); - this.h.get(i).save(nbttagcompound); - nbtTagList.add(nbttagcompound); - } + public void setItem(int rawIndex, final ItemStack itemStack) { + IndexedCompartment indexedCompartment = getIndexedContent(rawIndex); + + if (indexedCompartment.compartment() == null) { + this.player.drop(itemStack, true); + return; } - for(i = 0; i < this.i.size(); ++i) { - if (!this.i.get(i).isEmpty()) { - nbttagcompound = new NBTTagCompound(); - nbttagcompound.setByte("Slot", (byte)(i + 100)); - this.i.get(i).save(nbttagcompound); - nbtTagList.add(nbttagcompound); - } - } - - for(i = 0; i < this.j.size(); ++i) { - if (!this.j.get(i).isEmpty()) { - nbttagcompound = new NBTTagCompound(); - nbttagcompound.setByte("Slot", (byte)(i + 150)); - this.j.get(i).save(nbttagcompound); - nbtTagList.add(nbttagcompound); - } - } - - return nbtTagList; + indexedCompartment.compartment().set(indexedCompartment.index(), itemStack); } @Override - public void b(NBTTagList nbtTagList) { - this.h.clear(); - this.i.clear(); - this.j.clear(); + public float getDestroySpeed(BlockState blockState) { + return this.items.get(this.selected).getDestroySpeed(blockState); + } - for(int i = 0; i < nbtTagList.size(); ++i) { - NBTTagCompound nbttagcompound = nbtTagList.getCompound(i); - int j = nbttagcompound.getByte("Slot") & 255; - ItemStack itemstack = ItemStack.a(nbttagcompound); + @Override + public ListTag save(ListTag listTag) { + for (int i = 0; i < this.items.size(); ++i) { + if (!this.items.get(i).isEmpty()) { + CompoundTag compoundTag = new CompoundTag(); + compoundTag.putByte("Slot", (byte)i); + this.items.get(i).save(compoundTag); + listTag.add(compoundTag); + } + } + + for (int i = 0; i < this.armor.size(); ++i) { + if (!this.armor.get(i).isEmpty()) { + CompoundTag compoundTag = new CompoundTag(); + compoundTag.putByte("Slot", (byte)(i + 100)); + this.armor.get(i).save(compoundTag); + listTag.add(compoundTag); + } + } + + for (int i = 0; i < this.offhand.size(); ++i) { + if (!this.offhand.get(i).isEmpty()) { + CompoundTag compoundTag = new CompoundTag(); + compoundTag.putByte("Slot", (byte)(i + 150)); + this.offhand.get(i).save(compoundTag); + listTag.add(compoundTag); + } + } + + return listTag; + } + + @Override + public void load(ListTag listTag) { + this.items.clear(); + this.armor.clear(); + this.offhand.clear(); + + for(int i = 0; i < listTag.size(); ++i) { + CompoundTag compoundTag = listTag.getCompound(i); + int j = compoundTag.getByte("Slot") & 255; + ItemStack itemstack = ItemStack.of(compoundTag); if (!itemstack.isEmpty()) { - if (j < this.h.size()) { - this.h.set(j, itemstack); - } else if (j >= 100 && j < this.i.size() + 100) { - this.i.set(j - 100, itemstack); - } else if (j >= 150 && j < this.j.size() + 150) { - this.j.set(j - 150, itemstack); + if (j < this.items.size()) { + this.items.set(j, itemstack); + } else if (j >= 100 && j < this.armor.size() + 100) { + this.armor.set(j - 100, itemstack); + } else if (j >= 150 && j < this.offhand.size() + 150) { + this.offhand.set(j - 150, itemstack); } } } @@ -702,76 +644,126 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP } @Override - public ItemStack e(int i) { - return this.i.get(i); + public int getContainerSize() { + return 45; } @Override - public void a(DamageSource damageSource, float f, int[] intArray) { - if (f > 0.0F) { - f /= 4.0F; - if (f < 1.0F) { - f = 1.0F; + public boolean isEmpty() { + return !contains(itemStack -> !itemStack.isEmpty()); + } + + @Override + public ItemStack getItem(int rawIndex) { + IndexedCompartment indexedCompartment = getIndexedContent(rawIndex); + + if (indexedCompartment.compartment() == null) { + return ItemStack.EMPTY; + } + + return indexedCompartment.compartment().get(indexedCompartment.index()); + } + + @Override + public Component getName() { + return this.player.getName(); + } + + @Override + public ItemStack getArmor(int index) { + return this.armor.get(index); + } + + @Override + public void hurtArmor(DamageSource damagesource, float damage, int[] armorIndices) { + if (damage > 0.0F) { + damage /= 4.0F; + if (damage < 1.0F) { + damage = 1.0F; } - for (int index : intArray) { - ItemStack itemstack = this.i.get(index); - if ((!damageSource.isFire() || !itemstack.getItem().w()) && itemstack.getItem() instanceof ItemArmor) { - itemstack.damage((int) f, this.l, (entityHuman) -> entityHuman.broadcastItemBreak(EnumItemSlot.a(EnumItemSlot.Function.b, index))); + for (int index : armorIndices) { + ItemStack itemstack = this.armor.get(index); + if ((!damagesource.isFire() || !itemstack.getItem().isFireResistant()) && itemstack.getItem() instanceof ArmorItem) { + itemstack.hurtAndBreak((int) damage, this.player, localPlayer -> localPlayer.broadcastBreakEvent(EquipmentSlot.byTypeAndIndex(EquipmentSlot.Type.ARMOR, index))); } } } - } @Override - public void dropContents() { - for (List list : this.n) { - for (int i = 0; i < list.size(); ++i) { - ItemStack itemstack = list.get(i); + public void dropAll() { + for (NonNullList compartment : this.compartments) { + for (int i = 0; i < compartment.size(); ++i) { + ItemStack itemstack = compartment.get(i); if (!itemstack.isEmpty()) { - list.set(i, ItemStack.b); - this.l.a(itemstack, true, false); + this.player.drop(itemstack, true, false); + compartment.set(i, ItemStack.EMPTY); } } } } @Override - public boolean h(ItemStack itemStack) { - return this.n.stream() - .flatMap(Collection::stream) - .anyMatch(itemStack1 -> !itemStack1.isEmpty() && itemStack1.doMaterialsMatch(itemStack)); + public void setChanged() { + super.setChanged(); } @Override - public boolean a(Tag tag) { - return this.n.stream() - .flatMap(Collection::stream) - .anyMatch(itemStack -> !itemStack.isEmpty() && itemStack.a(tag)); + public int getTimesChanged() { + return super.getTimesChanged(); } @Override - public void a(PlayerInventory playerInventory) { - for(int i = 0; i < this.getSize(); ++i) { - this.setItem(i, playerInventory.getItem(i)); + public boolean stillValid(Player player) { + return true; + } + + @Override + public boolean contains(ItemStack itemstack) { + return contains(itemStack -> itemStack.isEmpty() && itemStack.sameItem(itemstack)); + } + + @Override + public boolean contains(Tag tag) { + return contains(itemStack -> !itemStack.isEmpty() && itemStack.is(tag)); + } + + @Override + public void replaceWith(Inventory inventory) { + Function getter; + + if (inventory instanceof SpecialPlayerInventory specialPlayerInventory) { + getter = specialPlayerInventory::getRawItem; + } else { + getter = inventory::getItem; } - this.k = playerInventory.k; + for(int i = 0; i < this.getContainerSize(); ++i) { + this.setRawItem(i, getter.apply(i)); + } + + this.selected = inventory.selected; } @Override - public void clear() { - for (List list : this.n) { - list.clear(); + public void clearContent() { + for (NonNullList compartment : this.compartments) { + compartment.clear(); } } @Override - public void a(AutoRecipeStackManager autoRecipeStackManager) { - for (ItemStack itemstack : this.h) { - autoRecipeStackManager.a(itemstack); + public void fillStackedContents(StackedContents stackedContents) { + for (ItemStack itemstack : this.items) { + stackedContents.accountSimpleStack(itemstack); } } + @Override + public ItemStack removeFromSelected(boolean dropWholeStack) { + ItemStack itemstack = this.getSelected(); + return itemstack.isEmpty() ? ItemStack.EMPTY : this.removeItem(this.selected, dropWholeStack ? itemstack.getCount() : 1); + } + } diff --git a/plugin/src/main/java/com/lishid/openinv/util/InternalAccessor.java b/plugin/src/main/java/com/lishid/openinv/util/InternalAccessor.java index 4f05407..090f5cf 100644 --- a/plugin/src/main/java/com/lishid/openinv/util/InternalAccessor.java +++ b/plugin/src/main/java/com/lishid/openinv/util/InternalAccessor.java @@ -83,6 +83,8 @@ public class InternalAccessor { case "v1_16_R2": return "https://github.com/lishid/OpenInv/releases/tag/4.1.5"; case "v1_16_R3": + return "https://github.com/Jikoo/OpenInv/releases/tag/4.1.8"; + case "v1_17_R1": default: return "https://github.com/Jikoo/OpenInv/releases"; } diff --git a/pom.xml b/pom.xml index c26be77..ef04ab1 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,6 @@ api plugin - internal/v1_16_R3 internal/v1_17_R1 assembly @@ -139,6 +138,12 @@ org.apache.maven.plugins 3.3.0 + + + net.md-5 + specialsource-maven-plugin + 1.2.2 + diff --git a/scripts/get_spigot_versions.sh b/scripts/get_spigot_versions.sh index 29376e0..4dca717 100644 --- a/scripts/get_spigot_versions.sh +++ b/scripts/get_spigot_versions.sh @@ -15,8 +15,8 @@ # along with this program. If not, see . # -# TODO FIGURE OUT AND REMOVE WHEN LESS STRESS -hacky_versions=("1.16.5-R0.1-SNAPSHOT" "1.17.1-R0.1-SNAPSHOT") +# TODO Fix script for bash version used in Actions images +hacky_versions=("1.17.1-R0.1-SNAPSHOT") for hacky_version in "${hacky_versions[@]}"; do echo "$hacky_version" done diff --git a/scripts/install_spigot_dependencies.sh b/scripts/install_spigot_dependencies.sh index 0beac8f..336da7d 100644 --- a/scripts/install_spigot_dependencies.sh +++ b/scripts/install_spigot_dependencies.sh @@ -36,12 +36,12 @@ echo Found Spigot dependencies: "${versions[@]}" for version in "${versions[@]}"; do set -e exit_code=0 - mvn dependency:get -Dartifact=org.spigotmc:spigot:"$version" -q -o || exit_code=$? + mvn dependency:get -Dartifact=org.spigotmc:spigot:"$version":remapped-mojang -q -o || exit_code=$? if [ $exit_code -ne 0 ]; then echo Installing missing Spigot version "$version" revision=${version%%-R*} get_buildtools - java -jar $buildtools -rev "$revision" + java -jar $buildtools -rev "$revision" --remapped else echo Spigot "$version" is already installed fi