Updated for 1.8

This commit is contained in:
lishd 2011-09-15 10:13:14 -04:00
parent 70c75996c0
commit 8791143e66
6 changed files with 45 additions and 12 deletions

View file

@ -4,6 +4,9 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="lib" path="D:/Programs/Eclipse/Workspace/bukkit.jar" sourcepath="D:/Programs/Eclipse/Workspace/Bukkit-Source.zip"/> <classpathentry kind="lib" path="D:/Programs/Eclipse/Workspace/bukkit.jar" sourcepath="D:/Programs/Eclipse/Workspace/Bukkit-Source.zip"/>
<classpathentry kind="lib" path="D:/Programs/Eclipse/Workspace/craftbukkit.jar" sourcepath="D:/Programs/Eclipse/Workspace/CraftBukkit-Source.zip"/> <classpathentry kind="lib" path="D:/Programs/Eclipse/Workspace/craftbukkit.jar" sourcepath="D:/Programs/Eclipse/Workspace/CraftBukkit-Source.zip"/>
<classpathentry kind="lib" path="D:/Programs/Eclipse/Workspace/FakePermissions.jar"/> <classpathentry kind="lib" path="D:/Programs/Eclipse/Workspace/PermissionsEx.jar"/>
<classpathentry kind="lib" path="D:/Programs/Eclipse/Workspace/Permissions.jar"/>
<classpathentry kind="lib" path="D:/Programs/Eclipse/Workspace/spout.jar" sourcepath="D:/Programs/Eclipse/Workspace/Spout.zip"/>
<classpathentry kind="lib" path="D:/Programs/Eclipse/Workspace/spoutapi.jar" sourcepath="D:/Programs/Eclipse/Workspace/SpoutAPI.zip"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

View file

@ -74,8 +74,8 @@ public class OpenInv extends JavaPlugin {
player.setHandle(entityplayer); player.setHandle(entityplayer);
} }
catch(Exception e) catch(Exception e)
{} {
System.out.println("[OpenInv] Error while trying to override player inventory, error: " + e.getMessage());
}
} }
} }

View file

@ -0,0 +1,10 @@
package lishid.openinv;
import org.bukkit.event.inventory.InventoryListener;
public class OpenInvInventoryListener extends InventoryListener{
OpenInv plugin;
public OpenInvInventoryListener(OpenInv scrap) {
plugin = scrap;
}
}

View file

