Major update of the code #3

Closed
Belphemur wants to merge 7 commits from master into master
5 changed files with 581 additions and 0 deletions
Showing only changes of commit 401557a043 - Show all commits

View File

@@ -0,0 +1,52 @@
/************************************************************************
* This file is part of AdminCmd.
*
* AdminCmd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* AdminCmd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with AdminCmd. If not, see <http://www.gnu.org/licenses/>.
************************************************************************/
package balor.OpenInv;
import org.bukkit.craftbukkit.entity.CraftHumanEntity;
import org.bukkit.entity.Player;
/**
* @author Balor (aka Antoine Aflalo)
*
*/
public class ACOfflinePlayerInventory extends ACPlayerInventory {
/**
* @param entityhuman
* @param proprietary
*/
ACOfflinePlayerInventory(final Player proprietary) {
super(proprietary);
}
/*
* (non-Javadoc)
*
* @see
* net.minecraft.server.PlayerInventory#onClose(org.bukkit.craftbukkit.entity
* .CraftHumanEntity)
*/
@Override
public void onClose(final CraftHumanEntity who) {
transaction.remove(who);
if (transaction.isEmpty()) {
InventoryManager.INSTANCE.closeOfflineInv(proprietary);
}
}
}

View File

@@ -0,0 +1,222 @@
/**
* Copyright (C) 2011-2012 lishid. All rights reserved.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package balor.OpenInv;
import net.minecraft.server.EntityHuman;
import net.minecraft.server.ItemStack;
import net.minecraft.server.PlayerInventory;
import org.bukkit.craftbukkit.entity.CraftHumanEntity;
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.entity.Player;
/**
* @author lishd (Modded by Balor) {@link https://github.com/lishd/OpenInv/}
*
*/
public class ACPlayerInventory extends PlayerInventory {
public final ItemStack[] extra = new ItemStack[5];
public final Player proprietary;
/**
* @param entityhuman
*/
ACPlayerInventory(final Player proprietary) {
super(((CraftPlayer) proprietary).getHandle());
this.proprietary = proprietary;
this.armor = player.inventory.armor;
this.items = player.inventory.items;
}
/*
* (non-Javadoc)
*
* @see
* net.minecraft.server.PlayerInventory#onClose(org.bukkit.craftbukkit.entity
* .CraftHumanEntity)
*/
@Override
public void onClose(final CraftHumanEntity who) {
super.onClose(who);
if (transaction.isEmpty() && !proprietary.isOnline()) {
InventoryManager.INSTANCE.closeOfflineInv(proprietary);
}
}
@Override
public ItemStack[] getContents() {
final ItemStack[] C = new ItemStack[getSize()];
System.arraycopy(items, 0, C, 0, items.length);
System.arraycopy(armor, 0, C, items.length, armor.length);
return C;
}
/*
* (non-Javadoc)
*
* @see net.minecraft.server.PlayerInventory#getSize()
*/
@Override
public int getSize() {
return super.getSize() + 5;
}
@Override
public boolean a(final EntityHuman entityhuman) {
return true;
}
@Override
public String getName() {
if (player.name.length() > 16) {
return player.name.substring(0, 16);
}
return player.name;
}
private int getReversedItemSlotNum(final int i) {
if (i >= 27) {
return i - 27;
} else {
return i + 9;
}
}
private int getReversedArmorSlotNum(final int i) {
if (i == 0) {
return 3;
}
if (i == 1) {
return 2;
}
if (i == 2) {
return 1;
}
if (i == 3) {
return 0;
} else {
return i;
}
}
@Override
public ItemStack getItem(int i) {
ItemStack[] is = this.items;
if (i >= is.length) {
i -= is.length;
is = this.armor;
} else {
i = getReversedItemSlotNum(i);
}
if (i >= is.length) {
i -= is.length;
is = this.extra;
} else if (is == this.armor) {
i = getReversedArmorSlotNum(i);
}
return is[i];
}
@Override
public ItemStack splitStack(int i, final int j) {
ItemStack[] is = this.items;
if (i >= is.length) {
i -= is.length;
is = this.armor;
} else {
i = getReversedItemSlotNum(i);
}
if (i >= is.length) {
i -= is.length;
is = this.extra;
} else if (is == this.armor) {
i = getReversedArmorSlotNum(i);
}
if (is[i] != null) {
ItemStack itemstack;
if (is[i].count <= j) {
itemstack = is[i];
is[i] = null;
return itemstack;
} else {
itemstack = is[i].a(j);
if (is[i].count == 0) {
is[i] = null;
}
return itemstack;
}
} else {
return null;
}
}
@Override
public ItemStack splitWithoutUpdate(int i) {
ItemStack[] is = this.items;
if (i >= is.length) {
i -= is.length;
is = this.armor;
} else {
i = getReversedItemSlotNum(i);
}
if (i >= is.length) {
i -= is.length;
is = this.extra;
} else if (is == this.armor) {
i = getReversedArmorSlotNum(i);
}
if (is[i] != null) {
final ItemStack itemstack = is[i];
is[i] = null;
return itemstack;
} else {
return null;
}
}
@Override
public void setItem(int i, final ItemStack itemstack) {
ItemStack[] is = this.items;
if (i >= is.length) {
i -= is.length;
is = this.armor;
} else {
i = getReversedItemSlotNum(i);
}
if (i >= is.length) {
i -= is.length;
is = this.extra;
} else if (is == this.armor) {
i = getReversedArmorSlotNum(i);
}
is[i] = itemstack;
}
}

