TotalFreedomMC/OpenInv
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/OpenInv.git synced 2024-06-30 17:59:31 +00:00
Code Issues Projects Releases Wiki Activity

New formatting.

Browse source
This commit is contained in:
lishid 2013-12-07 04:47:02 -05:00
parent 91f1f4b3e7
commit 99b7ec5e98
71 changed files with 1877 additions and 2954 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/com/lishid/openinv/commands/AnyChestPluginCommand.java
View file

@ -25,30 +25,23 @@ import org.bukkit.entity.Player;
import com.lishid.openinv.OpenInv; import com.lishid.openinv.OpenInv;
import com.lishid.openinv.Permissions; import com.lishid.openinv.Permissions;
public class AnyChestPluginCommand implements CommandExecutor public class AnyChestPluginCommand implements CommandExecutor {
{ public AnyChestPluginCommand(OpenInv plugin) {
public AnyChestPluginCommand(OpenInv 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 (!OpenInv.hasPermission(sender, Permissions.PERM_ANYCHEST)) if (!OpenInv.hasPermission(sender, Permissions.PERM_ANYCHEST)) {
{
sender.sendMessage(ChatColor.RED + "You do not have permission to use anychest."); sender.sendMessage(ChatColor.RED + "You do not have permission to use anychest.");
return true; return true;
} }
if (args.length > 0) if (args.length > 0) {
{ if (args[0].equalsIgnoreCase("check")) {
if (args[0].equalsIgnoreCase("check"))
{
if (OpenInv.GetPlayerAnyChestStatus(sender.getName())) if (OpenInv.GetPlayerAnyChestStatus(sender.getName()))
sender.sendMessage("AnyChest is ON."); sender.sendMessage("AnyChest is ON.");
else else

45
src/com/lishid/openinv/commands/OpenEnderPluginCommand.java
View file

@ -29,32 +29,26 @@ import com.lishid.openinv.Permissions;
import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialEnderChest;
import com.lishid.openinv.internal.InternalAccessor; import com.lishid.openinv.internal.InternalAccessor;
public class OpenEnderPluginCommand implements CommandExecutor public class OpenEnderPluginCommand implements CommandExecutor {
{
private final OpenInv plugin; private final OpenInv plugin;
public static HashMap<Player, String> openEnderHistory = new HashMap<Player, String>(); public static HashMap<Player, String> openEnderHistory = new HashMap<Player, String>();
public OpenEnderPluginCommand(OpenInv plugin) public OpenEnderPluginCommand(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 (!OpenInv.hasPermission(sender, Permissions.PERM_ENDERCHEST)) if (!OpenInv.hasPermission(sender, Permissions.PERM_ENDERCHEST)) {
{
sender.sendMessage(ChatColor.RED + "You do not have permission to access player enderchest"); sender.sendMessage(ChatColor.RED + "You do not have permission to access player enderchest");
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;
} }
@ -65,8 +59,7 @@ public class OpenEnderPluginCommand implements CommandExecutor
// History management // History management
String history = openEnderHistory.get(player); String history = openEnderHistory.get(player);
if (history == null || history == "") if (history == null || history == "") {
{
history = player.getName(); history = player.getName();
openEnderHistory.put(player, history); openEnderHistory.put(player, history);
} }
@ -77,39 +70,32 @@ public class OpenEnderPluginCommand implements CommandExecutor
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 + "OpenEnder history is empty!"); sender.sendMessage(ChatColor.RED + "OpenEnder 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 loading the player's data // Try loading the player's data
target = OpenInv.playerLoader.loadPlayer(name); target = OpenInv.playerLoader.loadPlayer(name);
if (target == null) if (target == null) {
{
sender.sendMessage(ChatColor.RED + "Player " + name + " not found!"); sender.sendMessage(ChatColor.RED + "Player " + name + " not found!");
return true; return true;
} }
} }
if (target != sender && !OpenInv.hasPermission(sender, Permissions.PERM_ENDERCHEST_ALL)) if (target != sender && !OpenInv.hasPermission(sender, Permissions.PERM_ENDERCHEST_ALL)) {
{
sender.sendMessage(ChatColor.RED + "You do not have permission to access other player's enderchest"); sender.sendMessage(ChatColor.RED + "You do not have permission to access other player's enderchest");
return true; return true;
} }
@ -120,8 +106,7 @@ public class OpenEnderPluginCommand implements CommandExecutor
// Create the inventory // Create the inventory
ISpecialEnderChest chest = OpenInv.enderChests.get(target.getName().toLowerCase()); ISpecialEnderChest chest = OpenInv.enderChests.get(target.getName().toLowerCase());
if (chest == null) if (chest == null) {
{
chest = InternalAccessor.Instance.newSpecialEnderChest(target, !offline); chest = InternalAccessor.Instance.newSpecialEnderChest(target, !offline);
} }

48
src/com/lishid/openinv/commands/OpenInvPluginCommand.java
View file

@ -29,31 +29,25 @@ import com.lishid.openinv.Permissions;
import com.lishid.openinv.internal.ISpecialPlayerInventory; import com.lishid.openinv.internal.ISpecialPlayerInventory;
import com.lishid.openinv.internal.InternalAccessor; import com.lishid.openinv.internal.InternalAccessor;
public class OpenInvPluginCommand implements CommandExecutor public class OpenInvPluginCommand implements CommandExecutor {
{
private final OpenInv plugin; private final OpenInv plugin;
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 (!OpenInv.hasPermission(sender, Permissions.PERM_OPENINV)) if (!OpenInv.hasPermission(sender, Permissions.PERM_OPENINV)) {
{
sender.sendMessage(ChatColor.RED + "You do not have permission to access player inventories"); sender.sendMessage(ChatColor.RED + "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;
} }
@ -64,8 +58,7 @@ public class OpenInvPluginCommand implements CommandExecutor
// 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);
} }
@ -76,26 +69,21 @@ public class OpenInvPluginCommand implements CommandExecutor
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) {
{
name = history; name = history;
} }
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) {
{ if (target == null) {
if (target == null)
{
// Try loading the player's data // Try loading the player's data
target = OpenInv.playerLoader.loadPlayer(name); target = OpenInv.playerLoader.loadPlayer(name);
if (target == null) if (target == null) {
{
sender.sendMessage(ChatColor.RED + "Player " + name + " not found!"); sender.sendMessage(ChatColor.RED + "Player " + name + " not found!");
return true; return true;
} }
@ -103,22 +91,19 @@ public class OpenInvPluginCommand implements CommandExecutor
} }
// Permissions checks // Permissions checks
if (!OpenInv.hasPermission(player, Permissions.PERM_OVERRIDE) && OpenInv.hasPermission(target, Permissions.PERM_EXEMPT)) if (!OpenInv.hasPermission(player, Permissions.PERM_OVERRIDE) && OpenInv.hasPermission(target, Permissions.PERM_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;
} }
// Crosswork check // Crosswork check
if ((!OpenInv.hasPermission(player, Permissions.PERM_CROSSWORLD) && !OpenInv.hasPermission(player, Permissions.PERM_OVERRIDE)) && target.getWorld() != player.getWorld()) if ((!OpenInv.hasPermission(player, Permissions.PERM_CROSSWORLD) && !OpenInv.hasPermission(player, Permissions.PERM_OVERRIDE)) && target.getWorld() != player.getWorld()) {
{
sender.sendMessage(ChatColor.RED + target.getDisplayName() + " is not in your world!"); sender.sendMessage(ChatColor.RED + target.getDisplayName() + " is not in your world!");
return true; return true;
} }
// Self-open check // Self-open check
if (!OpenInv.hasPermission(player, Permissions.PERM_OPENSELF) && target.equals(player)) if (!OpenInv.hasPermission(player, Permissions.PERM_OPENSELF) && target.equals(player)) {
{
sender.sendMessage(ChatColor.RED + "You're not allowed to openinv yourself."); sender.sendMessage(ChatColor.RED + "You're not allowed to openinv yourself.");
return true; return true;
} }
@ -129,8 +114,7 @@ public class OpenInvPluginCommand implements CommandExecutor
// Create the inventory // Create the inventory
ISpecialPlayerInventory inv = OpenInv.inventories.get(target.getName().toLowerCase()); ISpecialPlayerInventory inv = OpenInv.inventories.get(target.getName().toLowerCase());
if (inv == null) if (inv == null) {
{
inv = InternalAccessor.Instance.newSpecialPlayerInventory(target, !offline); inv = InternalAccessor.Instance.newSpecialPlayerInventory(target, !offline);
} }

36
src/com/lishid/openinv/commands/SearchInvPluginCommand.java
View file

@ -27,19 +27,14 @@ import org.bukkit.entity.Player;
import com.lishid.openinv.OpenInv; import com.lishid.openinv.OpenInv;
import com.lishid.openinv.Permissions; import com.lishid.openinv.Permissions;
public class SearchInvPluginCommand implements CommandExecutor public class SearchInvPluginCommand implements CommandExecutor {
{ public SearchInvPluginCommand() {
public SearchInvPluginCommand()
{
} }
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) if (!OpenInv.hasPermission(sender, Permissions.PERM_SEARCH)) {
{
if (!OpenInv.hasPermission(sender, Permissions.PERM_SEARCH))
{
sender.sendMessage(ChatColor.RED + "You do not have permission to access player inventories"); sender.sendMessage(ChatColor.RED + "You do not have permission to access player inventories");
return true; return true;
} }
@ -50,35 +45,28 @@ public class SearchInvPluginCommand implements CommandExecutor
Material material = null; Material material = null;
int count = 1; int count = 1;
if (args.length >= 1) if (args.length >= 1) {
{
String[] gData = null; String[] gData = null;
gData = args[0].split(":"); gData = args[0].split(":");
material = Material.matchMaterial(gData[0]); material = Material.matchMaterial(gData[0]);
} }
if (args.length >= 2) if (args.length >= 2) {
{ try {
try
{
count = Integer.parseInt(args[1]); count = Integer.parseInt(args[1]);
} }
catch (NumberFormatException ex) catch (NumberFormatException ex) {
{
sender.sendMessage(ChatColor.RED + "'" + args[1] + "' is not a number!"); sender.sendMessage(ChatColor.RED + "'" + args[1] + "' is not a number!");
return false; return false;
} }
} }
if (material == null) if (material == null) {
{
sender.sendMessage(ChatColor.RED + "Unknown item"); sender.sendMessage(ChatColor.RED + "Unknown item");
return false; return false;
} }
for (Player templayer : Bukkit.getServer().getOnlinePlayers()) for (Player templayer : Bukkit.getServer().getOnlinePlayers()) {
{ if (templayer.getInventory().contains(material, count)) {
if (templayer.getInventory().contains(material, count))
{
PlayerList += templayer.getName() + " "; PlayerList += templayer.getName() + " ";
} }
} }

21
src/com/lishid/openinv/commands/SilentChestPluginCommand.java
View file

@ -25,30 +25,23 @@ import org.bukkit.entity.Player;
import com.lishid.openinv.OpenInv; import com.lishid.openinv.OpenInv;
import com.lishid.openinv.Permissions; import com.lishid.openinv.Permissions;
public class SilentChestPluginCommand implements CommandExecutor public class SilentChestPluginCommand implements CommandExecutor {
{ public SilentChestPluginCommand(OpenInv plugin) {
public SilentChestPluginCommand(OpenInv 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 (!OpenInv.hasPermission(sender, Permissions.PERM_SILENT)) if (!OpenInv.hasPermission(sender, Permissions.PERM_SILENT)) {
{
sender.sendMessage(ChatColor.RED + "You do not have permission to use silent chest."); sender.sendMessage(ChatColor.RED + "You do not have permission to use silent chest.");
return true; return true;
} }
if (args.length > 0) if (args.length > 0) {
{ if (args[0].equalsIgnoreCase("check")) {
if (args[0].equalsIgnoreCase("check"))
{
if (OpenInv.GetPlayerSilentChestStatus(sender.getName())) if (OpenInv.GetPlayerSilentChestStatus(sender.getName()))
sender.sendMessage("SilentChest is ON."); sender.sendMessage("SilentChest is ON.");
else else

24
src/com/lishid/openinv/commands/ToggleOpenInvPluginCommand.java
View file

@ -26,40 +26,32 @@ import org.bukkit.entity.Player;
import com.lishid.openinv.OpenInv; import com.lishid.openinv.OpenInv;
import com.lishid.openinv.Permissions; import com.lishid.openinv.Permissions;
public class ToggleOpenInvPluginCommand implements CommandExecutor public class ToggleOpenInvPluginCommand implements CommandExecutor {
{
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 (!OpenInv.hasPermission(sender, Permissions.PERM_OPENINV)) if (!OpenInv.hasPermission(sender, Permissions.PERM_OPENINV)) {
{
sender.sendMessage(ChatColor.RED + "You do not have permission to access player inventories"); sender.sendMessage(ChatColor.RED + "You do not have permission to access player inventories");
return true; return true;
} }
Player player = (Player) sender; Player player = (Player) sender;
if (args.length > 0) if (args.length > 0) {
{ if (args[0].equalsIgnoreCase("check")) {
if (args[0].equalsIgnoreCase("check"))
{
if (OpenInv.GetPlayerItemOpenInvStatus(player.getName())) if (OpenInv.GetPlayerItemOpenInvStatus(player.getName()))
player.sendMessage("OpenInv with " + Material.getMaterial(OpenInv.GetItemOpenInvItem()).toString() + " is ON."); player.sendMessage("OpenInv with " + Material.getMaterial(OpenInv.GetItemOpenInvItem()).toString() + " is ON.");
else else
player.sendMessage("OpenInv with " + Material.getMaterial(OpenInv.GetItemOpenInvItem()).toString() + " is OFF."); player.sendMessage("OpenInv with " + Material.getMaterial(OpenInv.GetItemOpenInvItem()).toString() + " is OFF.");
} }
} }
if (OpenInv.GetPlayerItemOpenInvStatus(player.getName())) if (OpenInv.GetPlayerItemOpenInvStatus(player.getName())) {
{
OpenInv.SetPlayerItemOpenInvStatus(player.getName(), false); OpenInv.SetPlayerItemOpenInvStatus(player.getName(), false);
player.sendMessage("OpenInv with " + Material.getMaterial(OpenInv.GetItemOpenInvItem()).toString() + " is OFF."); player.sendMessage("OpenInv with " + Material.getMaterial(OpenInv.GetItemOpenInvItem()).toString() + " is OFF.");
} }
else else {
{
OpenInv.SetPlayerItemOpenInvStatus(player.getName(), true); OpenInv.SetPlayerItemOpenInvStatus(player.getName(), true);
player.sendMessage("OpenInv with " + Material.getMaterial(OpenInv.GetItemOpenInvItem()).toString() + " is ON."); player.sendMessage("OpenInv with " + Material.getMaterial(OpenInv.GetItemOpenInvItem()).toString() + " is ON.");
} }

3
src/com/lishid/openinv/internal/IAnySilentChest.java
View file

@ -18,8 +18,7 @@ package com.lishid.openinv.internal;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public interface IAnySilentChest public interface IAnySilentChest {
{
public boolean IsAnyChestNeeded(Player p, int x, int y, int z); public boolean IsAnyChestNeeded(Player p, int x, int y, int z);
public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z); public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z);

3
src/com/lishid/openinv/internal/IInventoryAccess.java
View file

@ -19,7 +19,6 @@ package com.lishid.openinv.internal;
import org.bukkit.entity.HumanEntity; import org.bukkit.entity.HumanEntity;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
public interface IInventoryAccess public interface IInventoryAccess {
{
public boolean check(Inventory inventory, HumanEntity player); public boolean check(Inventory inventory, HumanEntity player);
} }

3
src/com/lishid/openinv/internal/IPlayerDataManager.java
View file

@ -18,7 +18,6 @@ package com.lishid.openinv.internal;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public interface IPlayerDataManager public interface IPlayerDataManager {
{
public Player loadPlayer(String name); public Player loadPlayer(String name);
} }

3
src/com/lishid/openinv/internal/ISpecialEnderChest.java
View file

@ -19,8 +19,7 @@ package com.lishid.openinv.internal;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
public interface ISpecialEnderChest public interface ISpecialEnderChest {
{
public Inventory getBukkitInventory(); public Inventory getBukkitInventory();
public void InventoryRemovalCheck(); public void InventoryRemovalCheck();

3
src/com/lishid/openinv/internal/ISpecialPlayerInventory.java
View file

@ -19,8 +19,7 @@ package com.lishid.openinv.internal;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
public interface ISpecialPlayerInventory public interface ISpecialPlayerInventory {
{
public Inventory getBukkitInventory(); public Inventory getBukkitInventory();
public void InventoryRemovalCheck(); public void InventoryRemovalCheck();

60
src/com/lishid/openinv/internal/InternalAccessor.java
View file

@ -21,63 +21,51 @@ import org.bukkit.entity.Player;
import com.lishid.openinv.OpenInv; import com.lishid.openinv.OpenInv;
public class InternalAccessor public class InternalAccessor {
{
public static InternalAccessor Instance; public static InternalAccessor Instance;
private String version; private String version;
/* /*
* Returns false if version not supported * Returns false if version not supported
*/ */
public static boolean Initialize(Server server) public static boolean Initialize(Server server) {
{
Instance = new InternalAccessor(); Instance = new InternalAccessor();
String packageName = server.getClass().getPackage().getName(); String packageName = server.getClass().getPackage().getName();
Instance.version = packageName.substring(packageName.lastIndexOf('.') + 1); Instance.version = packageName.substring(packageName.lastIndexOf('.') + 1);
try try {
{
Class.forName("com.lishid.openinv.internal." + Instance.version + ".AnySilentChest"); Class.forName("com.lishid.openinv.internal." + Instance.version + ".AnySilentChest");
return true; return true;
} }
catch (Exception e) catch (Exception e) {
{
return false; return false;
} }
} }
public void PrintError() public void PrintError() {
{
OpenInv.log("OpenInv encountered an error with the CraftBukkit version \"" + Instance.version + "\". Please look for an updated version of OpenInv."); OpenInv.log("OpenInv encountered an error with the CraftBukkit version \"" + Instance.version + "\". Please look for an updated version of OpenInv.");
} }
public IPlayerDataManager newPlayerDataManager() public IPlayerDataManager newPlayerDataManager() {
{
return (IPlayerDataManager) createObject(IPlayerDataManager.class, "PlayerDataManager"); return (IPlayerDataManager) createObject(IPlayerDataManager.class, "PlayerDataManager");
} }
public IInventoryAccess newInventoryAccess() public IInventoryAccess newInventoryAccess() {
{
return (IInventoryAccess) createObject(IInventoryAccess.class, "InventoryAccess"); return (IInventoryAccess) createObject(IInventoryAccess.class, "InventoryAccess");
} }
public IAnySilentChest newAnySilentChest() public IAnySilentChest newAnySilentChest() {
{
return (IAnySilentChest) createObject(IAnySilentChest.class, "AnySilentChest"); return (IAnySilentChest) createObject(IAnySilentChest.class, "AnySilentChest");
} }
public ISpecialPlayerInventory newSpecialPlayerInventory(Player player, boolean offline) public ISpecialPlayerInventory newSpecialPlayerInventory(Player player, boolean offline) {
{ try {
try
{
Class<?> internalClass = Class.forName("com.lishid.openinv.internal." + version + ".SpecialPlayerInventory"); Class<?> internalClass = Class.forName("com.lishid.openinv.internal." + version + ".SpecialPlayerInventory");
if (ISpecialPlayerInventory.class.isAssignableFrom(internalClass)) if (ISpecialPlayerInventory.class.isAssignableFrom(internalClass)) {
{
return (ISpecialPlayerInventory) internalClass.getConstructor(Player.class, Boolean.class).newInstance(player, offline); return (ISpecialPlayerInventory) internalClass.getConstructor(Player.class, Boolean.class).newInstance(player, offline);
} }
} }
catch (Exception e) catch (Exception e) {
{
PrintError(); PrintError();
OpenInv.log(e); OpenInv.log(e);
} }
@ -85,18 +73,14 @@ public class InternalAccessor
return null; return null;
} }
public ISpecialEnderChest newSpecialEnderChest(Player player, boolean offline) public ISpecialEnderChest newSpecialEnderChest(Player player, boolean offline) {
{ try {
try
{
Class<?> internalClass = Class.forName("com.lishid.openinv.internal." + version + ".SpecialEnderChest"); Class<?> internalClass = Class.forName("com.lishid.openinv.internal." + version + ".SpecialEnderChest");
if (ISpecialEnderChest.class.isAssignableFrom(internalClass)) if (ISpecialEnderChest.class.isAssignableFrom(internalClass)) {
{
return (ISpecialEnderChest) internalClass.getConstructor(Player.class, Boolean.class).newInstance(player, offline); return (ISpecialEnderChest) internalClass.getConstructor(Player.class, Boolean.class).newInstance(player, offline);
} }
} }
catch (Exception e) catch (Exception e) {
{
PrintError(); PrintError();
OpenInv.log(e); OpenInv.log(e);
} }
@ -104,18 +88,14 @@ public class InternalAccessor
return null; return null;
} }
private Object createObject(Class<? extends Object> assignableClass, String className) private Object createObject(Class<? extends Object> assignableClass, String className) {
{ try {
try
{
Class<?> internalClass = Class.forName("com.lishid.openinv.internal." + version + "." + className); Class<?> internalClass = Class.forName("com.lishid.openinv.internal." + version + "." + className);
if (assignableClass.isAssignableFrom(internalClass)) if (assignableClass.isAssignableFrom(internalClass)) {
{
return internalClass.getConstructor().newInstance(); return internalClass.getConstructor().newInstance();
} }
} }
catch (Exception e) catch (Exception e) {
{
PrintError(); PrintError();
OpenInv.log(e); OpenInv.log(e);
} }

36
src/com/lishid/openinv/internal/craftbukkit/AnySilentChest.java
View file

@ -29,10 +29,8 @@ import net.minecraft.server.*;
import org.bukkit.craftbukkit.entity.*; import org.bukkit.craftbukkit.entity.*;
public class AnySilentChest implements IAnySilentChest public class AnySilentChest implements IAnySilentChest {
{ public boolean IsAnyChestNeeded(Player p, int x, int y, int z) {
public boolean IsAnyChestNeeded(Player p, int x, int y, int z)
{
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
EntityPlayer player = ((CraftPlayer) p).getHandle(); EntityPlayer player = ((CraftPlayer) p).getHandle();
World world = player.world; World world = player.world;
@ -53,16 +51,14 @@ public class AnySilentChest implements IAnySilentChest
return false; return false;
} }
public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
{
EntityPlayer player = ((CraftPlayer) p).getHandle(); EntityPlayer player = ((CraftPlayer) p).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) if (chest == null)
return true; return true;
if (!anychest) if (!anychest) {
{
if (world.s(x, y + 1, z)) if (world.s(x, y + 1, z))
return true; return true;
if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.s(x - 1, y + 1, z))) if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.s(x - 1, y + 1, z)))
@ -85,45 +81,37 @@ public class AnySilentChest implements IAnySilentChest
chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1)); chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
boolean returnValue = true; boolean returnValue = true;
if (!silentchest) if (!silentchest) {
{
player.openContainer((IInventory) chest); player.openContainer((IInventory) chest);
} }
else else {
{ try {
try
{
int id = 0; int id = 0;
try try {
{
Field windowID = player.getClass().getDeclaredField("containerCounter"); Field windowID = player.getClass().getDeclaredField("containerCounter");
windowID.setAccessible(true); windowID.setAccessible(true);
id = windowID.getInt(player); id = windowID.getInt(player);
id = id % 100 + 1; id = id % 100 + 1;
windowID.setInt(player, id); windowID.setInt(player, id);
} }
catch (NoSuchFieldException e) catch (NoSuchFieldException e) {}
{}
player.netServerHandler.sendPacket(new Packet100OpenWindow(id, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize())); player.netServerHandler.sendPacket(new Packet100OpenWindow(id, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize()));
player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest)); player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
player.activeContainer.windowId = id; player.activeContainer.windowId = id;
player.activeContainer.addSlotListener(player); player.activeContainer.addSlotListener(player);
if (OpenInv.NotifySilentChest()) if (OpenInv.NotifySilentChest()) {
{
p.sendMessage("You are opening a chest silently."); p.sendMessage("You are opening a chest silently.");
} }
returnValue = false; returnValue = false;
} }
catch (Exception e) catch (Exception e) {
{
e.printStackTrace(); e.printStackTrace();
p.sendMessage(ChatColor.RED + "Error while sending silent chest."); p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
} }
} }
if (anychest && OpenInv.NotifyAnyChest()) if (anychest && OpenInv.NotifyAnyChest()) {
{
p.sendMessage("You are opening a blocked chest."); p.sendMessage("You are opening a blocked chest.");
} }

18
src/com/lishid/openinv/internal/craftbukkit/InventoryAccess.java
View file

@ -27,24 +27,18 @@ import com.lishid.openinv.internal.IInventoryAccess;
import net.minecraft.server.*; import net.minecraft.server.*;
import org.bukkit.craftbukkit.inventory.*; import org.bukkit.craftbukkit.inventory.*;
public class InventoryAccess implements IInventoryAccess public class InventoryAccess implements IInventoryAccess {
{ public boolean check(Inventory inventory, HumanEntity player) {
public boolean check(Inventory inventory, HumanEntity player)
{
IInventory inv = ((CraftInventory) inventory).getInventory(); IInventory inv = ((CraftInventory) inventory).getInventory();
if (inv instanceof SpecialPlayerInventory) if (inv instanceof SpecialPlayerInventory) {
{ if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV))
{
return false; return false;
} }
} }
else if (inv instanceof SpecialEnderChest) else if (inv instanceof SpecialEnderChest) {
{ if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER))
{
return false; return false;
} }
} }

39
src/com/lishid/openinv/internal/craftbukkit/PlayerDataManager.java
View file

@ -30,23 +30,18 @@ import com.lishid.openinv.internal.IPlayerDataManager;
import net.minecraft.server.*; import net.minecraft.server.*;
import org.bukkit.craftbukkit.*; import org.bukkit.craftbukkit.*;
public class PlayerDataManager implements IPlayerDataManager public class PlayerDataManager implements IPlayerDataManager {
{ public Player loadPlayer(String name) {
public Player loadPlayer(String name) try {
{
try
{
// Default player folder // Default player folder
File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players");
if (!playerfolder.exists()) if (!playerfolder.exists()) {
{
return null; return null;
} }
String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name); String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name);
if (playername == null) if (playername == null) {
{
return null; return null;
} }
@ -57,16 +52,14 @@ public class PlayerDataManager implements IPlayerDataManager
// Get the bukkit entity // Get the bukkit entity
Player target = (entity == null) ? null : entity.getBukkitEntity(); Player target = (entity == null) ? null : entity.getBukkitEntity();
if (target != null) if (target != null) {
{
// Load data // Load data
target.loadData(); target.loadData();
// Return the entity // Return the entity
return target; return target;
} }
} }
catch (Exception e) catch (Exception e) {
{
OpenInv.log(e); OpenInv.log(e);
} }
@ -76,31 +69,25 @@ public class PlayerDataManager implements IPlayerDataManager
/** /**
* @author Balor (aka Antoine Aflalo) * @author Balor (aka Antoine Aflalo)
*/ */
private static String matchUser(final Collection<File> container, final String search) private static String matchUser(final Collection<File> container, final String search) {
{
String found = null; String found = null;
if (search == null) if (search == null) {
{
return found; return found;
} }
final String lowerSearch = search.toLowerCase(); final String lowerSearch = search.toLowerCase();
int delta = Integer.MAX_VALUE; int delta = Integer.MAX_VALUE;
for (final File file : container) for (final File file : container) {
{
final String filename = file.getName(); final String filename = file.getName();
final String str = filename.substring(0, filename.length() - 4); final String str = filename.substring(0, filename.length() - 4);
if (!str.toLowerCase().startsWith(lowerSearch)) if (!str.toLowerCase().startsWith(lowerSearch)) {
{
continue; continue;
} }
final int curDelta = str.length() - lowerSearch.length(); final int curDelta = str.length() - lowerSearch.length();
if (curDelta < delta) if (curDelta < delta) {
{
found = str; found = str;
delta = curDelta; delta = curDelta;
} }
if (curDelta == 0) if (curDelta == 0) {
{
break; break;
} }

9
src/com/lishid/openinv/internal/craftbukkit/SilentContainerChest.java
View file

@ -19,12 +19,10 @@ package com.lishid.openinv.internal.craftbukkit;
//Volatile //Volatile
import net.minecraft.server.*; import net.minecraft.server.*;
public class SilentContainerChest extends ContainerChest public class SilentContainerChest extends ContainerChest {
{
public IInventory inv; public IInventory inv;
public SilentContainerChest(IInventory i1, IInventory i2) public SilentContainerChest(IInventory i1, IInventory i2) {
{
super(i1, i2); super(i1, i2);
inv = i2; inv = i2;
// close signal // close signal
@ -32,8 +30,7 @@ public class SilentContainerChest extends ContainerChest
} }
@Override @Override
public void b(EntityHuman paramEntityHuman) public void b(EntityHuman paramEntityHuman) {
{
// Don't send close signal twice, might screw up // Don't send close signal twice, might screw up
} }
} }

64
src/com/lishid/openinv/internal/craftbukkit/SpecialEnderChest.java
View file

@ -33,8 +33,7 @@ import net.minecraft.server.*;
import org.bukkit.craftbukkit.entity.*; import org.bukkit.craftbukkit.entity.*;
import org.bukkit.craftbukkit.inventory.*; import org.bukkit.craftbukkit.inventory.*;
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
{
public List<HumanEntity> transaction = new ArrayList<HumanEntity>(); public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
public boolean playerOnline = false; public boolean playerOnline = false;
private CraftPlayer owner; private CraftPlayer owner;
@ -42,8 +41,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
private int maxStack = MAX_STACK; private int maxStack = MAX_STACK;
private CraftInventory inventory = new CraftInventory(this); private CraftInventory inventory = new CraftInventory(this);
public SpecialEnderChest(Player p, Boolean online) public SpecialEnderChest(Player p, Boolean online) {
{
super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize()); super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
CraftPlayer player = (CraftPlayer) p; CraftPlayer player = (CraftPlayer) p;
this.enderChest = player.getHandle().getEnderChest(); this.enderChest = player.getHandle().getEnderChest();
@ -52,97 +50,77 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
OpenInv.enderChests.put(owner.getName().toLowerCase(), this); OpenInv.enderChests.put(owner.getName().toLowerCase(), this);
} }
public Inventory getBukkitInventory() public Inventory getBukkitInventory() {
{
return inventory; return inventory;
} }
public void InventoryRemovalCheck() public void InventoryRemovalCheck() {
{
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) if (transaction.isEmpty() && !playerOnline) {
{
OpenInv.enderChests.remove(owner.getName().toLowerCase()); OpenInv.enderChests.remove(owner.getName().toLowerCase());
} }
} }
public void PlayerGoOnline(Player p) public void PlayerGoOnline(Player p) {
{ if (!playerOnline) {
if (!playerOnline) try {
{
try
{
InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest(); InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
Field field = playerEnderChest.getClass().getField("items"); Field field = playerEnderChest.getClass().getField("items");
field.setAccessible(true); field.setAccessible(true);
field.set(playerEnderChest, this.items); field.set(playerEnderChest, this.items);
} }
catch (Exception e) catch (Exception e) {}
{
}
p.saveData(); p.saveData();
playerOnline = true; playerOnline = true;
} }
} }
public void PlayerGoOffline() public void PlayerGoOffline() {
{
playerOnline = false; playerOnline = false;
} }
public ItemStack[] getContents() public ItemStack[] getContents() {
{
return this.items; return this.items;
} }
public void onOpen(CraftHumanEntity who) public void onOpen(CraftHumanEntity who) {
{
transaction.add(who); transaction.add(who);
} }
public void onClose(CraftHumanEntity who) public void onClose(CraftHumanEntity who) {
{
transaction.remove(who); transaction.remove(who);
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
public List<HumanEntity> getViewers() public List<HumanEntity> getViewers() {
{
return transaction; return transaction;
} }
public InventoryHolder getOwner() public InventoryHolder getOwner() {
{
return this.owner; return this.owner;
} }
public void setMaxStackSize(int size) public void setMaxStackSize(int size) {
{
maxStack = size; maxStack = size;
} }
public int getMaxStackSize() public int getMaxStackSize() {
{
return maxStack; return maxStack;
} }
public boolean a(EntityHuman entityhuman) public boolean a(EntityHuman entityhuman) {
{
return true; return true;
} }
public void startOpen() public void startOpen() {
{
} }
public void f() public void f() {
{
} }
public void update() public void update() {
{
enderChest.update(); enderChest.update();
} }
} }

132
src/com/lishid/openinv/internal/craftbukkit/SpecialPlayerInventory.java
View file

@ -27,15 +27,13 @@ import net.minecraft.server.*;
import org.bukkit.craftbukkit.entity.*; import org.bukkit.craftbukkit.entity.*;
import org.bukkit.craftbukkit.inventory.*; import org.bukkit.craftbukkit.inventory.*;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
{
CraftPlayer owner; CraftPlayer owner;
public boolean playerOnline = false; public boolean playerOnline = false;
private ItemStack[] extra = new ItemStack[5]; private ItemStack[] extra = new ItemStack[5];
private CraftInventory inventory = new CraftInventory(this); private CraftInventory inventory = new CraftInventory(this);
public SpecialPlayerInventory(Player p, Boolean online) public SpecialPlayerInventory(Player p, Boolean online) {
{
super(((CraftPlayer) p).getHandle()); super(((CraftPlayer) p).getHandle());
this.owner = ((CraftPlayer) p); this.owner = ((CraftPlayer) p);
this.playerOnline = online; this.playerOnline = online;
@ -45,26 +43,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public Inventory getBukkitInventory() public Inventory getBukkitInventory() {
{
return inventory; return inventory;
} }
@Override @Override
public void InventoryRemovalCheck() public void InventoryRemovalCheck() {
{
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) if (transaction.isEmpty() && !playerOnline) {
{
OpenInv.inventories.remove(owner.getName().toLowerCase()); OpenInv.inventories.remove(owner.getName().toLowerCase());
} }
} }
@Override @Override
public void PlayerGoOnline(Player player) public void PlayerGoOnline(Player player) {
{ if (!playerOnline) {
if (!playerOnline)
{
CraftPlayer p = (CraftPlayer) player; CraftPlayer p = (CraftPlayer) player;
p.getHandle().inventory.items = this.items; p.getHandle().inventory.items = this.items;
p.getHandle().inventory.armor = this.armor; p.getHandle().inventory.armor = this.armor;
@ -74,22 +67,19 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public void PlayerGoOffline() public void PlayerGoOffline() {
{
playerOnline = false; playerOnline = false;
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
@Override @Override
public void onClose(CraftHumanEntity who) public void onClose(CraftHumanEntity who) {
{
super.onClose(who); super.onClose(who);
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
@Override @Override
public ItemStack[] getContents() public ItemStack[] getContents() {
{
ItemStack[] C = new ItemStack[getSize()]; ItemStack[] C = new ItemStack[getSize()];
System.arraycopy(items, 0, C, 0, items.length); System.arraycopy(items, 0, C, 0, items.length);
System.arraycopy(items, 0, C, items.length, armor.length); System.arraycopy(items, 0, C, items.length, armor.length);
@ -97,33 +87,27 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public int getSize() public int getSize() {
{
return super.getSize() + 5; return super.getSize() + 5;
} }
@Override @Override
public ItemStack getItem(int i) public ItemStack getItem(int i) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
@ -131,123 +115,100 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public ItemStack splitStack(int i, int j) public ItemStack splitStack(int i, int j) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
if (is[i] != null) if (is[i] != null) {
{
ItemStack itemstack; ItemStack itemstack;
if (is[i].count <= j) if (is[i].count <= j) {
{
itemstack = is[i]; itemstack = is[i];
is[i] = null; is[i] = null;
return itemstack; return itemstack;
} }
else else {
{
itemstack = is[i].a(j); itemstack = is[i].a(j);
if (is[i].count == 0) if (is[i].count == 0) {
{
is[i] = null; is[i] = null;
} }
return itemstack; return itemstack;
} }
} }
else else {
{
return null; return null;
} }
} }
@Override @Override
public ItemStack splitWithoutUpdate(int i) public ItemStack splitWithoutUpdate(int i) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
if (is[i] != null) if (is[i] != null) {
{
ItemStack itemstack = is[i]; ItemStack itemstack = is[i];
is[i] = null; is[i] = null;
return itemstack; return itemstack;
} }
else else {
{
return null; return null;
} }
} }
@Override @Override
public void setItem(int i, ItemStack itemstack) public void setItem(int i, ItemStack itemstack) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
// Effects // Effects
if (is == this.extra) if (is == this.extra) {
{
owner.getHandle().drop(itemstack); owner.getHandle().drop(itemstack);
itemstack = null; itemstack = null;
} }
@ -257,16 +218,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
owner.getHandle().defaultContainer.b(); owner.getHandle().defaultContainer.b();
} }
private int getReversedItemSlotNum(int i) private int getReversedItemSlotNum(int i) {
{
if (i >= 27) if (i >= 27)
return i - 27; return i - 27;
else else
return i + 9; return i + 9;
} }
private int getReversedArmorSlotNum(int i) private int getReversedArmorSlotNum(int i) {
{
if (i == 0) if (i == 0)
return 3; return 3;
if (i == 1) if (i == 1)
@ -280,18 +239,15 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public String getName() public String getName() {
{ if (player.name.length() > 16) {
if (player.name.length() > 16)
{
return player.name.substring(0, 16); return player.name.substring(0, 16);
} }
return player.name; return player.name;
} }
@Override @Override
public boolean a_(EntityHuman entityhuman) public boolean a_(EntityHuman entityhuman) {
{
return true; return true;
} }
} }

36
src/com/lishid/openinv/internal/v1_4_5/AnySilentChest.java
View file

@ -29,10 +29,8 @@ import net.minecraft.server.v1_4_5.*;
import org.bukkit.craftbukkit.v1_4_5.entity.*; import org.bukkit.craftbukkit.v1_4_5.entity.*;
public class AnySilentChest implements IAnySilentChest public class AnySilentChest implements IAnySilentChest {
{ public boolean IsAnyChestNeeded(Player p, int x, int y, int z) {
public boolean IsAnyChestNeeded(Player p, int x, int y, int z)
{
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
EntityPlayer player = ((CraftPlayer) p).getHandle(); EntityPlayer player = ((CraftPlayer) p).getHandle();
World world = player.world; World world = player.world;
@ -53,16 +51,14 @@ public class AnySilentChest implements IAnySilentChest
return false; return false;
} }
public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
{
EntityPlayer player = ((CraftPlayer) p).getHandle(); EntityPlayer player = ((CraftPlayer) p).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) if (chest == null)
return true; return true;
if (!anychest) if (!anychest) {
{
if (world.s(x, y + 1, z)) if (world.s(x, y + 1, z))
return true; return true;
if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.s(x - 1, y + 1, z))) if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.s(x - 1, y + 1, z)))
@ -85,45 +81,37 @@ public class AnySilentChest implements IAnySilentChest
chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1)); chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
boolean returnValue = true; boolean returnValue = true;
if (!silentchest) if (!silentchest) {
{
player.openContainer((IInventory) chest); player.openContainer((IInventory) chest);
} }
else else {
{ try {
try
{
int id = 0; int id = 0;
try try {
{
Field windowID = player.getClass().getDeclaredField("containerCounter"); Field windowID = player.getClass().getDeclaredField("containerCounter");
windowID.setAccessible(true); windowID.setAccessible(true);
id = windowID.getInt(player); id = windowID.getInt(player);
id = id % 100 + 1; id = id % 100 + 1;
windowID.setInt(player, id); windowID.setInt(player, id);
} }
catch (NoSuchFieldException e) catch (NoSuchFieldException e) {}
{}
player.netServerHandler.sendPacket(new Packet100OpenWindow(id, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize())); player.netServerHandler.sendPacket(new Packet100OpenWindow(id, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize()));
player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest)); player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
player.activeContainer.windowId = id; player.activeContainer.windowId = id;
player.activeContainer.addSlotListener(player); player.activeContainer.addSlotListener(player);
if (OpenInv.NotifySilentChest()) if (OpenInv.NotifySilentChest()) {
{
p.sendMessage("You are opening a chest silently."); p.sendMessage("You are opening a chest silently.");
} }
returnValue = false; returnValue = false;
} }
catch (Exception e) catch (Exception e) {
{
e.printStackTrace(); e.printStackTrace();
p.sendMessage(ChatColor.RED + "Error while sending silent chest."); p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
} }
} }
if (anychest && OpenInv.NotifyAnyChest()) if (anychest && OpenInv.NotifyAnyChest()) {
{
p.sendMessage("You are opening a blocked chest."); p.sendMessage("You are opening a blocked chest.");
} }

18
src/com/lishid/openinv/internal/v1_4_5/InventoryAccess.java
View file

@ -27,24 +27,18 @@ import com.lishid.openinv.internal.IInventoryAccess;
import net.minecraft.server.v1_4_5.*; import net.minecraft.server.v1_4_5.*;
import org.bukkit.craftbukkit.v1_4_5.inventory.*; import org.bukkit.craftbukkit.v1_4_5.inventory.*;
public class InventoryAccess implements IInventoryAccess public class InventoryAccess implements IInventoryAccess {
{ public boolean check(Inventory inventory, HumanEntity player) {
public boolean check(Inventory inventory, HumanEntity player)
{
IInventory inv = ((CraftInventory) inventory).getInventory(); IInventory inv = ((CraftInventory) inventory).getInventory();
if (inv instanceof SpecialPlayerInventory) if (inv instanceof SpecialPlayerInventory) {
{ if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV))
{
return false; return false;
} }
} }
else if (inv instanceof SpecialEnderChest) else if (inv instanceof SpecialEnderChest) {
{ if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER))
{
return false; return false;
} }
} }

39
src/com/lishid/openinv/internal/v1_4_5/PlayerDataManager.java
View file

@ -30,23 +30,18 @@ import com.lishid.openinv.internal.IPlayerDataManager;
import net.minecraft.server.v1_4_5.*; import net.minecraft.server.v1_4_5.*;
import org.bukkit.craftbukkit.v1_4_5.*; import org.bukkit.craftbukkit.v1_4_5.*;
public class PlayerDataManager implements IPlayerDataManager public class PlayerDataManager implements IPlayerDataManager {
{ public Player loadPlayer(String name) {
public Player loadPlayer(String name) try {
{
try
{
// Default player folder // Default player folder
File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players");
if (!playerfolder.exists()) if (!playerfolder.exists()) {
{
return null; return null;
} }
String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name); String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name);
if (playername == null) if (playername == null) {
{
return null; return null;
} }
@ -57,16 +52,14 @@ public class PlayerDataManager implements IPlayerDataManager
// Get the bukkit entity // Get the bukkit entity
Player target = (entity == null) ? null : entity.getBukkitEntity(); Player target = (entity == null) ? null : entity.getBukkitEntity();
if (target != null) if (target != null) {
{
// Load data // Load data
target.loadData(); target.loadData();
// Return the entity // Return the entity
return target; return target;
} }
} }
catch (Exception e) catch (Exception e) {
{
OpenInv.log(e); OpenInv.log(e);
} }
@ -76,31 +69,25 @@ public class PlayerDataManager implements IPlayerDataManager
/** /**
* @author Balor (aka Antoine Aflalo) * @author Balor (aka Antoine Aflalo)
*/ */
private static String matchUser(final Collection<File> container, final String search) private static String matchUser(final Collection<File> container, final String search) {
{
String found = null; String found = null;
if (search == null) if (search == null) {
{
return found; return found;
} }
final String lowerSearch = search.toLowerCase(); final String lowerSearch = search.toLowerCase();
int delta = Integer.MAX_VALUE; int delta = Integer.MAX_VALUE;
for (final File file : container) for (final File file : container) {
{
final String filename = file.getName(); final String filename = file.getName();
final String str = filename.substring(0, filename.length() - 4); final String str = filename.substring(0, filename.length() - 4);
if (!str.toLowerCase().startsWith(lowerSearch)) if (!str.toLowerCase().startsWith(lowerSearch)) {
{
continue; continue;
} }
final int curDelta = str.length() - lowerSearch.length(); final int curDelta = str.length() - lowerSearch.length();
if (curDelta < delta) if (curDelta < delta) {
{
found = str; found = str;
delta = curDelta; delta = curDelta;
} }
if (curDelta == 0) if (curDelta == 0) {
{
break; break;
} }

9
src/com/lishid/openinv/internal/v1_4_5/SilentContainerChest.java
View file

@ -19,12 +19,10 @@ package com.lishid.openinv.internal.v1_4_5;
//Volatile //Volatile
import net.minecraft.server.v1_4_5.*; import net.minecraft.server.v1_4_5.*;
public class SilentContainerChest extends ContainerChest public class SilentContainerChest extends ContainerChest {
{
public IInventory inv; public IInventory inv;
public SilentContainerChest(IInventory i1, IInventory i2) public SilentContainerChest(IInventory i1, IInventory i2) {
{
super(i1, i2); super(i1, i2);
inv = i2; inv = i2;
// close signal // close signal
@ -32,8 +30,7 @@ public class SilentContainerChest extends ContainerChest
} }
@Override @Override
public void b(EntityHuman paramEntityHuman) public void b(EntityHuman paramEntityHuman) {
{
// Don't send close signal twice, might screw up // Don't send close signal twice, might screw up
} }
} }

64
src/com/lishid/openinv/internal/v1_4_5/SpecialEnderChest.java
View file

@ -33,8 +33,7 @@ import net.minecraft.server.v1_4_5.*;
import org.bukkit.craftbukkit.v1_4_5.entity.*; import org.bukkit.craftbukkit.v1_4_5.entity.*;
import org.bukkit.craftbukkit.v1_4_5.inventory.*; import org.bukkit.craftbukkit.v1_4_5.inventory.*;
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
{
public List<HumanEntity> transaction = new ArrayList<HumanEntity>(); public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
public boolean playerOnline = false; public boolean playerOnline = false;
private CraftPlayer owner; private CraftPlayer owner;
@ -42,8 +41,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
private int maxStack = MAX_STACK; private int maxStack = MAX_STACK;
private CraftInventory inventory = new CraftInventory(this); private CraftInventory inventory = new CraftInventory(this);
public SpecialEnderChest(Player p, Boolean online) public SpecialEnderChest(Player p, Boolean online) {
{
super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize()); super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
CraftPlayer player = (CraftPlayer) p; CraftPlayer player = (CraftPlayer) p;
this.enderChest = player.getHandle().getEnderChest(); this.enderChest = player.getHandle().getEnderChest();
@ -52,97 +50,77 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
OpenInv.enderChests.put(owner.getName().toLowerCase(), this); OpenInv.enderChests.put(owner.getName().toLowerCase(), this);
} }
public Inventory getBukkitInventory() public Inventory getBukkitInventory() {
{
return inventory; return inventory;
} }
public void InventoryRemovalCheck() public void InventoryRemovalCheck() {
{
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) if (transaction.isEmpty() && !playerOnline) {
{
OpenInv.enderChests.remove(owner.getName().toLowerCase()); OpenInv.enderChests.remove(owner.getName().toLowerCase());
} }
} }
public void PlayerGoOnline(Player p) public void PlayerGoOnline(Player p) {
{ if (!playerOnline) {
if (!playerOnline) try {
{
try
{
InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest(); InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
Field field = playerEnderChest.getClass().getField("items"); Field field = playerEnderChest.getClass().getField("items");
field.setAccessible(true); field.setAccessible(true);
field.set(playerEnderChest, this.items); field.set(playerEnderChest, this.items);
} }
catch (Exception e) catch (Exception e) {}
{
}
p.saveData(); p.saveData();
playerOnline = true; playerOnline = true;
} }
} }
public void PlayerGoOffline() public void PlayerGoOffline() {
{
playerOnline = false; playerOnline = false;
} }
public ItemStack[] getContents() public ItemStack[] getContents() {
{
return this.items; return this.items;
} }
public void onOpen(CraftHumanEntity who) public void onOpen(CraftHumanEntity who) {
{
transaction.add(who); transaction.add(who);
} }
public void onClose(CraftHumanEntity who) public void onClose(CraftHumanEntity who) {
{
transaction.remove(who); transaction.remove(who);
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
public List<HumanEntity> getViewers() public List<HumanEntity> getViewers() {
{
return transaction; return transaction;
} }
public InventoryHolder getOwner() public InventoryHolder getOwner() {
{
return this.owner; return this.owner;
} }
public void setMaxStackSize(int size) public void setMaxStackSize(int size) {
{
maxStack = size; maxStack = size;
} }
public int getMaxStackSize() public int getMaxStackSize() {
{
return maxStack; return maxStack;
} }
public boolean a(EntityHuman entityhuman) public boolean a(EntityHuman entityhuman) {
{
return true; return true;
} }
public void startOpen() public void startOpen() {
{
} }
public void f() public void f() {
{
} }
public void update() public void update() {
{
enderChest.update(); enderChest.update();
} }
} }

132
src/com/lishid/openinv/internal/v1_4_5/SpecialPlayerInventory.java
View file

@ -27,15 +27,13 @@ import net.minecraft.server.v1_4_5.*;
import org.bukkit.craftbukkit.v1_4_5.entity.*; import org.bukkit.craftbukkit.v1_4_5.entity.*;
import org.bukkit.craftbukkit.v1_4_5.inventory.*; import org.bukkit.craftbukkit.v1_4_5.inventory.*;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
{
CraftPlayer owner; CraftPlayer owner;
public boolean playerOnline = false; public boolean playerOnline = false;
private ItemStack[] extra = new ItemStack[5]; private ItemStack[] extra = new ItemStack[5];
private CraftInventory inventory = new CraftInventory(this); private CraftInventory inventory = new CraftInventory(this);
public SpecialPlayerInventory(Player p, Boolean online) public SpecialPlayerInventory(Player p, Boolean online) {
{
super(((CraftPlayer) p).getHandle()); super(((CraftPlayer) p).getHandle());
this.owner = ((CraftPlayer) p); this.owner = ((CraftPlayer) p);
this.playerOnline = online; this.playerOnline = online;
@ -45,26 +43,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public Inventory getBukkitInventory() public Inventory getBukkitInventory() {
{
return inventory; return inventory;
} }
@Override @Override
public void InventoryRemovalCheck() public void InventoryRemovalCheck() {
{
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) if (transaction.isEmpty() && !playerOnline) {
{
OpenInv.inventories.remove(owner.getName().toLowerCase()); OpenInv.inventories.remove(owner.getName().toLowerCase());
} }
} }
@Override @Override
public void PlayerGoOnline(Player player) public void PlayerGoOnline(Player player) {
{ if (!playerOnline) {
if (!playerOnline)
{
CraftPlayer p = (CraftPlayer) player; CraftPlayer p = (CraftPlayer) player;
p.getHandle().inventory.items = this.items; p.getHandle().inventory.items = this.items;
p.getHandle().inventory.armor = this.armor; p.getHandle().inventory.armor = this.armor;
@ -74,22 +67,19 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public void PlayerGoOffline() public void PlayerGoOffline() {
{
playerOnline = false; playerOnline = false;
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
@Override @Override
public void onClose(CraftHumanEntity who) public void onClose(CraftHumanEntity who) {
{
super.onClose(who); super.onClose(who);
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
@Override @Override
public ItemStack[] getContents() public ItemStack[] getContents() {
{
ItemStack[] C = new ItemStack[getSize()]; ItemStack[] C = new ItemStack[getSize()];
System.arraycopy(items, 0, C, 0, items.length); System.arraycopy(items, 0, C, 0, items.length);
System.arraycopy(items, 0, C, items.length, armor.length); System.arraycopy(items, 0, C, items.length, armor.length);
@ -97,33 +87,27 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public int getSize() public int getSize() {
{
return super.getSize() + 5; return super.getSize() + 5;
} }
@Override @Override
public ItemStack getItem(int i) public ItemStack getItem(int i) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
@ -131,123 +115,100 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public ItemStack splitStack(int i, int j) public ItemStack splitStack(int i, int j) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
if (is[i] != null) if (is[i] != null) {
{
ItemStack itemstack; ItemStack itemstack;
if (is[i].count <= j) if (is[i].count <= j) {
{
itemstack = is[i]; itemstack = is[i];
is[i] = null; is[i] = null;
return itemstack; return itemstack;
} }
else else {
{
itemstack = is[i].a(j); itemstack = is[i].a(j);
if (is[i].count == 0) if (is[i].count == 0) {
{
is[i] = null; is[i] = null;
} }
return itemstack; return itemstack;
} }
} }
else else {
{
return null; return null;
} }
} }
@Override @Override
public ItemStack splitWithoutUpdate(int i) public ItemStack splitWithoutUpdate(int i) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
if (is[i] != null) if (is[i] != null) {
{
ItemStack itemstack = is[i]; ItemStack itemstack = is[i];
is[i] = null; is[i] = null;
return itemstack; return itemstack;
} }
else else {
{
return null; return null;
} }
} }
@Override @Override
public void setItem(int i, ItemStack itemstack) public void setItem(int i, ItemStack itemstack) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
// Effects // Effects
if (is == this.extra) if (is == this.extra) {
{
owner.getHandle().drop(itemstack); owner.getHandle().drop(itemstack);
itemstack = null; itemstack = null;
} }
@ -257,16 +218,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
owner.getHandle().defaultContainer.b(); owner.getHandle().defaultContainer.b();
} }
private int getReversedItemSlotNum(int i) private int getReversedItemSlotNum(int i) {
{
if (i >= 27) if (i >= 27)
return i - 27; return i - 27;
else else
return i + 9; return i + 9;
} }
private int getReversedArmorSlotNum(int i) private int getReversedArmorSlotNum(int i) {
{
if (i == 0) if (i == 0)
return 3; return 3;
if (i == 1) if (i == 1)
@ -280,18 +239,15 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public String getName() public String getName() {
{ if (player.name.length() > 16) {
if (player.name.length() > 16)
{
return player.name.substring(0, 16); return player.name.substring(0, 16);
} }
return player.name; return player.name;
} }
@Override @Override
public boolean a_(EntityHuman entityhuman) public boolean a_(EntityHuman entityhuman) {
{
return true; return true;
} }
} }

36
src/com/lishid/openinv/internal/v1_4_6/AnySilentChest.java
View file

@ -29,10 +29,8 @@ import net.minecraft.server.v1_4_6.*;
import org.bukkit.craftbukkit.v1_4_6.entity.*; import org.bukkit.craftbukkit.v1_4_6.entity.*;
public class AnySilentChest implements IAnySilentChest public class AnySilentChest implements IAnySilentChest {
{ public boolean IsAnyChestNeeded(Player p, int x, int y, int z) {
public boolean IsAnyChestNeeded(Player p, int x, int y, int z)
{
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
EntityPlayer player = ((CraftPlayer) p).getHandle(); EntityPlayer player = ((CraftPlayer) p).getHandle();
World world = player.world; World world = player.world;
@ -53,16 +51,14 @@ public class AnySilentChest implements IAnySilentChest
return false; return false;
} }
public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
{
EntityPlayer player = ((CraftPlayer) p).getHandle(); EntityPlayer player = ((CraftPlayer) p).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) if (chest == null)
return true; return true;
if (!anychest) if (!anychest) {
{
if (world.s(x, y + 1, z)) if (world.s(x, y + 1, z))
return true; return true;
if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.s(x - 1, y + 1, z))) if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.s(x - 1, y + 1, z)))
@ -85,45 +81,37 @@ public class AnySilentChest implements IAnySilentChest
chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1)); chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
boolean returnValue = true; boolean returnValue = true;
if (!silentchest) if (!silentchest) {
{
player.openContainer((IInventory) chest); player.openContainer((IInventory) chest);
} }
else else {
{ try {
try
{
int id = 0; int id = 0;
try try {
{
Field windowID = player.getClass().getDeclaredField("containerCounter"); Field windowID = player.getClass().getDeclaredField("containerCounter");
windowID.setAccessible(true); windowID.setAccessible(true);
id = windowID.getInt(player); id = windowID.getInt(player);
id = id % 100 + 1; id = id % 100 + 1;
windowID.setInt(player, id); windowID.setInt(player, id);
} }
catch (NoSuchFieldException e) catch (NoSuchFieldException e) {}
{}
player.playerConnection.sendPacket(new Packet100OpenWindow(id, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize())); player.playerConnection.sendPacket(new Packet100OpenWindow(id, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize()));
player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest)); player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
player.activeContainer.windowId = id; player.activeContainer.windowId = id;
player.activeContainer.addSlotListener(player); player.activeContainer.addSlotListener(player);
if (OpenInv.NotifySilentChest()) if (OpenInv.NotifySilentChest()) {
{
p.sendMessage("You are opening a chest silently."); p.sendMessage("You are opening a chest silently.");
} }
returnValue = false; returnValue = false;
} }
catch (Exception e) catch (Exception e) {
{
e.printStackTrace(); e.printStackTrace();
p.sendMessage(ChatColor.RED + "Error while sending silent chest."); p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
} }
} }
if (anychest && OpenInv.NotifyAnyChest()) if (anychest && OpenInv.NotifyAnyChest()) {
{
p.sendMessage("You are opening a blocked chest."); p.sendMessage("You are opening a blocked chest.");
} }

18
src/com/lishid/openinv/internal/v1_4_6/InventoryAccess.java
View file

@ -27,24 +27,18 @@ import com.lishid.openinv.internal.IInventoryAccess;
import net.minecraft.server.v1_4_6.*; import net.minecraft.server.v1_4_6.*;
import org.bukkit.craftbukkit.v1_4_6.inventory.*; import org.bukkit.craftbukkit.v1_4_6.inventory.*;
public class InventoryAccess implements IInventoryAccess public class InventoryAccess implements IInventoryAccess {
{ public boolean check(Inventory inventory, HumanEntity player) {
public boolean check(Inventory inventory, HumanEntity player)
{
IInventory inv = ((CraftInventory) inventory).getInventory(); IInventory inv = ((CraftInventory) inventory).getInventory();
if (inv instanceof SpecialPlayerInventory) if (inv instanceof SpecialPlayerInventory) {
{ if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV))
{
return false; return false;
} }
} }
else if (inv instanceof SpecialEnderChest) else if (inv instanceof SpecialEnderChest) {
{ if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER))
{
return false; return false;
} }
} }

39
src/com/lishid/openinv/internal/v1_4_6/PlayerDataManager.java
View file

@ -30,23 +30,18 @@ import com.lishid.openinv.internal.IPlayerDataManager;
import net.minecraft.server.v1_4_6.*; import net.minecraft.server.v1_4_6.*;
import org.bukkit.craftbukkit.v1_4_6.*; import org.bukkit.craftbukkit.v1_4_6.*;
public class PlayerDataManager implements IPlayerDataManager public class PlayerDataManager implements IPlayerDataManager {
{ public Player loadPlayer(String name) {
public Player loadPlayer(String name) try {
{
try
{
// Default player folder // Default player folder
File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players");
if (!playerfolder.exists()) if (!playerfolder.exists()) {
{
return null; return null;
} }
String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name); String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name);
if (playername == null) if (playername == null) {
{
return null; return null;
} }
@ -57,16 +52,14 @@ public class PlayerDataManager implements IPlayerDataManager
// Get the bukkit entity // Get the bukkit entity
Player target = (entity == null) ? null : entity.getBukkitEntity(); Player target = (entity == null) ? null : entity.getBukkitEntity();
if (target != null) if (target != null) {
{
// Load data // Load data
target.loadData(); target.loadData();
// Return the entity // Return the entity
return target; return target;
} }
} }
catch (Exception e) catch (Exception e) {
{
OpenInv.log(e); OpenInv.log(e);
} }
@ -76,31 +69,25 @@ public class PlayerDataManager implements IPlayerDataManager
/** /**
* @author Balor (aka Antoine Aflalo) * @author Balor (aka Antoine Aflalo)
*/ */
private static String matchUser(final Collection<File> container, final String search) private static String matchUser(final Collection<File> container, final String search) {
{
String found = null; String found = null;
if (search == null) if (search == null) {
{
return found; return found;
} }
final String lowerSearch = search.toLowerCase(); final String lowerSearch = search.toLowerCase();
int delta = Integer.MAX_VALUE; int delta = Integer.MAX_VALUE;
for (final File file : container) for (final File file : container) {
{
final String filename = file.getName(); final String filename = file.getName();
final String str = filename.substring(0, filename.length() - 4); final String str = filename.substring(0, filename.length() - 4);
if (!str.toLowerCase().startsWith(lowerSearch)) if (!str.toLowerCase().startsWith(lowerSearch)) {
{
continue; continue;
} }
final int curDelta = str.length() - lowerSearch.length(); final int curDelta = str.length() - lowerSearch.length();
if (curDelta < delta) if (curDelta < delta) {
{
found = str; found = str;
delta = curDelta; delta = curDelta;
} }
if (curDelta == 0) if (curDelta == 0) {
{
break; break;
} }

9
src/com/lishid/openinv/internal/v1_4_6/SilentContainerChest.java
View file

@ -19,12 +19,10 @@ package com.lishid.openinv.internal.v1_4_6;
//Volatile //Volatile
import net.minecraft.server.v1_4_6.*; import net.minecraft.server.v1_4_6.*;
public class SilentContainerChest extends ContainerChest public class SilentContainerChest extends ContainerChest {
{
public IInventory inv; public IInventory inv;
public SilentContainerChest(IInventory i1, IInventory i2) public SilentContainerChest(IInventory i1, IInventory i2) {
{
super(i1, i2); super(i1, i2);
inv = i2; inv = i2;
// close signal // close signal
@ -32,8 +30,7 @@ public class SilentContainerChest extends ContainerChest
} }
@Override @Override
public void b(EntityHuman paramEntityHuman) public void b(EntityHuman paramEntityHuman) {
{
// Don't send close signal twice, might screw up // Don't send close signal twice, might screw up
} }
} }

64
src/com/lishid/openinv/internal/v1_4_6/SpecialEnderChest.java
View file

@ -33,8 +33,7 @@ import net.minecraft.server.v1_4_6.*;
import org.bukkit.craftbukkit.v1_4_6.entity.*; import org.bukkit.craftbukkit.v1_4_6.entity.*;
import org.bukkit.craftbukkit.v1_4_6.inventory.*; import org.bukkit.craftbukkit.v1_4_6.inventory.*;
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
{
public List<HumanEntity> transaction = new ArrayList<HumanEntity>(); public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
public boolean playerOnline = false; public boolean playerOnline = false;
private CraftPlayer owner; private CraftPlayer owner;
@ -42,8 +41,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
private int maxStack = MAX_STACK; private int maxStack = MAX_STACK;
private CraftInventory inventory = new CraftInventory(this); private CraftInventory inventory = new CraftInventory(this);
public SpecialEnderChest(Player p, Boolean online) public SpecialEnderChest(Player p, Boolean online) {
{
super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize()); super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
CraftPlayer player = (CraftPlayer) p; CraftPlayer player = (CraftPlayer) p;
this.enderChest = player.getHandle().getEnderChest(); this.enderChest = player.getHandle().getEnderChest();
@ -52,97 +50,77 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
OpenInv.enderChests.put(owner.getName().toLowerCase(), this); OpenInv.enderChests.put(owner.getName().toLowerCase(), this);
} }
public Inventory getBukkitInventory() public Inventory getBukkitInventory() {
{
return inventory; return inventory;
} }
public void InventoryRemovalCheck() public void InventoryRemovalCheck() {
{
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) if (transaction.isEmpty() && !playerOnline) {
{
OpenInv.enderChests.remove(owner.getName().toLowerCase()); OpenInv.enderChests.remove(owner.getName().toLowerCase());
} }
} }
public void PlayerGoOnline(Player p) public void PlayerGoOnline(Player p) {
{ if (!playerOnline) {
if (!playerOnline) try {
{
try
{
InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest(); InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
Field field = playerEnderChest.getClass().getField("items"); Field field = playerEnderChest.getClass().getField("items");
field.setAccessible(true); field.setAccessible(true);
field.set(playerEnderChest, this.items); field.set(playerEnderChest, this.items);
} }
catch (Exception e) catch (Exception e) {}
{
}
p.saveData(); p.saveData();
playerOnline = true; playerOnline = true;
} }
} }
public void PlayerGoOffline() public void PlayerGoOffline() {
{
playerOnline = false; playerOnline = false;
} }
public ItemStack[] getContents() public ItemStack[] getContents() {
{
return this.items; return this.items;
} }
public void onOpen(CraftHumanEntity who) public void onOpen(CraftHumanEntity who) {
{
transaction.add(who); transaction.add(who);
} }
public void onClose(CraftHumanEntity who) public void onClose(CraftHumanEntity who) {
{
transaction.remove(who); transaction.remove(who);
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
public List<HumanEntity> getViewers() public List<HumanEntity> getViewers() {
{
return transaction; return transaction;
} }
public InventoryHolder getOwner() public InventoryHolder getOwner() {
{
return this.owner; return this.owner;
} }
public void setMaxStackSize(int size) public void setMaxStackSize(int size) {
{
maxStack = size; maxStack = size;
} }
public int getMaxStackSize() public int getMaxStackSize() {
{
return maxStack; return maxStack;
} }
public boolean a(EntityHuman entityhuman) public boolean a(EntityHuman entityhuman) {
{
return true; return true;
} }
public void startOpen() public void startOpen() {
{
} }
public void f() public void f() {
{
} }
public void update() public void update() {
{
enderChest.update(); enderChest.update();
} }
} }

132
src/com/lishid/openinv/internal/v1_4_6/SpecialPlayerInventory.java
View file

@ -27,15 +27,13 @@ import net.minecraft.server.v1_4_6.*;
import org.bukkit.craftbukkit.v1_4_6.entity.*; import org.bukkit.craftbukkit.v1_4_6.entity.*;
import org.bukkit.craftbukkit.v1_4_6.inventory.*; import org.bukkit.craftbukkit.v1_4_6.inventory.*;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
{
CraftPlayer owner; CraftPlayer owner;
public boolean playerOnline = false; public boolean playerOnline = false;
private ItemStack[] extra = new ItemStack[5]; private ItemStack[] extra = new ItemStack[5];
private CraftInventory inventory = new CraftInventory(this); private CraftInventory inventory = new CraftInventory(this);
public SpecialPlayerInventory(Player p, Boolean online) public SpecialPlayerInventory(Player p, Boolean online) {
{
super(((CraftPlayer) p).getHandle()); super(((CraftPlayer) p).getHandle());
this.owner = ((CraftPlayer) p); this.owner = ((CraftPlayer) p);
this.playerOnline = online; this.playerOnline = online;
@ -45,26 +43,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public Inventory getBukkitInventory() public Inventory getBukkitInventory() {
{
return inventory; return inventory;
} }
@Override @Override
public void InventoryRemovalCheck() public void InventoryRemovalCheck() {
{
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) if (transaction.isEmpty() && !playerOnline) {
{
OpenInv.inventories.remove(owner.getName().toLowerCase()); OpenInv.inventories.remove(owner.getName().toLowerCase());
} }
} }
@Override @Override
public void PlayerGoOnline(Player player) public void PlayerGoOnline(Player player) {
{ if (!playerOnline) {
if (!playerOnline)
{
CraftPlayer p = (CraftPlayer) player; CraftPlayer p = (CraftPlayer) player;
p.getHandle().inventory.items = this.items; p.getHandle().inventory.items = this.items;
p.getHandle().inventory.armor = this.armor; p.getHandle().inventory.armor = this.armor;
@ -74,22 +67,19 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public void PlayerGoOffline() public void PlayerGoOffline() {
{
playerOnline = false; playerOnline = false;
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
@Override @Override
public void onClose(CraftHumanEntity who) public void onClose(CraftHumanEntity who) {
{
super.onClose(who); super.onClose(who);
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
@Override @Override
public ItemStack[] getContents() public ItemStack[] getContents() {
{
ItemStack[] C = new ItemStack[getSize()]; ItemStack[] C = new ItemStack[getSize()];
System.arraycopy(items, 0, C, 0, items.length); System.arraycopy(items, 0, C, 0, items.length);
System.arraycopy(items, 0, C, items.length, armor.length); System.arraycopy(items, 0, C, items.length, armor.length);
@ -97,33 +87,27 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public int getSize() public int getSize() {
{
return super.getSize() + 5; return super.getSize() + 5;
} }
@Override @Override
public ItemStack getItem(int i) public ItemStack getItem(int i) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
@ -131,123 +115,100 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public ItemStack splitStack(int i, int j) public ItemStack splitStack(int i, int j) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
if (is[i] != null) if (is[i] != null) {
{
ItemStack itemstack; ItemStack itemstack;
if (is[i].count <= j) if (is[i].count <= j) {
{
itemstack = is[i]; itemstack = is[i];
is[i] = null; is[i] = null;
return itemstack; return itemstack;
} }
else else {
{
itemstack = is[i].a(j); itemstack = is[i].a(j);
if (is[i].count == 0) if (is[i].count == 0) {
{
is[i] = null; is[i] = null;
} }
return itemstack; return itemstack;
} }
} }
else else {
{
return null; return null;
} }
} }
@Override @Override
public ItemStack splitWithoutUpdate(int i) public ItemStack splitWithoutUpdate(int i) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
if (is[i] != null) if (is[i] != null) {
{
ItemStack itemstack = is[i]; ItemStack itemstack = is[i];
is[i] = null; is[i] = null;
return itemstack; return itemstack;
} }
else else {
{
return null; return null;
} }
} }
@Override @Override
public void setItem(int i, ItemStack itemstack) public void setItem(int i, ItemStack itemstack) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
// Effects // Effects
if (is == this.extra) if (is == this.extra) {
{
owner.getHandle().drop(itemstack); owner.getHandle().drop(itemstack);
itemstack = null; itemstack = null;
} }
@ -257,16 +218,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
owner.getHandle().defaultContainer.b(); owner.getHandle().defaultContainer.b();
} }
private int getReversedItemSlotNum(int i) private int getReversedItemSlotNum(int i) {
{
if (i >= 27) if (i >= 27)
return i - 27; return i - 27;
else else
return i + 9; return i + 9;
} }
private int getReversedArmorSlotNum(int i) private int getReversedArmorSlotNum(int i) {
{
if (i == 0) if (i == 0)
return 3; return 3;
if (i == 1) if (i == 1)
@ -280,18 +239,15 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public String getName() public String getName() {
{ if (player.name.length() > 16) {
if (player.name.length() > 16)
{
return player.name.substring(0, 16); return player.name.substring(0, 16);
} }
return player.name; return player.name;
} }
@Override @Override
public boolean a_(EntityHuman entityhuman) public boolean a_(EntityHuman entityhuman) {
{
return true; return true;
} }
} }

36
src/com/lishid/openinv/internal/v1_4_R1/AnySilentChest.java
View file

@ -29,10 +29,8 @@ import net.minecraft.server.v1_4_R1.*;
import org.bukkit.craftbukkit.v1_4_R1.entity.*; import org.bukkit.craftbukkit.v1_4_R1.entity.*;
public class AnySilentChest implements IAnySilentChest public class AnySilentChest implements IAnySilentChest {
{ public boolean IsAnyChestNeeded(Player p, int x, int y, int z) {
public boolean IsAnyChestNeeded(Player p, int x, int y, int z)
{
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
EntityPlayer player = ((CraftPlayer) p).getHandle(); EntityPlayer player = ((CraftPlayer) p).getHandle();
World world = player.world; World world = player.world;
@ -53,16 +51,14 @@ public class AnySilentChest implements IAnySilentChest
return false; return false;
} }
public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
{
EntityPlayer player = ((CraftPlayer) p).getHandle(); EntityPlayer player = ((CraftPlayer) p).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) if (chest == null)
return true; return true;
if (!anychest) if (!anychest) {
{
if (world.s(x, y + 1, z)) if (world.s(x, y + 1, z))
return true; return true;
if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.s(x - 1, y + 1, z))) if ((world.getTypeId(x - 1, y, z) == Block.CHEST.id) && (world.s(x - 1, y + 1, z)))
@ -85,45 +81,37 @@ public class AnySilentChest implements IAnySilentChest
chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1)); chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
boolean returnValue = true; boolean returnValue = true;
if (!silentchest) if (!silentchest) {
{
player.openContainer((IInventory) chest); player.openContainer((IInventory) chest);
} }
else else {
{ try {
try
{
int id = 0; int id = 0;
try try {
{
Field windowID = player.getClass().getDeclaredField("containerCounter"); Field windowID = player.getClass().getDeclaredField("containerCounter");
windowID.setAccessible(true); windowID.setAccessible(true);
id = windowID.getInt(player); id = windowID.getInt(player);
id = id % 100 + 1; id = id % 100 + 1;
windowID.setInt(player, id); windowID.setInt(player, id);
} }
catch (NoSuchFieldException e) catch (NoSuchFieldException e) {}
{}
player.playerConnection.sendPacket(new Packet100OpenWindow(id, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize())); player.playerConnection.sendPacket(new Packet100OpenWindow(id, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize()));
player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest)); player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
player.activeContainer.windowId = id; player.activeContainer.windowId = id;
player.activeContainer.addSlotListener(player); player.activeContainer.addSlotListener(player);
if (OpenInv.NotifySilentChest()) if (OpenInv.NotifySilentChest()) {
{
p.sendMessage("You are opening a chest silently."); p.sendMessage("You are opening a chest silently.");
} }
returnValue = false; returnValue = false;
} }
catch (Exception e) catch (Exception e) {
{
e.printStackTrace(); e.printStackTrace();
p.sendMessage(ChatColor.RED + "Error while sending silent chest."); p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
} }
} }
if (anychest && OpenInv.NotifyAnyChest()) if (anychest && OpenInv.NotifyAnyChest()) {
{
p.sendMessage("You are opening a blocked chest."); p.sendMessage("You are opening a blocked chest.");
} }

18
src/com/lishid/openinv/internal/v1_4_R1/InventoryAccess.java
View file

@ -27,24 +27,18 @@ import com.lishid.openinv.internal.IInventoryAccess;
import net.minecraft.server.v1_4_R1.*; import net.minecraft.server.v1_4_R1.*;
import org.bukkit.craftbukkit.v1_4_R1.inventory.*; import org.bukkit.craftbukkit.v1_4_R1.inventory.*;
public class InventoryAccess implements IInventoryAccess public class InventoryAccess implements IInventoryAccess {
{ public boolean check(Inventory inventory, HumanEntity player) {
public boolean check(Inventory inventory, HumanEntity player)
{
IInventory inv = ((CraftInventory) inventory).getInventory(); IInventory inv = ((CraftInventory) inventory).getInventory();
if (inv instanceof SpecialPlayerInventory) if (inv instanceof SpecialPlayerInventory) {
{ if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV))
{
return false; return false;
} }
} }
else if (inv instanceof SpecialEnderChest) else if (inv instanceof SpecialEnderChest) {
{ if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER))
{
return false; return false;
} }
} }

39
src/com/lishid/openinv/internal/v1_4_R1/PlayerDataManager.java
View file

@ -30,23 +30,18 @@ import com.lishid.openinv.internal.IPlayerDataManager;
import net.minecraft.server.v1_4_R1.*; import net.minecraft.server.v1_4_R1.*;
import org.bukkit.craftbukkit.v1_4_R1.*; import org.bukkit.craftbukkit.v1_4_R1.*;
public class PlayerDataManager implements IPlayerDataManager public class PlayerDataManager implements IPlayerDataManager {
{ public Player loadPlayer(String name) {
public Player loadPlayer(String name) try {
{
try
{
// Default player folder // Default player folder
File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players");
if (!playerfolder.exists()) if (!playerfolder.exists()) {
{
return null; return null;
} }
String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name); String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name);
if (playername == null) if (playername == null) {
{
return null; return null;
} }
@ -57,16 +52,14 @@ public class PlayerDataManager implements IPlayerDataManager
// Get the bukkit entity // Get the bukkit entity
Player target = (entity == null) ? null : entity.getBukkitEntity(); Player target = (entity == null) ? null : entity.getBukkitEntity();
if (target != null) if (target != null) {
{
// Load data // Load data
target.loadData(); target.loadData();
// Return the entity // Return the entity
return target; return target;
} }
} }
catch (Exception e) catch (Exception e) {
{
OpenInv.log(e); OpenInv.log(e);
} }
@ -76,31 +69,25 @@ public class PlayerDataManager implements IPlayerDataManager
/** /**
* @author Balor (aka Antoine Aflalo) * @author Balor (aka Antoine Aflalo)
*/ */
private static String matchUser(final Collection<File> container, final String search) private static String matchUser(final Collection<File> container, final String search) {
{
String found = null; String found = null;
if (search == null) if (search == null) {
{
return found; return found;
} }
final String lowerSearch = search.toLowerCase(); final String lowerSearch = search.toLowerCase();
int delta = Integer.MAX_VALUE; int delta = Integer.MAX_VALUE;
for (final File file : container) for (final File file : container) {
{
final String filename = file.getName(); final String filename = file.getName();
final String str = filename.substring(0, filename.length() - 4); final String str = filename.substring(0, filename.length() - 4);
if (!str.toLowerCase().startsWith(lowerSearch)) if (!str.toLowerCase().startsWith(lowerSearch)) {
{
continue; continue;
} }
final int curDelta = str.length() - lowerSearch.length(); final int curDelta = str.length() - lowerSearch.length();
if (curDelta < delta) if (curDelta < delta) {
{
found = str; found = str;
delta = curDelta; delta = curDelta;
} }
if (curDelta == 0) if (curDelta == 0) {
{
break; break;
} }

9
src/com/lishid/openinv/internal/v1_4_R1/SilentContainerChest.java
View file

@ -19,12 +19,10 @@ package com.lishid.openinv.internal.v1_4_R1;
//Volatile //Volatile
import net.minecraft.server.v1_4_R1.*; import net.minecraft.server.v1_4_R1.*;
public class SilentContainerChest extends ContainerChest public class SilentContainerChest extends ContainerChest {
{
public IInventory inv; public IInventory inv;
public SilentContainerChest(IInventory i1, IInventory i2) public SilentContainerChest(IInventory i1, IInventory i2) {
{
super(i1, i2); super(i1, i2);
inv = i2; inv = i2;
// close signal // close signal
@ -32,8 +30,7 @@ public class SilentContainerChest extends ContainerChest
} }
@Override @Override
public void b(EntityHuman paramEntityHuman) public void b(EntityHuman paramEntityHuman) {
{
// Don't send close signal twice, might screw up // Don't send close signal twice, might screw up
} }
} }

64
src/com/lishid/openinv/internal/v1_4_R1/SpecialEnderChest.java
View file

@ -33,8 +33,7 @@ import net.minecraft.server.v1_4_R1.*;
import org.bukkit.craftbukkit.v1_4_R1.entity.*; import org.bukkit.craftbukkit.v1_4_R1.entity.*;
import org.bukkit.craftbukkit.v1_4_R1.inventory.*; import org.bukkit.craftbukkit.v1_4_R1.inventory.*;
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
{
public List<HumanEntity> transaction = new ArrayList<HumanEntity>(); public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
public boolean playerOnline = false; public boolean playerOnline = false;
private CraftPlayer owner; private CraftPlayer owner;
@ -42,8 +41,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
private int maxStack = MAX_STACK; private int maxStack = MAX_STACK;
private CraftInventory inventory = new CraftInventory(this); private CraftInventory inventory = new CraftInventory(this);
public SpecialEnderChest(Player p, Boolean online) public SpecialEnderChest(Player p, Boolean online) {
{
super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize()); super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
CraftPlayer player = (CraftPlayer) p; CraftPlayer player = (CraftPlayer) p;
this.enderChest = player.getHandle().getEnderChest(); this.enderChest = player.getHandle().getEnderChest();
@ -52,97 +50,77 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
OpenInv.enderChests.put(owner.getName().toLowerCase(), this); OpenInv.enderChests.put(owner.getName().toLowerCase(), this);
} }
public Inventory getBukkitInventory() public Inventory getBukkitInventory() {
{
return inventory; return inventory;
} }
public void InventoryRemovalCheck() public void InventoryRemovalCheck() {
{
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) if (transaction.isEmpty() && !playerOnline) {
{
OpenInv.enderChests.remove(owner.getName().toLowerCase()); OpenInv.enderChests.remove(owner.getName().toLowerCase());
} }
} }
public void PlayerGoOnline(Player p) public void PlayerGoOnline(Player p) {
{ if (!playerOnline) {
if (!playerOnline) try {
{
try
{
InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest(); InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
Field field = playerEnderChest.getClass().getField("items"); Field field = playerEnderChest.getClass().getField("items");
field.setAccessible(true); field.setAccessible(true);
field.set(playerEnderChest, this.items); field.set(playerEnderChest, this.items);
} }
catch (Exception e) catch (Exception e) {}
{
}
p.saveData(); p.saveData();
playerOnline = true; playerOnline = true;
} }
} }
public void PlayerGoOffline() public void PlayerGoOffline() {
{
playerOnline = false; playerOnline = false;
} }
public ItemStack[] getContents() public ItemStack[] getContents() {
{
return this.items; return this.items;
} }
public void onOpen(CraftHumanEntity who) public void onOpen(CraftHumanEntity who) {
{
transaction.add(who); transaction.add(who);
} }
public void onClose(CraftHumanEntity who) public void onClose(CraftHumanEntity who) {
{
transaction.remove(who); transaction.remove(who);
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
public List<HumanEntity> getViewers() public List<HumanEntity> getViewers() {
{
return transaction; return transaction;
} }
public InventoryHolder getOwner() public InventoryHolder getOwner() {
{
return this.owner; return this.owner;
} }
public void setMaxStackSize(int size) public void setMaxStackSize(int size) {
{
maxStack = size; maxStack = size;
} }
public int getMaxStackSize() public int getMaxStackSize() {
{
return maxStack; return maxStack;
} }
public boolean a(EntityHuman entityhuman) public boolean a(EntityHuman entityhuman) {
{
return true; return true;
} }
public void startOpen() public void startOpen() {
{
} }
public void f() public void f() {
{
} }
public void update() public void update() {
{
enderChest.update(); enderChest.update();
} }
} }

132
src/com/lishid/openinv/internal/v1_4_R1/SpecialPlayerInventory.java
View file

@ -27,15 +27,13 @@ import net.minecraft.server.v1_4_R1.*;
import org.bukkit.craftbukkit.v1_4_R1.entity.*; import org.bukkit.craftbukkit.v1_4_R1.entity.*;
import org.bukkit.craftbukkit.v1_4_R1.inventory.*; import org.bukkit.craftbukkit.v1_4_R1.inventory.*;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
{
CraftPlayer owner; CraftPlayer owner;
public boolean playerOnline = false; public boolean playerOnline = false;
private ItemStack[] extra = new ItemStack[5]; private ItemStack[] extra = new ItemStack[5];
private CraftInventory inventory = new CraftInventory(this); private CraftInventory inventory = new CraftInventory(this);
public SpecialPlayerInventory(Player p, Boolean online) public SpecialPlayerInventory(Player p, Boolean online) {
{
super(((CraftPlayer) p).getHandle()); super(((CraftPlayer) p).getHandle());
this.owner = ((CraftPlayer) p); this.owner = ((CraftPlayer) p);
this.playerOnline = online; this.playerOnline = online;
@ -45,26 +43,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public Inventory getBukkitInventory() public Inventory getBukkitInventory() {
{
return inventory; return inventory;
} }
@Override @Override
public void InventoryRemovalCheck() public void InventoryRemovalCheck() {
{
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) if (transaction.isEmpty() && !playerOnline) {
{
OpenInv.inventories.remove(owner.getName().toLowerCase()); OpenInv.inventories.remove(owner.getName().toLowerCase());
} }
} }
@Override @Override
public void PlayerGoOnline(Player player) public void PlayerGoOnline(Player player) {
{ if (!playerOnline) {
if (!playerOnline)
{
CraftPlayer p = (CraftPlayer) player; CraftPlayer p = (CraftPlayer) player;
p.getHandle().inventory.items = this.items; p.getHandle().inventory.items = this.items;
p.getHandle().inventory.armor = this.armor; p.getHandle().inventory.armor = this.armor;
@ -74,22 +67,19 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public void PlayerGoOffline() public void PlayerGoOffline() {
{
playerOnline = false; playerOnline = false;
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
@Override @Override
public void onClose(CraftHumanEntity who) public void onClose(CraftHumanEntity who) {
{
super.onClose(who); super.onClose(who);
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
@Override @Override
public ItemStack[] getContents() public ItemStack[] getContents() {
{
ItemStack[] C = new ItemStack[getSize()]; ItemStack[] C = new ItemStack[getSize()];
System.arraycopy(items, 0, C, 0, items.length); System.arraycopy(items, 0, C, 0, items.length);
System.arraycopy(items, 0, C, items.length, armor.length); System.arraycopy(items, 0, C, items.length, armor.length);
@ -97,33 +87,27 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public int getSize() public int getSize() {
{
return super.getSize() + 5; return super.getSize() + 5;
} }
@Override @Override
public ItemStack getItem(int i) public ItemStack getItem(int i) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
@ -131,123 +115,100 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public ItemStack splitStack(int i, int j) public ItemStack splitStack(int i, int j) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
if (is[i] != null) if (is[i] != null) {
{
ItemStack itemstack; ItemStack itemstack;
if (is[i].count <= j) if (is[i].count <= j) {
{
itemstack = is[i]; itemstack = is[i];
is[i] = null; is[i] = null;
return itemstack; return itemstack;
} }
else else {
{
itemstack = is[i].a(j); itemstack = is[i].a(j);
if (is[i].count == 0) if (is[i].count == 0) {
{
is[i] = null; is[i] = null;
} }
return itemstack; return itemstack;
} }
} }
else else {
{
return null; return null;
} }
} }
@Override @Override
public ItemStack splitWithoutUpdate(int i) public ItemStack splitWithoutUpdate(int i) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
if (is[i] != null) if (is[i] != null) {
{
ItemStack itemstack = is[i]; ItemStack itemstack = is[i];
is[i] = null; is[i] = null;
return itemstack; return itemstack;
} }
else else {
{
return null; return null;
} }
} }
@Override @Override
public void setItem(int i, ItemStack itemstack) public void setItem(int i, ItemStack itemstack) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
// Effects // Effects
if (is == this.extra) if (is == this.extra) {
{
owner.getHandle().drop(itemstack); owner.getHandle().drop(itemstack);
itemstack = null; itemstack = null;
} }
@ -257,16 +218,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
owner.getHandle().defaultContainer.b(); owner.getHandle().defaultContainer.b();
} }
private int getReversedItemSlotNum(int i) private int getReversedItemSlotNum(int i) {
{
if (i >= 27) if (i >= 27)
return i - 27; return i - 27;
else else
return i + 9; return i + 9;
} }
private int getReversedArmorSlotNum(int i) private int getReversedArmorSlotNum(int i) {
{
if (i == 0) if (i == 0)
return 3; return 3;
if (i == 1) if (i == 1)
@ -280,18 +239,15 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public String getName() public String getName() {
{ if (player.name.length() > 16) {
if (player.name.length() > 16)
{
return player.name.substring(0, 16); return player.name.substring(0, 16);
} }
return player.name; return player.name;
} }
@Override @Override
public boolean a_(EntityHuman entityhuman) public boolean a_(EntityHuman entityhuman) {
{
return true; return true;
} }
} }

36
src/com/lishid/openinv/internal/v1_5_R2/AnySilentChest.java
View file

@ -29,10 +29,8 @@ import net.minecraft.server.v1_5_R2.*;
import org.bukkit.craftbukkit.v1_5_R2.entity.*; import org.bukkit.craftbukkit.v1_5_R2.entity.*;
public class AnySilentChest implements IAnySilentChest public class AnySilentChest implements IAnySilentChest {
{ public boolean IsAnyChestNeeded(Player p, int x, int y, int z) {
public boolean IsAnyChestNeeded(Player p, int x, int y, int z)
{
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
EntityPlayer player = ((CraftPlayer) p).getHandle(); EntityPlayer player = ((CraftPlayer) p).getHandle();
World world = player.world; World world = player.world;
@ -55,8 +53,7 @@ public class AnySilentChest implements IAnySilentChest
return false; return false;
} }
public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
{
EntityPlayer player = ((CraftPlayer) p).getHandle(); EntityPlayer player = ((CraftPlayer) p).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);
@ -65,8 +62,7 @@ public class AnySilentChest implements IAnySilentChest
int id = world.getTypeId(x, y, z); int id = world.getTypeId(x, y, z);
if (!anychest) if (!anychest) {
{
if (world.t(x, y + 1, z)) if (world.t(x, y + 1, z))
return true; return true;
if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z))) if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z)))
@ -89,45 +85,37 @@ public class AnySilentChest implements IAnySilentChest
chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1)); chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
boolean returnValue = true; boolean returnValue = true;
if (!silentchest) if (!silentchest) {
{
player.openContainer((IInventory) chest); player.openContainer((IInventory) chest);
} }
else else {
{ try {
try
{
int windowId = 0; int windowId = 0;
try try {
{
Field windowID = player.getClass().getDeclaredField("containerCounter"); Field windowID = player.getClass().getDeclaredField("containerCounter");
windowID.setAccessible(true); windowID.setAccessible(true);
windowId = windowID.getInt(player); windowId = windowID.getInt(player);
windowId = windowId % 100 + 1; windowId = windowId % 100 + 1;
windowID.setInt(player, windowId); windowID.setInt(player, windowId);
} }
catch (NoSuchFieldException e) catch (NoSuchFieldException e) {}
{}
player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize(), true)); player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize(), true));
player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest)); player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
player.activeContainer.windowId = windowId; player.activeContainer.windowId = windowId;
player.activeContainer.addSlotListener(player); player.activeContainer.addSlotListener(player);
if (OpenInv.NotifySilentChest()) if (OpenInv.NotifySilentChest()) {
{
p.sendMessage("You are opening a chest silently."); p.sendMessage("You are opening a chest silently.");
} }
returnValue = false; returnValue = false;
} }
catch (Exception e) catch (Exception e) {
{
e.printStackTrace(); e.printStackTrace();
p.sendMessage(ChatColor.RED + "Error while sending silent chest."); p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
} }
} }
if (anychest && OpenInv.NotifyAnyChest()) if (anychest && OpenInv.NotifyAnyChest()) {
{
p.sendMessage("You are opening a blocked chest."); p.sendMessage("You are opening a blocked chest.");
} }

18
src/com/lishid/openinv/internal/v1_5_R2/InventoryAccess.java
View file

@ -27,24 +27,18 @@ import com.lishid.openinv.internal.IInventoryAccess;
import net.minecraft.server.v1_5_R2.*; import net.minecraft.server.v1_5_R2.*;
import org.bukkit.craftbukkit.v1_5_R2.inventory.*; import org.bukkit.craftbukkit.v1_5_R2.inventory.*;
public class InventoryAccess implements IInventoryAccess public class InventoryAccess implements IInventoryAccess {
{ public boolean check(Inventory inventory, HumanEntity player) {
public boolean check(Inventory inventory, HumanEntity player)
{
IInventory inv = ((CraftInventory) inventory).getInventory(); IInventory inv = ((CraftInventory) inventory).getInventory();
if (inv instanceof SpecialPlayerInventory) if (inv instanceof SpecialPlayerInventory) {
{ if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV))
{
return false; return false;
} }
} }
else if (inv instanceof SpecialEnderChest) else if (inv instanceof SpecialEnderChest) {
{ if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER))
{
return false; return false;
} }
} }

39
src/com/lishid/openinv/internal/v1_5_R2/PlayerDataManager.java
View file

@ -30,23 +30,18 @@ import com.lishid.openinv.internal.IPlayerDataManager;
import net.minecraft.server.v1_5_R2.*; import net.minecraft.server.v1_5_R2.*;
import org.bukkit.craftbukkit.v1_5_R2.*; import org.bukkit.craftbukkit.v1_5_R2.*;
public class PlayerDataManager implements IPlayerDataManager public class PlayerDataManager implements IPlayerDataManager {
{ public Player loadPlayer(String name) {
public Player loadPlayer(String name) try {
{
try
{
// Default player folder // Default player folder
File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players");
if (!playerfolder.exists()) if (!playerfolder.exists()) {
{
return null; return null;
} }
String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name); String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name);
if (playername == null) if (playername == null) {
{
return null; return null;
} }
@ -57,16 +52,14 @@ public class PlayerDataManager implements IPlayerDataManager
// Get the bukkit entity // Get the bukkit entity
Player target = (entity == null) ? null : entity.getBukkitEntity(); Player target = (entity == null) ? null : entity.getBukkitEntity();
if (target != null) if (target != null) {
{
// Load data // Load data
target.loadData(); target.loadData();
// Return the entity // Return the entity
return target; return target;
} }
} }
catch (Exception e) catch (Exception e) {
{
OpenInv.log(e); OpenInv.log(e);
} }
@ -76,31 +69,25 @@ public class PlayerDataManager implements IPlayerDataManager
/** /**
* @author Balor (aka Antoine Aflalo) * @author Balor (aka Antoine Aflalo)
*/ */
private static String matchUser(final Collection<File> container, final String search) private static String matchUser(final Collection<File> container, final String search) {
{
String found = null; String found = null;
if (search == null) if (search == null) {
{
return found; return found;
} }
final String lowerSearch = search.toLowerCase(); final String lowerSearch = search.toLowerCase();
int delta = Integer.MAX_VALUE; int delta = Integer.MAX_VALUE;
for (final File file : container) for (final File file : container) {
{
final String filename = file.getName(); final String filename = file.getName();
final String str = filename.substring(0, filename.length() - 4); final String str = filename.substring(0, filename.length() - 4);
if (!str.toLowerCase().startsWith(lowerSearch)) if (!str.toLowerCase().startsWith(lowerSearch)) {
{
continue; continue;
} }
final int curDelta = str.length() - lowerSearch.length(); final int curDelta = str.length() - lowerSearch.length();
if (curDelta < delta) if (curDelta < delta) {
{
found = str; found = str;
delta = curDelta; delta = curDelta;
} }
if (curDelta == 0) if (curDelta == 0) {
{
break; break;
} }

9
src/com/lishid/openinv/internal/v1_5_R2/SilentContainerChest.java
View file

@ -19,12 +19,10 @@ package com.lishid.openinv.internal.v1_5_R2;
//Volatile //Volatile
import net.minecraft.server.v1_5_R2.*; import net.minecraft.server.v1_5_R2.*;
public class SilentContainerChest extends ContainerChest public class SilentContainerChest extends ContainerChest {
{
public IInventory inv; public IInventory inv;
public SilentContainerChest(IInventory i1, IInventory i2) public SilentContainerChest(IInventory i1, IInventory i2) {
{
super(i1, i2); super(i1, i2);
inv = i2; inv = i2;
// close signal // close signal
@ -32,8 +30,7 @@ public class SilentContainerChest extends ContainerChest
} }
@Override @Override
public void b(EntityHuman paramEntityHuman) public void b(EntityHuman paramEntityHuman) {
{
// Don't send close signal twice, might screw up // Don't send close signal twice, might screw up
} }
} }

64
src/com/lishid/openinv/internal/v1_5_R2/SpecialEnderChest.java
View file

@ -33,8 +33,7 @@ import net.minecraft.server.v1_5_R2.*;
import org.bukkit.craftbukkit.v1_5_R2.entity.*; import org.bukkit.craftbukkit.v1_5_R2.entity.*;
import org.bukkit.craftbukkit.v1_5_R2.inventory.*; import org.bukkit.craftbukkit.v1_5_R2.inventory.*;
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
{
public List<HumanEntity> transaction = new ArrayList<HumanEntity>(); public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
public boolean playerOnline = false; public boolean playerOnline = false;
private CraftPlayer owner; private CraftPlayer owner;
@ -42,8 +41,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
private int maxStack = MAX_STACK; private int maxStack = MAX_STACK;
private CraftInventory inventory = new CraftInventory(this); private CraftInventory inventory = new CraftInventory(this);
public SpecialEnderChest(Player p, Boolean online) public SpecialEnderChest(Player p, Boolean online) {
{
super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize()); super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
CraftPlayer player = (CraftPlayer) p; CraftPlayer player = (CraftPlayer) p;
this.enderChest = player.getHandle().getEnderChest(); this.enderChest = player.getHandle().getEnderChest();
@ -52,97 +50,77 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
OpenInv.enderChests.put(owner.getName().toLowerCase(), this); OpenInv.enderChests.put(owner.getName().toLowerCase(), this);
} }
public Inventory getBukkitInventory() public Inventory getBukkitInventory() {
{
return inventory; return inventory;
} }
public void InventoryRemovalCheck() public void InventoryRemovalCheck() {
{
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) if (transaction.isEmpty() && !playerOnline) {
{
OpenInv.enderChests.remove(owner.getName().toLowerCase()); OpenInv.enderChests.remove(owner.getName().toLowerCase());
} }
} }
public void PlayerGoOnline(Player p) public void PlayerGoOnline(Player p) {
{ if (!playerOnline) {
if (!playerOnline) try {
{
try
{
InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest(); InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
Field field = playerEnderChest.getClass().getField("items"); Field field = playerEnderChest.getClass().getField("items");
field.setAccessible(true); field.setAccessible(true);
field.set(playerEnderChest, this.items); field.set(playerEnderChest, this.items);
} }
catch (Exception e) catch (Exception e) {}
{
}
p.saveData(); p.saveData();
playerOnline = true; playerOnline = true;
} }
} }
public void PlayerGoOffline() public void PlayerGoOffline() {
{
playerOnline = false; playerOnline = false;
} }
public ItemStack[] getContents() public ItemStack[] getContents() {
{
return this.items; return this.items;
} }
public void onOpen(CraftHumanEntity who) public void onOpen(CraftHumanEntity who) {
{
transaction.add(who); transaction.add(who);
} }
public void onClose(CraftHumanEntity who) public void onClose(CraftHumanEntity who) {
{
transaction.remove(who); transaction.remove(who);
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
public List<HumanEntity> getViewers() public List<HumanEntity> getViewers() {
{
return transaction; return transaction;
} }
public InventoryHolder getOwner() public InventoryHolder getOwner() {
{
return this.owner; return this.owner;
} }
public void setMaxStackSize(int size) public void setMaxStackSize(int size) {
{
maxStack = size; maxStack = size;
} }
public int getMaxStackSize() public int getMaxStackSize() {
{
return maxStack; return maxStack;
} }
public boolean a(EntityHuman entityhuman) public boolean a(EntityHuman entityhuman) {
{
return true; return true;
} }
public void startOpen() public void startOpen() {
{
} }
public void f() public void f() {
{
} }
public void update() public void update() {
{
enderChest.update(); enderChest.update();
} }
} }

132
src/com/lishid/openinv/internal/v1_5_R2/SpecialPlayerInventory.java
View file

@ -27,15 +27,13 @@ import net.minecraft.server.v1_5_R2.*;
import org.bukkit.craftbukkit.v1_5_R2.entity.*; import org.bukkit.craftbukkit.v1_5_R2.entity.*;
import org.bukkit.craftbukkit.v1_5_R2.inventory.*; import org.bukkit.craftbukkit.v1_5_R2.inventory.*;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
{
CraftPlayer owner; CraftPlayer owner;
public boolean playerOnline = false; public boolean playerOnline = false;
private ItemStack[] extra = new ItemStack[5]; private ItemStack[] extra = new ItemStack[5];
private CraftInventory inventory = new CraftInventory(this); private CraftInventory inventory = new CraftInventory(this);
public SpecialPlayerInventory(Player p, Boolean online) public SpecialPlayerInventory(Player p, Boolean online) {
{
super(((CraftPlayer) p).getHandle()); super(((CraftPlayer) p).getHandle());
this.owner = ((CraftPlayer) p); this.owner = ((CraftPlayer) p);
this.playerOnline = online; this.playerOnline = online;
@ -45,26 +43,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public Inventory getBukkitInventory() public Inventory getBukkitInventory() {
{
return inventory; return inventory;
} }
@Override @Override
public void InventoryRemovalCheck() public void InventoryRemovalCheck() {
{
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) if (transaction.isEmpty() && !playerOnline) {
{
OpenInv.inventories.remove(owner.getName().toLowerCase()); OpenInv.inventories.remove(owner.getName().toLowerCase());
} }
} }
@Override @Override
public void PlayerGoOnline(Player player) public void PlayerGoOnline(Player player) {
{ if (!playerOnline) {
if (!playerOnline)
{
CraftPlayer p = (CraftPlayer) player; CraftPlayer p = (CraftPlayer) player;
p.getHandle().inventory.items = this.items; p.getHandle().inventory.items = this.items;
p.getHandle().inventory.armor = this.armor; p.getHandle().inventory.armor = this.armor;
@ -74,22 +67,19 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public void PlayerGoOffline() public void PlayerGoOffline() {
{
playerOnline = false; playerOnline = false;
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
@Override @Override
public void onClose(CraftHumanEntity who) public void onClose(CraftHumanEntity who) {
{
super.onClose(who); super.onClose(who);
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
@Override @Override
public ItemStack[] getContents() public ItemStack[] getContents() {
{
ItemStack[] C = new ItemStack[getSize()]; ItemStack[] C = new ItemStack[getSize()];
System.arraycopy(items, 0, C, 0, items.length); System.arraycopy(items, 0, C, 0, items.length);
System.arraycopy(items, 0, C, items.length, armor.length); System.arraycopy(items, 0, C, items.length, armor.length);
@ -97,33 +87,27 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public int getSize() public int getSize() {
{
return super.getSize() + 5; return super.getSize() + 5;
} }
@Override @Override
public ItemStack getItem(int i) public ItemStack getItem(int i) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
@ -131,123 +115,100 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public ItemStack splitStack(int i, int j) public ItemStack splitStack(int i, int j) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
if (is[i] != null) if (is[i] != null) {
{
ItemStack itemstack; ItemStack itemstack;
if (is[i].count <= j) if (is[i].count <= j) {
{
itemstack = is[i]; itemstack = is[i];
is[i] = null; is[i] = null;
return itemstack; return itemstack;
} }
else else {
{
itemstack = is[i].a(j); itemstack = is[i].a(j);
if (is[i].count == 0) if (is[i].count == 0) {
{
is[i] = null; is[i] = null;
} }
return itemstack; return itemstack;
} }
} }
else else {
{
return null; return null;
} }
} }
@Override @Override
public ItemStack splitWithoutUpdate(int i) public ItemStack splitWithoutUpdate(int i) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
if (is[i] != null) if (is[i] != null) {
{
ItemStack itemstack = is[i]; ItemStack itemstack = is[i];
is[i] = null; is[i] = null;
return itemstack; return itemstack;
} }
else else {
{
return null; return null;
} }
} }
@Override @Override
public void setItem(int i, ItemStack itemstack) public void setItem(int i, ItemStack itemstack) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
// Effects // Effects
if (is == this.extra) if (is == this.extra) {
{
owner.getHandle().drop(itemstack); owner.getHandle().drop(itemstack);
itemstack = null; itemstack = null;
} }
@ -257,16 +218,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
owner.getHandle().defaultContainer.b(); owner.getHandle().defaultContainer.b();
} }
private int getReversedItemSlotNum(int i) private int getReversedItemSlotNum(int i) {
{
if (i >= 27) if (i >= 27)
return i - 27; return i - 27;
else else
return i + 9; return i + 9;
} }
private int getReversedArmorSlotNum(int i) private int getReversedArmorSlotNum(int i) {
{
if (i == 0) if (i == 0)
return 3; return 3;
if (i == 1) if (i == 1)
@ -280,18 +239,15 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public String getName() public String getName() {
{ if (player.name.length() > 16) {
if (player.name.length() > 16)
{
return player.name.substring(0, 16); return player.name.substring(0, 16);
} }
return player.name; return player.name;
} }
@Override @Override
public boolean a(EntityHuman entityhuman) public boolean a(EntityHuman entityhuman) {
{
return true; return true;
} }
} }

36
src/com/lishid/openinv/internal/v1_5_R3/AnySilentChest.java
View file

@ -31,10 +31,8 @@ import net.minecraft.server.v1_5_R3.*;
import org.bukkit.craftbukkit.v1_5_R3.entity.*; import org.bukkit.craftbukkit.v1_5_R3.entity.*;
public class AnySilentChest implements IAnySilentChest public class AnySilentChest implements IAnySilentChest {
{ public boolean IsAnyChestNeeded(Player p, int x, int y, int z) {
public boolean IsAnyChestNeeded(Player p, int x, int y, int z)
{
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
EntityPlayer player = ((CraftPlayer) p).getHandle(); EntityPlayer player = ((CraftPlayer) p).getHandle();
World world = player.world; World world = player.world;
@ -57,8 +55,7 @@ public class AnySilentChest implements IAnySilentChest
return false; return false;
} }
public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
{
EntityPlayer player = ((CraftPlayer) p).getHandle(); EntityPlayer player = ((CraftPlayer) p).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);
@ -67,8 +64,7 @@ public class AnySilentChest implements IAnySilentChest
int id = world.getTypeId(x, y, z); int id = world.getTypeId(x, y, z);
if (!anychest) if (!anychest) {
{
if (world.t(x, y + 1, z)) if (world.t(x, y + 1, z))
return true; return true;
if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z))) if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z)))
@ -91,45 +87,37 @@ public class AnySilentChest implements IAnySilentChest
chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1)); chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
boolean returnValue = true; boolean returnValue = true;
if (!silentchest) if (!silentchest) {
{
player.openContainer((IInventory) chest); player.openContainer((IInventory) chest);
} }
else else {
{ try {
try
{
int windowId = 0; int windowId = 0;
try try {
{
Field windowID = player.getClass().getDeclaredField("containerCounter"); Field windowID = player.getClass().getDeclaredField("containerCounter");
windowID.setAccessible(true); windowID.setAccessible(true);
windowId = windowID.getInt(player); windowId = windowID.getInt(player);
windowId = windowId % 100 + 1; windowId = windowId % 100 + 1;
windowID.setInt(player, windowId); windowID.setInt(player, windowId);
} }
catch (NoSuchFieldException e) catch (NoSuchFieldException e) {}
{}
player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize(), true)); player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize(), true));
player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest)); player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
player.activeContainer.windowId = windowId; player.activeContainer.windowId = windowId;
player.activeContainer.addSlotListener(player); player.activeContainer.addSlotListener(player);
if (OpenInv.NotifySilentChest()) if (OpenInv.NotifySilentChest()) {
{
p.sendMessage("You are opening a chest silently."); p.sendMessage("You are opening a chest silently.");
} }
returnValue = false; returnValue = false;
} }
catch (Exception e) catch (Exception e) {
{
e.printStackTrace(); e.printStackTrace();
p.sendMessage(ChatColor.RED + "Error while sending silent chest."); p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
} }
} }
if (anychest && OpenInv.NotifyAnyChest()) if (anychest && OpenInv.NotifyAnyChest()) {
{
p.sendMessage("You are opening a blocked chest."); p.sendMessage("You are opening a blocked chest.");
} }

18
src/com/lishid/openinv/internal/v1_5_R3/InventoryAccess.java
View file

@ -27,24 +27,18 @@ import com.lishid.openinv.internal.IInventoryAccess;
import net.minecraft.server.v1_5_R3.*; import net.minecraft.server.v1_5_R3.*;
import org.bukkit.craftbukkit.v1_5_R3.inventory.*; import org.bukkit.craftbukkit.v1_5_R3.inventory.*;
public class InventoryAccess implements IInventoryAccess public class InventoryAccess implements IInventoryAccess {
{ public boolean check(Inventory inventory, HumanEntity player) {
public boolean check(Inventory inventory, HumanEntity player)
{
IInventory inv = ((CraftInventory) inventory).getInventory(); IInventory inv = ((CraftInventory) inventory).getInventory();
if (inv instanceof SpecialPlayerInventory) if (inv instanceof SpecialPlayerInventory) {
{ if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV))
{
return false; return false;
} }
} }
else if (inv instanceof SpecialEnderChest) else if (inv instanceof SpecialEnderChest) {
{ if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER))
{
return false; return false;
} }
} }

39
src/com/lishid/openinv/internal/v1_5_R3/PlayerDataManager.java
View file

@ -30,23 +30,18 @@ import com.lishid.openinv.internal.IPlayerDataManager;
import net.minecraft.server.v1_5_R3.*; import net.minecraft.server.v1_5_R3.*;
import org.bukkit.craftbukkit.v1_5_R3.*; import org.bukkit.craftbukkit.v1_5_R3.*;
public class PlayerDataManager implements IPlayerDataManager public class PlayerDataManager implements IPlayerDataManager {
{ public Player loadPlayer(String name) {
public Player loadPlayer(String name) try {
{
try
{
// Default player folder // Default player folder
File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players");
if (!playerfolder.exists()) if (!playerfolder.exists()) {
{
return null; return null;
} }
String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name); String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name);
if (playername == null) if (playername == null) {
{
return null; return null;
} }
@ -57,16 +52,14 @@ public class PlayerDataManager implements IPlayerDataManager
// Get the bukkit entity // Get the bukkit entity
Player target = (entity == null) ? null : entity.getBukkitEntity(); Player target = (entity == null) ? null : entity.getBukkitEntity();
if (target != null) if (target != null) {
{
// Load data // Load data
target.loadData(); target.loadData();
// Return the entity // Return the entity
return target; return target;
} }
} }
catch (Exception e) catch (Exception e) {
{
OpenInv.log(e); OpenInv.log(e);
} }
@ -76,31 +69,25 @@ public class PlayerDataManager implements IPlayerDataManager
/** /**
* @author Balor (aka Antoine Aflalo) * @author Balor (aka Antoine Aflalo)
*/ */
private static String matchUser(final Collection<File> container, final String search) private static String matchUser(final Collection<File> container, final String search) {
{
String found = null; String found = null;
if (search == null) if (search == null) {
{
return found; return found;
} }
final String lowerSearch = search.toLowerCase(); final String lowerSearch = search.toLowerCase();
int delta = Integer.MAX_VALUE; int delta = Integer.MAX_VALUE;
for (final File file : container) for (final File file : container) {
{
final String filename = file.getName(); final String filename = file.getName();
final String str = filename.substring(0, filename.length() - 4); final String str = filename.substring(0, filename.length() - 4);
if (!str.toLowerCase().startsWith(lowerSearch)) if (!str.toLowerCase().startsWith(lowerSearch)) {
{
continue; continue;
} }
final int curDelta = str.length() - lowerSearch.length(); final int curDelta = str.length() - lowerSearch.length();
if (curDelta < delta) if (curDelta < delta) {
{
found = str; found = str;
delta = curDelta; delta = curDelta;
} }
if (curDelta == 0) if (curDelta == 0) {
{
break; break;
} }

9
src/com/lishid/openinv/internal/v1_5_R3/SilentContainerChest.java
View file

@ -19,12 +19,10 @@ package com.lishid.openinv.internal.v1_5_R3;
//Volatile //Volatile
import net.minecraft.server.v1_5_R3.*; import net.minecraft.server.v1_5_R3.*;
public class SilentContainerChest extends ContainerChest public class SilentContainerChest extends ContainerChest {
{
public IInventory inv; public IInventory inv;
public SilentContainerChest(IInventory i1, IInventory i2) public SilentContainerChest(IInventory i1, IInventory i2) {
{
super(i1, i2); super(i1, i2);
inv = i2; inv = i2;
// close signal // close signal
@ -32,8 +30,7 @@ public class SilentContainerChest extends ContainerChest
} }
@Override @Override
public void b(EntityHuman paramEntityHuman) public void b(EntityHuman paramEntityHuman) {
{
// Don't send close signal twice, might screw up // Don't send close signal twice, might screw up
} }
} }

64
src/com/lishid/openinv/internal/v1_5_R3/SpecialEnderChest.java
View file

@ -33,8 +33,7 @@ import net.minecraft.server.v1_5_R3.*;
import org.bukkit.craftbukkit.v1_5_R3.entity.*; import org.bukkit.craftbukkit.v1_5_R3.entity.*;
import org.bukkit.craftbukkit.v1_5_R3.inventory.*; import org.bukkit.craftbukkit.v1_5_R3.inventory.*;
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
{
public List<HumanEntity> transaction = new ArrayList<HumanEntity>(); public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
public boolean playerOnline = false; public boolean playerOnline = false;
private CraftPlayer owner; private CraftPlayer owner;
@ -42,8 +41,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
private int maxStack = MAX_STACK; private int maxStack = MAX_STACK;
private CraftInventory inventory = new CraftInventory(this); private CraftInventory inventory = new CraftInventory(this);
public SpecialEnderChest(Player p, Boolean online) public SpecialEnderChest(Player p, Boolean online) {
{
super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize()); super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
CraftPlayer player = (CraftPlayer) p; CraftPlayer player = (CraftPlayer) p;
this.enderChest = player.getHandle().getEnderChest(); this.enderChest = player.getHandle().getEnderChest();
@ -52,97 +50,77 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
OpenInv.enderChests.put(owner.getName().toLowerCase(), this); OpenInv.enderChests.put(owner.getName().toLowerCase(), this);
} }
public Inventory getBukkitInventory() public Inventory getBukkitInventory() {
{
return inventory; return inventory;
} }
public void InventoryRemovalCheck() public void InventoryRemovalCheck() {
{
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) if (transaction.isEmpty() && !playerOnline) {
{
OpenInv.enderChests.remove(owner.getName().toLowerCase()); OpenInv.enderChests.remove(owner.getName().toLowerCase());
} }
} }
public void PlayerGoOnline(Player p) public void PlayerGoOnline(Player p) {
{ if (!playerOnline) {
if (!playerOnline) try {
{
try
{
InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest(); InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
Field field = playerEnderChest.getClass().getField("items"); Field field = playerEnderChest.getClass().getField("items");
field.setAccessible(true); field.setAccessible(true);
field.set(playerEnderChest, this.items); field.set(playerEnderChest, this.items);
} }
catch (Exception e) catch (Exception e) {}
{
}
p.saveData(); p.saveData();
playerOnline = true; playerOnline = true;
} }
} }
public void PlayerGoOffline() public void PlayerGoOffline() {
{
playerOnline = false; playerOnline = false;
} }
public ItemStack[] getContents() public ItemStack[] getContents() {
{
return this.items; return this.items;
} }
public void onOpen(CraftHumanEntity who) public void onOpen(CraftHumanEntity who) {
{
transaction.add(who); transaction.add(who);
} }
public void onClose(CraftHumanEntity who) public void onClose(CraftHumanEntity who) {
{
transaction.remove(who); transaction.remove(who);
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
public List<HumanEntity> getViewers() public List<HumanEntity> getViewers() {
{
return transaction; return transaction;
} }
public InventoryHolder getOwner() public InventoryHolder getOwner() {
{
return this.owner; return this.owner;
} }
public void setMaxStackSize(int size) public void setMaxStackSize(int size) {
{
maxStack = size; maxStack = size;
} }
public int getMaxStackSize() public int getMaxStackSize() {
{
return maxStack; return maxStack;
} }
public boolean a(EntityHuman entityhuman) public boolean a(EntityHuman entityhuman) {
{
return true; return true;
} }
public void startOpen() public void startOpen() {
{
} }
public void f() public void f() {
{
} }
public void update() public void update() {
{
enderChest.update(); enderChest.update();
} }
} }

132
src/com/lishid/openinv/internal/v1_5_R3/SpecialPlayerInventory.java
View file

@ -27,15 +27,13 @@ import net.minecraft.server.v1_5_R3.*;
import org.bukkit.craftbukkit.v1_5_R3.entity.*; import org.bukkit.craftbukkit.v1_5_R3.entity.*;
import org.bukkit.craftbukkit.v1_5_R3.inventory.*; import org.bukkit.craftbukkit.v1_5_R3.inventory.*;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
{
CraftPlayer owner; CraftPlayer owner;
public boolean playerOnline = false; public boolean playerOnline = false;
private ItemStack[] extra = new ItemStack[5]; private ItemStack[] extra = new ItemStack[5];
private CraftInventory inventory = new CraftInventory(this); private CraftInventory inventory = new CraftInventory(this);
public SpecialPlayerInventory(Player p, Boolean online) public SpecialPlayerInventory(Player p, Boolean online) {
{
super(((CraftPlayer) p).getHandle()); super(((CraftPlayer) p).getHandle());
this.owner = ((CraftPlayer) p); this.owner = ((CraftPlayer) p);
this.playerOnline = online; this.playerOnline = online;
@ -45,26 +43,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public Inventory getBukkitInventory() public Inventory getBukkitInventory() {
{
return inventory; return inventory;
} }
@Override @Override
public void InventoryRemovalCheck() public void InventoryRemovalCheck() {
{
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) if (transaction.isEmpty() && !playerOnline) {
{
OpenInv.inventories.remove(owner.getName().toLowerCase()); OpenInv.inventories.remove(owner.getName().toLowerCase());
} }
} }
@Override @Override
public void PlayerGoOnline(Player player) public void PlayerGoOnline(Player player) {
{ if (!playerOnline) {
if (!playerOnline)
{
CraftPlayer p = (CraftPlayer) player; CraftPlayer p = (CraftPlayer) player;
p.getHandle().inventory.items = this.items; p.getHandle().inventory.items = this.items;
p.getHandle().inventory.armor = this.armor; p.getHandle().inventory.armor = this.armor;
@ -74,22 +67,19 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public void PlayerGoOffline() public void PlayerGoOffline() {
{
playerOnline = false; playerOnline = false;
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
@Override @Override
public void onClose(CraftHumanEntity who) public void onClose(CraftHumanEntity who) {
{
super.onClose(who); super.onClose(who);
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
@Override @Override
public ItemStack[] getContents() public ItemStack[] getContents() {
{
ItemStack[] C = new ItemStack[getSize()]; ItemStack[] C = new ItemStack[getSize()];
System.arraycopy(items, 0, C, 0, items.length); System.arraycopy(items, 0, C, 0, items.length);
System.arraycopy(items, 0, C, items.length, armor.length); System.arraycopy(items, 0, C, items.length, armor.length);
@ -97,33 +87,27 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public int getSize() public int getSize() {
{
return super.getSize() + 5; return super.getSize() + 5;
} }
@Override @Override
public ItemStack getItem(int i) public ItemStack getItem(int i) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
@ -131,123 +115,100 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public ItemStack splitStack(int i, int j) public ItemStack splitStack(int i, int j) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
if (is[i] != null) if (is[i] != null) {
{
ItemStack itemstack; ItemStack itemstack;
if (is[i].count <= j) if (is[i].count <= j) {
{
itemstack = is[i]; itemstack = is[i];
is[i] = null; is[i] = null;
return itemstack; return itemstack;
} }
else else {
{
itemstack = is[i].a(j); itemstack = is[i].a(j);
if (is[i].count == 0) if (is[i].count == 0) {
{
is[i] = null; is[i] = null;
} }
return itemstack; return itemstack;
} }
} }
else else {
{
return null; return null;
} }
} }
@Override @Override
public ItemStack splitWithoutUpdate(int i) public ItemStack splitWithoutUpdate(int i) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
if (is[i] != null) if (is[i] != null) {
{
ItemStack itemstack = is[i]; ItemStack itemstack = is[i];
is[i] = null; is[i] = null;
return itemstack; return itemstack;
} }
else else {
{
return null; return null;
} }
} }
@Override @Override
public void setItem(int i, ItemStack itemstack) public void setItem(int i, ItemStack itemstack) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
// Effects // Effects
if (is == this.extra) if (is == this.extra) {
{
owner.getHandle().drop(itemstack); owner.getHandle().drop(itemstack);
itemstack = null; itemstack = null;
} }
@ -257,16 +218,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
owner.getHandle().defaultContainer.b(); owner.getHandle().defaultContainer.b();
} }
private int getReversedItemSlotNum(int i) private int getReversedItemSlotNum(int i) {
{
if (i >= 27) if (i >= 27)
return i - 27; return i - 27;
else else
return i + 9; return i + 9;
} }
private int getReversedArmorSlotNum(int i) private int getReversedArmorSlotNum(int i) {
{
if (i == 0) if (i == 0)
return 3; return 3;
if (i == 1) if (i == 1)
@ -280,18 +239,15 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public String getName() public String getName() {
{ if (player.name.length() > 16) {
if (player.name.length() > 16)
{
return player.name.substring(0, 16); return player.name.substring(0, 16);
} }
return player.name; return player.name;
} }
@Override @Override
public boolean a(EntityHuman entityhuman) public boolean a(EntityHuman entityhuman) {
{
return true; return true;
} }
} }

36
src/com/lishid/openinv/internal/v1_6_R1/AnySilentChest.java
View file

@ -29,10 +29,8 @@ import net.minecraft.server.v1_6_R1.*;
import org.bukkit.craftbukkit.v1_6_R1.entity.*; import org.bukkit.craftbukkit.v1_6_R1.entity.*;
public class AnySilentChest implements IAnySilentChest public class AnySilentChest implements IAnySilentChest {
{ public boolean IsAnyChestNeeded(Player p, int x, int y, int z) {
public boolean IsAnyChestNeeded(Player p, int x, int y, int z)
{
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
EntityPlayer player = ((CraftPlayer) p).getHandle(); EntityPlayer player = ((CraftPlayer) p).getHandle();
World world = player.world; World world = player.world;
@ -55,8 +53,7 @@ public class AnySilentChest implements IAnySilentChest
return false; return false;
} }
public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
{
EntityPlayer player = ((CraftPlayer) p).getHandle(); EntityPlayer player = ((CraftPlayer) p).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);
@ -65,8 +62,7 @@ public class AnySilentChest implements IAnySilentChest
int id = world.getTypeId(x, y, z); int id = world.getTypeId(x, y, z);
if (!anychest) if (!anychest) {
{
if (world.t(x, y + 1, z)) if (world.t(x, y + 1, z))
return true; return true;
if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z))) if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z)))
@ -89,45 +85,37 @@ public class AnySilentChest implements IAnySilentChest
chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1)); chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
boolean returnValue = true; boolean returnValue = true;
if (!silentchest) if (!silentchest) {
{
player.openContainer((IInventory) chest); player.openContainer((IInventory) chest);
} }
else else {
{ try {
try
{
int windowId = 0; int windowId = 0;
try try {
{
Field windowID = player.getClass().getDeclaredField("containerCounter"); Field windowID = player.getClass().getDeclaredField("containerCounter");
windowID.setAccessible(true); windowID.setAccessible(true);
windowId = windowID.getInt(player); windowId = windowID.getInt(player);
windowId = windowId % 100 + 1; windowId = windowId % 100 + 1;
windowID.setInt(player, windowId); windowID.setInt(player, windowId);
} }
catch (NoSuchFieldException e) catch (NoSuchFieldException e) {}
{}
player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize(), true)); player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize(), true));
player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest)); player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
player.activeContainer.windowId = windowId; player.activeContainer.windowId = windowId;
player.activeContainer.addSlotListener(player); player.activeContainer.addSlotListener(player);
if (OpenInv.NotifySilentChest()) if (OpenInv.NotifySilentChest()) {
{
p.sendMessage("You are opening a chest silently."); p.sendMessage("You are opening a chest silently.");
} }
returnValue = false; returnValue = false;
} }
catch (Exception e) catch (Exception e) {
{
e.printStackTrace(); e.printStackTrace();
p.sendMessage(ChatColor.RED + "Error while sending silent chest."); p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
} }
} }
if (anychest && OpenInv.NotifyAnyChest()) if (anychest && OpenInv.NotifyAnyChest()) {
{
p.sendMessage("You are opening a blocked chest."); p.sendMessage("You are opening a blocked chest.");
} }

18
src/com/lishid/openinv/internal/v1_6_R1/InventoryAccess.java
View file

@ -27,24 +27,18 @@ import com.lishid.openinv.internal.IInventoryAccess;
import net.minecraft.server.v1_6_R1.*; import net.minecraft.server.v1_6_R1.*;
import org.bukkit.craftbukkit.v1_6_R1.inventory.*; import org.bukkit.craftbukkit.v1_6_R1.inventory.*;
public class InventoryAccess implements IInventoryAccess public class InventoryAccess implements IInventoryAccess {
{ public boolean check(Inventory inventory, HumanEntity player) {
public boolean check(Inventory inventory, HumanEntity player)
{
IInventory inv = ((CraftInventory) inventory).getInventory(); IInventory inv = ((CraftInventory) inventory).getInventory();
if (inv instanceof SpecialPlayerInventory) if (inv instanceof SpecialPlayerInventory) {
{ if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV))
{
return false; return false;
} }
} }
else if (inv instanceof SpecialEnderChest) else if (inv instanceof SpecialEnderChest) {
{ if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER))
{
return false; return false;
} }
} }

39
src/com/lishid/openinv/internal/v1_6_R1/PlayerDataManager.java
View file

@ -30,23 +30,18 @@ import com.lishid.openinv.internal.IPlayerDataManager;
import net.minecraft.server.v1_6_R1.*; import net.minecraft.server.v1_6_R1.*;
import org.bukkit.craftbukkit.v1_6_R1.*; import org.bukkit.craftbukkit.v1_6_R1.*;
public class PlayerDataManager implements IPlayerDataManager public class PlayerDataManager implements IPlayerDataManager {
{ public Player loadPlayer(String name) {
public Player loadPlayer(String name) try {
{
try
{
// Default player folder // Default player folder
File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players");
if (!playerfolder.exists()) if (!playerfolder.exists()) {
{
return null; return null;
} }
String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name); String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name);
if (playername == null) if (playername == null) {
{
return null; return null;
} }
@ -57,16 +52,14 @@ public class PlayerDataManager implements IPlayerDataManager
// Get the bukkit entity // Get the bukkit entity
Player target = (entity == null) ? null : entity.getBukkitEntity(); Player target = (entity == null) ? null : entity.getBukkitEntity();
if (target != null) if (target != null) {
{
// Load data // Load data
target.loadData(); target.loadData();
// Return the entity // Return the entity
return target; return target;
} }
} }
catch (Exception e) catch (Exception e) {
{
OpenInv.log(e); OpenInv.log(e);
} }
@ -76,31 +69,25 @@ public class PlayerDataManager implements IPlayerDataManager
/** /**
* @author Balor (aka Antoine Aflalo) * @author Balor (aka Antoine Aflalo)
*/ */
private static String matchUser(final Collection<File> container, final String search) private static String matchUser(final Collection<File> container, final String search) {
{
String found = null; String found = null;
if (search == null) if (search == null) {
{
return found; return found;
} }
final String lowerSearch = search.toLowerCase(); final String lowerSearch = search.toLowerCase();
int delta = Integer.MAX_VALUE; int delta = Integer.MAX_VALUE;
for (final File file : container) for (final File file : container) {
{
final String filename = file.getName(); final String filename = file.getName();
final String str = filename.substring(0, filename.length() - 4); final String str = filename.substring(0, filename.length() - 4);
if (!str.toLowerCase().startsWith(lowerSearch)) if (!str.toLowerCase().startsWith(lowerSearch)) {
{
continue; continue;
} }
final int curDelta = str.length() - lowerSearch.length(); final int curDelta = str.length() - lowerSearch.length();
if (curDelta < delta) if (curDelta < delta) {
{
found = str; found = str;
delta = curDelta; delta = curDelta;
} }
if (curDelta == 0) if (curDelta == 0) {
{
break; break;
} }

9
src/com/lishid/openinv/internal/v1_6_R1/SilentContainerChest.java
View file

@ -19,12 +19,10 @@ package com.lishid.openinv.internal.v1_6_R1;
//Volatile //Volatile
import net.minecraft.server.v1_6_R1.*; import net.minecraft.server.v1_6_R1.*;
public class SilentContainerChest extends ContainerChest public class SilentContainerChest extends ContainerChest {
{
public IInventory inv; public IInventory inv;
public SilentContainerChest(IInventory i1, IInventory i2) public SilentContainerChest(IInventory i1, IInventory i2) {
{
super(i1, i2); super(i1, i2);
inv = i2; inv = i2;
// close signal // close signal
@ -32,8 +30,7 @@ public class SilentContainerChest extends ContainerChest
} }
@Override @Override
public void b(EntityHuman paramEntityHuman) public void b(EntityHuman paramEntityHuman) {
{
// Don't send close signal twice, might screw up // Don't send close signal twice, might screw up
} }
} }

64
src/com/lishid/openinv/internal/v1_6_R1/SpecialEnderChest.java
View file

@ -33,8 +33,7 @@ import net.minecraft.server.v1_6_R1.*;
import org.bukkit.craftbukkit.v1_6_R1.entity.*; import org.bukkit.craftbukkit.v1_6_R1.entity.*;
import org.bukkit.craftbukkit.v1_6_R1.inventory.*; import org.bukkit.craftbukkit.v1_6_R1.inventory.*;
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
{
public List<HumanEntity> transaction = new ArrayList<HumanEntity>(); public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
public boolean playerOnline = false; public boolean playerOnline = false;
private CraftPlayer owner; private CraftPlayer owner;
@ -42,8 +41,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
private int maxStack = MAX_STACK; private int maxStack = MAX_STACK;
private CraftInventory inventory = new CraftInventory(this); private CraftInventory inventory = new CraftInventory(this);
public SpecialEnderChest(Player p, Boolean online) public SpecialEnderChest(Player p, Boolean online) {
{
super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize()); super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
CraftPlayer player = (CraftPlayer) p; CraftPlayer player = (CraftPlayer) p;
this.enderChest = player.getHandle().getEnderChest(); this.enderChest = player.getHandle().getEnderChest();
@ -52,97 +50,77 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
OpenInv.enderChests.put(owner.getName().toLowerCase(), this); OpenInv.enderChests.put(owner.getName().toLowerCase(), this);
} }
public Inventory getBukkitInventory() public Inventory getBukkitInventory() {
{
return inventory; return inventory;
} }
public void InventoryRemovalCheck() public void InventoryRemovalCheck() {
{
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) if (transaction.isEmpty() && !playerOnline) {
{
OpenInv.enderChests.remove(owner.getName().toLowerCase()); OpenInv.enderChests.remove(owner.getName().toLowerCase());
} }
} }
public void PlayerGoOnline(Player p) public void PlayerGoOnline(Player p) {
{ if (!playerOnline) {
if (!playerOnline) try {
{
try
{
InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest(); InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
Field field = playerEnderChest.getClass().getField("items"); Field field = playerEnderChest.getClass().getField("items");
field.setAccessible(true); field.setAccessible(true);
field.set(playerEnderChest, this.items); field.set(playerEnderChest, this.items);
} }
catch (Exception e) catch (Exception e) {}
{
}
p.saveData(); p.saveData();
playerOnline = true; playerOnline = true;
} }
} }
public void PlayerGoOffline() public void PlayerGoOffline() {
{
playerOnline = false; playerOnline = false;
} }
public ItemStack[] getContents() public ItemStack[] getContents() {
{
return this.items; return this.items;
} }
public void onOpen(CraftHumanEntity who) public void onOpen(CraftHumanEntity who) {
{
transaction.add(who); transaction.add(who);
} }
public void onClose(CraftHumanEntity who) public void onClose(CraftHumanEntity who) {
{
transaction.remove(who); transaction.remove(who);
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
public List<HumanEntity> getViewers() public List<HumanEntity> getViewers() {
{
return transaction; return transaction;
} }
public InventoryHolder getOwner() public InventoryHolder getOwner() {
{
return this.owner; return this.owner;
} }
public void setMaxStackSize(int size) public void setMaxStackSize(int size) {
{
maxStack = size; maxStack = size;
} }
public int getMaxStackSize() public int getMaxStackSize() {
{
return maxStack; return maxStack;
} }
public boolean a(EntityHuman entityhuman) public boolean a(EntityHuman entityhuman) {
{
return true; return true;
} }
public void startOpen() public void startOpen() {
{
} }
public void f() public void f() {
{
} }
public void update() public void update() {
{
enderChest.update(); enderChest.update();
} }
} }

132
src/com/lishid/openinv/internal/v1_6_R1/SpecialPlayerInventory.java
View file

@ -27,15 +27,13 @@ import net.minecraft.server.v1_6_R1.*;
import org.bukkit.craftbukkit.v1_6_R1.entity.*; import org.bukkit.craftbukkit.v1_6_R1.entity.*;
import org.bukkit.craftbukkit.v1_6_R1.inventory.*; import org.bukkit.craftbukkit.v1_6_R1.inventory.*;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
{
CraftPlayer owner; CraftPlayer owner;
public boolean playerOnline = false; public boolean playerOnline = false;
private ItemStack[] extra = new ItemStack[5]; private ItemStack[] extra = new ItemStack[5];
private CraftInventory inventory = new CraftInventory(this); private CraftInventory inventory = new CraftInventory(this);
public SpecialPlayerInventory(Player p, Boolean online) public SpecialPlayerInventory(Player p, Boolean online) {
{
super(((CraftPlayer) p).getHandle()); super(((CraftPlayer) p).getHandle());
this.owner = ((CraftPlayer) p); this.owner = ((CraftPlayer) p);
this.playerOnline = online; this.playerOnline = online;
@ -45,26 +43,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public Inventory getBukkitInventory() public Inventory getBukkitInventory() {
{
return inventory; return inventory;
} }
@Override @Override
public void InventoryRemovalCheck() public void InventoryRemovalCheck() {
{
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) if (transaction.isEmpty() && !playerOnline) {
{
OpenInv.inventories.remove(owner.getName().toLowerCase()); OpenInv.inventories.remove(owner.getName().toLowerCase());
} }
} }
@Override @Override
public void PlayerGoOnline(Player player) public void PlayerGoOnline(Player player) {
{ if (!playerOnline) {
if (!playerOnline)
{
CraftPlayer p = (CraftPlayer) player; CraftPlayer p = (CraftPlayer) player;
p.getHandle().inventory.items = this.items; p.getHandle().inventory.items = this.items;
p.getHandle().inventory.armor = this.armor; p.getHandle().inventory.armor = this.armor;
@ -74,22 +67,19 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public void PlayerGoOffline() public void PlayerGoOffline() {
{
playerOnline = false; playerOnline = false;
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
@Override @Override
public void onClose(CraftHumanEntity who) public void onClose(CraftHumanEntity who) {
{
super.onClose(who); super.onClose(who);
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
@Override @Override
public ItemStack[] getContents() public ItemStack[] getContents() {
{
ItemStack[] C = new ItemStack[getSize()]; ItemStack[] C = new ItemStack[getSize()];
System.arraycopy(items, 0, C, 0, items.length); System.arraycopy(items, 0, C, 0, items.length);
System.arraycopy(items, 0, C, items.length, armor.length); System.arraycopy(items, 0, C, items.length, armor.length);
@ -97,33 +87,27 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public int getSize() public int getSize() {
{
return super.getSize() + 5; return super.getSize() + 5;
} }
@Override @Override
public ItemStack getItem(int i) public ItemStack getItem(int i) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
@ -131,123 +115,100 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public ItemStack splitStack(int i, int j) public ItemStack splitStack(int i, int j) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
if (is[i] != null) if (is[i] != null) {
{
ItemStack itemstack; ItemStack itemstack;
if (is[i].count <= j) if (is[i].count <= j) {
{
itemstack = is[i]; itemstack = is[i];
is[i] = null; is[i] = null;
return itemstack; return itemstack;
} }
else else {
{
itemstack = is[i].a(j); itemstack = is[i].a(j);
if (is[i].count == 0) if (is[i].count == 0) {
{
is[i] = null; is[i] = null;
} }
return itemstack; return itemstack;
} }
} }
else else {
{
return null; return null;
} }
} }
@Override @Override
public ItemStack splitWithoutUpdate(int i) public ItemStack splitWithoutUpdate(int i) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
if (is[i] != null) if (is[i] != null) {
{
ItemStack itemstack = is[i]; ItemStack itemstack = is[i];
is[i] = null; is[i] = null;
return itemstack; return itemstack;
} }
else else {
{
return null; return null;
} }
} }
@Override @Override
public void setItem(int i, ItemStack itemstack) public void setItem(int i, ItemStack itemstack) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
// Effects // Effects
if (is == this.extra) if (is == this.extra) {
{
owner.getHandle().drop(itemstack); owner.getHandle().drop(itemstack);
itemstack = null; itemstack = null;
} }
@ -257,16 +218,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
owner.getHandle().defaultContainer.b(); owner.getHandle().defaultContainer.b();
} }
private int getReversedItemSlotNum(int i) private int getReversedItemSlotNum(int i) {
{
if (i >= 27) if (i >= 27)
return i - 27; return i - 27;
else else
return i + 9; return i + 9;
} }
private int getReversedArmorSlotNum(int i) private int getReversedArmorSlotNum(int i) {
{
if (i == 0) if (i == 0)
return 3; return 3;
if (i == 1) if (i == 1)
@ -280,18 +239,15 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public String getName() public String getName() {
{ if (player.getName().length() > 16) {
if (player.getName().length() > 16)
{
return player.getName().substring(0, 16); return player.getName().substring(0, 16);
} }
return player.getName(); return player.getName();
} }
@Override @Override
public boolean a(EntityHuman entityhuman) public boolean a(EntityHuman entityhuman) {
{
return true; return true;
} }
} }

36
src/com/lishid/openinv/internal/v1_6_R2/AnySilentChest.java
View file

@ -29,10 +29,8 @@ import net.minecraft.server.v1_6_R2.*;
import org.bukkit.craftbukkit.v1_6_R2.entity.*; import org.bukkit.craftbukkit.v1_6_R2.entity.*;
public class AnySilentChest implements IAnySilentChest public class AnySilentChest implements IAnySilentChest {
{ public boolean IsAnyChestNeeded(Player p, int x, int y, int z) {
public boolean IsAnyChestNeeded(Player p, int x, int y, int z)
{
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
EntityPlayer player = ((CraftPlayer) p).getHandle(); EntityPlayer player = ((CraftPlayer) p).getHandle();
World world = player.world; World world = player.world;
@ -55,8 +53,7 @@ public class AnySilentChest implements IAnySilentChest
return false; return false;
} }
public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
{
EntityPlayer player = ((CraftPlayer) p).getHandle(); EntityPlayer player = ((CraftPlayer) p).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);
@ -65,8 +62,7 @@ public class AnySilentChest implements IAnySilentChest
int id = world.getTypeId(x, y, z); int id = world.getTypeId(x, y, z);
if (!anychest) if (!anychest) {
{
if (world.t(x, y + 1, z)) if (world.t(x, y + 1, z))
return true; return true;
if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z))) if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z)))
@ -89,45 +85,37 @@ public class AnySilentChest implements IAnySilentChest
chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1)); chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
boolean returnValue = true; boolean returnValue = true;
if (!silentchest) if (!silentchest) {
{
player.openContainer((IInventory) chest); player.openContainer((IInventory) chest);
} }
else else {
{ try {
try
{
int windowId = 0; int windowId = 0;
try try {
{
Field windowID = player.getClass().getDeclaredField("containerCounter"); Field windowID = player.getClass().getDeclaredField("containerCounter");
windowID.setAccessible(true); windowID.setAccessible(true);
windowId = windowID.getInt(player); windowId = windowID.getInt(player);
windowId = windowId % 100 + 1; windowId = windowId % 100 + 1;
windowID.setInt(player, windowId); windowID.setInt(player, windowId);
} }
catch (NoSuchFieldException e) catch (NoSuchFieldException e) {}
{}
player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize(), true)); player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize(), true));
player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest)); player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
player.activeContainer.windowId = windowId; player.activeContainer.windowId = windowId;
player.activeContainer.addSlotListener(player); player.activeContainer.addSlotListener(player);
if (OpenInv.NotifySilentChest()) if (OpenInv.NotifySilentChest()) {
{
p.sendMessage("You are opening a chest silently."); p.sendMessage("You are opening a chest silently.");
} }
returnValue = false; returnValue = false;
} }
catch (Exception e) catch (Exception e) {
{
e.printStackTrace(); e.printStackTrace();
p.sendMessage(ChatColor.RED + "Error while sending silent chest."); p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
} }
} }
if (anychest && OpenInv.NotifyAnyChest()) if (anychest && OpenInv.NotifyAnyChest()) {
{
p.sendMessage("You are opening a blocked chest."); p.sendMessage("You are opening a blocked chest.");
} }

18
src/com/lishid/openinv/internal/v1_6_R2/InventoryAccess.java
View file

@ -27,24 +27,18 @@ import com.lishid.openinv.internal.IInventoryAccess;
import net.minecraft.server.v1_6_R2.*; import net.minecraft.server.v1_6_R2.*;
import org.bukkit.craftbukkit.v1_6_R2.inventory.*; import org.bukkit.craftbukkit.v1_6_R2.inventory.*;
public class InventoryAccess implements IInventoryAccess public class InventoryAccess implements IInventoryAccess {
{ public boolean check(Inventory inventory, HumanEntity player) {
public boolean check(Inventory inventory, HumanEntity player)
{
IInventory inv = ((CraftInventory) inventory).getInventory(); IInventory inv = ((CraftInventory) inventory).getInventory();
if (inv instanceof SpecialPlayerInventory) if (inv instanceof SpecialPlayerInventory) {
{ if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV))
{
return false; return false;
} }
} }
else if (inv instanceof SpecialEnderChest) else if (inv instanceof SpecialEnderChest) {
{ if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER))
{
return false; return false;
} }
} }

39
src/com/lishid/openinv/internal/v1_6_R2/PlayerDataManager.java
View file

@ -30,23 +30,18 @@ import com.lishid.openinv.internal.IPlayerDataManager;
import net.minecraft.server.v1_6_R2.*; import net.minecraft.server.v1_6_R2.*;
import org.bukkit.craftbukkit.v1_6_R2.*; import org.bukkit.craftbukkit.v1_6_R2.*;
public class PlayerDataManager implements IPlayerDataManager public class PlayerDataManager implements IPlayerDataManager {
{ public Player loadPlayer(String name) {
public Player loadPlayer(String name) try {
{
try
{
// Default player folder // Default player folder
File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players");
if (!playerfolder.exists()) if (!playerfolder.exists()) {
{
return null; return null;
} }
String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name); String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name);
if (playername == null) if (playername == null) {
{
return null; return null;
} }
@ -57,16 +52,14 @@ public class PlayerDataManager implements IPlayerDataManager
// Get the bukkit entity // Get the bukkit entity
Player target = (entity == null) ? null : entity.getBukkitEntity(); Player target = (entity == null) ? null : entity.getBukkitEntity();
if (target != null) if (target != null) {
{
// Load data // Load data
target.loadData(); target.loadData();
// Return the entity // Return the entity
return target; return target;
} }
} }
catch (Exception e) catch (Exception e) {
{
OpenInv.log(e); OpenInv.log(e);
} }
@ -76,31 +69,25 @@ public class PlayerDataManager implements IPlayerDataManager
/** /**
* @author Balor (aka Antoine Aflalo) * @author Balor (aka Antoine Aflalo)
*/ */
private static String matchUser(final Collection<File> container, final String search) private static String matchUser(final Collection<File> container, final String search) {
{
String found = null; String found = null;
if (search == null) if (search == null) {
{
return found; return found;
} }
final String lowerSearch = search.toLowerCase(); final String lowerSearch = search.toLowerCase();
int delta = Integer.MAX_VALUE; int delta = Integer.MAX_VALUE;
for (final File file : container) for (final File file : container) {
{
final String filename = file.getName(); final String filename = file.getName();
final String str = filename.substring(0, filename.length() - 4); final String str = filename.substring(0, filename.length() - 4);
if (!str.toLowerCase().startsWith(lowerSearch)) if (!str.toLowerCase().startsWith(lowerSearch)) {
{
continue; continue;
} }
final int curDelta = str.length() - lowerSearch.length(); final int curDelta = str.length() - lowerSearch.length();
if (curDelta < delta) if (curDelta < delta) {
{
found = str; found = str;
delta = curDelta; delta = curDelta;
} }
if (curDelta == 0) if (curDelta == 0) {
{
break; break;
} }

9
src/com/lishid/openinv/internal/v1_6_R2/SilentContainerChest.java
View file

@ -19,12 +19,10 @@ package com.lishid.openinv.internal.v1_6_R2;
//Volatile //Volatile
import net.minecraft.server.v1_6_R2.*; import net.minecraft.server.v1_6_R2.*;
public class SilentContainerChest extends ContainerChest public class SilentContainerChest extends ContainerChest {
{
public IInventory inv; public IInventory inv;
public SilentContainerChest(IInventory i1, IInventory i2) public SilentContainerChest(IInventory i1, IInventory i2) {
{
super(i1, i2); super(i1, i2);
inv = i2; inv = i2;
// close signal // close signal
@ -32,8 +30,7 @@ public class SilentContainerChest extends ContainerChest
} }
@Override @Override
public void b(EntityHuman paramEntityHuman) public void b(EntityHuman paramEntityHuman) {
{
// Don't send close signal twice, might screw up // Don't send close signal twice, might screw up
} }
} }

64
src/com/lishid/openinv/internal/v1_6_R2/SpecialEnderChest.java
View file

@ -33,8 +33,7 @@ import net.minecraft.server.v1_6_R2.*;
import org.bukkit.craftbukkit.v1_6_R2.entity.*; import org.bukkit.craftbukkit.v1_6_R2.entity.*;
import org.bukkit.craftbukkit.v1_6_R2.inventory.*; import org.bukkit.craftbukkit.v1_6_R2.inventory.*;
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
{
public List<HumanEntity> transaction = new ArrayList<HumanEntity>(); public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
public boolean playerOnline = false; public boolean playerOnline = false;
private CraftPlayer owner; private CraftPlayer owner;
@ -42,8 +41,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
private int maxStack = MAX_STACK; private int maxStack = MAX_STACK;
private CraftInventory inventory = new CraftInventory(this); private CraftInventory inventory = new CraftInventory(this);
public SpecialEnderChest(Player p, Boolean online) public SpecialEnderChest(Player p, Boolean online) {
{
super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize()); super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
CraftPlayer player = (CraftPlayer) p; CraftPlayer player = (CraftPlayer) p;
this.enderChest = player.getHandle().getEnderChest(); this.enderChest = player.getHandle().getEnderChest();
@ -52,97 +50,77 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
OpenInv.enderChests.put(owner.getName().toLowerCase(), this); OpenInv.enderChests.put(owner.getName().toLowerCase(), this);
} }
public Inventory getBukkitInventory() public Inventory getBukkitInventory() {
{
return inventory; return inventory;
} }
public void InventoryRemovalCheck() public void InventoryRemovalCheck() {
{
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) if (transaction.isEmpty() && !playerOnline) {
{
OpenInv.enderChests.remove(owner.getName().toLowerCase()); OpenInv.enderChests.remove(owner.getName().toLowerCase());
} }
} }
public void PlayerGoOnline(Player p) public void PlayerGoOnline(Player p) {
{ if (!playerOnline) {
if (!playerOnline) try {
{
try
{
InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest(); InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
Field field = playerEnderChest.getClass().getField("items"); Field field = playerEnderChest.getClass().getField("items");
field.setAccessible(true); field.setAccessible(true);
field.set(playerEnderChest, this.items); field.set(playerEnderChest, this.items);
} }
catch (Exception e) catch (Exception e) {}
{
}
p.saveData(); p.saveData();
playerOnline = true; playerOnline = true;
} }
} }
public void PlayerGoOffline() public void PlayerGoOffline() {
{
playerOnline = false; playerOnline = false;
} }
public ItemStack[] getContents() public ItemStack[] getContents() {
{
return this.items; return this.items;
} }
public void onOpen(CraftHumanEntity who) public void onOpen(CraftHumanEntity who) {
{
transaction.add(who); transaction.add(who);
} }
public void onClose(CraftHumanEntity who) public void onClose(CraftHumanEntity who) {
{
transaction.remove(who); transaction.remove(who);
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
public List<HumanEntity> getViewers() public List<HumanEntity> getViewers() {
{
return transaction; return transaction;
} }
public InventoryHolder getOwner() public InventoryHolder getOwner() {
{
return this.owner; return this.owner;
} }
public void setMaxStackSize(int size) public void setMaxStackSize(int size) {
{
maxStack = size; maxStack = size;
} }
public int getMaxStackSize() public int getMaxStackSize() {
{
return maxStack; return maxStack;
} }
public boolean a(EntityHuman entityhuman) public boolean a(EntityHuman entityhuman) {
{
return true; return true;
} }
public void startOpen() public void startOpen() {
{
} }
public void f() public void f() {
{
} }
public void update() public void update() {
{
enderChest.update(); enderChest.update();
} }
} }

132
src/com/lishid/openinv/internal/v1_6_R2/SpecialPlayerInventory.java
View file

@ -27,15 +27,13 @@ import net.minecraft.server.v1_6_R2.*;
import org.bukkit.craftbukkit.v1_6_R2.entity.*; import org.bukkit.craftbukkit.v1_6_R2.entity.*;
import org.bukkit.craftbukkit.v1_6_R2.inventory.*; import org.bukkit.craftbukkit.v1_6_R2.inventory.*;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
{
CraftPlayer owner; CraftPlayer owner;
public boolean playerOnline = false; public boolean playerOnline = false;
private ItemStack[] extra = new ItemStack[5]; private ItemStack[] extra = new ItemStack[5];
private CraftInventory inventory = new CraftInventory(this); private CraftInventory inventory = new CraftInventory(this);
public SpecialPlayerInventory(Player p, Boolean online) public SpecialPlayerInventory(Player p, Boolean online) {
{
super(((CraftPlayer) p).getHandle()); super(((CraftPlayer) p).getHandle());
this.owner = ((CraftPlayer) p); this.owner = ((CraftPlayer) p);
this.playerOnline = online; this.playerOnline = online;
@ -45,26 +43,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public Inventory getBukkitInventory() public Inventory getBukkitInventory() {
{
return inventory; return inventory;
} }
@Override @Override
public void InventoryRemovalCheck() public void InventoryRemovalCheck() {
{
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) if (transaction.isEmpty() && !playerOnline) {
{
OpenInv.inventories.remove(owner.getName().toLowerCase()); OpenInv.inventories.remove(owner.getName().toLowerCase());
} }
} }
@Override @Override
public void PlayerGoOnline(Player player) public void PlayerGoOnline(Player player) {
{ if (!playerOnline) {
if (!playerOnline)
{
CraftPlayer p = (CraftPlayer) player; CraftPlayer p = (CraftPlayer) player;
p.getHandle().inventory.items = this.items; p.getHandle().inventory.items = this.items;
p.getHandle().inventory.armor = this.armor; p.getHandle().inventory.armor = this.armor;
@ -74,22 +67,19 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public void PlayerGoOffline() public void PlayerGoOffline() {
{
playerOnline = false; playerOnline = false;
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
@Override @Override
public void onClose(CraftHumanEntity who) public void onClose(CraftHumanEntity who) {
{
super.onClose(who); super.onClose(who);
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
@Override @Override
public ItemStack[] getContents() public ItemStack[] getContents() {
{
ItemStack[] C = new ItemStack[getSize()]; ItemStack[] C = new ItemStack[getSize()];
System.arraycopy(items, 0, C, 0, items.length); System.arraycopy(items, 0, C, 0, items.length);
System.arraycopy(items, 0, C, items.length, armor.length); System.arraycopy(items, 0, C, items.length, armor.length);
@ -97,33 +87,27 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public int getSize() public int getSize() {
{
return super.getSize() + 5; return super.getSize() + 5;
} }
@Override @Override
public ItemStack getItem(int i) public ItemStack getItem(int i) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
@ -131,123 +115,100 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public ItemStack splitStack(int i, int j) public ItemStack splitStack(int i, int j) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
if (is[i] != null) if (is[i] != null) {
{
ItemStack itemstack; ItemStack itemstack;
if (is[i].count <= j) if (is[i].count <= j) {
{
itemstack = is[i]; itemstack = is[i];
is[i] = null; is[i] = null;
return itemstack; return itemstack;
} }
else else {
{
itemstack = is[i].a(j); itemstack = is[i].a(j);
if (is[i].count == 0) if (is[i].count == 0) {
{
is[i] = null; is[i] = null;
} }
return itemstack; return itemstack;
} }
} }
else else {
{
return null; return null;
} }
} }
@Override @Override
public ItemStack splitWithoutUpdate(int i) public ItemStack splitWithoutUpdate(int i) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
if (is[i] != null) if (is[i] != null) {
{
ItemStack itemstack = is[i]; ItemStack itemstack = is[i];
is[i] = null; is[i] = null;
return itemstack; return itemstack;
} }
else else {
{
return null; return null;
} }
} }
@Override @Override
public void setItem(int i, ItemStack itemstack) public void setItem(int i, ItemStack itemstack) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
// Effects // Effects
if (is == this.extra) if (is == this.extra) {
{
owner.getHandle().drop(itemstack); owner.getHandle().drop(itemstack);
itemstack = null; itemstack = null;
} }
@ -257,16 +218,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
owner.getHandle().defaultContainer.b(); owner.getHandle().defaultContainer.b();
} }
private int getReversedItemSlotNum(int i) private int getReversedItemSlotNum(int i) {
{
if (i >= 27) if (i >= 27)
return i - 27; return i - 27;
else else
return i + 9; return i + 9;
} }
private int getReversedArmorSlotNum(int i) private int getReversedArmorSlotNum(int i) {
{
if (i == 0) if (i == 0)
return 3; return 3;
if (i == 1) if (i == 1)
@ -280,18 +239,15 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public String getName() public String getName() {
{ if (player.getName().length() > 16) {
if (player.getName().length() > 16)
{
return player.getName().substring(0, 16); return player.getName().substring(0, 16);
} }
return player.getName(); return player.getName();
} }
@Override @Override
public boolean a(EntityHuman entityhuman) public boolean a(EntityHuman entityhuman) {
{
return true; return true;
} }
} }

36
src/com/lishid/openinv/internal/v1_6_R3/AnySilentChest.java
View file

@ -29,10 +29,8 @@ import net.minecraft.server.v1_6_R3.*;
import org.bukkit.craftbukkit.v1_6_R3.entity.*; import org.bukkit.craftbukkit.v1_6_R3.entity.*;
public class AnySilentChest implements IAnySilentChest public class AnySilentChest implements IAnySilentChest {
{ public boolean IsAnyChestNeeded(Player p, int x, int y, int z) {
public boolean IsAnyChestNeeded(Player p, int x, int y, int z)
{
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
EntityPlayer player = ((CraftPlayer) p).getHandle(); EntityPlayer player = ((CraftPlayer) p).getHandle();
World world = player.world; World world = player.world;
@ -55,8 +53,7 @@ public class AnySilentChest implements IAnySilentChest
return false; return false;
} }
public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
{
EntityPlayer player = ((CraftPlayer) p).getHandle(); EntityPlayer player = ((CraftPlayer) p).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);
@ -65,8 +62,7 @@ public class AnySilentChest implements IAnySilentChest
int id = world.getTypeId(x, y, z); int id = world.getTypeId(x, y, z);
if (!anychest) if (!anychest) {
{
if (world.t(x, y + 1, z)) if (world.t(x, y + 1, z))
return true; return true;
if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z))) if ((world.getTypeId(x - 1, y, z) == id) && (world.t(x - 1, y + 1, z)))
@ -89,45 +85,37 @@ public class AnySilentChest implements IAnySilentChest
chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1)); chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
boolean returnValue = true; boolean returnValue = true;
if (!silentchest) if (!silentchest) {
{
player.openContainer((IInventory) chest); player.openContainer((IInventory) chest);
} }
else else {
{ try {
try
{
int windowId = 0; int windowId = 0;
try try {
{
Field windowID = player.getClass().getDeclaredField("containerCounter"); Field windowID = player.getClass().getDeclaredField("containerCounter");
windowID.setAccessible(true); windowID.setAccessible(true);
windowId = windowID.getInt(player); windowId = windowID.getInt(player);
windowId = windowId % 100 + 1; windowId = windowId % 100 + 1;
windowID.setInt(player, windowId); windowID.setInt(player, windowId);
} }
catch (NoSuchFieldException e) catch (NoSuchFieldException e) {}
{}
player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize(), true)); player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, ((IInventory) chest).getName(), ((IInventory) chest).getSize(), true));
player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest)); player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
player.activeContainer.windowId = windowId; player.activeContainer.windowId = windowId;
player.activeContainer.addSlotListener(player); player.activeContainer.addSlotListener(player);
if (OpenInv.NotifySilentChest()) if (OpenInv.NotifySilentChest()) {
{
p.sendMessage("You are opening a chest silently."); p.sendMessage("You are opening a chest silently.");
} }
returnValue = false; returnValue = false;
} }
catch (Exception e) catch (Exception e) {
{
e.printStackTrace(); e.printStackTrace();
p.sendMessage(ChatColor.RED + "Error while sending silent chest."); p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
} }
} }
if (anychest && OpenInv.NotifyAnyChest()) if (anychest && OpenInv.NotifyAnyChest()) {
{
p.sendMessage("You are opening a blocked chest."); p.sendMessage("You are opening a blocked chest.");
} }

18
src/com/lishid/openinv/internal/v1_6_R3/InventoryAccess.java
View file

@ -27,24 +27,18 @@ import com.lishid.openinv.internal.IInventoryAccess;
import net.minecraft.server.v1_6_R3.*; import net.minecraft.server.v1_6_R3.*;
import org.bukkit.craftbukkit.v1_6_R3.inventory.*; import org.bukkit.craftbukkit.v1_6_R3.inventory.*;
public class InventoryAccess implements IInventoryAccess public class InventoryAccess implements IInventoryAccess {
{ public boolean check(Inventory inventory, HumanEntity player) {
public boolean check(Inventory inventory, HumanEntity player)
{
IInventory inv = ((CraftInventory) inventory).getInventory(); IInventory inv = ((CraftInventory) inventory).getInventory();
if (inv instanceof SpecialPlayerInventory) if (inv instanceof SpecialPlayerInventory) {
{ if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV))
{
return false; return false;
} }
} }
else if (inv instanceof SpecialEnderChest) else if (inv instanceof SpecialEnderChest) {
{ if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER))
{
return false; return false;
} }
} }

39
src/com/lishid/openinv/internal/v1_6_R3/PlayerDataManager.java
View file

@ -30,23 +30,18 @@ import com.lishid.openinv.internal.IPlayerDataManager;
import net.minecraft.server.v1_6_R3.*; import net.minecraft.server.v1_6_R3.*;
import org.bukkit.craftbukkit.v1_6_R3.*; import org.bukkit.craftbukkit.v1_6_R3.*;
public class PlayerDataManager implements IPlayerDataManager public class PlayerDataManager implements IPlayerDataManager {
{ public Player loadPlayer(String name) {
public Player loadPlayer(String name) try {
{
try
{
// Default player folder // Default player folder
File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players"); File playerfolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "players");
if (!playerfolder.exists()) if (!playerfolder.exists()) {
{
return null; return null;
} }
String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name); String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name);
if (playername == null) if (playername == null) {
{
return null; return null;
} }
@ -57,16 +52,14 @@ public class PlayerDataManager implements IPlayerDataManager
// Get the bukkit entity // Get the bukkit entity
Player target = (entity == null) ? null : entity.getBukkitEntity(); Player target = (entity == null) ? null : entity.getBukkitEntity();
if (target != null) if (target != null) {
{
// Load data // Load data
target.loadData(); target.loadData();
// Return the entity // Return the entity
return target; return target;
} }
} }
catch (Exception e) catch (Exception e) {
{
OpenInv.log(e); OpenInv.log(e);
} }
@ -76,31 +69,25 @@ public class PlayerDataManager implements IPlayerDataManager
/** /**
* @author Balor (aka Antoine Aflalo) * @author Balor (aka Antoine Aflalo)
*/ */
private static String matchUser(final Collection<File> container, final String search) private static String matchUser(final Collection<File> container, final String search) {
{
String found = null; String found = null;
if (search == null) if (search == null) {
{
return found; return found;
} }
final String lowerSearch = search.toLowerCase(); final String lowerSearch = search.toLowerCase();
int delta = Integer.MAX_VALUE; int delta = Integer.MAX_VALUE;
for (final File file : container) for (final File file : container) {
{
final String filename = file.getName(); final String filename = file.getName();
final String str = filename.substring(0, filename.length() - 4); final String str = filename.substring(0, filename.length() - 4);
if (!str.toLowerCase().startsWith(lowerSearch)) if (!str.toLowerCase().startsWith(lowerSearch)) {
{
continue; continue;
} }
final int curDelta = str.length() - lowerSearch.length(); final int curDelta = str.length() - lowerSearch.length();
if (curDelta < delta) if (curDelta < delta) {
{
found = str; found = str;
delta = curDelta; delta = curDelta;
} }
if (curDelta == 0) if (curDelta == 0) {
{
break; break;
} }

9
src/com/lishid/openinv/internal/v1_6_R3/SilentContainerChest.java
View file

@ -19,12 +19,10 @@ package com.lishid.openinv.internal.v1_6_R3;
//Volatile //Volatile
import net.minecraft.server.v1_6_R3.*; import net.minecraft.server.v1_6_R3.*;
public class SilentContainerChest extends ContainerChest public class SilentContainerChest extends ContainerChest {
{
public IInventory inv; public IInventory inv;
public SilentContainerChest(IInventory i1, IInventory i2) public SilentContainerChest(IInventory i1, IInventory i2) {
{
super(i1, i2); super(i1, i2);
inv = i2; inv = i2;
// close signal // close signal
@ -32,8 +30,7 @@ public class SilentContainerChest extends ContainerChest
} }
@Override @Override
public void b(EntityHuman paramEntityHuman) public void b(EntityHuman paramEntityHuman) {
{
// Don't send close signal twice, might screw up // Don't send close signal twice, might screw up
} }
} }

64
src/com/lishid/openinv/internal/v1_6_R3/SpecialEnderChest.java
View file

@ -33,8 +33,7 @@ import net.minecraft.server.v1_6_R3.*;
import org.bukkit.craftbukkit.v1_6_R3.entity.*; import org.bukkit.craftbukkit.v1_6_R3.entity.*;
import org.bukkit.craftbukkit.v1_6_R3.inventory.*; import org.bukkit.craftbukkit.v1_6_R3.inventory.*;
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
{
public List<HumanEntity> transaction = new ArrayList<HumanEntity>(); public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
public boolean playerOnline = false; public boolean playerOnline = false;
private CraftPlayer owner; private CraftPlayer owner;
@ -42,8 +41,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
private int maxStack = MAX_STACK; private int maxStack = MAX_STACK;
private CraftInventory inventory = new CraftInventory(this); private CraftInventory inventory = new CraftInventory(this);
public SpecialEnderChest(Player p, Boolean online) public SpecialEnderChest(Player p, Boolean online) {
{
super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize()); super(((CraftPlayer) p).getHandle().getEnderChest().getName(), ((CraftPlayer) p).getHandle().getEnderChest().c(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
CraftPlayer player = (CraftPlayer) p; CraftPlayer player = (CraftPlayer) p;
this.enderChest = player.getHandle().getEnderChest(); this.enderChest = player.getHandle().getEnderChest();
@ -52,97 +50,77 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
OpenInv.enderChests.put(owner.getName().toLowerCase(), this); OpenInv.enderChests.put(owner.getName().toLowerCase(), this);
} }
public Inventory getBukkitInventory() public Inventory getBukkitInventory() {
{
return inventory; return inventory;
} }
public void InventoryRemovalCheck() public void InventoryRemovalCheck() {
{
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) if (transaction.isEmpty() && !playerOnline) {
{
OpenInv.enderChests.remove(owner.getName().toLowerCase()); OpenInv.enderChests.remove(owner.getName().toLowerCase());
} }
} }
public void PlayerGoOnline(Player p) public void PlayerGoOnline(Player p) {
{ if (!playerOnline) {
if (!playerOnline) try {
{
try
{
InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest(); InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
Field field = playerEnderChest.getClass().getField("items"); Field field = playerEnderChest.getClass().getField("items");
field.setAccessible(true); field.setAccessible(true);
field.set(playerEnderChest, this.items); field.set(playerEnderChest, this.items);
} }
catch (Exception e) catch (Exception e) {}
{
}
p.saveData(); p.saveData();
playerOnline = true; playerOnline = true;
} }
} }
public void PlayerGoOffline() public void PlayerGoOffline() {
{
playerOnline = false; playerOnline = false;
} }
public ItemStack[] getContents() public ItemStack[] getContents() {
{
return this.items; return this.items;
} }
public void onOpen(CraftHumanEntity who) public void onOpen(CraftHumanEntity who) {
{
transaction.add(who); transaction.add(who);
} }
public void onClose(CraftHumanEntity who) public void onClose(CraftHumanEntity who) {
{
transaction.remove(who); transaction.remove(who);
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
public List<HumanEntity> getViewers() public List<HumanEntity> getViewers() {
{
return transaction; return transaction;
} }
public InventoryHolder getOwner() public InventoryHolder getOwner() {
{
return this.owner; return this.owner;
} }
public void setMaxStackSize(int size) public void setMaxStackSize(int size) {
{
maxStack = size; maxStack = size;
} }
public int getMaxStackSize() public int getMaxStackSize() {
{
return maxStack; return maxStack;
} }
public boolean a(EntityHuman entityhuman) public boolean a(EntityHuman entityhuman) {
{
return true; return true;
} }
public void startOpen() public void startOpen() {
{
} }
public void f() public void f() {
{
} }
public void update() public void update() {
{
enderChest.update(); enderChest.update();
} }
} }

132
src/com/lishid/openinv/internal/v1_6_R3/SpecialPlayerInventory.java
View file

@ -27,15 +27,13 @@ import net.minecraft.server.v1_6_R3.*;
import org.bukkit.craftbukkit.v1_6_R3.entity.*; import org.bukkit.craftbukkit.v1_6_R3.entity.*;
import org.bukkit.craftbukkit.v1_6_R3.inventory.*; import org.bukkit.craftbukkit.v1_6_R3.inventory.*;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
{
CraftPlayer owner; CraftPlayer owner;
public boolean playerOnline = false; public boolean playerOnline = false;
private ItemStack[] extra = new ItemStack[5]; private ItemStack[] extra = new ItemStack[5];
private CraftInventory inventory = new CraftInventory(this); private CraftInventory inventory = new CraftInventory(this);
public SpecialPlayerInventory(Player p, Boolean online) public SpecialPlayerInventory(Player p, Boolean online) {
{
super(((CraftPlayer) p).getHandle()); super(((CraftPlayer) p).getHandle());
this.owner = ((CraftPlayer) p); this.owner = ((CraftPlayer) p);
this.playerOnline = online; this.playerOnline = online;
@ -45,26 +43,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public Inventory getBukkitInventory() public Inventory getBukkitInventory() {
{
return inventory; return inventory;
} }
@Override @Override
public void InventoryRemovalCheck() public void InventoryRemovalCheck() {
{
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) if (transaction.isEmpty() && !playerOnline) {
{
OpenInv.inventories.remove(owner.getName().toLowerCase()); OpenInv.inventories.remove(owner.getName().toLowerCase());
} }
} }
@Override @Override
public void PlayerGoOnline(Player player) public void PlayerGoOnline(Player player) {
{ if (!playerOnline) {
if (!playerOnline)
{
CraftPlayer p = (CraftPlayer) player; CraftPlayer p = (CraftPlayer) player;
p.getHandle().inventory.items = this.items; p.getHandle().inventory.items = this.items;
p.getHandle().inventory.armor = this.armor; p.getHandle().inventory.armor = this.armor;
@ -74,22 +67,19 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public void PlayerGoOffline() public void PlayerGoOffline() {
{
playerOnline = false; playerOnline = false;
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
@Override @Override
public void onClose(CraftHumanEntity who) public void onClose(CraftHumanEntity who) {
{
super.onClose(who); super.onClose(who);
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
@Override @Override
public ItemStack[] getContents() public ItemStack[] getContents() {
{
ItemStack[] C = new ItemStack[getSize()]; ItemStack[] C = new ItemStack[getSize()];
System.arraycopy(items, 0, C, 0, items.length); System.arraycopy(items, 0, C, 0, items.length);
System.arraycopy(items, 0, C, items.length, armor.length); System.arraycopy(items, 0, C, items.length, armor.length);
@ -97,33 +87,27 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public int getSize() public int getSize() {
{
return super.getSize() + 5; return super.getSize() + 5;
} }
@Override @Override
public ItemStack getItem(int i) public ItemStack getItem(int i) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
@ -131,123 +115,100 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public ItemStack splitStack(int i, int j) public ItemStack splitStack(int i, int j) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
if (is[i] != null) if (is[i] != null) {
{
ItemStack itemstack; ItemStack itemstack;
if (is[i].count <= j) if (is[i].count <= j) {
{
itemstack = is[i]; itemstack = is[i];
is[i] = null; is[i] = null;
return itemstack; return itemstack;
} }
else else {
{
itemstack = is[i].a(j); itemstack = is[i].a(j);
if (is[i].count == 0) if (is[i].count == 0) {
{
is[i] = null; is[i] = null;
} }
return itemstack; return itemstack;
} }
} }
else else {
{
return null; return null;
} }
} }
@Override @Override
public ItemStack splitWithoutUpdate(int i) public ItemStack splitWithoutUpdate(int i) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
if (is[i] != null) if (is[i] != null) {
{
ItemStack itemstack = is[i]; ItemStack itemstack = is[i];
is[i] = null; is[i] = null;
return itemstack; return itemstack;
} }
else else {
{
return null; return null;
} }
} }
@Override @Override
public void setItem(int i, ItemStack itemstack) public void setItem(int i, ItemStack itemstack) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
// Effects // Effects
if (is == this.extra) if (is == this.extra) {
{
owner.getHandle().drop(itemstack); owner.getHandle().drop(itemstack);
itemstack = null; itemstack = null;
} }
@ -257,16 +218,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
owner.getHandle().defaultContainer.b(); owner.getHandle().defaultContainer.b();
} }
private int getReversedItemSlotNum(int i) private int getReversedItemSlotNum(int i) {
{
if (i >= 27) if (i >= 27)
return i - 27; return i - 27;
else else
return i + 9; return i + 9;
} }
private int getReversedArmorSlotNum(int i) private int getReversedArmorSlotNum(int i) {
{
if (i == 0) if (i == 0)
return 3; return 3;
if (i == 1) if (i == 1)
@ -280,18 +239,15 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public String getName() public String getName() {
{ if (player.getName().length() > 16) {
if (player.getName().length() > 16)
{
return player.getName().substring(0, 16); return player.getName().substring(0, 16);
} }
return player.getName(); return player.getName();
} }
@Override @Override
public boolean a(EntityHuman entityhuman) public boolean a(EntityHuman entityhuman) {
{
return true; return true;
} }
} }

36
src/com/lishid/openinv/internal/v1_7_R1/AnySilentChest.java
View file

@ -29,10 +29,8 @@ import net.minecraft.server.v1_7_R1.*;
import org.bukkit.craftbukkit.v1_7_R1.entity.*; import org.bukkit.craftbukkit.v1_7_R1.entity.*;
public class AnySilentChest implements IAnySilentChest public class AnySilentChest implements IAnySilentChest {
{ public boolean IsAnyChestNeeded(Player p, int x, int y, int z) {
public boolean IsAnyChestNeeded(Player p, int x, int y, int z)
{
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
EntityPlayer player = ((CraftPlayer) p).getHandle(); EntityPlayer player = ((CraftPlayer) p).getHandle();
World world = player.world; World world = player.world;
@ -55,8 +53,7 @@ public class AnySilentChest implements IAnySilentChest
return false; return false;
} }
public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) public boolean ActivateChest(Player p, boolean anychest, boolean silentchest, int x, int y, int z) {
{
EntityPlayer player = ((CraftPlayer) p).getHandle(); EntityPlayer player = ((CraftPlayer) p).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);
@ -65,8 +62,7 @@ public class AnySilentChest implements IAnySilentChest
int id = Block.b(world.getType(x, y, z)); int id = Block.b(world.getType(x, y, z));
if (!anychest) if (!anychest) {
{
if (world.getType(x, y + 1, z).c()) if (world.getType(x, y + 1, z).c())
return true; return true;
if ((Block.b(world.getType(x - 1, y, z)) == id) && (world.getType(x - 1, y + 1, z).c())) if ((Block.b(world.getType(x - 1, y, z)) == id) && (world.getType(x - 1, y + 1, z).c()))
@ -89,45 +85,37 @@ public class AnySilentChest implements IAnySilentChest
chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1)); chest = new InventoryLargeChest("Large chest", (IInventory) chest, (TileEntityChest) world.getTileEntity(x, y, z + 1));
boolean returnValue = true; boolean returnValue = true;
if (!silentchest) if (!silentchest) {
{
player.openContainer((IInventory) chest); player.openContainer((IInventory) chest);
} }
else else {
{ try {
try
{
int windowId = 0; int windowId = 0;
try try {
{
Field windowID = player.getClass().getDeclaredField("containerCounter"); Field windowID = player.getClass().getDeclaredField("containerCounter");
windowID.setAccessible(true); windowID.setAccessible(true);
windowId = windowID.getInt(player); windowId = windowID.getInt(player);
windowId = windowId % 100 + 1; windowId = windowId % 100 + 1;
windowID.setInt(player, windowId); windowID.setInt(player, windowId);
} }
catch (NoSuchFieldException e) catch (NoSuchFieldException e) {}
{}
player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, 0, ((IInventory) chest).getInventoryName(), ((IInventory) chest).getSize(), true)); player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, 0, ((IInventory) chest).getInventoryName(), ((IInventory) chest).getSize(), true));
player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest)); player.activeContainer = new SilentContainerChest(player.inventory, ((IInventory) chest));
player.activeContainer.windowId = windowId; player.activeContainer.windowId = windowId;
player.activeContainer.addSlotListener(player); player.activeContainer.addSlotListener(player);
if (OpenInv.NotifySilentChest()) if (OpenInv.NotifySilentChest()) {
{
p.sendMessage("You are opening a chest silently."); p.sendMessage("You are opening a chest silently.");
} }
returnValue = false; returnValue = false;
} }
catch (Exception e) catch (Exception e) {
{
e.printStackTrace(); e.printStackTrace();
p.sendMessage(ChatColor.RED + "Error while sending silent chest."); p.sendMessage(ChatColor.RED + "Error while sending silent chest.");
} }
} }
if (anychest && OpenInv.NotifyAnyChest()) if (anychest && OpenInv.NotifyAnyChest()) {
{
p.sendMessage("You are opening a blocked chest."); p.sendMessage("You are opening a blocked chest.");
} }

18
src/com/lishid/openinv/internal/v1_7_R1/InventoryAccess.java
View file

@ -27,24 +27,18 @@ import com.lishid.openinv.internal.IInventoryAccess;
import net.minecraft.server.v1_7_R1.*; import net.minecraft.server.v1_7_R1.*;
import org.bukkit.craftbukkit.v1_7_R1.inventory.*; import org.bukkit.craftbukkit.v1_7_R1.inventory.*;
public class InventoryAccess implements IInventoryAccess public class InventoryAccess implements IInventoryAccess {
{ public boolean check(Inventory inventory, HumanEntity player) {
public boolean check(Inventory inventory, HumanEntity player)
{
IInventory inv = ((CraftInventory) inventory).getInventory(); IInventory inv = ((CraftInventory) inventory).getInventory();
if (inv instanceof SpecialPlayerInventory) if (inv instanceof SpecialPlayerInventory) {
{ if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV)) {
if (!OpenInv.hasPermission(player, Permissions.PERM_EDITINV))
{
return false; return false;
} }
} }
else if (inv instanceof SpecialEnderChest) else if (inv instanceof SpecialEnderChest) {
{ if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER)) {
if (!OpenInv.hasPermission(player, Permissions.PERM_EDITENDER))
{
return false; return false;
} }
} }

9
src/com/lishid/openinv/internal/v1_7_R1/SilentContainerChest.java
View file

@ -19,12 +19,10 @@ package com.lishid.openinv.internal.v1_7_R1;
//Volatile //Volatile
import net.minecraft.server.v1_7_R1.*; import net.minecraft.server.v1_7_R1.*;
public class SilentContainerChest extends ContainerChest public class SilentContainerChest extends ContainerChest {
{
public IInventory inv; public IInventory inv;
public SilentContainerChest(IInventory i1, IInventory i2) public SilentContainerChest(IInventory i1, IInventory i2) {
{
super(i1, i2); super(i1, i2);
inv = i2; inv = i2;
// close signal // close signal
@ -32,8 +30,7 @@ public class SilentContainerChest extends ContainerChest
} }
@Override @Override
public void b(EntityHuman paramEntityHuman) public void b(EntityHuman paramEntityHuman) {
{
// Don't send close signal twice, might screw up // Don't send close signal twice, might screw up
} }
} }

64
src/com/lishid/openinv/internal/v1_7_R1/SpecialEnderChest.java
View file

@ -33,8 +33,7 @@ import net.minecraft.server.v1_7_R1.*;
import org.bukkit.craftbukkit.v1_7_R1.entity.*; import org.bukkit.craftbukkit.v1_7_R1.entity.*;
import org.bukkit.craftbukkit.v1_7_R1.inventory.*; import org.bukkit.craftbukkit.v1_7_R1.inventory.*;
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
{
public List<HumanEntity> transaction = new ArrayList<HumanEntity>(); public List<HumanEntity> transaction = new ArrayList<HumanEntity>();
public boolean playerOnline = false; public boolean playerOnline = false;
private CraftPlayer owner; private CraftPlayer owner;
@ -42,8 +41,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
private int maxStack = MAX_STACK; private int maxStack = MAX_STACK;
private CraftInventory inventory = new CraftInventory(this); private CraftInventory inventory = new CraftInventory(this);
public SpecialEnderChest(Player p, Boolean online) public SpecialEnderChest(Player p, Boolean online) {
{
super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize()); super(((CraftPlayer) p).getHandle().getEnderChest().getInventoryName(), ((CraftPlayer) p).getHandle().getEnderChest().k_(), ((CraftPlayer) p).getHandle().getEnderChest().getSize());
CraftPlayer player = (CraftPlayer) p; CraftPlayer player = (CraftPlayer) p;
this.enderChest = player.getHandle().getEnderChest(); this.enderChest = player.getHandle().getEnderChest();
@ -52,97 +50,77 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
OpenInv.enderChests.put(owner.getName().toLowerCase(), this); OpenInv.enderChests.put(owner.getName().toLowerCase(), this);
} }
public Inventory getBukkitInventory() public Inventory getBukkitInventory() {
{
return inventory; return inventory;
} }
public void InventoryRemovalCheck() public void InventoryRemovalCheck() {
{
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) if (transaction.isEmpty() && !playerOnline) {
{
OpenInv.enderChests.remove(owner.getName().toLowerCase()); OpenInv.enderChests.remove(owner.getName().toLowerCase());
} }
} }
public void PlayerGoOnline(Player p) public void PlayerGoOnline(Player p) {
{ if (!playerOnline) {
if (!playerOnline) try {
{
try
{
InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest(); InventoryEnderChest playerEnderChest = ((CraftPlayer) p).getHandle().getEnderChest();
Field field = playerEnderChest.getClass().getField("items"); Field field = playerEnderChest.getClass().getField("items");
field.setAccessible(true); field.setAccessible(true);
field.set(playerEnderChest, this.items); field.set(playerEnderChest, this.items);
} }
catch (Exception e) catch (Exception e) {}
{
}
p.saveData(); p.saveData();
playerOnline = true; playerOnline = true;
} }
} }
public void PlayerGoOffline() public void PlayerGoOffline() {
{
playerOnline = false; playerOnline = false;
} }
public ItemStack[] getContents() public ItemStack[] getContents() {
{
return this.items; return this.items;
} }
public void onOpen(CraftHumanEntity who) public void onOpen(CraftHumanEntity who) {
{
transaction.add(who); transaction.add(who);
} }
public void onClose(CraftHumanEntity who) public void onClose(CraftHumanEntity who) {
{
transaction.remove(who); transaction.remove(who);
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
public List<HumanEntity> getViewers() public List<HumanEntity> getViewers() {
{
return transaction; return transaction;
} }
public InventoryHolder getOwner() public InventoryHolder getOwner() {
{
return this.owner; return this.owner;
} }
public void setMaxStackSize(int size) public void setMaxStackSize(int size) {
{
maxStack = size; maxStack = size;
} }
public int getMaxStackSize() public int getMaxStackSize() {
{
return maxStack; return maxStack;
} }
public boolean a(EntityHuman entityhuman) public boolean a(EntityHuman entityhuman) {
{
return true; return true;
} }
public void startOpen() public void startOpen() {
{
} }
public void f() public void f() {
{
} }
public void update() public void update() {
{
enderChest.update(); enderChest.update();
} }
} }

132
src/com/lishid/openinv/internal/v1_7_R1/SpecialPlayerInventory.java
View file

@ -27,15 +27,13 @@ import net.minecraft.server.v1_7_R1.*;
import org.bukkit.craftbukkit.v1_7_R1.entity.*; import org.bukkit.craftbukkit.v1_7_R1.entity.*;
import org.bukkit.craftbukkit.v1_7_R1.inventory.*; import org.bukkit.craftbukkit.v1_7_R1.inventory.*;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
{
CraftPlayer owner; CraftPlayer owner;
public boolean playerOnline = false; public boolean playerOnline = false;
private ItemStack[] extra = new ItemStack[5]; private ItemStack[] extra = new ItemStack[5];
private CraftInventory inventory = new CraftInventory(this); private CraftInventory inventory = new CraftInventory(this);
public SpecialPlayerInventory(Player p, Boolean online) public SpecialPlayerInventory(Player p, Boolean online) {
{
super(((CraftPlayer) p).getHandle()); super(((CraftPlayer) p).getHandle());
this.owner = ((CraftPlayer) p); this.owner = ((CraftPlayer) p);
this.playerOnline = online; this.playerOnline = online;
@ -45,26 +43,21 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public Inventory getBukkitInventory() public Inventory getBukkitInventory() {
{
return inventory; return inventory;
} }
@Override @Override
public void InventoryRemovalCheck() public void InventoryRemovalCheck() {
{
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) if (transaction.isEmpty() && !playerOnline) {
{
OpenInv.inventories.remove(owner.getName().toLowerCase()); OpenInv.inventories.remove(owner.getName().toLowerCase());
} }
} }
@Override @Override
public void PlayerGoOnline(Player player) public void PlayerGoOnline(Player player) {
{ if (!playerOnline) {
if (!playerOnline)
{
CraftPlayer p = (CraftPlayer) player; CraftPlayer p = (CraftPlayer) player;
p.getHandle().inventory.items = this.items; p.getHandle().inventory.items = this.items;
p.getHandle().inventory.armor = this.armor; p.getHandle().inventory.armor = this.armor;
@ -74,22 +67,19 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public void PlayerGoOffline() public void PlayerGoOffline() {
{
playerOnline = false; playerOnline = false;
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
@Override @Override
public void onClose(CraftHumanEntity who) public void onClose(CraftHumanEntity who) {
{
super.onClose(who); super.onClose(who);
this.InventoryRemovalCheck(); this.InventoryRemovalCheck();
} }
@Override @Override
public ItemStack[] getContents() public ItemStack[] getContents() {
{
ItemStack[] C = new ItemStack[getSize()]; ItemStack[] C = new ItemStack[getSize()];
System.arraycopy(items, 0, C, 0, items.length); System.arraycopy(items, 0, C, 0, items.length);
System.arraycopy(items, 0, C, items.length, armor.length); System.arraycopy(items, 0, C, items.length, armor.length);
@ -97,33 +87,27 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public int getSize() public int getSize() {
{
return super.getSize() + 5; return super.getSize() + 5;
} }
@Override @Override
public ItemStack getItem(int i) public ItemStack getItem(int i) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
@ -131,123 +115,100 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public ItemStack splitStack(int i, int j) public ItemStack splitStack(int i, int j) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
if (is[i] != null) if (is[i] != null) {
{
ItemStack itemstack; ItemStack itemstack;
if (is[i].count <= j) if (is[i].count <= j) {
{
itemstack = is[i]; itemstack = is[i];
is[i] = null; is[i] = null;
return itemstack; return itemstack;
} }
else else {
{
itemstack = is[i].a(j); itemstack = is[i].a(j);
if (is[i].count == 0) if (is[i].count == 0) {
{
is[i] = null; is[i] = null;
} }
return itemstack; return itemstack;
} }
} }
else else {
{
return null; return null;
} }
} }
@Override @Override
public ItemStack splitWithoutUpdate(int i) public ItemStack splitWithoutUpdate(int i) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
if (is[i] != null) if (is[i] != null) {
{
ItemStack itemstack = is[i]; ItemStack itemstack = is[i];
is[i] = null; is[i] = null;
return itemstack; return itemstack;
} }
else else {
{
return null; return null;
} }
} }
@Override @Override
public void setItem(int i, ItemStack itemstack) public void setItem(int i, ItemStack itemstack) {
{
ItemStack[] is = this.items; ItemStack[] is = this.items;
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.armor; is = this.armor;
} }
else else {
{
i = getReversedItemSlotNum(i); i = getReversedItemSlotNum(i);
} }
if (i >= is.length) if (i >= is.length) {
{
i -= is.length; i -= is.length;
is = this.extra; is = this.extra;
} }
else if (is == this.armor) else if (is == this.armor) {
{
i = getReversedArmorSlotNum(i); i = getReversedArmorSlotNum(i);
} }
// Effects // Effects
if (is == this.extra) if (is == this.extra) {
{
owner.getHandle().drop(itemstack, true); owner.getHandle().drop(itemstack, true);
itemstack = null; itemstack = null;
} }
@ -257,16 +218,14 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
owner.getHandle().defaultContainer.b(); owner.getHandle().defaultContainer.b();
} }
private int getReversedItemSlotNum(int i) private int getReversedItemSlotNum(int i) {
{
if (i >= 27) if (i >= 27)
return i - 27; return i - 27;
else else
return i + 9; return i + 9;
} }
private int getReversedArmorSlotNum(int i) private int getReversedArmorSlotNum(int i) {
{
if (i == 0) if (i == 0)
return 3; return 3;
if (i == 1) if (i == 1)
@ -280,18 +239,15 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public String getInventoryName() public String getInventoryName() {
{ if (player.getName().length() > 16) {
if (player.getName().length() > 16)
{
return player.getName().substring(0, 16); return player.getName().substring(0, 16);
} }
return player.getName(); return player.getName();
} }
@Override @Override
public boolean a(EntityHuman entityhuman) public boolean a(EntityHuman entityhuman) {
{
return true; return true;
} }
} }