@ -19,7 +19,7 @@ import org.bukkit.entity.Player;
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, PlayerInventoryChest> offlineInv = new HashMap<Player, PlayerInventoryChest>();
public static HashMap<Player, OpenInvHistory> theOpenInvHistory = new HashMap<Player, OpenInvHistory>(); public static HashMap<Player, OpenInvHistory> theOpenInvHistory = new HashMap<Player, OpenInvHistory>();
public OpenInvPluginCommand(OpenInv plugin) { public OpenInvPluginCommand(OpenInv plugin) {
this.plugin = plugin; this.plugin = plugin;
@ -33,6 +33,8 @@ public class OpenInvPluginCommand implements CommandExecutor {
//boolean Offline = false; //boolean Offline = false;
Player player = (Player)sender; Player player = (Player)sender;
//History management
OpenInvHistory history = theOpenInvHistory.get(player); OpenInvHistory history = theOpenInvHistory.get(player);
if(history == null) if(history == null)
@ -41,11 +43,22 @@ public class OpenInvPluginCommand implements CommandExecutor {
theOpenInvHistory.put(player, history); theOpenInvHistory.put(player, history);
} }
//Toggleopeninv command
if(command.getName().equalsIgnoreCase("toggleopeninv")) if(command.getName().equalsIgnoreCase("toggleopeninv"))
{ {
if(OpenInvToggleState.openInvState.get(player.getName()) != null && OpenInvToggleState.openInvState.get(player.getName()) == 1) if(args.length > 0)
{ {
OpenInvToggleState.openInvState.put(player.getName(), 0); if(args[0].equalsIgnoreCase("check"))
{
if(OpenInvToggleState.openInvState.containsKey(player.getName()))
player.sendMessage("OpenInv with stick is ON.");
else
player.sendMessage("OpenInv with stick is OFF.");
}
}
if(OpenInvToggleState.openInvState.containsKey(player.getName()))
{
OpenInvToggleState.openInvState.remove(player.getName());
player.sendMessage("OpenInv with stick is OFF."); player.sendMessage("OpenInv with stick is OFF.");
} }
else else
@ -56,6 +69,7 @@ public class OpenInvPluginCommand implements CommandExecutor {
return true; return true;
} }
//Target selecting
Player target; Player target;
if (args.length < 1) { if (args.length < 1) {
@ -99,12 +113,15 @@ public class OpenInvPluginCommand implements CommandExecutor {
return true; return true;
/*}*/ /*}*/
} }
//Check if target is the player him/her self
if(target == player) if(target == player)
{ {
sender.sendMessage(ChatColor.RED + "Cannot OpenInv yourself!"); sender.sendMessage(ChatColor.RED + "Cannot OpenInv yourself!");
return true; return true;
} }
//Permissions checks
if (!PermissionRelay.hasPermission(player, "OpenInv.override") && PermissionRelay.hasPermission(target, "OpenInv.exempt")) { if (!PermissionRelay.hasPermission(player, "OpenInv.override") && PermissionRelay.hasPermission(target, "OpenInv.exempt")) {
sender.sendMessage(ChatColor.RED + target.getDisplayName() + "'s inventory is protected!"); sender.sendMessage(ChatColor.RED + target.getDisplayName() + "'s inventory is protected!");
return true; return true;
@ -116,6 +133,7 @@ public class OpenInvPluginCommand implements CommandExecutor {
return true; return true;
} }
//The actual openinv
history.lastPlayer = target.getName(); history.lastPlayer = target.getName();
// Get the EntityPlayer handle from the sender // Get the EntityPlayer handle from the sender

View file

@ -13,18 +13,18 @@ public class PlayerInventoryChest extends InventoryPlayer
this.items = inventory.items; this.items = inventory.items;
this.itemInHandIndex = inventory.itemInHandIndex; this.itemInHandIndex = inventory.itemInHandIndex;
this.e = inventory.e; this.e = inventory.e;
this.b(inventory.j()); this.b(inventory.l());
inventory.d.defaultContainer = new ContainerPlayer(this, !inventory.d.world.isStatic); inventory.d.defaultContainer = new ContainerPlayer(this, !inventory.d.world.isStatic);
inventory.d.activeContainer = inventory.d.defaultContainer; inventory.d.activeContainer = inventory.d.defaultContainer;
} }
@Override @Override
public String getName() { public String getName() {
return ((EntityPlayer)this.d).displayName + " (" + this.itemInHandIndex + ")"; return ((EntityPlayer)this.d).displayName;
} }
@Override @Override
public boolean a_(EntityHuman entityhuman) public boolean a(EntityHuman entityhuman)
{ {
return true; return true;
} }

View file

@ -1,6 +1,6 @@
name: OpenInv name: OpenInv
main: lishid.openinv.OpenInv main: lishid.openinv.OpenInv
version: 1.3.3 version: 1.4.1
author: lishid author: lishid
description: > description: >
This plugin allows you to open another player's inventory as a chest This plugin allows you to open another player's inventory as a chest
@ -14,4 +14,6 @@ commands:
usage: | usage: |
/<command> <Item> [MinAmount] - Item can be the Item ID or the CraftBukkit Item Name, MinAmount is the minimum amount to be considered. /<command> <Item> [MinAmount] - Item can be the Item ID or the CraftBukkit Item Name, MinAmount is the minimum amount to be considered.
toggleopeninv: toggleopeninv:
description: Toggle the stick usage description: Toggle the stick openinv
usage: |
/<command> [check] - Checks whether stick openinv is enabled