Custom inventory titles for 1.14

This commit is contained in:
Jikoo
2019-05-05 15:15:17 -04:00
parent 185f037254
commit 0f266c8a64
34 changed files with 420 additions and 239 deletions

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_4_5;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import java.util.Arrays;
import java.util.Collection;
import net.minecraft.server.v1_4_5.EntityPlayer;
@@ -28,6 +29,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_4_5.CraftServer;
import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager {
@@ -55,9 +57,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@NotNull
@Override
public String getPlayerDataID(@NotNull OfflinePlayer offline) {
@Override
public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getName();
}
@@ -71,9 +72,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return player;
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Arrays.asList(Bukkit.getOnlinePlayers());
}
@@ -97,4 +97,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_4_6;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import java.util.Arrays;
import java.util.Collection;
import net.minecraft.server.v1_4_6.EntityPlayer;
@@ -28,6 +29,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_4_6.CraftServer;
import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager {
@@ -55,9 +57,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@NotNull
@Override
public String getPlayerDataID(@NotNull OfflinePlayer offline) {
@Override
public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getName();
}
@@ -71,9 +72,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return player;
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Arrays.asList(Bukkit.getOnlinePlayers());
}
@@ -97,4 +97,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_10_R1;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import com.mojang.authlib.GameProfile;
import java.util.Collection;
import java.util.UUID;
@@ -29,6 +30,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager {
@@ -56,9 +58,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@NotNull
@Override
public String getPlayerDataID(@NotNull OfflinePlayer offline) {
@Override
public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getUniqueId().toString();
}
@@ -78,9 +79,8 @@ public class PlayerDataManager implements IPlayerDataManager {
}
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Bukkit.getOnlinePlayers();
}
@@ -104,4 +104,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_11_R1;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import com.mojang.authlib.GameProfile;
import java.util.Collection;
import java.util.UUID;
@@ -29,6 +30,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager {
@@ -56,9 +58,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@NotNull
@Override
public String getPlayerDataID(@NotNull OfflinePlayer offline) {
@Override
public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getUniqueId().toString();
}
@@ -78,9 +79,8 @@ public class PlayerDataManager implements IPlayerDataManager {
}
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Bukkit.getOnlinePlayers();
}
@@ -104,4 +104,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_12_R1;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import com.mojang.authlib.GameProfile;
import java.util.Collection;
import java.util.UUID;
@@ -29,6 +30,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_12_R1.CraftServer;
import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager {
@@ -54,9 +56,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Bukkit.getOnlinePlayers();
}
@@ -76,8 +77,7 @@ public class PlayerDataManager implements IPlayerDataManager {
}
}
@NotNull
@Override
@NotNull @Override
public String getPlayerDataID(@NotNull final OfflinePlayer offline) {
return offline.getUniqueId().toString();
}
@@ -105,4 +105,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_13_R1;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import com.mojang.authlib.GameProfile;
import java.util.Collection;
import java.util.UUID;
@@ -29,6 +30,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager {
@@ -53,9 +55,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Bukkit.getOnlinePlayers();
}
@@ -75,9 +76,8 @@ public class PlayerDataManager implements IPlayerDataManager {
}
}
@NotNull
@Override
public String getPlayerDataID(@NotNull final OfflinePlayer offline) {
@Override
public @NotNull String getPlayerDataID(@NotNull final OfflinePlayer offline) {
return offline.getUniqueId().toString();
}
@@ -104,4 +104,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_13_R2;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import com.mojang.authlib.GameProfile;
import java.util.Collection;
import java.util.UUID;
@@ -30,6 +31,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager {
@@ -54,9 +56,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Bukkit.getOnlinePlayers();
}
@@ -76,9 +77,8 @@ public class PlayerDataManager implements IPlayerDataManager {
}
}
@NotNull
@Override
public String getPlayerDataID(@NotNull final OfflinePlayer offline) {
@Override
public @NotNull String getPlayerDataID(@NotNull final OfflinePlayer offline) {
return offline.getUniqueId().toString();
}
@@ -105,4 +105,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}

View File

