Using the new API for opening inventories.
This commit is contained in:
@@ -25,6 +25,8 @@ import org.bukkit.plugin.PluginDescriptionFile;
|
|||||||
import org.bukkit.plugin.PluginManager;
|
import org.bukkit.plugin.PluginManager;
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
import org.bukkit.plugin.java.JavaPlugin;
|
||||||
|
|
||||||
|
import balor.OpenInv.InventoryManager;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Open other player's inventory
|
* Open other player's inventory
|
||||||
*
|
*
|
||||||
@@ -45,6 +47,7 @@ public class OpenInv extends JavaPlugin {
|
|||||||
mainPlugin.getConfig().options().copyDefaults(true);
|
mainPlugin.getConfig().options().copyDefaults(true);
|
||||||
mainPlugin.saveConfig();
|
mainPlugin.saveConfig();
|
||||||
|
|
||||||
|
InventoryManager.createInstance();
|
||||||
PluginManager pm = getServer().getPluginManager();
|
PluginManager pm = getServer().getPluginManager();
|
||||||
pm.registerEvents(playerListener, this);
|
pm.registerEvents(playerListener, this);
|
||||||
pm.registerEvents(entityListener, this);
|
pm.registerEvents(entityListener, this);
|
||||||
|
@@ -18,14 +18,12 @@ package lishid.openinv;
|
|||||||
|
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
|
|
||||||
import lishid.openinv.commands.OpenInvPluginCommand;
|
|
||||||
import lishid.openinv.utils.SilentContainerChest;
|
import lishid.openinv.utils.SilentContainerChest;
|
||||||
import net.minecraft.server.Block;
|
import net.minecraft.server.Block;
|
||||||
import net.minecraft.server.EntityPlayer;
|
import net.minecraft.server.EntityPlayer;
|
||||||
import net.minecraft.server.IInventory;
|
import net.minecraft.server.IInventory;
|
||||||
import net.minecraft.server.InventoryLargeChest;
|
import net.minecraft.server.InventoryLargeChest;
|
||||||
import net.minecraft.server.Packet100OpenWindow;
|
import net.minecraft.server.Packet100OpenWindow;
|
||||||
import net.minecraft.server.Packet101CloseWindow;
|
|
||||||
import net.minecraft.server.TileEntityChest;
|
import net.minecraft.server.TileEntityChest;
|
||||||
import net.minecraft.server.World;
|
import net.minecraft.server.World;
|
||||||
|
|
||||||
@@ -34,176 +32,179 @@ import org.bukkit.block.Chest;
|
|||||||
import org.bukkit.block.Sign;
|
import org.bukkit.block.Sign;
|
||||||
import org.bukkit.craftbukkit.entity.CraftPlayer;
|
import org.bukkit.craftbukkit.entity.CraftPlayer;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.event.Event.Result;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
import org.bukkit.event.Event.Result;
|
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.block.Action;
|
import org.bukkit.event.block.Action;
|
||||||
import org.bukkit.event.player.PlayerInteractEvent;
|
import org.bukkit.event.player.PlayerInteractEvent;
|
||||||
import org.bukkit.event.player.PlayerLoginEvent;
|
import org.bukkit.event.player.PlayerQuitEvent;
|
||||||
|
|
||||||
public class OpenInvPlayerListener implements Listener{
|
import balor.OpenInv.InventoryManager;
|
||||||
|
|
||||||
|
public class OpenInvPlayerListener implements Listener {
|
||||||
OpenInv plugin;
|
OpenInv plugin;
|
||||||
|
|
||||||
public OpenInvPlayerListener(OpenInv scrap) {
|
public OpenInvPlayerListener(OpenInv scrap) {
|
||||||
plugin = scrap;
|
plugin = scrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.LOWEST)
|
|
||||||
public void onPlayerLogin(PlayerLoginEvent event)
|
|
||||||
{
|
|
||||||
try{
|
|
||||||
for(Player target : OpenInvPluginCommand.offlineInv.keySet())
|
|
||||||
{
|
|
||||||
if(target.getName().equalsIgnoreCase(event.getPlayer().getName()))
|
|
||||||
{
|
|
||||||
((CraftPlayer)OpenInvPluginCommand.offlineInv.get(target).Opener).getHandle().netServerHandler.sendPacket(new Packet101CloseWindow());
|
|
||||||
target.saveData();
|
|
||||||
OpenInvPluginCommand.offlineInv.remove(target);
|
|
||||||
event.getPlayer().loadData();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch(Exception e){}
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR)
|
@EventHandler(priority = EventPriority.MONITOR)
|
||||||
public void onPlayerInteract(PlayerInteractEvent event)
|
public void onPlayerInteract(PlayerInteractEvent event) {
|
||||||
{
|
if (event.getAction() == Action.RIGHT_CLICK_BLOCK
|
||||||
if(event.getAction() == Action.RIGHT_CLICK_BLOCK && event.useInteractedBlock() == Result.DENY)
|
&& event.useInteractedBlock() == Result.DENY)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getClickedBlock().getState() instanceof Chest)
|
if (event.getAction() == Action.RIGHT_CLICK_BLOCK
|
||||||
{
|
&& event.getClickedBlock().getState() instanceof Chest) {
|
||||||
boolean silentchest = false;
|
boolean silentchest = false;
|
||||||
boolean anychest = false;
|
boolean anychest = false;
|
||||||
int x = event.getClickedBlock().getX();
|
int x = event.getClickedBlock().getX();
|
||||||
int y = event.getClickedBlock().getY();
|
int y = event.getClickedBlock().getY();
|
||||||
int z = event.getClickedBlock().getZ();
|
int z = event.getClickedBlock().getZ();
|
||||||
|
|
||||||
if(event.getPlayer().hasPermission("OpenInv.silent") && OpenInv.GetPlayerSilentChestStatus(event.getPlayer().getName()))
|
if (event.getPlayer().hasPermission("OpenInv.silent")
|
||||||
{
|
&& OpenInv.GetPlayerSilentChestStatus(event.getPlayer().getName())) {
|
||||||
silentchest = true;
|
silentchest = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(event.getPlayer().hasPermission("OpenInv.anychest") && OpenInv.GetPlayerAnyChestStatus(event.getPlayer().getName()))
|
if (event.getPlayer().hasPermission("OpenInv.anychest")
|
||||||
{
|
&& OpenInv.GetPlayerAnyChestStatus(event.getPlayer().getName())) {
|
||||||
try
|
try {
|
||||||
{
|
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
|
||||||
//FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
|
EntityPlayer player = ((CraftPlayer) event.getPlayer()).getHandle();
|
||||||
EntityPlayer player = ((CraftPlayer)event.getPlayer()).getHandle();
|
|
||||||
World world = player.world;
|
World world = player.world;
|
||||||
//If block on top
|
// If block on top
|
||||||
if(world.e(x, y + 1, z))
|
if (world.e(x, y + 1, z))
|
||||||
anychest = true;
|
anychest = true;
|
||||||
|
|
||||||
//If block next to chest is chest and has a block on top
|
// If block next to chest is chest and has a block on top
|
||||||
if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.e(x - 1, y + 1, z)))
|
if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id)
|
||||||
anychest = true;
|
&& (world.e(x - 1, y + 1, z)))
|
||||||
if ((world.getTypeId(x + 1, y, z) == Block.CHEST.id) && (world.e(x + 1, y + 1, z)))
|
anychest = true;
|
||||||
anychest = true;
|
if ((world.getTypeId(x + 1, y, z) == Block.CHEST.id)
|
||||||
if ((world.getTypeId(x, y, z - 1) == Block.CHEST.id) && (world.e(x, y + 1, z - 1)))
|
&& (world.e(x + 1, y + 1, z)))
|
||||||
anychest = true;
|
anychest = true;
|
||||||
if ((world.getTypeId(x, y, z + 1) == Block.CHEST.id) && (world.e(x, y + 1, z + 1)))
|
if ((world.getTypeId(x, y, z - 1) == Block.CHEST.id)
|
||||||
anychest = true;
|
&& (world.e(x, y + 1, z - 1)))
|
||||||
}
|
anychest = true;
|
||||||
catch(Exception e)
|
if ((world.getTypeId(x, y, z + 1) == Block.CHEST.id)
|
||||||
{
|
&& (world.e(x, y + 1, z + 1)))
|
||||||
event.getPlayer().sendMessage(ChatColor.RED + "Error while executing openinv. Unsupported CraftBukkit.");
|
anychest = true;
|
||||||
|
} catch (Exception e) {
|
||||||
|
event.getPlayer().sendMessage(
|
||||||
|
ChatColor.RED
|
||||||
|
+ "Error while executing openinv. Unsupported CraftBukkit.");
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//If the anychest or silentchest is active
|
// If the anychest or silentchest is active
|
||||||
if(anychest || silentchest)
|
if (anychest || silentchest) {
|
||||||
{
|
EntityPlayer player = ((CraftPlayer) event.getPlayer()).getHandle();
|
||||||
EntityPlayer player = ((CraftPlayer)event.getPlayer()).getHandle();
|
|
||||||
World world = player.world;
|
World world = player.world;
|
||||||
Object chest = (TileEntityChest)world.getTileEntity(x, y, z);
|
Object chest = (TileEntityChest) world.getTileEntity(x, y, z);
|
||||||
if (chest == null) return;
|
if (chest == null)
|
||||||
|
return;
|
||||||
if(!anychest)
|
|
||||||
{
|
if (!anychest) {
|
||||||
if (world.e(x, y + 1, z)) return;
|
if (world.e(x, y + 1, z))
|
||||||
if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.e(x - 1, y + 1, z))) return;
|
return;
|
||||||
if ((world.getTypeId(x + 1, y, z) == Block.CHEST.id) && (world.e(x + 1, y + 1, z))) return;
|
if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id)
|
||||||
if ((world.getTypeId(x, y, z - 1) == Block.CHEST.id) && (world.e(x, y + 1, z - 1))) return;
|
&& (world.e(x - 1, y + 1, z)))
|
||||||
if ((world.getTypeId(x, y, z + 1) == Block.CHEST.id) && (world.e(x, y + 1, z + 1))) return;
|
return;
|
||||||
}
|
if ((world.getTypeId(x + 1, y, z) == Block.CHEST.id)
|
||||||
|
&& (world.e(x + 1, y + 1, z)))
|
||||||
if (world.getTypeId(x - 1, y, z) == Block.CHEST.id) chest = new InventoryLargeChest("Large chest", (TileEntityChest)world.getTileEntity(x - 1, y, z), (IInventory)chest);
|
return;
|
||||||
if (world.getTypeId(x + 1, y, z) == Block.CHEST.id) chest = new InventoryLargeChest("Large chest", (IInventory)chest, (TileEntityChest)world.getTileEntity(x + 1, y, z));
|
if ((world.getTypeId(x, y, z - 1) == Block.CHEST.id)
|
||||||
if (world.getTypeId(x, y, z - 1) == Block.CHEST.id) chest = new InventoryLargeChest("Large chest", (TileEntityChest)world.getTileEntity(x, y, z - 1), (IInventory)chest);
|
&& (world.e(x, y + 1, z - 1)))
|
||||||
if (world.getTypeId(x, y, z + 1) == Block.CHEST.id) chest = new InventoryLargeChest("Large chest", (IInventory)chest, (TileEntityChest)world.getTileEntity(x, y, z + 1));
|
return;
|
||||||
|
if ((world.getTypeId(x, y, z + 1) == Block.CHEST.id)
|
||||||
if(!silentchest)
|
&& (world.e(x, y + 1, z + 1)))
|
||||||
{
|
return;
|
||||||
player.openContainer((IInventory)chest);
|
}
|
||||||
}
|
|
||||||
else
|
if (world.getTypeId(x - 1, y, z) == Block.CHEST.id)
|
||||||
{
|
chest = new InventoryLargeChest("Large chest",
|
||||||
try{
|
(TileEntityChest) world.getTileEntity(x - 1, y, z), (IInventory) chest);
|
||||||
int id = 0;
|
if (world.getTypeId(x + 1, y, z) == Block.CHEST.id)
|
||||||
try{
|
chest = new InventoryLargeChest("Large chest", (IInventory) chest,
|
||||||
Field windowID = player.getClass().getDeclaredField("containerCounter");
|
(TileEntityChest) world.getTileEntity(x + 1, y, z));
|
||||||
windowID.setAccessible(true);
|
if (world.getTypeId(x, y, z - 1) == Block.CHEST.id)
|
||||||
id = windowID.getInt(player);
|
chest = new InventoryLargeChest("Large chest",
|
||||||
id = id % 100 + 1;
|
(TileEntityChest) world.getTileEntity(x, y, z - 1), (IInventory) chest);
|
||||||
windowID.setInt(player, id);
|
if (world.getTypeId(x, y, z + 1) == Block.CHEST.id)
|
||||||
}
|
chest = new InventoryLargeChest("Large chest", (IInventory) chest,
|
||||||
catch(NoSuchFieldException e)
|
(TileEntityChest) world.getTileEntity(x, y, z + 1));
|
||||||
{ }
|
|
||||||
|
if (!silentchest) {
|
||||||
player.netServerHandler.sendPacket(new Packet100OpenWindow(id, 0, ((IInventory)chest).getName(), ((IInventory)chest).getSize()));
|
player.openContainer((IInventory) chest);
|
||||||
player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory)chest));
|
} else {
|
||||||
player.activeContainer.windowId = id;
|
try {
|
||||||
player.activeContainer.addSlotListener(player);
|
int id = 0;
|
||||||
//event.getPlayer().sendMessage("You are opening a chest silently.");
|
try {
|
||||||
event.setUseInteractedBlock(Result.DENY);
|
Field windowID = player.getClass().getDeclaredField("containerCounter");
|
||||||
event.setCancelled(true);
|
windowID.setAccessible(true);
|
||||||
}
|
id = windowID.getInt(player);
|
||||||
catch(Exception e)
|
id = id % 100 + 1;
|
||||||
{
|
windowID.setInt(player, id);
|
||||||
|
} catch (NoSuchFieldException e) {
|
||||||
|
}
|
||||||
|
|
||||||
|
player.netServerHandler.sendPacket(new Packet100OpenWindow(id, 0,
|
||||||
|
((IInventory) chest).getName(), ((IInventory) chest).getSize()));
|
||||||
|
player.activeContainer = new SilentContainerChest(player.inventory,
|
||||||
|
((IInventory) chest));
|
||||||
|
player.activeContainer.windowId = id;
|
||||||
|
player.activeContainer.addSlotListener(player);
|
||||||
|
// event.getPlayer().sendMessage("You are opening a chest silently.");
|
||||||
|
event.setUseInteractedBlock(Result.DENY);
|
||||||
|
event.setCancelled(true);
|
||||||
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
event.getPlayer().sendMessage(ChatColor.RED + "Error while sending silent chest.");
|
event.getPlayer().sendMessage(
|
||||||
|
ChatColor.RED + "Error while sending silent chest.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(anychest)
|
if (anychest)
|
||||||
event.getPlayer().sendMessage("You are opening a blocked chest.");
|
event.getPlayer().sendMessage("You are opening a blocked chest.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getClickedBlock().getState() instanceof Sign)
|
if (event.getAction() == Action.RIGHT_CLICK_BLOCK
|
||||||
{
|
&& event.getClickedBlock().getState() instanceof Sign) {
|
||||||
Player player = event.getPlayer();
|
Player player = event.getPlayer();
|
||||||
try{
|
try {
|
||||||
Sign sign = ((Sign)event.getClickedBlock().getState());
|
Sign sign = ((Sign) event.getClickedBlock().getState());
|
||||||
if (player.hasPermission("OpenInv.openinv") && sign.getLine(0).equalsIgnoreCase("[openinv]"))
|
if (player.hasPermission("OpenInv.openinv")
|
||||||
{
|
&& sign.getLine(0).equalsIgnoreCase("[openinv]")) {
|
||||||
String text = sign.getLine(1).trim() + sign.getLine(2).trim() + sign.getLine(3).trim();
|
String text = sign.getLine(1).trim() + sign.getLine(2).trim()
|
||||||
|
+ sign.getLine(3).trim();
|
||||||
player.performCommand("openinv " + text);
|
player.performCommand("openinv " + text);
|
||||||
}
|
}
|
||||||
}
|
} catch (Exception ex) {
|
||||||
catch(Exception ex)
|
|
||||||
{
|
|
||||||
player.sendMessage("Internal Error.");
|
player.sendMessage("Internal Error.");
|
||||||
ex.printStackTrace();
|
ex.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK)
|
if (event.getAction() == Action.RIGHT_CLICK_AIR
|
||||||
{
|
|| event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
||||||
Player player = event.getPlayer();
|
Player player = event.getPlayer();
|
||||||
|
|
||||||
if(!(player.getItemInHand().getType().getId() == OpenInv.GetItemOpenInvItem())
|
if (!(player.getItemInHand().getType().getId() == OpenInv.GetItemOpenInvItem())
|
||||||
|| (!OpenInv.GetPlayerItemOpenInvStatus(player.getName()))
|
|| (!OpenInv.GetPlayerItemOpenInvStatus(player.getName()))
|
||||||
|| !player.hasPermission("OpenInv.openinv"))
|
|| !player.hasPermission("OpenInv.openinv")) {
|
||||||
{
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
player.performCommand("openinv");
|
player.performCommand("openinv");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
public void onQuit(PlayerQuitEvent event) {
|
||||||
|
InventoryManager.INSTANCE.onQuit(event.getPlayer());
|
||||||
|
}
|
||||||
}
|
}
|
@@ -20,7 +20,6 @@ import java.io.File;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
|
||||||
import lishid.openinv.OpenInv;
|
import lishid.openinv.OpenInv;
|
||||||
import lishid.openinv.utils.PlayerInventoryChest;
|
|
||||||
|
|
||||||
import net.minecraft.server.EntityPlayer;
|
import net.minecraft.server.EntityPlayer;
|
||||||
import net.minecraft.server.ItemInWorldManager;
|
import net.minecraft.server.ItemInWorldManager;
|
||||||
@@ -35,153 +34,79 @@ import org.bukkit.craftbukkit.CraftServer;
|
|||||||
import org.bukkit.craftbukkit.entity.CraftPlayer;
|
import org.bukkit.craftbukkit.entity.CraftPlayer;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
|
import balor.OpenInv.InventoryManager;
|
||||||
|
import balor.OpenInv.PlayerNotFound;
|
||||||
|
import balor.OpenInv.WorldNotFoundException;
|
||||||
|
|
||||||
public class OpenInvPluginCommand implements CommandExecutor {
|
public class OpenInvPluginCommand implements CommandExecutor {
|
||||||
private final OpenInv plugin;
|
private final OpenInv plugin;
|
||||||
public static HashMap<Player, PlayerInventoryChest> offlineInv = new HashMap<Player, PlayerInventoryChest>();
|
public static HashMap<Player, String> openInvHistory = new HashMap<Player, String>();
|
||||||
public static HashMap<Player, String> openInvHistory = new HashMap<Player, String>();
|
|
||||||
public OpenInvPluginCommand(OpenInv plugin) {
|
public OpenInvPluginCommand(OpenInv plugin) {
|
||||||
this.plugin = plugin;
|
this.plugin = plugin;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
|
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
|
||||||
if(!(sender instanceof Player))
|
if (!(sender instanceof Player)) {
|
||||||
{
|
sender.sendMessage(ChatColor.RED + "You can't use this from the console.");
|
||||||
sender.sendMessage(ChatColor.RED + "You can't use this from the console.");
|
return true;
|
||||||
return true;
|
}
|
||||||
}
|
if (!sender.hasPermission("OpenInv.openinv")) {
|
||||||
if (!sender.hasPermission("OpenInv.openinv")) {
|
sender.sendMessage(ChatColor.RED
|
||||||
sender.sendMessage(ChatColor.RED + "You do not have permission to access player inventories");
|
+ "You do not have permission to access player inventories");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(args.length > 0 && args[0].equalsIgnoreCase("?"))
|
if (args.length > 0 && args[0].equalsIgnoreCase("?")) {
|
||||||
{
|
OpenInv.ShowHelp((Player) sender);
|
||||||
OpenInv.ShowHelp((Player)sender);
|
return true;
|
||||||
return true;
|
}
|
||||||
}
|
|
||||||
|
Player player = (Player) sender;
|
||||||
Player player = (Player)sender;
|
boolean Offline = false;
|
||||||
boolean Offline = false;
|
|
||||||
|
// History management
|
||||||
//History management
|
|
||||||
String history = openInvHistory.get(player);
|
String history = openInvHistory.get(player);
|
||||||
|
|
||||||
if(history == null || history == "")
|
if (history == null || history == "") {
|
||||||
{
|
|
||||||
history = player.getName();
|
history = player.getName();
|
||||||
openInvHistory.put(player, history);
|
openInvHistory.put(player, history);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Target selecting
|
// Target selecting
|
||||||
Player target;
|
Player target;
|
||||||
|
|
||||||
String name = "";
|
String name = "";
|
||||||
|
|
||||||
//Read from history if target is not named
|
// Read from history if target is not named
|
||||||
if (args.length < 1) {
|
if (args.length < 1) {
|
||||||
if(history != null && history != "")
|
if (history != null && history != "") {
|
||||||
{
|
|
||||||
name = history;
|
name = history;
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
sender.sendMessage(ChatColor.RED + "OpenInv history is empty!");
|
sender.sendMessage(ChatColor.RED + "OpenInv history is empty!");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
name = args[0];
|
name = args[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
target = this.plugin.getServer().getPlayer(name);
|
target = this.plugin.getServer().getPlayer(name);
|
||||||
|
if (target == null) {
|
||||||
if(target == null)
|
try {
|
||||||
{
|
InventoryManager.INSTANCE.openOfflineInv(player, name, player.getWorld().getName());
|
||||||
//Offline inv here...
|
} catch (PlayerNotFound e) {
|
||||||
try{
|
sender.sendMessage(e.getMessage());
|
||||||
//See if the player has data files
|
} catch (WorldNotFoundException e) {
|
||||||
|
sender.sendMessage(e.getMessage());
|
||||||
// Find the player folder
|
|
||||||
File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players");
|
|
||||||
|
|
||||||
// Find player name
|
|
||||||
for (File playerfile : playerfolder.listFiles())
|
|
||||||
{
|
|
||||||
String filename = playerfile.getName();
|
|
||||||
String playername = filename.substring(0, filename.length() - 4);
|
|
||||||
|
|
||||||
if(playername.trim().equalsIgnoreCase(name))
|
|
||||||
{
|
|
||||||
//Create an entity to load the player data
|
|
||||||
MinecraftServer server = ((CraftServer)this.plugin.getServer()).getServer();
|
|
||||||
EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), playername, new ItemInWorldManager(server.getWorldServer(0)));
|
|
||||||
target = (entity == null) ? null : (Player) entity.getBukkitEntity();
|
|
||||||
if(target != null)
|
|
||||||
{
|
|
||||||
Offline = true;
|
|
||||||
target.loadData();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
sender.sendMessage(ChatColor.RED + "Player not found!");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if(!Offline)
|
|
||||||
{
|
|
||||||
sender.sendMessage(ChatColor.RED + "Player not found!");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
catch(Exception e)
|
} else {
|
||||||
{
|
InventoryManager.INSTANCE.openInv(player, target);
|
||||||
sender.sendMessage("Error while retrieving offline player data!");
|
|
||||||
e.printStackTrace();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Permissions checks
|
|
||||||
if (!player.hasPermission("OpenInv.override") && target.hasPermission("OpenInv.exempt")) {
|
|
||||||
sender.sendMessage(ChatColor.RED + target.getDisplayName() + "'s inventory is protected!");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if((!player.hasPermission("OpenInv.crossworld") && !player.hasPermission("OpenInv.override")) &&
|
|
||||||
target.getWorld() != player.getWorld()){
|
|
||||||
sender.sendMessage(ChatColor.RED + target.getDisplayName() + " is not in your world!");
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//Record the target
|
// Record the target
|
||||||
history = target.getName();
|
history = target.getName();
|
||||||
openInvHistory.put(player, history);
|
openInvHistory.put(player, history);
|
||||||
|
|
||||||
//Get the EntityPlayer handle from the sender
|
|
||||||
EntityPlayer entityplayer = ((CraftPlayer) player).getHandle();
|
|
||||||
|
|
||||||
//Get the EntityPlayer from the Target
|
|
||||||
EntityPlayer entitytarget = ((CraftPlayer) target).getHandle();
|
|
||||||
|
|
||||||
//Create the inventory
|
|
||||||
PlayerInventoryChest inv = new PlayerInventoryChest(entitytarget.inventory, entitytarget);
|
|
||||||
|
|
||||||
//Save data into the inventory for tracking
|
|
||||||
inv.Opener = player;
|
|
||||||
inv.Target = target;
|
|
||||||
|
|
||||||
//Saves offline openinv
|
|
||||||
if(Offline)
|
|
||||||
{
|
|
||||||
inv.Offline = true;
|
|
||||||
offlineInv.put(target, inv);
|
|
||||||
}
|
|
||||||
|
|
||||||
//Open the inventory
|
|
||||||
entityplayer.openContainer(inv);
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,293 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2012 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 <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package lishid.openinv.utils;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.entity.CraftHumanEntity;
|
|
||||||
import org.bukkit.entity.HumanEntity;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.InventoryHolder;
|
|
||||||
|
|
||||||
import lishid.openinv.commands.OpenInvPluginCommand;
|
|
||||||
import net.minecraft.server.EntityHuman;
|
|
||||||
import net.minecraft.server.EntityPlayer;
|
|
||||||
import net.minecraft.server.IInventory;
|
|
||||||
import net.minecraft.server.ItemStack;
|
|
||||||
import net.minecraft.server.PlayerInventory;
|
|
||||||
|
|
||||||
public class PlayerInventoryChest implements IInventory
|
|
||||||
{
|
|
||||||
public boolean Offline = false;
|
|
||||||
public Player Opener;
|
|
||||||
EntityPlayer player;
|
|
||||||
public Player Target;
|
|
||||||
private ItemStack[] items = new ItemStack[36];
|
|
||||||
private ItemStack[] armor = new ItemStack[4];
|
|
||||||
private ItemStack[] extra = new ItemStack[5];
|
|
||||||
private int maxStack = MAX_STACK;
|
|
||||||
|
|
||||||
public PlayerInventoryChest(PlayerInventory inventory, EntityPlayer entityplayer)
|
|
||||||
{
|
|
||||||
player = entityplayer;
|
|
||||||
this.items = inventory.items;
|
|
||||||
this.armor = inventory.armor;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemStack[] getContents()
|
|
||||||
{
|
|
||||||
ItemStack[] C = new ItemStack[getSize()];
|
|
||||||
System.arraycopy(items, 0, C, 0, items.length);
|
|
||||||
System.arraycopy(items, 0, C, items.length, armor.length);
|
|
||||||
return C;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getSize()
|
|
||||||
{
|
|
||||||
return 45;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemStack getItem(int i)
|
|
||||||
{
|
|
||||||
ItemStack[] is = this.items;
|
|
||||||
|
|
||||||
if (i >= is.length)
|
|
||||||
{
|
|
||||||
i -= is.length;
|
|
||||||
is = this.armor;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
i = getReversedItemSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= is.length)
|
|
||||||
{
|
|
||||||
i -= is.length;
|
|
||||||
is = this.extra;
|
|
||||||
}
|
|
||||||
else if(is == this.armor)
|
|
||||||
{
|
|
||||||
i = getReversedArmorSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
return is[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemStack splitStack(int i, int j)
|
|
||||||
{
|
|
||||||
ItemStack[] is = this.items;
|
|
||||||
|
|
||||||
if (i >= is.length)
|
|
||||||
{
|
|
||||||
i -= is.length;
|
|
||||||
is = this.armor;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
i = getReversedItemSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= is.length)
|
|
||||||
{
|
|
||||||
i -= is.length;
|
|
||||||
is = this.extra;
|
|
||||||
}
|
|
||||||
else if(is == this.armor)
|
|
||||||
{
|
|
||||||
i = getReversedArmorSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is[i] != null)
|
|
||||||
{
|
|
||||||
ItemStack itemstack;
|
|
||||||
|
|
||||||
if (is[i].count <= j)
|
|
||||||
{
|
|
||||||
itemstack = is[i];
|
|
||||||
is[i] = null;
|
|
||||||
return itemstack;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
itemstack = is[i].a(j);
|
|
||||||
if (is[i].count == 0)
|
|
||||||
{
|
|
||||||
is[i] = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return itemstack;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemStack splitWithoutUpdate(int i) {
|
|
||||||
ItemStack[] is = this.items;
|
|
||||||
|
|
||||||
if (i >= is.length)
|
|
||||||
{
|
|
||||||
i -= is.length;
|
|
||||||
is = this.armor;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
i = getReversedItemSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= is.length)
|
|
||||||
{
|
|
||||||
i -= is.length;
|
|
||||||
is = this.extra;
|
|
||||||
}
|
|
||||||
else if(is == this.armor)
|
|
||||||
{
|
|
||||||
i = getReversedArmorSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is[i] != null) {
|
|
||||||
ItemStack itemstack = is[i];
|
|
||||||
|
|
||||||
is[i] = null;
|
|
||||||
return itemstack;
|
|
||||||
} else {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setItem(int i, ItemStack itemstack)
|
|
||||||
{
|
|
||||||
ItemStack[] is = this.items;
|
|
||||||
|
|
||||||
if (i >= is.length)
|
|
||||||
{
|
|
||||||
i -= is.length;
|
|
||||||
is = this.armor;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
i = getReversedItemSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= is.length)
|
|
||||||
{
|
|
||||||
i -= is.length;
|
|
||||||
is = this.extra;
|
|
||||||
}
|
|
||||||
else if(is == this.armor)
|
|
||||||
{
|
|
||||||
i = getReversedArmorSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
|
|
||||||
//Effects
|
|
||||||
if(is == this.extra)
|
|
||||||
{
|
|
||||||
if(i == 0)
|
|
||||||
{
|
|
||||||
itemstack.setData(0);
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
|
|
||||||
is[i] = itemstack;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedItemSlotNum(int i)
|
|
||||||
{
|
|
||||||
if (i >= 27) return i - 27;
|
|
||||||
else return i + 9;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedArmorSlotNum(int i)
|
|
||||||
{
|
|
||||||
if (i == 0) return 3;
|
|
||||||
if (i == 1) return 2;
|
|
||||||
if (i == 2) return 1;
|
|
||||||
if (i == 3) return 0;
|
|
||||||
else return i;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getName()
|
|
||||||
{
|
|
||||||
if (player.name.length() > 16) return player.name.substring(0, 16);
|
|
||||||
return player.name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getMaxStackSize()
|
|
||||||
{
|
|
||||||
return maxStack;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean a(EntityHuman entityhuman)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void f()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public void g()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
PlayerInventoryChest inv = OpenInvPluginCommand.offlineInv.get(this.Target);
|
|
||||||
if (inv != null)
|
|
||||||
{
|
|
||||||
this.Target.saveData();
|
|
||||||
OpenInvPluginCommand.offlineInv.remove(this.Target);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void update()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
|
|
||||||
|
|
||||||
public void onOpen(CraftHumanEntity who) {
|
|
||||||
transaction.add(who);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onClose(CraftHumanEntity who) {
|
|
||||||
transaction.remove(who);
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<HumanEntity> getViewers() {
|
|
||||||
return transaction;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public InventoryHolder getOwner() {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setMaxStackSize(int size) {
|
|
||||||
maxStack = size;
|
|
||||||
}
|
|
||||||
}
|
|
Reference in New Issue
Block a user