View File

@@ -0,0 +1,206 @@
/************************************************************************
* This file is part of AdminCmd.
*
* AdminCmd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* AdminCmd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with AdminCmd. If not, see <http://www.gnu.org/licenses/>.
************************************************************************/
package balor.OpenInv;
import java.io.File;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import net.minecraft.server.EntityPlayer;
import net.minecraft.server.ItemInWorldManager;
import net.minecraft.server.MinecraftServer;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.World;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.entity.Player;
import com.google.common.collect.MapMaker;
/**
* @author Balor (aka Antoine Aflalo)
*
*/
public class InventoryManager {
public static InventoryManager INSTANCE;
private final Map<Player, ACPlayerInventory> replacedInv = new MapMaker().makeMap();
/**
*
*/
private InventoryManager() {
}
public static void createInstance() {
if (INSTANCE == null) {
INSTANCE = new InventoryManager();
}
}
public void onQuit(final Player p) {
replacedInv.remove(p);
}
void closeOfflineInv(final Player p) {
onQuit(p);
p.saveData();
}
/**
* Open the inventory of an offline player
*
* @param sender
* @param name
* @throws PlayerNotFound
* @author lishd {@link https
* ://github.com/lishd/OpenInv/blob/master/src/lishid
* /openinv/commands/OpenInvPluginCommand.java}
* @throws WorldNotFoundException
*/
public void openOfflineInv(final Player sender, final String name, final String world)
throws PlayerNotFound, WorldNotFoundException {
Player target = null;
final HashMap<String, String> replace = new HashMap<String, String>();
replace.put("player", name);
// Offline inv here...
// See if the player has data files
// Find the player folder
World worldFound = matchWorld(Bukkit.getWorlds(), world);
if (worldFound == null)
throw new WorldNotFoundException(ChatColor.RED + "The World " + ChatColor.GOLD + world
+ ChatColor.RED + " can't be found.");
final File playerfolder = new File(worldFound.getWorldFolder(), "players");
if (!playerfolder.exists()) {
throw new PlayerNotFound(ChatColor.RED + "The player " + ChatColor.GOLD + name
+ ChatColor.RED + " can't be found.");
}
final String playername = matchUser(Arrays.asList(playerfolder.listFiles()), name);
if (playername == null) {
throw new PlayerNotFound(ChatColor.RED + "The player " + ChatColor.GOLD + name
+ ChatColor.RED + " can't be found.");
}
// Create an entity to load the player data
final MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
final EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), playername,
new ItemInWorldManager(server.getWorldServer(0)));
target = (entity == null) ? null : (Player) entity.getBukkitEntity();
if (target != null) {
target.loadData();
} else {
throw new PlayerNotFound(ChatColor.RED + "The player " + ChatColor.GOLD + name
+ ChatColor.RED + " can't be found.");
}
openInv(sender, target, true);
}
/**
* Open the inventory of the connected player
*
* @param sender
* the user who'll see the inventory
* @param target
* player to have his inventory opened
*/
public void openInv(final Player sender, final Player target) {
openInv(sender, target, false);
}
private void openInv(final Player sender, final Player target, final boolean offline) {
final ACPlayerInventory inventory = getInventory(target, offline);
final EntityPlayer eh = ((CraftPlayer) sender).getHandle();
eh.openContainer(inventory);
}
private ACPlayerInventory getInventory(final Player player, final boolean offline) {
ACPlayerInventory inventory = replacedInv.get(player);
if (inventory == null) {
if (offline) {
inventory = new ACOfflinePlayerInventory(player);
} else {
inventory = new ACPlayerInventory(player);
}
}
return inventory;
}
private String matchUser(final Collection<File> container, final String search) {
String found = null;
if (search == null) {
return found;
}
final String lowerSearch = search.toLowerCase();
int delta = Integer.MAX_VALUE;
for (final File file : container) {
final String filename = file.getName();
final String str = filename.substring(0, filename.length() - 4);
if (!str.toLowerCase().startsWith(lowerSearch)) {
continue;
}
final int curDelta = str.length() - lowerSearch.length();
if (curDelta < delta) {
found = str;
delta = curDelta;
}
if (curDelta == 0) {
break;
}
}
return found;
}
/**
* Search for the given string in the list and return it.
*
* @param container
* @param search
* @return
*/
private World matchWorld(final Collection<World> container, final String search) {
World found = null;
if (search == null) {
return found;
}
final String lowerSearch = search.toLowerCase();
int delta = Integer.MAX_VALUE;
for (final World w : container) {
String str = w.getName();
if (str.toLowerCase().startsWith(lowerSearch)) {
final int curDelta = str.length() - lowerSearch.length();
if (curDelta < delta) {
found = w;
delta = curDelta;
}
if (curDelta == 0) {
break;
}
}
}
return found;
}
}