@@ -17,19 +17,32 @@
package com.lishid.openinv.internal.v1_14_R1;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import com.mojang.authlib.GameProfile;
import java.util.Collection;
import java.util.UUID;
import net.minecraft.server.v1_14_R1.ChatComponentText;
import net.minecraft.server.v1_14_R1.Container;
import net.minecraft.server.v1_14_R1.Containers;
import net.minecraft.server.v1_14_R1.DimensionManager;
import net.minecraft.server.v1_14_R1.EntityHuman;
import net.minecraft.server.v1_14_R1.EntityPlayer;
import net.minecraft.server.v1_14_R1.MinecraftServer;
import net.minecraft.server.v1_14_R1.PacketPlayOutOpenWindow;
import net.minecraft.server.v1_14_R1.PlayerInteractManager;
import net.minecraft.server.v1_14_R1.PlayerInventory;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_14_R1.event.CraftEventFactory;
import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftContainer;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager {
@@ -54,9 +67,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Bukkit.getOnlinePlayers();
}
@@ -76,9 +88,8 @@ public class PlayerDataManager implements IPlayerDataManager {
}
}
@NotNull
@Override
public String getPlayerDataID(@NotNull final OfflinePlayer offline) {
public @NotNull String getPlayerDataID(@NotNull final OfflinePlayer offline) {
return offline.getUniqueId().toString();
}
@@ -105,4 +116,68 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
EntityPlayer nmsPlayer = getHandle(player);
if (nmsPlayer == null || nmsPlayer.playerConnection == null) {
return null;
}
String title;
if (inventory instanceof SpecialEnderChest) {
HumanEntity owner = (HumanEntity) ((SpecialEnderChest) inventory).getBukkitOwner();
title = (owner.getName() != null ? owner.getName() : owner.getUniqueId().toString()) + "'s Ender Chest";
} else if (inventory instanceof SpecialPlayerInventory) {
EntityHuman owner = ((PlayerInventory) inventory).player;
title = (owner.getName() != null ? owner.getName() : owner.getUniqueID().toString()) + "'s Inventory";
} else {
return player.openInventory(inventory.getBukkitInventory());
}
Container container = new CraftContainer(new InventoryView() {
@Override
public @NotNull Inventory getTopInventory() {
return inventory.getBukkitInventory();
}
@Override
public @NotNull Inventory getBottomInventory() {
return player.getInventory();
}
@Override
public @NotNull HumanEntity getPlayer() {
return player;
}
@Override
public @NotNull InventoryType getType() {
return inventory.getBukkitInventory().getType();
}
@Override
public @NotNull String getTitle() {
return title;
}
}, nmsPlayer, nmsPlayer.nextContainerCounter()) {
@Override
public Containers<?> getType() {
return inventory instanceof SpecialEnderChest ? Containers.GENERIC_9X3 : Containers.GENERIC_9X5;
}
};
container.setTitle(new ChatComponentText(title));
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();
}
}

View File

@@ -31,7 +31,6 @@ import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity;
import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.jetbrains.annotations.NotNull;
@@ -51,7 +50,7 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn
}
@Override
public @NotNull Inventory getBukkitInventory() {
public @NotNull CraftInventory getBukkitInventory() {
return inventory;
}

View File

@@ -47,8 +47,6 @@ import org.bukkit.craftbukkit.v1_14_R1.entity.CraftHumanEntity;
import org.bukkit.craftbukkit.v1_14_R1.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -63,13 +61,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
public SpecialPlayerInventory(final Player bukkitPlayer, final Boolean online) {
super(PlayerDataManager.getHandle(bukkitPlayer));
this.inventory = new CraftInventory(this) {
@NotNull
@Override
public InventoryType getType() {
return InventoryType.CHEST;
}
};
this.inventory = new CraftInventory(this);
this.playerOnline = online;
this.player = super.player;
this.items = this.player.inventory.items;
@@ -98,7 +90,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
}
@Override
public @NotNull Inventory getBukkitInventory() {
public @NotNull CraftInventory getBukkitInventory() {
return this.inventory;
}

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_4_R1;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import java.util.Arrays;
import java.util.Collection;
import net.minecraft.server.v1_4_R1.EntityPlayer;
@@ -28,6 +29,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_4_R1.CraftServer;
import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
@@ -56,9 +58,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@NotNull
@Override
public String getPlayerDataID(@NotNull OfflinePlayer offline) {
@Override
public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getName();
}
@@ -72,9 +73,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return player;
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Arrays.asList(Bukkit.getOnlinePlayers());
}
@@ -98,4 +98,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_5_R2;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import java.util.Arrays;
import java.util.Collection;
import net.minecraft.server.v1_5_R2.EntityPlayer;
@@ -28,6 +29,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_5_R2.CraftServer;
import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager {
@@ -55,9 +57,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@NotNull
@Override
public String getPlayerDataID(@NotNull OfflinePlayer offline) {
@Override
public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getName();
}
@@ -71,9 +72,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return player;
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Arrays.asList(Bukkit.getOnlinePlayers());
}
@@ -97,4 +97,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_5_R3;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import java.util.Arrays;
import java.util.Collection;
import net.minecraft.server.v1_5_R3.EntityPlayer;
@@ -28,6 +29,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_5_R3.CraftServer;
import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager {
@@ -55,9 +57,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@NotNull
@Override
public String getPlayerDataID(@NotNull OfflinePlayer offline) {
@Override
public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getName();
}
@@ -71,9 +72,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return player;
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Arrays.asList(Bukkit.getOnlinePlayers());
}
@@ -97,4 +97,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_6_R1;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import java.util.Arrays;
import java.util.Collection;
import net.minecraft.server.v1_6_R1.EntityPlayer;
@@ -28,6 +29,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_6_R1.CraftServer;
import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager {
@@ -55,9 +57,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@NotNull
@Override
public String getPlayerDataID(@NotNull OfflinePlayer offline) {
@Override
public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getName();
}
@@ -71,9 +72,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return player;
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Arrays.asList(Bukkit.getOnlinePlayers());
}
@@ -97,4 +97,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_6_R2;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import java.util.Arrays;
import java.util.Collection;
import net.minecraft.server.v1_6_R2.EntityPlayer;
@@ -28,6 +29,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_6_R2.CraftServer;
import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager {
@@ -55,9 +57,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@NotNull
@Override
public String getPlayerDataID(@NotNull OfflinePlayer offline) {
@Override
public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getName();
}
@@ -71,9 +72,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return player;
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Arrays.asList(Bukkit.getOnlinePlayers());
}
@@ -97,4 +97,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_6_R3;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import java.util.Arrays;
import java.util.Collection;
import net.minecraft.server.v1_6_R3.EntityPlayer;
@@ -28,6 +29,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_6_R3.CraftServer;
import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager {
@@ -55,9 +57,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@NotNull
@Override
public String getPlayerDataID(@NotNull OfflinePlayer offline) {
@Override
public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getName();
}
@@ -71,9 +72,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return player;
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Arrays.asList(Bukkit.getOnlinePlayers());
}
@@ -97,4 +97,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_7_R1;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import java.util.Arrays;
import java.util.Collection;
import net.minecraft.server.v1_7_R1.EntityPlayer;
@@ -29,6 +30,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_7_R1.CraftServer;
import org.bukkit.craftbukkit.v1_7_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager {
@@ -56,9 +58,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@NotNull
@Override
public String getPlayerDataID(@NotNull OfflinePlayer offline) {
@Override
public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getName();
}
@@ -72,9 +73,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return player;
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Arrays.asList(Bukkit.getOnlinePlayers());
}
@@ -98,4 +98,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_7_R2;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import java.util.Arrays;
import java.util.Collection;
import net.minecraft.server.v1_7_R2.EntityPlayer;
@@ -29,6 +30,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_7_R2.CraftServer;
import org.bukkit.craftbukkit.v1_7_R2.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
@SuppressWarnings("deprecation") // Deprecated methods are used properly and will not change.
@@ -57,9 +59,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@NotNull
@Override
public String getPlayerDataID(@NotNull OfflinePlayer offline) {
@Override
public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getName();
}
@@ -73,9 +74,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return player;
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Arrays.asList(Bukkit.getOnlinePlayers());
}
@@ -99,4 +99,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_7_R3;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import java.util.Arrays;
import java.util.Collection;
import java.util.UUID;
@@ -30,6 +31,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_7_R3.CraftServer;
import org.bukkit.craftbukkit.v1_7_R3.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager {
@@ -57,9 +59,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@NotNull
@Override
public String getPlayerDataID(@NotNull OfflinePlayer offline) {
@Override
public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getUniqueId().toString();
}
@@ -79,9 +80,8 @@ public class PlayerDataManager implements IPlayerDataManager {
}
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Arrays.asList(Bukkit.getOnlinePlayers());
}
@@ -105,4 +105,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_7_R4;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import java.util.Collection;
import java.util.UUID;
import net.minecraft.server.v1_7_R4.EntityPlayer;
@@ -29,6 +30,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_7_R4.CraftServer;
import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager {
@@ -56,9 +58,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@NotNull
@Override
public String getPlayerDataID(@NotNull OfflinePlayer offline) {
@Override
public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getUniqueId().toString();
}
@@ -78,9 +79,8 @@ public class PlayerDataManager implements IPlayerDataManager {
}
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Bukkit.getOnlinePlayers();
}
@@ -104,4 +104,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_8_R1;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import com.mojang.authlib.GameProfile;
import java.util.Collection;
import java.util.UUID;
@@ -29,6 +30,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_8_R1.CraftServer;
import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager {
@@ -56,9 +58,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@NotNull
@Override
public String getPlayerDataID(@NotNull OfflinePlayer offline) {
@Override
public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getUniqueId().toString();
}
@@ -78,9 +79,8 @@ public class PlayerDataManager implements IPlayerDataManager {
}
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Bukkit.getOnlinePlayers();
}
@@ -104,4 +104,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_8_R2;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import com.mojang.authlib.GameProfile;
import java.util.Collection;
import java.util.UUID;
@@ -29,6 +30,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_8_R2.CraftServer;
import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager {
@@ -56,9 +58,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@NotNull
@Override
public String getPlayerDataID(@NotNull OfflinePlayer offline) {
@Override
public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getUniqueId().toString();
}
@@ -78,9 +79,8 @@ public class PlayerDataManager implements IPlayerDataManager {
}
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Bukkit.getOnlinePlayers();
}
@@ -104,4 +104,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_8_R3;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import com.mojang.authlib.GameProfile;
import java.util.Collection;
import java.util.UUID;
@@ -29,6 +30,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_8_R3.CraftServer;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager {
@@ -56,9 +58,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@NotNull
@Override
public String getPlayerDataID(@NotNull OfflinePlayer offline) {
@Override
public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getUniqueId().toString();
}
@@ -78,9 +79,8 @@ public class PlayerDataManager implements IPlayerDataManager {
}
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Bukkit.getOnlinePlayers();
}
@@ -104,4 +104,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_9_R1;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import com.mojang.authlib.GameProfile;
import java.util.Collection;
import java.util.UUID;
@@ -29,6 +30,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_9_R1.CraftServer;
import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager {
@@ -56,9 +58,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@NotNull
@Override
public String getPlayerDataID(@NotNull OfflinePlayer offline) {
@Override
public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getUniqueId().toString();
}
@@ -78,9 +79,8 @@ public class PlayerDataManager implements IPlayerDataManager {
}
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Bukkit.getOnlinePlayers();
}
@@ -104,4 +104,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}

View File

@@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_9_R2;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialInventory;
import com.mojang.authlib.GameProfile;
import java.util.Collection;
import java.util.UUID;
@@ -29,6 +30,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_9_R2.CraftServer;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager {
@@ -56,9 +58,8 @@ public class PlayerDataManager implements IPlayerDataManager {
return target;
}
@NotNull
@Override
public String getPlayerDataID(@NotNull OfflinePlayer offline) {
@Override
public @NotNull String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getUniqueId().toString();
}
@@ -78,9 +79,8 @@ public class PlayerDataManager implements IPlayerDataManager {
}
}
@NotNull
@Override
public Collection<? extends Player> getOnlinePlayers() {
@Override
public @NotNull Collection<? extends Player> getOnlinePlayers() {
return Bukkit.getOnlinePlayers();
}
@@ -104,4 +104,9 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer;
}
@Override
public InventoryView openInventory(@NotNull Player player, @NotNull ISpecialInventory inventory) {
return player.openInventory(inventory.getBukkitInventory());
}
}