View File

@@ -0,0 +1,39 @@
/************************************************************************
* This file is part of AdminCmd.
*
* AdminCmd is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* AdminCmd is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with AdminCmd. If not, see <http://www.gnu.org/licenses/>.
************************************************************************/
package balor.OpenInv;
import org.bukkit.command.CommandSender;
/**
* @author Balor (aka Antoine Aflalo)
*
*/
public class PlayerNotFound extends Exception {
/**
*
*/
private static final long serialVersionUID = -6841087146104592092L;
/**
* @param message
*/
public PlayerNotFound(final String message) {
super(message);
}
}

View File

@@ -0,0 +1,62 @@
/************************************************************************
* This file is part of OpenInv.
*
* OpenInv is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* OpenInv is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with OpenInv. If not, see <http://www.gnu.org/licenses/>.
************************************************************************/
package balor.OpenInv;
/**
* @author Balor (aka Antoine Aflalo)
*
*/
public class WorldNotFoundException extends Exception {
/**
*
*/
private static final long serialVersionUID = 1L;
/**
*
*/
public WorldNotFoundException() {
// TODO Auto-generated constructor stub
}
/**
* @param message
*/
public WorldNotFoundException(String message) {
super(message);
// TODO Auto-generated constructor stub
}
/**
* @param cause
*/
public WorldNotFoundException(Throwable cause) {
super(cause);
// TODO Auto-generated constructor stub
}
/**
* @param message
* @param cause
*/
public WorldNotFoundException(String message, Throwable cause) {
super(message, cause);
// TODO Auto-generated constructor stub
}
}