Compare commits
1 Commits
3.1.2
...
uuid-rewor
| Author | SHA1 | Date | |
|---|---|---|---|
|
e4c23a777e |
19
.gitignore
vendored
19
.gitignore
vendored
@@ -1,10 +1,9 @@
|
|||||||
**/.settings
|
/.settings
|
||||||
**/.gitignore
|
/.gitignore
|
||||||
**/.project
|
/.project
|
||||||
**/.classpath
|
/.classpath
|
||||||
**/.idea
|
/.idea
|
||||||
**/target
|
/target
|
||||||
**/bin
|
/bin
|
||||||
**/out
|
/lib
|
||||||
**dependency-reduced-pom.xml
|
/out
|
||||||
**pom.xml.versionsBackup
|
|
||||||
|
|||||||
13
README
Normal file
13
README
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
Copyright (C) 2011-2014 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/>.
|
||||||
139
README.MD
139
README.MD
@@ -1,139 +0,0 @@
|
|||||||
## About
|
|
||||||
OpenInv is a [Bukkit plugin](https://dev.bukkit.org/bukkit-plugins/openinv/) which allows users to open and edit anyone's inventory or ender chest - online or not!
|
|
||||||
|
|
||||||
## Features
|
|
||||||
- **OpenInv**: Open anyone's inventory, even if they're offline.
|
|
||||||
- Read-only mode! No edits allowed! Don't grant the permission `OpenInv.editinv`
|
|
||||||
- Cross-world support! Don't grant `OpenInv.crossworld`
|
|
||||||
- No self-opening! Don't grant `OpenInv.openself`
|
|
||||||
- Drop items as the player! Place items in the unused slots to the right of the armor to drop them
|
|
||||||
- **OpenEnder**: Open anyone's inventory, even if they're offline.
|
|
||||||
- Read-only mode! No edits allowed! Don't grant `OpenInv.editender`
|
|
||||||
- Cross-world support! Don't grant `OpenInv.crossworld`
|
|
||||||
- No opening others! Don't grant `OpenInv.openenderall`
|
|
||||||
- **SilentChest**: Open containers without displaying an animation or making sound.
|
|
||||||
- **AnyChest**: Open containers, even if blocked by ocelots or blocks.
|
|
||||||
|
|
||||||
## Commands
|
|
||||||
<table width=100%>
|
|
||||||
<tr>
|
|
||||||
<th width=175px>Command</th>
|
|
||||||
<th>Aliases</th>
|
|
||||||
<th>Description</th>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>/openinv [player]</td>
|
|
||||||
<td>oi, inv, open</td>
|
|
||||||
<td>Open a player's inventory. If unspecified, will select last player opened or own if none opened previously.</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>/openender [player]</td>
|
|
||||||
<td>oe</td>
|
|
||||||
<td>Open a player's ender chest. If unspecified, will select last player opened or own if none opened previously.</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>/searchinv <item> [minAmount]</td>
|
|
||||||
<td>si</td>
|
|
||||||
<td>Lists all online players that have a certain item in their inventory.</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>/searchender <item> [minAmount]</td>
|
|
||||||
<td>se</td>
|
|
||||||
<td>Lists all online players that have a certain item in their ender chest.</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>/anychest [check]</td>
|
|
||||||
<td>ac</td>
|
|
||||||
<td>Check or toggle the AnyChest function, allowing opening blocked containers.</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>/silentchest [check]</td>
|
|
||||||
<td>sc</td>
|
|
||||||
<td>Check or toggle the SilentChest function, allowing opening containers silently.</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
## Permissions
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<th>Node</th>
|
|
||||||
<th>Description</th>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>OpenInv.*</td>
|
|
||||||
<td>Gives permission to use all of OpenInv.</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>OpenInv.openinv</td>
|
|
||||||
<td>Required to use /openinv.</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>OpenInv.openself</td>
|
|
||||||
<td>Required to open own inventory.</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>OpenInv.editinv</td>
|
|
||||||
<td>Required to make changes to open inventories.</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>OpenInv.openender</td>
|
|
||||||
<td>Required to use /openender.</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>OpenInv.editender</td>
|
|
||||||
<td>Required to make changes to open ender chests.</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>OpenInv.openenderall</td>
|
|
||||||
<td>Allows users to open others' ender chests. Without it, users can only open their own.</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>OpenInv.exempt</td>
|
|
||||||
<td>Prevents the player's inventory being opened by others.</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>OpenInv.override</td>
|
|
||||||
<td>Allows bypassing of the exempt permission.</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>OpenInv.crossworld</td>
|
|
||||||
<td>Allows cross-world usage of /openinv and /openender.</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>OpenInv.search</td>
|
|
||||||
<td>Required to use /searchinv and /searchender.</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>OpenInv.anychest</td>
|
|
||||||
<td>Required to use /anychest.</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td>OpenInv.silent</td>
|
|
||||||
<td>Required to use /silentchest.</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
## For Developers
|
|
||||||
To compile, the relevant Craftbukkit/Spigot jars must be installed in your local repository using the install plugin.
|
|
||||||
Ex: `mvn install:install-file -Dpackaging=jar -Dfile=spigot-1.11-R0.1-SNAPSHOT.jar -DgroupId=org.spigotmc -DartifactId=spigot -Dversion=1.11-R0.1-SNAPSHOT`
|
|
||||||
|
|
||||||
To compile for a specific version or set of versions, you'll need to use a profile. Provided profiles are `latest`, `modern` (versions 1.8+), and `all`. Select an existing profile using the `-P` argument (ex: `mvn clean package -am -P all`) or make your own. For more information, check out the [official guide](http://maven.apache.org/guides/introduction/introduction-to-profiles.html).
|
|
||||||
|
|
||||||
The final file is target/OpenInv.jar
|
|
||||||
|
|
||||||
## License
|
|
||||||
```
|
|
||||||
Copyright (C) 2011-2014 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/>.
|
|
||||||
```
|
|
||||||
24
api/pom.xml
24
api/pom.xml
@@ -1,24 +0,0 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvparent</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>openinvapi</artifactId>
|
|
||||||
<name>OpenInvAPI</name>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.bukkit</groupId>
|
|
||||||
<artifactId>bukkit</artifactId>
|
|
||||||
<version>1.4.5-R1.0</version>
|
|
||||||
<scope>system</scope>
|
|
||||||
<systemPath>${project.basedir}/../lib/bukkit-1.4.5-R1.0.jar</systemPath>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@@ -1,187 +0,0 @@
|
|||||||
package com.lishid.openinv;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IAnySilentContainer;
|
|
||||||
import com.lishid.openinv.internal.IInventoryAccess;
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.OfflinePlayer;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.plugin.Plugin;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Interface defining behavior for the OpenInv plugin.
|
|
||||||
*
|
|
||||||
* @author Jikoo
|
|
||||||
*/
|
|
||||||
public interface IOpenInv {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if the server version is supported by OpenInv.
|
|
||||||
*
|
|
||||||
* @return true if the server version is supported
|
|
||||||
*/
|
|
||||||
public boolean isSupportedVersion();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the active IInventoryAccess implementation. May return null if the server version is
|
|
||||||
* unsupported.
|
|
||||||
*
|
|
||||||
* @return the IInventoryAccess
|
|
||||||
*/
|
|
||||||
public IInventoryAccess getInventoryAccess();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the active ISilentContainer implementation. May return null if the server version is
|
|
||||||
* unsupported.
|
|
||||||
*
|
|
||||||
* @return the ISilentContainer
|
|
||||||
*/
|
|
||||||
public IAnySilentContainer getAnySilentContainer();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets an ISpecialPlayerInventory for the given Player.
|
|
||||||
*
|
|
||||||
* @param player the Player
|
|
||||||
* @param online true if the Player is currently online
|
|
||||||
* @return the ISpecialPlayerInventory
|
|
||||||
*/
|
|
||||||
public ISpecialPlayerInventory getInventory(Player player, boolean online);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets an ISpecialEnderChest for the given Player.
|
|
||||||
*
|
|
||||||
* @param player the Player
|
|
||||||
* @param online true if the Player is currently online
|
|
||||||
* @return the ISpecialEnderChest
|
|
||||||
*/
|
|
||||||
public ISpecialEnderChest getEnderChest(Player player, boolean online);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Forcibly unload a cached Player's data.
|
|
||||||
*
|
|
||||||
* @param player the OfflinePlayer to unload
|
|
||||||
*/
|
|
||||||
public void unload(OfflinePlayer player);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check the configuration value for whether or not OpenInv saves player data when unloading
|
|
||||||
* players. This is exclusively for users who do not allow editing of inventories, only viewing,
|
|
||||||
* and wish to prevent any possibility of bugs such as lishid#40. If true, OpenInv will not ever
|
|
||||||
* save any edits made to players.
|
|
||||||
*
|
|
||||||
* @return false unless configured otherwise
|
|
||||||
*/
|
|
||||||
public boolean disableSaving();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check the configuration value for whether or not OpenInv displays a notification to the user
|
|
||||||
* when a container is activated with SilentChest.
|
|
||||||
*
|
|
||||||
* @return true unless configured otherwise
|
|
||||||
*/
|
|
||||||
public boolean notifySilentChest();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check the configuration value for whether or not OpenInv displays a notification to the user
|
|
||||||
* when a container is activated with AnyChest.
|
|
||||||
*
|
|
||||||
* @return true unless configured otherwise
|
|
||||||
*/
|
|
||||||
public boolean notifyAnyChest();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets a player's SilentChest setting.
|
|
||||||
*
|
|
||||||
* @param player the OfflinePlayer
|
|
||||||
* @return true if SilentChest is enabled
|
|
||||||
*/
|
|
||||||
public boolean getPlayerSilentChestStatus(OfflinePlayer player);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets a player's SilentChest setting.
|
|
||||||
*
|
|
||||||
* @param player the OfflinePlayer
|
|
||||||
* @param status the status
|
|
||||||
*/
|
|
||||||
public void setPlayerSilentChestStatus(OfflinePlayer player, boolean status);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the provided player's AnyChest setting.
|
|
||||||
*
|
|
||||||
* @param player the OfflinePlayer
|
|
||||||
* @return true if AnyChest is enabled
|
|
||||||
*/
|
|
||||||
public boolean getPlayerAnyChestStatus(OfflinePlayer player);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets a player's AnyChest setting.
|
|
||||||
*
|
|
||||||
* @param player the OfflinePlayer
|
|
||||||
* @param status the status
|
|
||||||
*/
|
|
||||||
public void setPlayerAnyChestStatus(OfflinePlayer player, boolean status);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets a unique identifier by which the OfflinePlayer can be referenced. Using the value
|
|
||||||
* returned to look up a Player will generally be much faster for later implementations.
|
|
||||||
*
|
|
||||||
* @param offline the OfflinePlayer
|
|
||||||
* @return the identifier
|
|
||||||
*/
|
|
||||||
public String getPlayerID(OfflinePlayer offline);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an OfflinePlayer by name.
|
|
||||||
* <p>
|
|
||||||
* Note: This method is potentially very heavily blocking. It should not ever be called on the
|
|
||||||
* main thread, and if it is, a stack trace will be displayed alerting server owners to the
|
|
||||||
* call.
|
|
||||||
*
|
|
||||||
* @param name the name of the Player
|
|
||||||
* @return the OfflinePlayer with the closest matching name or null if no players have ever logged in
|
|
||||||
*/
|
|
||||||
public OfflinePlayer matchPlayer(String name);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Load a Player from an OfflinePlayer. May return null under some circumstances.
|
|
||||||
*
|
|
||||||
* @param offline the OfflinePlayer to load a Player for
|
|
||||||
* @return the Player
|
|
||||||
*/
|
|
||||||
public Player loadPlayer(final OfflinePlayer offline);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Mark a Player as in use by a Plugin to prevent it from being removed from the cache. Used to
|
|
||||||
* prevent issues with multiple copies of the same Player being loaded such as lishid#49.
|
|
||||||
* Changes made to loaded copies overwrite changes to the others when saved, leading to
|
|
||||||
* duplication bugs and more.
|
|
||||||
* <p>
|
|
||||||
* When finished with the Player object, be sure to call {@link #releasePlayer(Player, Plugin)}
|
|
||||||
* to prevent the cache from keeping it stored until the plugin is disabled.
|
|
||||||
* <p>
|
|
||||||
* When using a Player object from OpenInv, you must handle the Player coming online, replacing
|
|
||||||
* your Player reference with the Player from the PlayerJoinEvent. In addition, you must change
|
|
||||||
* any values in the Player to reflect any unsaved alterations to the existing Player which do
|
|
||||||
* not affect the inventory or ender chest contents.
|
|
||||||
* <p>
|
|
||||||
* OpenInv only saves player data when unloading a Player from the cache, and then only if
|
|
||||||
* {@link #disableSaving()} returns false. If you are making changes that OpenInv does not cause
|
|
||||||
* to persist when a Player logs in as noted above, it is suggested that you manually call
|
|
||||||
* {@link Player#saveData()} when releasing your reference to ensure your changes persist.
|
|
||||||
*
|
|
||||||
* @param player the Player
|
|
||||||
* @param plugin the Plugin holding the reference to the Player
|
|
||||||
*/
|
|
||||||
public void retainPlayer(Player player, Plugin plugin);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Mark a Player as no longer in use by a Plugin to allow OpenInv to remove it from the cache
|
|
||||||
* when eligible.
|
|
||||||
*
|
|
||||||
* @param player the Player
|
|
||||||
* @param plugin the Plugin no longer holding a reference to the Player
|
|
||||||
*/
|
|
||||||
public void releasePlayer(Player player, Plugin plugin);
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
package com.lishid.openinv.internal;
|
|
||||||
|
|
||||||
import org.bukkit.block.Block;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
public interface IAnySilentContainer {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if the given block is a container which can be unblocked or silenced.
|
|
||||||
*
|
|
||||||
* @param block the BlockState
|
|
||||||
* @return true if the Block is a supported container
|
|
||||||
*/
|
|
||||||
public boolean isAnySilentContainer(Block block);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if the container at the given coordinates is blocked.
|
|
||||||
*
|
|
||||||
* @param player the Player opening the container
|
|
||||||
* @param block the Block
|
|
||||||
* @return true if the container is blocked
|
|
||||||
*/
|
|
||||||
public boolean isAnyContainerNeeded(Player player, Block block);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Opens the container at the given coordinates for the Player. If you do not want blocked
|
|
||||||
* containers to open, be sure to check {@link #isAnyContainerNeeded(Player, Block)}
|
|
||||||
* first.
|
|
||||||
*
|
|
||||||
* @param player
|
|
||||||
* @param silentchest whether the container's noise is to be silenced
|
|
||||||
* @param block the Block
|
|
||||||
* @return true if the container can be opened
|
|
||||||
*/
|
|
||||||
public boolean activateContainer(Player player, boolean silentchest, Block block);
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal;
|
|
||||||
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
public interface IInventoryAccess {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if an Inventory is an ISpecialPlayerInventory implementation.
|
|
||||||
*
|
|
||||||
* @param inventory the Inventory
|
|
||||||
* @return true if the Inventory is backed by an ISpecialPlayerInventory
|
|
||||||
*/
|
|
||||||
public boolean isSpecialPlayerInventory(Inventory inventory);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets an ISpecialPlayerInventory from an Inventory or null if the Inventory is not backed by
|
|
||||||
* an ISpecialPlayerInventory.
|
|
||||||
*
|
|
||||||
* @param inventory the Inventory
|
|
||||||
* @return the ISpecialPlayerInventory or null
|
|
||||||
*/
|
|
||||||
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if an Inventory is an ISpecialEnderChest implementation.
|
|
||||||
*
|
|
||||||
* @param inventory the Inventory
|
|
||||||
* @return true if the Inventory is backed by an ISpecialEnderChest
|
|
||||||
*/
|
|
||||||
public boolean isSpecialEnderChest(Inventory inventory);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets an ISpecialEnderChest from an Inventory or null if the Inventory is not backed by an
|
|
||||||
* ISpecialEnderChest.
|
|
||||||
*
|
|
||||||
* @param inventory the Inventory
|
|
||||||
* @return the ISpecialEnderChest or null
|
|
||||||
*/
|
|
||||||
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory);
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal;
|
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
public interface ISpecialEnderChest {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the Inventory associated with this ISpecialEnderChest.
|
|
||||||
*
|
|
||||||
* @return the Inventory
|
|
||||||
*/
|
|
||||||
public Inventory getBukkitInventory();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the Player associated with this ISpecialEnderChest online.
|
|
||||||
*
|
|
||||||
* @param player the Player coming online
|
|
||||||
*/
|
|
||||||
public void setPlayerOnline(Player player);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the Player associated with this ISpecialEnderChest offline.
|
|
||||||
*/
|
|
||||||
public void setPlayerOffline();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets whether or not this ISpecialEnderChest is in use.
|
|
||||||
*
|
|
||||||
* @return true if the ISpecialEnderChest is in use
|
|
||||||
*/
|
|
||||||
public boolean isInUse();
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal;
|
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
public interface ISpecialPlayerInventory {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the Inventory associated with this ISpecialPlayerInventory.
|
|
||||||
*
|
|
||||||
* @return the Inventory
|
|
||||||
*/
|
|
||||||
public Inventory getBukkitInventory();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the Player associated with this ISpecialPlayerInventory online.
|
|
||||||
*
|
|
||||||
* @param player the Player coming online
|
|
||||||
*/
|
|
||||||
public void setPlayerOnline(Player player);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the Player associated with this ISpecialPlayerInventory offline.
|
|
||||||
*/
|
|
||||||
public void setPlayerOffline();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets whether or not this ISpecialPlayerInventory is in use.
|
|
||||||
*
|
|
||||||
* @return true if the ISpecialPlayerInventory is in use
|
|
||||||
*/
|
|
||||||
public boolean isInUse();
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvparent</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>openinvassembly</artifactId>
|
|
||||||
<name>OpenInvAssembly</name>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<directory>../target</directory>
|
|
||||||
<finalName>OpenInv</finalName>
|
|
||||||
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-assembly-plugin</artifactId>
|
|
||||||
<version>3.0.0</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>reactor-uberjar</id>
|
|
||||||
<phase>package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>single</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<appendAssemblyId>false</appendAssemblyId>
|
|
||||||
<descriptors>
|
|
||||||
<descriptor>src/assembly/reactor-uberjar.xml</descriptor>
|
|
||||||
</descriptors>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
|
|
||||||
</build>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
|
|
||||||
|
|
||||||
<id>reactor-uberjar</id>
|
|
||||||
|
|
||||||
<formats>
|
|
||||||
<format>jar</format>
|
|
||||||
</formats>
|
|
||||||
|
|
||||||
<includeBaseDirectory>false</includeBaseDirectory>
|
|
||||||
|
|
||||||
<moduleSets>
|
|
||||||
<moduleSet>
|
|
||||||
|
|
||||||
<useAllReactorProjects>true</useAllReactorProjects>
|
|
||||||
|
|
||||||
<binaries>
|
|
||||||
<outputDirectory>/</outputDirectory>
|
|
||||||
<unpack>true</unpack>
|
|
||||||
<!-- unpackOptions must be present or build breaks. -->
|
|
||||||
<unpackOptions/>
|
|
||||||
</binaries>
|
|
||||||
|
|
||||||
</moduleSet>
|
|
||||||
</moduleSets>
|
|
||||||
|
|
||||||
</assembly>
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvparent</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>openinvcommon</artifactId>
|
|
||||||
<name>OpenInvCommon</name>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.bukkit</groupId>
|
|
||||||
<artifactId>bukkit</artifactId>
|
|
||||||
<version>1.4.5-R1.0</version>
|
|
||||||
<scope>system</scope>
|
|
||||||
<systemPath>${project.basedir}/../lib/bukkit-1.4.5-R1.0.jar</systemPath>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvapi</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal;
|
|
||||||
|
|
||||||
import java.util.Collection;
|
|
||||||
|
|
||||||
import org.bukkit.OfflinePlayer;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
public interface IPlayerDataManager {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Loads a Player for an OfflinePlayer.
|
|
||||||
* </p>
|
|
||||||
* This method is potentially blocking, and should not be called on the main thread.
|
|
||||||
*
|
|
||||||
* @param offline
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
public Player loadPlayer(OfflinePlayer offline);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets a unique identifying string for an OfflinePlayer.
|
|
||||||
*
|
|
||||||
* @param player
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
public String getPlayerDataID(OfflinePlayer player);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets an OfflinePlayer by the given unique identifier.
|
|
||||||
*
|
|
||||||
* @param identifier the unique identifier
|
|
||||||
* @return the OfflinePlayer, or null if no exact match was found
|
|
||||||
*/
|
|
||||||
public OfflinePlayer getPlayerByID(String identifier);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets a Collection of all Players currently online.
|
|
||||||
*
|
|
||||||
* @return the Collection of Players
|
|
||||||
*/
|
|
||||||
public Collection<? extends Player> getOnlinePlayers();
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,170 +0,0 @@
|
|||||||
package com.lishid.openinv.util;
|
|
||||||
|
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import com.google.common.collect.Multimap;
|
|
||||||
import com.google.common.collect.TreeMultimap;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A minimal thread-safe time-based cache implementation backed by a HashMap and TreeMultimap.
|
|
||||||
*
|
|
||||||
* @author Jikoo
|
|
||||||
*/
|
|
||||||
public class Cache<K, V> {
|
|
||||||
|
|
||||||
private final Map<K, V> internal;
|
|
||||||
private final Multimap<Long, K> expiry;
|
|
||||||
private final long retention;
|
|
||||||
private final Function<V> inUseCheck, postRemoval;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructs a Cache with the specified retention duration, in use function, and post-removal function.
|
|
||||||
*
|
|
||||||
* @param retention duration after which keys are automatically invalidated if not in use
|
|
||||||
* @param inUseCheck Function used to check if a key is considered in use
|
|
||||||
* @param postRemoval Function used to perform any operations required when a key is invalidated
|
|
||||||
*/
|
|
||||||
public Cache(long retention, Function<V> inUseCheck, Function<V> postRemoval) {
|
|
||||||
this.internal = new HashMap<K, V>();
|
|
||||||
|
|
||||||
this.expiry = TreeMultimap.create(new Comparator<Long>() {
|
|
||||||
@Override
|
|
||||||
public int compare(Long long1, Long long2) {
|
|
||||||
return long1.compareTo(long2);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
new Comparator<K>() {
|
|
||||||
@Override
|
|
||||||
public int compare(K k1, K k2) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
this.retention = retention;
|
|
||||||
this.inUseCheck = inUseCheck;
|
|
||||||
this.postRemoval = postRemoval;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set a key and value pair. Keys are unique. Using an existing key will cause the old value to
|
|
||||||
* be overwritten and the expiration timer to be reset.
|
|
||||||
*
|
|
||||||
* @param key key with which the specified value is to be associated
|
|
||||||
* @param value value to be associated with the specified key
|
|
||||||
*/
|
|
||||||
public void put(K key, V value) {
|
|
||||||
// Invalidate key - runs lazy check and ensures value won't be cleaned up early
|
|
||||||
invalidate(key);
|
|
||||||
|
|
||||||
synchronized (internal) {
|
|
||||||
internal.put(key, value);
|
|
||||||
expiry.put(System.currentTimeMillis() + retention, key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns the value to which the specified key is mapped, or null if no value is mapped for the key.
|
|
||||||
*
|
|
||||||
* @param key the key whose associated value is to be returned
|
|
||||||
* @return the value to which the specified key is mapped, or null if no value is mapped for the key
|
|
||||||
*/
|
|
||||||
public V get(K key) {
|
|
||||||
synchronized (internal) {
|
|
||||||
// Run lazy check to clean cache
|
|
||||||
lazyCheck();
|
|
||||||
|
|
||||||
return internal.get(key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns true if the specified key is mapped to a value.
|
|
||||||
*
|
|
||||||
* @param key key to check if a mapping exists for
|
|
||||||
* @return true if a mapping exists for the specified key
|
|
||||||
*/
|
|
||||||
public boolean containsKey(K key) {
|
|
||||||
synchronized (internal) {
|
|
||||||
// Run lazy check to clean cache
|
|
||||||
lazyCheck();
|
|
||||||
|
|
||||||
return internal.containsKey(key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Forcibly invalidates a key, even if it is considered to be in use.
|
|
||||||
*
|
|
||||||
* @param key key to invalidate
|
|
||||||
*/
|
|
||||||
public void invalidate(K key) {
|
|
||||||
synchronized (internal) {
|
|
||||||
// Run lazy check to clean cache
|
|
||||||
lazyCheck();
|
|
||||||
|
|
||||||
if (!internal.containsKey(key)) {
|
|
||||||
// Value either not present or cleaned by lazy check. Either way, we're good
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remove stored object
|
|
||||||
internal.remove(key);
|
|
||||||
|
|
||||||
// Remove expiration entry - prevents more work later, plus prevents issues with values invalidating early
|
|
||||||
for (Iterator<Map.Entry<Long, K>> iterator = expiry.entries().iterator(); iterator.hasNext();) {
|
|
||||||
if (key.equals(iterator.next().getValue())) {
|
|
||||||
iterator.remove();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Forcibly invalidates all keys, even if they are considered to be in use.
|
|
||||||
*/
|
|
||||||
public void invalidateAll() {
|
|
||||||
synchronized (internal) {
|
|
||||||
for (V value : internal.values()) {
|
|
||||||
postRemoval.run(value);
|
|
||||||
}
|
|
||||||
expiry.clear();
|
|
||||||
internal.clear();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Invalidate all expired keys that are not considered in use. If a key is expired but is
|
|
||||||
* considered in use by the provided Function, its expiration time is reset.
|
|
||||||
*/
|
|
||||||
private void lazyCheck() {
|
|
||||||
long now = System.currentTimeMillis();
|
|
||||||
long nextExpiry = now + retention;
|
|
||||||
for (Iterator<Map.Entry<Long, K>> iterator = expiry.entries().iterator(); iterator.hasNext();) {
|
|
||||||
Map.Entry<Long, K> entry = iterator.next();
|
|
||||||
|
|
||||||
if (entry.getKey() > now) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
iterator.remove();
|
|
||||||
|
|
||||||
if (inUseCheck.run(internal.get(entry.getValue()))) {
|
|
||||||
expiry.put(nextExpiry, entry.getValue());
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
V value = internal.remove(entry.getValue());
|
|
||||||
|
|
||||||
if (value == null) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
postRemoval.run(value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
package com.lishid.openinv.util;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Abstraction for some simple cache calls.
|
|
||||||
*
|
|
||||||
* @author Jikoo
|
|
||||||
*/
|
|
||||||
public abstract class Function<V> {
|
|
||||||
|
|
||||||
public abstract boolean run(V value);
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,186 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.util;
|
|
||||||
|
|
||||||
import java.lang.reflect.Constructor;
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IAnySilentContainer;
|
|
||||||
import com.lishid.openinv.internal.IInventoryAccess;
|
|
||||||
import com.lishid.openinv.internal.IPlayerDataManager;
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.plugin.Plugin;
|
|
||||||
|
|
||||||
public class InternalAccessor {
|
|
||||||
|
|
||||||
private final Plugin plugin;
|
|
||||||
|
|
||||||
private final String version;
|
|
||||||
private boolean supported = false;
|
|
||||||
|
|
||||||
public InternalAccessor(Plugin plugin) {
|
|
||||||
this.plugin = plugin;
|
|
||||||
|
|
||||||
String packageName = plugin.getServer().getClass().getPackage().getName();
|
|
||||||
version = packageName.substring(packageName.lastIndexOf('.') + 1);
|
|
||||||
|
|
||||||
try {
|
|
||||||
Class.forName("com.lishid.openinv.internal." + version + ".PlayerDataManager");
|
|
||||||
supported = true;
|
|
||||||
} catch (Exception e) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the server implementation version. If not initialized, returns the string "null"
|
|
||||||
* instead.
|
|
||||||
*
|
|
||||||
* @return the version, or "null"
|
|
||||||
*/
|
|
||||||
public String getVersion() {
|
|
||||||
return this.version != null ? this.version : "null";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if the server implementation is supported.
|
|
||||||
*
|
|
||||||
* @return true if initialized for a supported server version
|
|
||||||
*/
|
|
||||||
public boolean isSupported() {
|
|
||||||
return this.supported;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates an instance of the IPlayerDataManager implementation for the current server version,
|
|
||||||
* or null if unsupported.
|
|
||||||
*
|
|
||||||
* @return the IPlayerDataManager
|
|
||||||
*/
|
|
||||||
public IPlayerDataManager newPlayerDataManager() {
|
|
||||||
return createObject(IPlayerDataManager.class, "PlayerDataManager");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates an instance of the IInventoryAccess implementation for the current server version, or
|
|
||||||
* null if unsupported.
|
|
||||||
*
|
|
||||||
* @return the IInventoryAccess
|
|
||||||
*/
|
|
||||||
public IInventoryAccess newInventoryAccess() {
|
|
||||||
return createObject(IInventoryAccess.class, "InventoryAccess");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates an instance of the IAnySilentContainer implementation for the current server version,
|
|
||||||
* or null if unsupported.
|
|
||||||
*
|
|
||||||
* @return the IAnySilentContainer
|
|
||||||
*/
|
|
||||||
public IAnySilentContainer newAnySilentContainer() {
|
|
||||||
return createObject(IAnySilentContainer.class, "AnySilentContainer");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates an instance of the ISpecialPlayerInventory implementation for the given Player, or
|
|
||||||
* null if the current version is unsupported.
|
|
||||||
*
|
|
||||||
* @param player the Player
|
|
||||||
* @param online true if the Player is online
|
|
||||||
* @return the ISpecialPlayerInventory created
|
|
||||||
*/
|
|
||||||
public ISpecialPlayerInventory newSpecialPlayerInventory(Player player, boolean online) {
|
|
||||||
return createObject(ISpecialPlayerInventory.class, "SpecialPlayerInventory", player, online);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates an instance of the ISpecialEnderChest implementation for the given Player, or
|
|
||||||
* null if the current version is unsupported.
|
|
||||||
*
|
|
||||||
* @param player the Player
|
|
||||||
* @param online true if the Player is online
|
|
||||||
* @return the ISpecialEnderChest created
|
|
||||||
*/
|
|
||||||
public ISpecialEnderChest newSpecialEnderChest(Player player, boolean online) {
|
|
||||||
return createObject(ISpecialEnderChest.class, "SpecialEnderChest", player, online);
|
|
||||||
}
|
|
||||||
|
|
||||||
private <T> T createObject(Class<? extends T> assignableClass, String className, Object... params) {
|
|
||||||
try {
|
|
||||||
// Check if internal versioned class exists
|
|
||||||
Class<?> internalClass = Class.forName("com.lishid.openinv.internal." + version + "." + className);
|
|
||||||
if (!assignableClass.isAssignableFrom(internalClass)) {
|
|
||||||
plugin.getLogger().warning("Found class " + internalClass.getName() + " but cannot cast to " + assignableClass.getName());
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Quick return: no parameters, no need to fiddle about finding the correct constructor.
|
|
||||||
if (params.length == 0) {
|
|
||||||
return assignableClass.cast(internalClass.getConstructor().newInstance());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Search constructors for one matching the given parameters
|
|
||||||
nextConstructor: for (Constructor<?> constructor : internalClass.getConstructors()) {
|
|
||||||
Class<?>[] requiredClasses = constructor.getParameterTypes();
|
|
||||||
if (requiredClasses.length != params.length) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
for (int i = 0; i < params.length; ++i) {
|
|
||||||
if (!requiredClasses[i].isAssignableFrom(params[i].getClass())) {
|
|
||||||
continue nextConstructor;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return assignableClass.cast(constructor.newInstance(params));
|
|
||||||
}
|
|
||||||
|
|
||||||
StringBuilder message = new StringBuilder("Found class ").append(internalClass.getName())
|
|
||||||
.append(" but cannot find any matching constructors for [");
|
|
||||||
for (Object object : params) {
|
|
||||||
message.append(object.getClass().getName()).append(", ");
|
|
||||||
}
|
|
||||||
if (params.length > 0) {
|
|
||||||
message.delete(message.length() - 2, message.length());
|
|
||||||
}
|
|
||||||
|
|
||||||
plugin.getLogger().warning(message.append(']').toString());
|
|
||||||
} catch (Exception e) {
|
|
||||||
plugin.getLogger().warning("OpenInv encountered an error with the CraftBukkit version \"" + version + "\". Please look for an updated version of OpenInv.");
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static <T> T grabFieldOfTypeFromObject(Class<T> type, Object object) {
|
|
||||||
// Use reflection to find the iinventory
|
|
||||||
Class<?> clazz = object.getClass();
|
|
||||||
T result = null;
|
|
||||||
for (Field f : clazz.getDeclaredFields()) {
|
|
||||||
f.setAccessible(true);
|
|
||||||
if (type.isAssignableFrom(f.getDeclaringClass())) {
|
|
||||||
try {
|
|
||||||
result = type.cast(f.get(object));
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
package com.lishid.openinv.util;
|
|
||||||
|
|
||||||
import org.bukkit.permissions.Permissible;
|
|
||||||
|
|
||||||
public enum Permissions {
|
|
||||||
|
|
||||||
OPENINV("OpenInv.openinv"),
|
|
||||||
OVERRIDE("OpenInv.override"),
|
|
||||||
EXEMPT("OpenInv.exempt"),
|
|
||||||
CROSSWORLD("OpenInv.crossworld"),
|
|
||||||
SILENT("OpenInv.silent"),
|
|
||||||
ANYCHEST("OpenInv.anychest"),
|
|
||||||
ENDERCHEST("OpenInv.openender"),
|
|
||||||
ENDERCHEST_ALL("OpenInv.openenderall"),
|
|
||||||
SEARCH("OpenInv.search"),
|
|
||||||
EDITINV("OpenInv.editinv"),
|
|
||||||
EDITENDER("OpenInv.editender"),
|
|
||||||
OPENSELF("OpenInv.openself");
|
|
||||||
|
|
||||||
private final String permission;
|
|
||||||
|
|
||||||
private Permissions(String permission) {
|
|
||||||
this.permission = permission;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean hasPermission(Permissible permissible) {
|
|
||||||
String[] parts = permission.split("\\.");
|
|
||||||
String perm = "";
|
|
||||||
for (int i = 0; i < parts.length; i++) {
|
|
||||||
if (permissible.hasPermission(perm + "*")) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
perm += parts[i] + ".";
|
|
||||||
}
|
|
||||||
return permissible.hasPermission(permission);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvinternal</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>openinvadapter1_4_5</artifactId>
|
|
||||||
<name>OpenInvAdapter1_4_5</name>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.bukkit</groupId>
|
|
||||||
<artifactId>craftbukkit</artifactId>
|
|
||||||
<version>1.4.5-R1.0</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvcommon</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@@ -1,168 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_4_5;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IAnySilentContainer;
|
|
||||||
|
|
||||||
import org.bukkit.ChatColor;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_4_5.AxisAlignedBB;
|
|
||||||
import net.minecraft.server.v1_4_5.BlockEnderChest;
|
|
||||||
import net.minecraft.server.v1_4_5.Container;
|
|
||||||
import net.minecraft.server.v1_4_5.EntityOcelot;
|
|
||||||
import net.minecraft.server.v1_4_5.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_4_5.IInventory;
|
|
||||||
import net.minecraft.server.v1_4_5.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_4_5.InventoryLargeChest;
|
|
||||||
import net.minecraft.server.v1_4_5.Packet100OpenWindow;
|
|
||||||
import net.minecraft.server.v1_4_5.TileEntityChest;
|
|
||||||
import net.minecraft.server.v1_4_5.TileEntityEnderChest;
|
|
||||||
import net.minecraft.server.v1_4_5.World;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_4_5.event.CraftEventFactory;
|
|
||||||
|
|
||||||
public class AnySilentContainer implements IAnySilentContainer {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnySilentContainer(org.bukkit.block.Block block) {
|
|
||||||
return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
|
|
||||||
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
World world = player.world;
|
|
||||||
|
|
||||||
if (block instanceof BlockEnderChest) {
|
|
||||||
// Ender chests are not blocked by ocelots.
|
|
||||||
return world.t(block.getX(), block.getY() + 1, block.getZ());
|
|
||||||
}
|
|
||||||
|
|
||||||
// If block or ocelot on top
|
|
||||||
if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
// If block next to chest is chest and has a block or ocelot on top
|
|
||||||
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
|
|
||||||
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
|
|
||||||
} else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
|
|
||||||
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
|
|
||||||
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
|
|
||||||
return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
|
|
||||||
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
|
|
||||||
return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isBlockedChest(World world, int x, int y, int z) {
|
|
||||||
return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean hasOcelotOnTop(World world, int x, int y, int z) {
|
|
||||||
for (Object localEntity : world.a(EntityOcelot.class,
|
|
||||||
AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
|
|
||||||
EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
|
|
||||||
if (localEntityOcelot.isSitting()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
|
|
||||||
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
|
|
||||||
// Silent ender chest is API-only
|
|
||||||
if (silentchest && block.getType() == Material.ENDER_CHEST) {
|
|
||||||
p.openInventory(p.getEnderChest());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
World world = player.world;
|
|
||||||
Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
if (tile == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tile instanceof TileEntityEnderChest) {
|
|
||||||
// Anychest ender chest. See net.minecraft.server.BlockEnderChest
|
|
||||||
InventoryEnderChest enderChest = player.getEnderChest();
|
|
||||||
enderChest.a((TileEntityEnderChest) tile);
|
|
||||||
player.openContainer(enderChest);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(tile instanceof IInventory)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
IInventory inventory = (IInventory) tile;
|
|
||||||
int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
|
|
||||||
} else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
|
|
||||||
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
|
|
||||||
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
// AnyChest only
|
|
||||||
if (!silentchest) {
|
|
||||||
player.openContainer(inventory);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// SilentChest
|
|
||||||
try {
|
|
||||||
// Call InventoryOpenEvent
|
|
||||||
Container container = new SilentContainerChest(player.inventory, inventory);
|
|
||||||
container = CraftEventFactory.callInventoryOpenEvent(player, container);
|
|
||||||
if (container == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Open window
|
|
||||||
int windowId = player.nextContainerCounter();
|
|
||||||
player.netServerHandler.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize()));
|
|
||||||
player.activeContainer = container;
|
|
||||||
player.activeContainer.windowId = windowId;
|
|
||||||
player.activeContainer.addSlotListener(player);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
p.sendMessage(ChatColor.RED + "Error while sending silent container.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_4_5;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IInventoryAccess;
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
import com.lishid.openinv.util.InternalAccessor;
|
|
||||||
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_4_5.IInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class InventoryAccess implements IInventoryAccess {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialPlayerInventory) {
|
|
||||||
return (SpecialPlayerInventory) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialEnderChest(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialEnderChest) {
|
|
||||||
return (SpecialEnderChest) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,101 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_4_5;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collection;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IPlayerDataManager;
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.OfflinePlayer;
|
|
||||||
import org.bukkit.Server;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_4_5.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_4_5.ItemInWorldManager;
|
|
||||||
import net.minecraft.server.v1_4_5.MinecraftServer;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_4_5.CraftServer;
|
|
||||||
import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
|
|
||||||
|
|
||||||
public class PlayerDataManager implements IPlayerDataManager {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Player loadPlayer(OfflinePlayer offline) {
|
|
||||||
// Ensure the player has data
|
|
||||||
if (offline == null || !offline.hasPlayedBefore()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
|
|
||||||
|
|
||||||
// Create an entity to load the player data
|
|
||||||
EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
|
|
||||||
new ItemInWorldManager(server.getWorldServer(0)));
|
|
||||||
|
|
||||||
// Get the bukkit entity
|
|
||||||
Player target = (entity == null) ? null : entity.getBukkitEntity();
|
|
||||||
if (target != null) {
|
|
||||||
// Load data
|
|
||||||
target.loadData();
|
|
||||||
}
|
|
||||||
// Return the entity
|
|
||||||
return target;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getPlayerDataID(OfflinePlayer player) {
|
|
||||||
return player.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public OfflinePlayer getPlayerByID(String identifier) {
|
|
||||||
OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
|
|
||||||
// Ensure player is a real player, otherwise return null
|
|
||||||
if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return player;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<? extends Player> getOnlinePlayers() {
|
|
||||||
return Arrays.asList(Bukkit.getOnlinePlayers());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static EntityPlayer getHandle(Player player) {
|
|
||||||
if (player instanceof CraftPlayer) {
|
|
||||||
return ((CraftPlayer) player).getHandle();
|
|
||||||
}
|
|
||||||
|
|
||||||
Server server = player.getServer();
|
|
||||||
EntityPlayer nmsPlayer = null;
|
|
||||||
|
|
||||||
if (server instanceof CraftServer) {
|
|
||||||
nmsPlayer = ((CraftServer) server).getHandle().f(player.getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nmsPlayer == null) {
|
|
||||||
// Could use reflection to examine fields, but it's honestly not worth the bother.
|
|
||||||
throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
|
|
||||||
}
|
|
||||||
|
|
||||||
return nmsPlayer;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_4_5;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_4_5.ContainerChest;
|
|
||||||
import net.minecraft.server.v1_4_5.EntityHuman;
|
|
||||||
import net.minecraft.server.v1_4_5.IInventory;
|
|
||||||
import net.minecraft.server.v1_4_5.ItemStack;
|
|
||||||
import net.minecraft.server.v1_4_5.PlayerInventory;
|
|
||||||
|
|
||||||
public class SilentContainerChest extends ContainerChest {
|
|
||||||
|
|
||||||
public SilentContainerChest(IInventory i1, IInventory i2) {
|
|
||||||
super(i1, i2);
|
|
||||||
// Send close signal
|
|
||||||
i2.f();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void b(EntityHuman entityHuman) {
|
|
||||||
// Don't send close signal twice, might screw up
|
|
||||||
PlayerInventory playerinventory = entityHuman.inventory;
|
|
||||||
|
|
||||||
if (playerinventory.getCarried() != null) {
|
|
||||||
ItemStack carried = playerinventory.getCarried();
|
|
||||||
playerinventory.setCarried(null);
|
|
||||||
entityHuman.drop(carried);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,129 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_4_5;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
|
|
||||||
import org.bukkit.entity.HumanEntity;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
import org.bukkit.inventory.InventoryHolder;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_4_5.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_4_5.IInventory;
|
|
||||||
import net.minecraft.server.v1_4_5.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_4_5.InventorySubcontainer;
|
|
||||||
import net.minecraft.server.v1_4_5.ItemStack;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_4_5.entity.CraftHumanEntity;
|
|
||||||
import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
|
|
||||||
import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
|
|
||||||
|
|
||||||
private final InventoryEnderChest enderChest;
|
|
||||||
private final CraftInventory inventory = new CraftInventory(this);
|
|
||||||
private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
|
|
||||||
private boolean playerOnline = false;
|
|
||||||
private CraftPlayer owner;
|
|
||||||
private int maxStack = MAX_STACK;
|
|
||||||
|
|
||||||
public SpecialEnderChest(Player player, Boolean online) {
|
|
||||||
super(((CraftPlayer) player).getHandle().getEnderChest().getName(),
|
|
||||||
((CraftPlayer) player).getHandle().getEnderChest().getSize());
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.enderChest = nmsPlayer.getEnderChest();
|
|
||||||
this.owner = nmsPlayer.getBukkitEntity();
|
|
||||||
this.items = enderChest.getContents();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Inventory getBukkitInventory() {
|
|
||||||
return inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOnline(Player player) {
|
|
||||||
if (!playerOnline) {
|
|
||||||
try {
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.owner = nmsPlayer.getBukkitEntity();
|
|
||||||
InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
|
|
||||||
Field field = playerEnderChest.getClass().getField("items");
|
|
||||||
field.setAccessible(true);
|
|
||||||
field.set(playerEnderChest, this.items);
|
|
||||||
} catch (Exception e) {}
|
|
||||||
playerOnline = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOffline() {
|
|
||||||
playerOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInUse() {
|
|
||||||
return !this.getViewers().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack[] getContents() {
|
|
||||||
return this.items;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onOpen(CraftHumanEntity who) {
|
|
||||||
transaction.add(who);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onClose(CraftHumanEntity who) {
|
|
||||||
transaction.remove(who);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<HumanEntity> getViewers() {
|
|
||||||
return transaction;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public InventoryHolder getOwner() {
|
|
||||||
return this.owner;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setMaxStackSize(int size) {
|
|
||||||
maxStack = size;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getMaxStackSize() {
|
|
||||||
return maxStack;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void update() {
|
|
||||||
super.update();
|
|
||||||
enderChest.update();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,235 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_4_5;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_4_5.ItemStack;
|
|
||||||
import net.minecraft.server.v1_4_5.PlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
|
|
||||||
|
|
||||||
private final ItemStack[] extra = new ItemStack[5];
|
|
||||||
private final CraftInventory inventory = new CraftInventory(this);
|
|
||||||
private boolean playerOnline = false;
|
|
||||||
|
|
||||||
public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
|
|
||||||
super(PlayerDataManager.getHandle(bukkitPlayer));
|
|
||||||
this.playerOnline = online;
|
|
||||||
this.items = player.inventory.items;
|
|
||||||
this.armor = player.inventory.armor;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Inventory getBukkitInventory() {
|
|
||||||
return inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOnline(Player player) {
|
|
||||||
if (!playerOnline) {
|
|
||||||
this.player = PlayerDataManager.getHandle(player);
|
|
||||||
this.player.inventory.items = this.items;
|
|
||||||
this.player.inventory.armor = this.armor;
|
|
||||||
playerOnline = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOffline() {
|
|
||||||
playerOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInUse() {
|
|
||||||
return !this.getViewers().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack[] getContents() {
|
|
||||||
ItemStack[] contents = new ItemStack[getSize()];
|
|
||||||
System.arraycopy(items, 0, contents, 0, items.length);
|
|
||||||
System.arraycopy(armor, 0, contents, items.length, armor.length);
|
|
||||||
return contents;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getSize() {
|
|
||||||
return super.getSize() + 5;
|
|
||||||
}
|
|
||||||
|
|
||||||
@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, 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) {
|
|
||||||
ItemStack itemstack = is[i];
|
|
||||||
|
|
||||||
is[i] = null;
|
|
||||||
return itemstack;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setItem(int i, ItemStack itemstack) {
|
|
||||||
ItemStack[] is = this.items;
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.armor;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
i = getReversedItemSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.extra;
|
|
||||||
}
|
|
||||||
else if (is == this.armor) {
|
|
||||||
i = getReversedArmorSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Effects
|
|
||||||
if (is == this.extra) {
|
|
||||||
player.drop(itemstack);
|
|
||||||
itemstack = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
is[i] = itemstack;
|
|
||||||
|
|
||||||
player.defaultContainer.b();
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedItemSlotNum(int i) {
|
|
||||||
if (i >= 27)
|
|
||||||
return i - 27;
|
|
||||||
else
|
|
||||||
return i + 9;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedArmorSlotNum(int i) {
|
|
||||||
if (i == 0)
|
|
||||||
return 3;
|
|
||||||
if (i == 1)
|
|
||||||
return 2;
|
|
||||||
if (i == 2)
|
|
||||||
return 1;
|
|
||||||
if (i == 3)
|
|
||||||
return 0;
|
|
||||||
else
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName() {
|
|
||||||
if (player.getName().length() > 16) {
|
|
||||||
return player.getName().substring(0, 16);
|
|
||||||
}
|
|
||||||
return player.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvinternal</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>openinvadapter1_4_6</artifactId>
|
|
||||||
<name>OpenInvAdapter1_4_6</name>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.bukkit</groupId>
|
|
||||||
<artifactId>craftbukkit</artifactId>
|
|
||||||
<version>1.4.6-R0.3</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvcommon</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@@ -1,168 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_4_6;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IAnySilentContainer;
|
|
||||||
|
|
||||||
import org.bukkit.ChatColor;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_4_6.AxisAlignedBB;
|
|
||||||
import net.minecraft.server.v1_4_6.BlockEnderChest;
|
|
||||||
import net.minecraft.server.v1_4_6.Container;
|
|
||||||
import net.minecraft.server.v1_4_6.EntityOcelot;
|
|
||||||
import net.minecraft.server.v1_4_6.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_4_6.IInventory;
|
|
||||||
import net.minecraft.server.v1_4_6.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_4_6.InventoryLargeChest;
|
|
||||||
import net.minecraft.server.v1_4_6.Packet100OpenWindow;
|
|
||||||
import net.minecraft.server.v1_4_6.TileEntityChest;
|
|
||||||
import net.minecraft.server.v1_4_6.TileEntityEnderChest;
|
|
||||||
import net.minecraft.server.v1_4_6.World;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_4_6.event.CraftEventFactory;
|
|
||||||
|
|
||||||
public class AnySilentContainer implements IAnySilentContainer {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnySilentContainer(org.bukkit.block.Block block) {
|
|
||||||
return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
|
|
||||||
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
World world = player.world;
|
|
||||||
|
|
||||||
if (block instanceof BlockEnderChest) {
|
|
||||||
// Ender chests are not blocked by ocelots.
|
|
||||||
return world.t(block.getX(), block.getY() + 1, block.getZ());
|
|
||||||
}
|
|
||||||
|
|
||||||
// If block or ocelot on top
|
|
||||||
if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
// If block next to chest is chest and has a block or ocelot on top
|
|
||||||
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
|
|
||||||
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
|
|
||||||
} else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
|
|
||||||
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
|
|
||||||
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
|
|
||||||
return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
|
|
||||||
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
|
|
||||||
return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isBlockedChest(World world, int x, int y, int z) {
|
|
||||||
return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean hasOcelotOnTop(World world, int x, int y, int z) {
|
|
||||||
for (Object localEntity : world.a(EntityOcelot.class,
|
|
||||||
AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
|
|
||||||
EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
|
|
||||||
if (localEntityOcelot.isSitting()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
|
|
||||||
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
|
|
||||||
// Silent ender chest is API-only
|
|
||||||
if (silentchest && block.getType() == Material.ENDER_CHEST) {
|
|
||||||
p.openInventory(p.getEnderChest());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
World world = player.world;
|
|
||||||
Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
if (tile == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tile instanceof TileEntityEnderChest) {
|
|
||||||
// Anychest ender chest. See net.minecraft.server.BlockEnderChest
|
|
||||||
InventoryEnderChest enderChest = player.getEnderChest();
|
|
||||||
enderChest.a((TileEntityEnderChest) tile);
|
|
||||||
player.openContainer(enderChest);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(tile instanceof IInventory)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
IInventory inventory = (IInventory) tile;
|
|
||||||
int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
|
|
||||||
} else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
|
|
||||||
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
|
|
||||||
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
// AnyChest only
|
|
||||||
if (!silentchest) {
|
|
||||||
player.openContainer(inventory);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// SilentChest
|
|
||||||
try {
|
|
||||||
// Call InventoryOpenEvent
|
|
||||||
Container container = new SilentContainerChest(player.inventory, inventory);
|
|
||||||
container = CraftEventFactory.callInventoryOpenEvent(player, container);
|
|
||||||
if (container == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Open window
|
|
||||||
int windowId = player.nextContainerCounter();
|
|
||||||
player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize()));
|
|
||||||
player.activeContainer = container;
|
|
||||||
player.activeContainer.windowId = windowId;
|
|
||||||
player.activeContainer.addSlotListener(player);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
p.sendMessage(ChatColor.RED + "Error while sending silent container.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_4_6;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IInventoryAccess;
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
import com.lishid.openinv.util.InternalAccessor;
|
|
||||||
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_4_6.IInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class InventoryAccess implements IInventoryAccess {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialPlayerInventory) {
|
|
||||||
return (SpecialPlayerInventory) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialEnderChest(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialEnderChest) {
|
|
||||||
return (SpecialEnderChest) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,101 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_4_6;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collection;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IPlayerDataManager;
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.OfflinePlayer;
|
|
||||||
import org.bukkit.Server;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_4_6.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_4_6.MinecraftServer;
|
|
||||||
import net.minecraft.server.v1_4_6.PlayerInteractManager;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_4_6.CraftServer;
|
|
||||||
import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer;
|
|
||||||
|
|
||||||
public class PlayerDataManager implements IPlayerDataManager {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Player loadPlayer(OfflinePlayer offline) {
|
|
||||||
// Ensure the player has data
|
|
||||||
if (offline == null || !offline.hasPlayedBefore()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
|
|
||||||
|
|
||||||
// Create an entity to load the player data
|
|
||||||
EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
|
|
||||||
new PlayerInteractManager(server.getWorldServer(0)));
|
|
||||||
|
|
||||||
// Get the bukkit entity
|
|
||||||
Player target = (entity == null) ? null : entity.getBukkitEntity();
|
|
||||||
if (target != null) {
|
|
||||||
// Load data
|
|
||||||
target.loadData();
|
|
||||||
}
|
|
||||||
// Return the entity
|
|
||||||
return target;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getPlayerDataID(OfflinePlayer player) {
|
|
||||||
return player.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public OfflinePlayer getPlayerByID(String identifier) {
|
|
||||||
OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
|
|
||||||
// Ensure player is a real player, otherwise return null
|
|
||||||
if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return player;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<? extends Player> getOnlinePlayers() {
|
|
||||||
return Arrays.asList(Bukkit.getOnlinePlayers());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static EntityPlayer getHandle(Player player) {
|
|
||||||
if (player instanceof CraftPlayer) {
|
|
||||||
return ((CraftPlayer) player).getHandle();
|
|
||||||
}
|
|
||||||
|
|
||||||
Server server = player.getServer();
|
|
||||||
EntityPlayer nmsPlayer = null;
|
|
||||||
|
|
||||||
if (server instanceof CraftServer) {
|
|
||||||
nmsPlayer = ((CraftServer) server).getHandle().f(player.getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nmsPlayer == null) {
|
|
||||||
// Could use reflection to examine fields, but it's honestly not worth the bother.
|
|
||||||
throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
|
|
||||||
}
|
|
||||||
|
|
||||||
return nmsPlayer;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_4_6;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_4_6.ContainerChest;
|
|
||||||
import net.minecraft.server.v1_4_6.EntityHuman;
|
|
||||||
import net.minecraft.server.v1_4_6.IInventory;
|
|
||||||
import net.minecraft.server.v1_4_6.ItemStack;
|
|
||||||
import net.minecraft.server.v1_4_6.PlayerInventory;
|
|
||||||
|
|
||||||
public class SilentContainerChest extends ContainerChest {
|
|
||||||
|
|
||||||
public SilentContainerChest(IInventory i1, IInventory i2) {
|
|
||||||
super(i1, i2);
|
|
||||||
// Send close signal
|
|
||||||
i2.f();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void b(EntityHuman entityHuman) {
|
|
||||||
// Don't send close signal twice, might screw up
|
|
||||||
PlayerInventory playerinventory = entityHuman.inventory;
|
|
||||||
|
|
||||||
if (playerinventory.getCarried() != null) {
|
|
||||||
ItemStack carried = playerinventory.getCarried();
|
|
||||||
playerinventory.setCarried(null);
|
|
||||||
entityHuman.drop(carried);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,129 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_4_6;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
|
|
||||||
import org.bukkit.entity.HumanEntity;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
import org.bukkit.inventory.InventoryHolder;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_4_6.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_4_6.IInventory;
|
|
||||||
import net.minecraft.server.v1_4_6.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_4_6.InventorySubcontainer;
|
|
||||||
import net.minecraft.server.v1_4_6.ItemStack;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_4_6.entity.CraftHumanEntity;
|
|
||||||
import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer;
|
|
||||||
import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
|
|
||||||
|
|
||||||
private final InventoryEnderChest enderChest;
|
|
||||||
private final CraftInventory inventory = new CraftInventory(this);
|
|
||||||
private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
|
|
||||||
private boolean playerOnline = false;
|
|
||||||
private CraftPlayer owner;
|
|
||||||
private int maxStack = MAX_STACK;
|
|
||||||
|
|
||||||
public SpecialEnderChest(Player player, Boolean online) {
|
|
||||||
super(((CraftPlayer) player).getHandle().getEnderChest().getName(),
|
|
||||||
((CraftPlayer) player).getHandle().getEnderChest().getSize());
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.enderChest = nmsPlayer.getEnderChest();
|
|
||||||
this.owner = nmsPlayer.getBukkitEntity();
|
|
||||||
this.items = enderChest.getContents();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Inventory getBukkitInventory() {
|
|
||||||
return inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOnline(Player player) {
|
|
||||||
if (!playerOnline) {
|
|
||||||
try {
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.owner = nmsPlayer.getBukkitEntity();
|
|
||||||
InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
|
|
||||||
Field field = playerEnderChest.getClass().getField("items");
|
|
||||||
field.setAccessible(true);
|
|
||||||
field.set(playerEnderChest, this.items);
|
|
||||||
} catch (Exception e) {}
|
|
||||||
playerOnline = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOffline() {
|
|
||||||
playerOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInUse() {
|
|
||||||
return !this.getViewers().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack[] getContents() {
|
|
||||||
return this.items;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onOpen(CraftHumanEntity who) {
|
|
||||||
transaction.add(who);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onClose(CraftHumanEntity who) {
|
|
||||||
transaction.remove(who);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<HumanEntity> getViewers() {
|
|
||||||
return transaction;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public InventoryHolder getOwner() {
|
|
||||||
return this.owner;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setMaxStackSize(int size) {
|
|
||||||
maxStack = size;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getMaxStackSize() {
|
|
||||||
return maxStack;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void update() {
|
|
||||||
super.update();
|
|
||||||
enderChest.update();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,227 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_4_6;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_4_6.ItemStack;
|
|
||||||
import net.minecraft.server.v1_4_6.PlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
|
|
||||||
|
|
||||||
private final ItemStack[] extra = new ItemStack[5];
|
|
||||||
private final CraftInventory inventory = new CraftInventory(this);
|
|
||||||
private boolean playerOnline = false;
|
|
||||||
|
|
||||||
public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
|
|
||||||
super(PlayerDataManager.getHandle(bukkitPlayer));
|
|
||||||
this.playerOnline = online;
|
|
||||||
this.items = player.inventory.items;
|
|
||||||
this.armor = player.inventory.armor;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Inventory getBukkitInventory() {
|
|
||||||
return inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOnline(Player player) {
|
|
||||||
if (!playerOnline) {
|
|
||||||
this.player = PlayerDataManager.getHandle(player);
|
|
||||||
this.player.inventory.items = this.items;
|
|
||||||
this.player.inventory.armor = this.armor;
|
|
||||||
playerOnline = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOffline() {
|
|
||||||
playerOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInUse() {
|
|
||||||
return !this.getViewers().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack[] getContents() {
|
|
||||||
ItemStack[] contents = new ItemStack[getSize()];
|
|
||||||
System.arraycopy(items, 0, contents, 0, items.length);
|
|
||||||
System.arraycopy(armor, 0, contents, items.length, armor.length);
|
|
||||||
return contents;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getSize() {
|
|
||||||
return super.getSize() + 5;
|
|
||||||
}
|
|
||||||
|
|
||||||
@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, 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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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) {
|
|
||||||
ItemStack itemstack = is[i];
|
|
||||||
|
|
||||||
is[i] = null;
|
|
||||||
return itemstack;
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setItem(int i, ItemStack itemstack) {
|
|
||||||
ItemStack[] is = this.items;
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.armor;
|
|
||||||
} else {
|
|
||||||
i = getReversedItemSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.extra;
|
|
||||||
} else if (is == this.armor) {
|
|
||||||
i = getReversedArmorSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Effects
|
|
||||||
if (is == this.extra) {
|
|
||||||
player.drop(itemstack);
|
|
||||||
itemstack = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
is[i] = itemstack;
|
|
||||||
|
|
||||||
player.defaultContainer.b();
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedItemSlotNum(int i) {
|
|
||||||
if (i >= 27) {
|
|
||||||
return i - 27;
|
|
||||||
}
|
|
||||||
return i + 9;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedArmorSlotNum(int i) {
|
|
||||||
if (i == 0) {
|
|
||||||
return 3;
|
|
||||||
}
|
|
||||||
if (i == 1) {
|
|
||||||
return 2;
|
|
||||||
}
|
|
||||||
if (i == 2) {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
if (i == 3) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName() {
|
|
||||||
if (player.getName().length() > 16) {
|
|
||||||
return player.getName().substring(0, 16);
|
|
||||||
}
|
|
||||||
return player.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvparent</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>openinvinternal</artifactId>
|
|
||||||
<name>OpenInvInternal</name>
|
|
||||||
|
|
||||||
<packaging>pom</packaging>
|
|
||||||
|
|
||||||
<profiles>
|
|
||||||
|
|
||||||
<profile>
|
|
||||||
<id>latest</id>
|
|
||||||
<modules>
|
|
||||||
<module>v1_11_R1</module>
|
|
||||||
</modules>
|
|
||||||
</profile>
|
|
||||||
|
|
||||||
<profile>
|
|
||||||
<id>modern</id>
|
|
||||||
<modules>
|
|
||||||
<module>v1_8_R1</module>
|
|
||||||
<module>v1_8_R2</module>
|
|
||||||
<module>v1_8_R3</module>
|
|
||||||
<module>v1_9_R1</module>
|
|
||||||
<module>v1_9_R2</module>
|
|
||||||
<module>v1_10_R1</module>
|
|
||||||
<module>v1_11_R1</module>
|
|
||||||
</modules>
|
|
||||||
</profile>
|
|
||||||
|
|
||||||
<profile>
|
|
||||||
<id>all</id>
|
|
||||||
<modules>
|
|
||||||
<module>1_4_5</module>
|
|
||||||
<module>1_4_6</module>
|
|
||||||
<module>v1_4_R1</module>
|
|
||||||
<!-- 1_5_R1 was never released -->
|
|
||||||
<module>v1_5_R2</module>
|
|
||||||
<module>v1_5_R3</module>
|
|
||||||
<!-- 1_6_R1 also had no tagged releases, remove? -->
|
|
||||||
<module>v1_6_R1</module>
|
|
||||||
<module>v1_6_R2</module>
|
|
||||||
<module>v1_6_R3</module>
|
|
||||||
<!-- TODO: Recompile CB for 1_7_R1 through 1_7_R4, currently using whatever jars worked -->
|
|
||||||
<module>v1_7_R1</module>
|
|
||||||
<module>v1_7_R2</module>
|
|
||||||
<module>v1_7_R3</module>
|
|
||||||
<module>v1_7_R4</module>
|
|
||||||
<module>v1_8_R1</module>
|
|
||||||
<module>v1_8_R2</module>
|
|
||||||
<module>v1_8_R3</module>
|
|
||||||
<module>v1_9_R1</module>
|
|
||||||
<module>v1_9_R2</module>
|
|
||||||
<module>v1_10_R1</module>
|
|
||||||
<module>v1_11_R1</module>
|
|
||||||
</modules>
|
|
||||||
</profile>
|
|
||||||
|
|
||||||
</profiles>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvinternal</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>openinvadapter1_10_R1</artifactId>
|
|
||||||
<name>OpenInvAdapter1_10_R1</name>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.spigotmc</groupId>
|
|
||||||
<artifactId>spigot</artifactId>
|
|
||||||
<version>1.10-R0.1-SNAPSHOT</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvcommon</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@@ -1,214 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_10_R1;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IAnySilentContainer;
|
|
||||||
|
|
||||||
import org.bukkit.ChatColor;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_10_R1.AxisAlignedBB;
|
|
||||||
import net.minecraft.server.v1_10_R1.Block;
|
|
||||||
import net.minecraft.server.v1_10_R1.BlockChest;
|
|
||||||
import net.minecraft.server.v1_10_R1.BlockEnderChest;
|
|
||||||
import net.minecraft.server.v1_10_R1.BlockPosition;
|
|
||||||
import net.minecraft.server.v1_10_R1.Container;
|
|
||||||
import net.minecraft.server.v1_10_R1.Entity;
|
|
||||||
import net.minecraft.server.v1_10_R1.EntityOcelot;
|
|
||||||
import net.minecraft.server.v1_10_R1.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_10_R1.EnumDirection;
|
|
||||||
import net.minecraft.server.v1_10_R1.ITileInventory;
|
|
||||||
import net.minecraft.server.v1_10_R1.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_10_R1.InventoryLargeChest;
|
|
||||||
import net.minecraft.server.v1_10_R1.PacketPlayOutOpenWindow;
|
|
||||||
import net.minecraft.server.v1_10_R1.StatisticList;
|
|
||||||
import net.minecraft.server.v1_10_R1.TileEntity;
|
|
||||||
import net.minecraft.server.v1_10_R1.TileEntityChest;
|
|
||||||
import net.minecraft.server.v1_10_R1.TileEntityEnderChest;
|
|
||||||
import net.minecraft.server.v1_10_R1.World;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_10_R1.event.CraftEventFactory;
|
|
||||||
|
|
||||||
public class AnySilentContainer implements IAnySilentContainer {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnySilentContainer(org.bukkit.block.Block block) {
|
|
||||||
return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block b) {
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
World world = player.world;
|
|
||||||
BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
|
|
||||||
Block block = world.getType(blockPosition).getBlock();
|
|
||||||
|
|
||||||
if (block instanceof BlockEnderChest) {
|
|
||||||
// Ender chests are not blocked by ocelots.
|
|
||||||
return world.getType(blockPosition.up()).m();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if chest is blocked or has an ocelot on top
|
|
||||||
if (isBlockedChest(world, blockPosition)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check for matching adjacent chests that are blocked or have an ocelot on top
|
|
||||||
for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
|
|
||||||
BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
|
|
||||||
Block localBlock = world.getType(localBlockPosition).getBlock();
|
|
||||||
|
|
||||||
if (localBlock != block) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
|
|
||||||
if (!(localTileEntity instanceof TileEntityChest)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isBlockedChest(world, localBlockPosition)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isBlockedChest(World world, BlockPosition blockPosition) {
|
|
||||||
// For reference, loot at net.minecraft.server.BlockChest
|
|
||||||
return world.getType(blockPosition.up()).l() || hasOcelotOnTop(world, blockPosition);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean hasOcelotOnTop(World world, BlockPosition blockPosition) {
|
|
||||||
for (Entity localEntity : world.a(EntityOcelot.class,
|
|
||||||
new AxisAlignedBB(blockPosition.getX(), blockPosition.getY() + 1,
|
|
||||||
blockPosition.getZ(), blockPosition.getX() + 1, blockPosition.getY() + 2,
|
|
||||||
blockPosition.getZ() + 1))) {
|
|
||||||
EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
|
|
||||||
if (localEntityOcelot.isSitting()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block b) {
|
|
||||||
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
|
|
||||||
// Silent ender chest is pretty much API-only
|
|
||||||
if (silentchest && b.getType() == Material.ENDER_CHEST) {
|
|
||||||
p.openInventory(p.getEnderChest());
|
|
||||||
player.b(StatisticList.X);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
World world = player.world;
|
|
||||||
BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
|
|
||||||
Object tile = world.getTileEntity(blockPosition);
|
|
||||||
|
|
||||||
if (tile == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tile instanceof TileEntityEnderChest) {
|
|
||||||
// Anychest ender chest. See net.minecraft.server.BlockEnderChest
|
|
||||||
InventoryEnderChest enderChest = player.getEnderChest();
|
|
||||||
enderChest.a((TileEntityEnderChest) tile);
|
|
||||||
player.openContainer(enderChest);
|
|
||||||
player.b(StatisticList.X);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(tile instanceof ITileInventory)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
ITileInventory tileInventory = (ITileInventory) tile;
|
|
||||||
Block block = world.getType(blockPosition).getBlock();
|
|
||||||
Container container = null;
|
|
||||||
|
|
||||||
if (block instanceof BlockChest) {
|
|
||||||
for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
|
|
||||||
BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
|
|
||||||
Block localBlock = world.getType(localBlockPosition).getBlock();
|
|
||||||
|
|
||||||
if (localBlock != block) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
|
|
||||||
if (!(localTileEntity instanceof TileEntityChest)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((localEnumDirection == EnumDirection.WEST) || (localEnumDirection == EnumDirection.NORTH)) {
|
|
||||||
tileInventory = new InventoryLargeChest("container.chestDouble",
|
|
||||||
(TileEntityChest) localTileEntity, tileInventory);
|
|
||||||
} else {
|
|
||||||
tileInventory = new InventoryLargeChest("container.chestDouble",
|
|
||||||
tileInventory, (TileEntityChest) localTileEntity);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
BlockChest blockChest = (BlockChest) block;
|
|
||||||
if (blockChest.g == BlockChest.Type.BASIC) {
|
|
||||||
player.b(StatisticList.ac);
|
|
||||||
} else if (blockChest.g == BlockChest.Type.TRAP) {
|
|
||||||
player.b(StatisticList.W);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (silentchest) {
|
|
||||||
container = new SilentContainerChest(player.inventory, tileInventory, player);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// AnyChest only - SilentChest not active or container unsupported
|
|
||||||
if (!silentchest || container == null) {
|
|
||||||
player.openContainer(tileInventory);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// SilentChest
|
|
||||||
try {
|
|
||||||
// Call InventoryOpenEvent
|
|
||||||
container = CraftEventFactory.callInventoryOpenEvent(player, container, false);
|
|
||||||
if (container == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Open window
|
|
||||||
int windowId = player.nextContainerCounter();
|
|
||||||
player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, tileInventory.getContainerName(), tileInventory.getScoreboardDisplayName(), tileInventory.getSize()));
|
|
||||||
player.activeContainer = container;
|
|
||||||
player.activeContainer.windowId = windowId;
|
|
||||||
player.activeContainer.addSlotListener(player);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
p.sendMessage(ChatColor.RED + "Error while sending silent container.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_10_R1;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IInventoryAccess;
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
import com.lishid.openinv.util.InternalAccessor;
|
|
||||||
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_10_R1.IInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class InventoryAccess implements IInventoryAccess {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialPlayerInventory) {
|
|
||||||
return (SpecialPlayerInventory) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialEnderChest(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialEnderChest) {
|
|
||||||
return (SpecialEnderChest) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,109 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_10_R1;
|
|
||||||
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IPlayerDataManager;
|
|
||||||
|
|
||||||
import com.mojang.authlib.GameProfile;
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.OfflinePlayer;
|
|
||||||
import org.bukkit.Server;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_10_R1.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_10_R1.MinecraftServer;
|
|
||||||
import net.minecraft.server.v1_10_R1.PlayerInteractManager;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
|
|
||||||
import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
|
|
||||||
|
|
||||||
public class PlayerDataManager implements IPlayerDataManager {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Player loadPlayer(OfflinePlayer offline) {
|
|
||||||
// Ensure player has data
|
|
||||||
if (offline == null || !offline.hasPlayedBefore()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create a profile and entity to load the player data
|
|
||||||
GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
|
|
||||||
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
|
|
||||||
EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
|
|
||||||
new PlayerInteractManager(server.getWorldServer(0)));
|
|
||||||
|
|
||||||
// Get the bukkit entity
|
|
||||||
Player target = (entity == null) ? null : entity.getBukkitEntity();
|
|
||||||
if (target != null) {
|
|
||||||
// Load data
|
|
||||||
target.loadData();
|
|
||||||
}
|
|
||||||
// Return the entity
|
|
||||||
return target;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getPlayerDataID(OfflinePlayer player) {
|
|
||||||
return player.getUniqueId().toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public OfflinePlayer getPlayerByID(String identifier) {
|
|
||||||
try {
|
|
||||||
UUID uuid = UUID.fromString(identifier);
|
|
||||||
OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
|
|
||||||
// Ensure player is a real player, otherwise return null
|
|
||||||
if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return player;
|
|
||||||
} catch (IllegalArgumentException e) {
|
|
||||||
// Not a UUID
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<? extends Player> getOnlinePlayers() {
|
|
||||||
return Bukkit.getOnlinePlayers();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static EntityPlayer getHandle(Player player) {
|
|
||||||
if (player instanceof CraftPlayer) {
|
|
||||||
return ((CraftPlayer) player).getHandle();
|
|
||||||
}
|
|
||||||
|
|
||||||
Server server = player.getServer();
|
|
||||||
EntityPlayer nmsPlayer = null;
|
|
||||||
|
|
||||||
if (server instanceof CraftServer) {
|
|
||||||
nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nmsPlayer == null) {
|
|
||||||
// Could use reflection to examine fields, but it's honestly not worth the bother.
|
|
||||||
throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
|
|
||||||
}
|
|
||||||
|
|
||||||
return nmsPlayer;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_10_R1;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_10_R1.ContainerChest;
|
|
||||||
import net.minecraft.server.v1_10_R1.EntityHuman;
|
|
||||||
import net.minecraft.server.v1_10_R1.IInventory;
|
|
||||||
import net.minecraft.server.v1_10_R1.ItemStack;
|
|
||||||
import net.minecraft.server.v1_10_R1.PlayerInventory;
|
|
||||||
|
|
||||||
public class SilentContainerChest extends ContainerChest {
|
|
||||||
|
|
||||||
public SilentContainerChest(IInventory i1, IInventory i2, EntityHuman e1) {
|
|
||||||
super(i1, i2, e1);
|
|
||||||
// Send close signal
|
|
||||||
i2.closeContainer(e1);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void b(EntityHuman entityHuman) {
|
|
||||||
// Don't send close signal twice, might screw up
|
|
||||||
PlayerInventory playerinventory = entityHuman.inventory;
|
|
||||||
|
|
||||||
if (playerinventory.getCarried() != null) {
|
|
||||||
ItemStack carried = playerinventory.getCarried();
|
|
||||||
playerinventory.setCarried(null);
|
|
||||||
entityHuman.drop(carried, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,104 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_10_R1;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.lang.reflect.Modifier;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_10_R1.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_10_R1.IInventory;
|
|
||||||
import net.minecraft.server.v1_10_R1.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_10_R1.InventorySubcontainer;
|
|
||||||
import net.minecraft.server.v1_10_R1.ItemStack;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
|
|
||||||
|
|
||||||
private final InventoryEnderChest enderChest;
|
|
||||||
private final CraftInventory inventory = new CraftInventory(this);
|
|
||||||
private boolean playerOnline = false;
|
|
||||||
|
|
||||||
public SpecialEnderChest(Player player, Boolean online) {
|
|
||||||
super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
|
|
||||||
PlayerDataManager.getHandle(player).getEnderChest().hasCustomName(),
|
|
||||||
PlayerDataManager.getHandle(player).getEnderChest().getSize());
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.enderChest = nmsPlayer.getEnderChest();
|
|
||||||
this.bukkitOwner = nmsPlayer.getBukkitEntity();
|
|
||||||
setItemArrays(this, enderChest.getContents());
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setItemArrays(InventorySubcontainer subcontainer, ItemStack[] items) {
|
|
||||||
try {
|
|
||||||
// Prepare to remove final modifier
|
|
||||||
Field modifiers = Field.class.getDeclaredField("modifiers");
|
|
||||||
modifiers.setAccessible(true);
|
|
||||||
// Access and replace main inventory array
|
|
||||||
Field field = InventorySubcontainer.class.getField("items");
|
|
||||||
modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
|
|
||||||
field.set(subcontainer, items);
|
|
||||||
} catch (NoSuchFieldException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
} catch (SecurityException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
} catch (IllegalArgumentException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
} catch (IllegalAccessException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Inventory getBukkitInventory() {
|
|
||||||
return inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOnline(Player player) {
|
|
||||||
if (!playerOnline) {
|
|
||||||
try {
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.bukkitOwner = nmsPlayer.getBukkitEntity();
|
|
||||||
setItemArrays(nmsPlayer.getEnderChest(), this.items);
|
|
||||||
} catch (Exception e) {}
|
|
||||||
playerOnline = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOffline() {
|
|
||||||
playerOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInUse() {
|
|
||||||
return !this.getViewers().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void update() {
|
|
||||||
super.update();
|
|
||||||
enderChest.update();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,294 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_10_R1;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.lang.reflect.Modifier;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_10_R1.EntityHuman;
|
|
||||||
import net.minecraft.server.v1_10_R1.ItemStack;
|
|
||||||
import net.minecraft.server.v1_10_R1.PlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
|
|
||||||
|
|
||||||
private final ItemStack[] extra = new ItemStack[4];
|
|
||||||
private final CraftInventory inventory = new CraftInventory(this);
|
|
||||||
private boolean playerOnline = false;
|
|
||||||
|
|
||||||
public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
|
|
||||||
super(PlayerDataManager.getHandle(bukkitPlayer));
|
|
||||||
this.playerOnline = online;
|
|
||||||
setItemArrays(this, player.inventory.items, player.inventory.armor, player.inventory.extraSlots);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setItemArrays(PlayerInventory inventory, ItemStack[] items, ItemStack[] armor,
|
|
||||||
ItemStack[] extraSlots) {
|
|
||||||
try {
|
|
||||||
// Prepare to remove final modifier
|
|
||||||
Field modifiers = Field.class.getDeclaredField("modifiers");
|
|
||||||
modifiers.setAccessible(true);
|
|
||||||
|
|
||||||
// Access and replace main inventory array
|
|
||||||
Field field = PlayerInventory.class.getField("items");
|
|
||||||
modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
|
|
||||||
field.set(inventory, items);
|
|
||||||
|
|
||||||
// Access and replace armor inventory array
|
|
||||||
field = PlayerInventory.class.getField("armor");
|
|
||||||
modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
|
|
||||||
field.set(inventory, armor);
|
|
||||||
|
|
||||||
// Access and replace offhand inventory array
|
|
||||||
field = PlayerInventory.class.getField("extraSlots");
|
|
||||||
modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
|
|
||||||
field.set(inventory, extraSlots);
|
|
||||||
|
|
||||||
// Access and replace array containing all inventory arrays
|
|
||||||
field = PlayerInventory.class.getDeclaredField("g");
|
|
||||||
field.setAccessible(true);
|
|
||||||
modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
|
|
||||||
field.set(inventory, new ItemStack[][] { items, armor, extraSlots });
|
|
||||||
} catch (NoSuchFieldException e) {
|
|
||||||
// Unable to set final fields to item arrays, we're screwed. Noisily fail.
|
|
||||||
e.printStackTrace();
|
|
||||||
} catch (IllegalArgumentException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
} catch (IllegalAccessException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Inventory getBukkitInventory() {
|
|
||||||
return inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOnline(Player player) {
|
|
||||||
if (!playerOnline) {
|
|
||||||
this.player = PlayerDataManager.getHandle(player);
|
|
||||||
setItemArrays(this.player.inventory, items, armor, extraSlots);
|
|
||||||
playerOnline = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOffline() {
|
|
||||||
playerOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInUse() {
|
|
||||||
return !this.getViewers().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack[] getContents() {
|
|
||||||
ItemStack[] contents = new ItemStack[getSize()];
|
|
||||||
System.arraycopy(items, 0, contents, 0, items.length);
|
|
||||||
System.arraycopy(armor, 0, contents, items.length, armor.length);
|
|
||||||
System.arraycopy(extraSlots, 0, contents, items.length + armor.length, extraSlots.length);
|
|
||||||
return contents;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getSize() {
|
|
||||||
return super.getSize() + 4;
|
|
||||||
}
|
|
||||||
|
|
||||||
@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.extraSlots;
|
|
||||||
} else if (is == this.armor) {
|
|
||||||
i = getReversedArmorSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.extra;
|
|
||||||
}
|
|
||||||
|
|
||||||
// extraSlots is, for now, just an array with length 1. No need for special handling.
|
|
||||||
|
|
||||||
return is[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack splitStack(int i, int j) {
|
|
||||||
ItemStack[] is = this.items;
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.armor;
|
|
||||||
} else {
|
|
||||||
i = getReversedItemSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.extraSlots;
|
|
||||||
} else if (is == this.armor) {
|
|
||||||
i = getReversedArmorSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.extra;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is[i] != null) {
|
|
||||||
ItemStack itemstack;
|
|
||||||
|
|
||||||
if (is[i].count <= j) {
|
|
||||||
itemstack = is[i];
|
|
||||||
is[i] = null;
|
|
||||||
return itemstack;
|
|
||||||
} else {
|
|
||||||
itemstack = is[i].cloneAndSubtract(j);
|
|
||||||
if (is[i].count == 0) {
|
|
||||||
is[i] = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return itemstack;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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.extraSlots;
|
|
||||||
} else if (is == this.armor) {
|
|
||||||
i = getReversedArmorSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.extra;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is[i] != null) {
|
|
||||||
ItemStack itemstack = is[i];
|
|
||||||
|
|
||||||
is[i] = null;
|
|
||||||
return itemstack;
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setItem(int i, ItemStack itemstack) {
|
|
||||||
ItemStack[] is = this.items;
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.armor;
|
|
||||||
} else {
|
|
||||||
i = getReversedItemSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.extraSlots;
|
|
||||||
} else if (is == this.armor) {
|
|
||||||
i = getReversedArmorSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.extra;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Effects
|
|
||||||
if (is == this.extra) {
|
|
||||||
player.drop(itemstack, true);
|
|
||||||
itemstack = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
is[i] = itemstack;
|
|
||||||
|
|
||||||
player.defaultContainer.b();
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedItemSlotNum(int i) {
|
|
||||||
if (i >= 27) {
|
|
||||||
return i - 27;
|
|
||||||
}
|
|
||||||
return i + 9;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedArmorSlotNum(int i) {
|
|
||||||
if (i == 0) {
|
|
||||||
return 3;
|
|
||||||
}
|
|
||||||
if (i == 1) {
|
|
||||||
return 2;
|
|
||||||
}
|
|
||||||
if (i == 2) {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
if (i == 3) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName() {
|
|
||||||
if (player.getName().length() > 16) {
|
|
||||||
return player.getName().substring(0, 16);
|
|
||||||
}
|
|
||||||
return player.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean a(EntityHuman entityhuman) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvinternal</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>openinvadapter1_11_R1</artifactId>
|
|
||||||
<name>OpenInvAdapter1_11_R1</name>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.spigotmc</groupId>
|
|
||||||
<artifactId>spigot</artifactId>
|
|
||||||
<version>1.11.2-R0.1-SNAPSHOT</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvcommon</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@@ -1,286 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_11_R1;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IAnySilentContainer;
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.ChatColor;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.block.BlockState;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.scheduler.BukkitRunnable;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_11_R1.AxisAlignedBB;
|
|
||||||
import net.minecraft.server.v1_11_R1.Block;
|
|
||||||
import net.minecraft.server.v1_11_R1.BlockChest;
|
|
||||||
import net.minecraft.server.v1_11_R1.BlockEnderChest;
|
|
||||||
import net.minecraft.server.v1_11_R1.BlockPosition;
|
|
||||||
import net.minecraft.server.v1_11_R1.BlockShulkerBox;
|
|
||||||
import net.minecraft.server.v1_11_R1.Container;
|
|
||||||
import net.minecraft.server.v1_11_R1.Entity;
|
|
||||||
import net.minecraft.server.v1_11_R1.EntityOcelot;
|
|
||||||
import net.minecraft.server.v1_11_R1.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_11_R1.EnumDirection;
|
|
||||||
import net.minecraft.server.v1_11_R1.IBlockData;
|
|
||||||
import net.minecraft.server.v1_11_R1.ITileInventory;
|
|
||||||
import net.minecraft.server.v1_11_R1.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_11_R1.InventoryLargeChest;
|
|
||||||
import net.minecraft.server.v1_11_R1.PacketPlayOutOpenWindow;
|
|
||||||
import net.minecraft.server.v1_11_R1.StatisticList;
|
|
||||||
import net.minecraft.server.v1_11_R1.TileEntity;
|
|
||||||
import net.minecraft.server.v1_11_R1.TileEntityChest;
|
|
||||||
import net.minecraft.server.v1_11_R1.TileEntityEnderChest;
|
|
||||||
import net.minecraft.server.v1_11_R1.TileEntityShulkerBox;
|
|
||||||
import net.minecraft.server.v1_11_R1.World;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_11_R1.event.CraftEventFactory;
|
|
||||||
|
|
||||||
public class AnySilentContainer implements IAnySilentContainer {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnySilentContainer(org.bukkit.block.Block block) {
|
|
||||||
if (block.getType() == Material.ENDER_CHEST) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
BlockState state = block.getState();
|
|
||||||
return state instanceof org.bukkit.block.Chest || state instanceof org.bukkit.block.ShulkerBox;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block b) {
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
World world = player.world;
|
|
||||||
BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
|
|
||||||
IBlockData blockData = world.getType(blockPosition);
|
|
||||||
Block block = blockData.getBlock();
|
|
||||||
|
|
||||||
if (block instanceof BlockShulkerBox) {
|
|
||||||
return isBlockedShulkerBox(world, blockPosition, blockData);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (block instanceof BlockEnderChest) {
|
|
||||||
// Ender chests are not blocked by ocelots.
|
|
||||||
return world.getType(blockPosition.up()).m();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if chest is blocked or has an ocelot on top
|
|
||||||
if (isBlockedChest(world, blockPosition)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check for matching adjacent chests that are blocked or have an ocelot on top
|
|
||||||
for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
|
|
||||||
BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
|
|
||||||
Block localBlock = world.getType(localBlockPosition).getBlock();
|
|
||||||
|
|
||||||
if (localBlock != block) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
|
|
||||||
if (!(localTileEntity instanceof TileEntityChest)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isBlockedChest(world, localBlockPosition)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isBlockedShulkerBox(World world, BlockPosition blockPosition, IBlockData blockData) {
|
|
||||||
// For reference, look at net.minecraft.server.BlockShulkerBox
|
|
||||||
TileEntity tile = world.getTileEntity(blockPosition);
|
|
||||||
|
|
||||||
if (!(tile instanceof TileEntityShulkerBox)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
EnumDirection enumDirection = blockData.get(BlockShulkerBox.a);
|
|
||||||
if (((TileEntityShulkerBox) tile).p() == TileEntityShulkerBox.AnimationPhase.CLOSED) {
|
|
||||||
AxisAlignedBB axisAlignedBB = Block.j.b(0.5F * enumDirection.getAdjacentX(),
|
|
||||||
0.5F * enumDirection.getAdjacentY(), 0.5F * enumDirection.getAdjacentZ())
|
|
||||||
.a(enumDirection.getAdjacentX(), enumDirection.getAdjacentY(),
|
|
||||||
enumDirection.getAdjacentZ());
|
|
||||||
|
|
||||||
try {
|
|
||||||
// 1.11.2
|
|
||||||
return world.a(axisAlignedBB.a(blockPosition.shift(enumDirection)));
|
|
||||||
} catch (NoSuchMethodError e) {
|
|
||||||
// 1.11
|
|
||||||
return world.b(axisAlignedBB.a(blockPosition.shift(enumDirection)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isBlockedChest(World world, BlockPosition blockPosition) {
|
|
||||||
// For reference, loot at net.minecraft.server.BlockChest
|
|
||||||
return world.getType(blockPosition.up()).m() || hasOcelotOnTop(world, blockPosition);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean hasOcelotOnTop(World world, BlockPosition blockPosition) {
|
|
||||||
for (Entity localEntity : world.a(EntityOcelot.class,
|
|
||||||
new AxisAlignedBB(blockPosition.getX(), blockPosition.getY() + 1,
|
|
||||||
blockPosition.getZ(), blockPosition.getX() + 1, blockPosition.getY() + 2,
|
|
||||||
blockPosition.getZ() + 1))) {
|
|
||||||
EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
|
|
||||||
if (localEntityOcelot.isSitting()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block b) {
|
|
||||||
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
|
|
||||||
// Silent ender chest is pretty much API-only
|
|
||||||
if (silentchest && b.getType() == Material.ENDER_CHEST) {
|
|
||||||
p.openInventory(p.getEnderChest());
|
|
||||||
player.b(StatisticList.getStatistic("stat.enderchestOpened"));
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
final World world = player.world;
|
|
||||||
final BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ());
|
|
||||||
final Object tile = world.getTileEntity(blockPosition);
|
|
||||||
|
|
||||||
if (tile == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tile instanceof TileEntityEnderChest) {
|
|
||||||
// Anychest ender chest. See net.minecraft.server.BlockEnderChest
|
|
||||||
InventoryEnderChest enderChest = player.getEnderChest();
|
|
||||||
enderChest.a((TileEntityEnderChest) tile);
|
|
||||||
player.openContainer(enderChest);
|
|
||||||
player.b(StatisticList.getStatistic("stat.enderchestOpened"));
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(tile instanceof ITileInventory)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
ITileInventory tileInventory = (ITileInventory) tile;
|
|
||||||
Block block = world.getType(blockPosition).getBlock();
|
|
||||||
Container container = null;
|
|
||||||
|
|
||||||
if (block instanceof BlockChest) {
|
|
||||||
for (EnumDirection localEnumDirection : EnumDirection.EnumDirectionLimit.HORIZONTAL) {
|
|
||||||
BlockPosition localBlockPosition = blockPosition.shift(localEnumDirection);
|
|
||||||
Block localBlock = world.getType(localBlockPosition).getBlock();
|
|
||||||
|
|
||||||
if (localBlock != block) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
TileEntity localTileEntity = world.getTileEntity(localBlockPosition);
|
|
||||||
if (!(localTileEntity instanceof TileEntityChest)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((localEnumDirection == EnumDirection.WEST) || (localEnumDirection == EnumDirection.NORTH)) {
|
|
||||||
tileInventory = new InventoryLargeChest("container.chestDouble",
|
|
||||||
(TileEntityChest) localTileEntity, tileInventory);
|
|
||||||
} else {
|
|
||||||
tileInventory = new InventoryLargeChest("container.chestDouble",
|
|
||||||
tileInventory, (TileEntityChest) localTileEntity);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
BlockChest blockChest = (BlockChest) block;
|
|
||||||
if (blockChest.g == BlockChest.Type.BASIC) {
|
|
||||||
player.b(StatisticList.getStatistic("stat.chestOpened"));
|
|
||||||
} else if (blockChest.g == BlockChest.Type.TRAP) {
|
|
||||||
player.b(StatisticList.getStatistic("stat.trappedChestTriggered"));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (silentchest) {
|
|
||||||
container = new SilentContainerChest(player.inventory, tileInventory, player);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (block instanceof BlockShulkerBox) {
|
|
||||||
player.b(StatisticList.getStatistic("stat.shulkerBoxOpened"));
|
|
||||||
|
|
||||||
if (silentchest && tileInventory instanceof TileEntityShulkerBox) {
|
|
||||||
// Set value to current + 1. Ensures consistency later when resetting.
|
|
||||||
SilentContainerShulkerBox.setOpenValue((TileEntityShulkerBox) tileInventory,
|
|
||||||
SilentContainerShulkerBox.getOpenValue((TileEntityShulkerBox) tileInventory) + 1);
|
|
||||||
|
|
||||||
container = new SilentContainerShulkerBox(player.inventory, tileInventory, player);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// AnyChest only - SilentChest not active or container unsupported
|
|
||||||
if (!silentchest || container == null) {
|
|
||||||
player.openContainer(tileInventory);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// SilentChest
|
|
||||||
try {
|
|
||||||
// Call InventoryOpenEvent
|
|
||||||
container = CraftEventFactory.callInventoryOpenEvent(player, container, false);
|
|
||||||
if (container == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Open window
|
|
||||||
int windowId = player.nextContainerCounter();
|
|
||||||
player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, tileInventory.getContainerName(), tileInventory.getScoreboardDisplayName(), tileInventory.getSize()));
|
|
||||||
player.activeContainer = container;
|
|
||||||
player.activeContainer.windowId = windowId;
|
|
||||||
player.activeContainer.addSlotListener(player);
|
|
||||||
|
|
||||||
// Special handling for shulker boxes - reset value for viewers to what it was initially.
|
|
||||||
if (tile instanceof TileEntityShulkerBox) {
|
|
||||||
new BukkitRunnable() {
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
// TODO hacky
|
|
||||||
Object tile = world.getTileEntity(blockPosition);
|
|
||||||
if (!(tile instanceof TileEntityShulkerBox)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
TileEntityShulkerBox box = (TileEntityShulkerBox) tile;
|
|
||||||
// Reset back - we added 1, and calling TileEntityShulkerBox#startOpen adds 1 more.
|
|
||||||
SilentContainerShulkerBox.setOpenValue(box,
|
|
||||||
SilentContainerShulkerBox.getOpenValue((TileEntityShulkerBox) tile) - 2);
|
|
||||||
}
|
|
||||||
}.runTaskLater(Bukkit.getPluginManager().getPlugin("OpenInv"), 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
p.sendMessage(ChatColor.RED + "Error while sending silent container.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_11_R1;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IInventoryAccess;
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
import com.lishid.openinv.util.InternalAccessor;
|
|
||||||
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_11_R1.IInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class InventoryAccess implements IInventoryAccess {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialPlayerInventory) {
|
|
||||||
return (SpecialPlayerInventory) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialEnderChest(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialEnderChest) {
|
|
||||||
return (SpecialEnderChest) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,109 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_11_R1;
|
|
||||||
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IPlayerDataManager;
|
|
||||||
|
|
||||||
import com.mojang.authlib.GameProfile;
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.OfflinePlayer;
|
|
||||||
import org.bukkit.Server;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_11_R1.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_11_R1.MinecraftServer;
|
|
||||||
import net.minecraft.server.v1_11_R1.PlayerInteractManager;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
|
|
||||||
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
|
|
||||||
|
|
||||||
public class PlayerDataManager implements IPlayerDataManager {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Player loadPlayer(OfflinePlayer offline) {
|
|
||||||
// Ensure player has data
|
|
||||||
if (offline == null || !offline.hasPlayedBefore()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create a profile and entity to load the player data
|
|
||||||
GameProfile profile = new GameProfile(offline.getUniqueId(), offline.getName());
|
|
||||||
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
|
|
||||||
EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
|
|
||||||
new PlayerInteractManager(server.getWorldServer(0)));
|
|
||||||
|
|
||||||
// Get the bukkit entity
|
|
||||||
Player target = (entity == null) ? null : entity.getBukkitEntity();
|
|
||||||
if (target != null) {
|
|
||||||
// Load data
|
|
||||||
target.loadData();
|
|
||||||
}
|
|
||||||
// Return the entity
|
|
||||||
return target;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getPlayerDataID(OfflinePlayer player) {
|
|
||||||
return player.getUniqueId().toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public OfflinePlayer getPlayerByID(String identifier) {
|
|
||||||
try {
|
|
||||||
UUID uuid = UUID.fromString(identifier);
|
|
||||||
OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
|
|
||||||
// Ensure player is a real player, otherwise return null
|
|
||||||
if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return player;
|
|
||||||
} catch (IllegalArgumentException e) {
|
|
||||||
// Not a UUID
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<? extends Player> getOnlinePlayers() {
|
|
||||||
return Bukkit.getOnlinePlayers();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static EntityPlayer getHandle(Player player) {
|
|
||||||
if (player instanceof CraftPlayer) {
|
|
||||||
return ((CraftPlayer) player).getHandle();
|
|
||||||
}
|
|
||||||
|
|
||||||
Server server = player.getServer();
|
|
||||||
EntityPlayer nmsPlayer = null;
|
|
||||||
|
|
||||||
if (server instanceof CraftServer) {
|
|
||||||
nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nmsPlayer == null) {
|
|
||||||
// Could use reflection to examine fields, but it's honestly not worth the bother.
|
|
||||||
throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
|
|
||||||
}
|
|
||||||
|
|
||||||
return nmsPlayer;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_11_R1;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_11_R1.ContainerChest;
|
|
||||||
import net.minecraft.server.v1_11_R1.EntityHuman;
|
|
||||||
import net.minecraft.server.v1_11_R1.IInventory;
|
|
||||||
import net.minecraft.server.v1_11_R1.ItemStack;
|
|
||||||
import net.minecraft.server.v1_11_R1.PlayerInventory;
|
|
||||||
|
|
||||||
public class SilentContainerChest extends ContainerChest {
|
|
||||||
|
|
||||||
public SilentContainerChest(PlayerInventory playerInventory, IInventory iInventory,
|
|
||||||
EntityHuman entityHuman) {
|
|
||||||
super(playerInventory, iInventory, entityHuman);
|
|
||||||
// Send close signal
|
|
||||||
iInventory.closeContainer(entityHuman);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void b(EntityHuman entityHuman) {
|
|
||||||
// Don't send close signal twice, might screw up
|
|
||||||
PlayerInventory playerinventory = entityHuman.inventory;
|
|
||||||
|
|
||||||
if (playerinventory.getCarried() != ItemStack.a) {
|
|
||||||
ItemStack carried = playerinventory.getCarried();
|
|
||||||
playerinventory.setCarried(ItemStack.a);
|
|
||||||
entityHuman.drop(carried, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
package com.lishid.openinv.internal.v1_11_R1;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_11_R1.ContainerShulkerBox;
|
|
||||||
import net.minecraft.server.v1_11_R1.EntityHuman;
|
|
||||||
import net.minecraft.server.v1_11_R1.IInventory;
|
|
||||||
import net.minecraft.server.v1_11_R1.ItemStack;
|
|
||||||
import net.minecraft.server.v1_11_R1.PlayerInventory;
|
|
||||||
import net.minecraft.server.v1_11_R1.TileEntityShulkerBox;
|
|
||||||
|
|
||||||
public class SilentContainerShulkerBox extends ContainerShulkerBox {
|
|
||||||
|
|
||||||
private static Field fieldShulkerActionData;
|
|
||||||
|
|
||||||
public SilentContainerShulkerBox(PlayerInventory playerInventory, IInventory iInventory,
|
|
||||||
EntityHuman entityHuman) {
|
|
||||||
super(playerInventory, iInventory, entityHuman);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void b(EntityHuman entityHuman) {
|
|
||||||
PlayerInventory playerinventory = entityHuman.inventory;
|
|
||||||
|
|
||||||
if (!playerinventory.getCarried().isEmpty()) {
|
|
||||||
entityHuman.drop(playerinventory.getCarried(), false);
|
|
||||||
playerinventory.setCarried(ItemStack.a);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Field exposeOpenStatus() throws NoSuchFieldException, SecurityException {
|
|
||||||
if (fieldShulkerActionData == null) {
|
|
||||||
fieldShulkerActionData = TileEntityShulkerBox.class.getDeclaredField("h");
|
|
||||||
fieldShulkerActionData.setAccessible(true);
|
|
||||||
}
|
|
||||||
return fieldShulkerActionData;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void setOpenValue(TileEntityShulkerBox tileShulkerBox, Object value) {
|
|
||||||
try {
|
|
||||||
exposeOpenStatus().set(tileShulkerBox, value);
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Integer getOpenValue(TileEntityShulkerBox tileShulkerBox) {
|
|
||||||
try {
|
|
||||||
return (Integer) exposeOpenStatus().get(tileShulkerBox);
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,105 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_11_R1;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.lang.reflect.Modifier;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_11_R1.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_11_R1.IInventory;
|
|
||||||
import net.minecraft.server.v1_11_R1.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_11_R1.InventorySubcontainer;
|
|
||||||
import net.minecraft.server.v1_11_R1.ItemStack;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
|
|
||||||
|
|
||||||
private final InventoryEnderChest enderChest;
|
|
||||||
private final CraftInventory inventory = new CraftInventory(this);
|
|
||||||
private boolean playerOnline = false;
|
|
||||||
|
|
||||||
public SpecialEnderChest(Player player, Boolean online) {
|
|
||||||
super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
|
|
||||||
PlayerDataManager.getHandle(player).getEnderChest().hasCustomName(),
|
|
||||||
PlayerDataManager.getHandle(player).getEnderChest().getSize());
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.enderChest = nmsPlayer.getEnderChest();
|
|
||||||
this.bukkitOwner = nmsPlayer.getBukkitEntity();
|
|
||||||
setItemLists(this, enderChest.getContents());
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setItemLists(InventorySubcontainer subcontainer, List<ItemStack> list) {
|
|
||||||
try {
|
|
||||||
// Prepare to remove final modifier
|
|
||||||
Field modifiers = Field.class.getDeclaredField("modifiers");
|
|
||||||
modifiers.setAccessible(true);
|
|
||||||
// Access and replace main inventory array
|
|
||||||
Field field = InventorySubcontainer.class.getField("items");
|
|
||||||
modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
|
|
||||||
field.set(subcontainer, list);
|
|
||||||
} catch (NoSuchFieldException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
} catch (SecurityException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
} catch (IllegalArgumentException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
} catch (IllegalAccessException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Inventory getBukkitInventory() {
|
|
||||||
return inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOnline(Player player) {
|
|
||||||
if (!playerOnline) {
|
|
||||||
try {
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.bukkitOwner = nmsPlayer.getBukkitEntity();
|
|
||||||
setItemLists(nmsPlayer.getEnderChest(), this.items);
|
|
||||||
} catch (Exception e) {}
|
|
||||||
playerOnline = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOffline() {
|
|
||||||
playerOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInUse() {
|
|
||||||
return !this.getViewers().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void update() {
|
|
||||||
super.update();
|
|
||||||
enderChest.update();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,259 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_11_R1;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.lang.reflect.Modifier;
|
|
||||||
import java.util.Arrays;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_11_R1.ContainerUtil;
|
|
||||||
import net.minecraft.server.v1_11_R1.EntityHuman;
|
|
||||||
import net.minecraft.server.v1_11_R1.ItemStack;
|
|
||||||
import net.minecraft.server.v1_11_R1.NonNullList;
|
|
||||||
import net.minecraft.server.v1_11_R1.PlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
|
|
||||||
|
|
||||||
private final CraftInventory inventory = new CraftInventory(this);
|
|
||||||
private boolean playerOnline = false;
|
|
||||||
|
|
||||||
public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
|
|
||||||
super(PlayerDataManager.getHandle(bukkitPlayer));
|
|
||||||
this.playerOnline = online;
|
|
||||||
setItemArrays(this, player.inventory.items, player.inventory.armor, player.inventory.extraSlots);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setItemArrays(PlayerInventory inventory, NonNullList<ItemStack> items,
|
|
||||||
NonNullList<ItemStack> armor, NonNullList<ItemStack> extraSlots) {
|
|
||||||
try {
|
|
||||||
// Prepare to remove final modifier
|
|
||||||
Field modifiers = Field.class.getDeclaredField("modifiers");
|
|
||||||
modifiers.setAccessible(true);
|
|
||||||
|
|
||||||
// Access and replace main inventory array
|
|
||||||
Field field = PlayerInventory.class.getField("items");
|
|
||||||
modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
|
|
||||||
field.set(inventory, items);
|
|
||||||
|
|
||||||
// Access and replace armor inventory array
|
|
||||||
field = PlayerInventory.class.getField("armor");
|
|
||||||
modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
|
|
||||||
field.set(inventory, armor);
|
|
||||||
|
|
||||||
// Access and replace offhand inventory array
|
|
||||||
field = PlayerInventory.class.getField("extraSlots");
|
|
||||||
modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
|
|
||||||
field.set(inventory, extraSlots);
|
|
||||||
|
|
||||||
// Access and replace array containing all inventory arrays
|
|
||||||
field = PlayerInventory.class.getDeclaredField("g");
|
|
||||||
field.setAccessible(true);
|
|
||||||
modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL);
|
|
||||||
field.set(inventory, Arrays.asList(new NonNullList[] { items, armor, extraSlots }));
|
|
||||||
} catch (NoSuchFieldException e) {
|
|
||||||
// Unable to set final fields to item arrays, we're screwed. Noisily fail.
|
|
||||||
e.printStackTrace();
|
|
||||||
} catch (IllegalArgumentException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
} catch (IllegalAccessException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Inventory getBukkitInventory() {
|
|
||||||
return inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOnline(Player player) {
|
|
||||||
if (!playerOnline) {
|
|
||||||
this.player = PlayerDataManager.getHandle(player);;
|
|
||||||
setItemArrays(this.player.inventory, items, armor, extraSlots);
|
|
||||||
playerOnline = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOffline() {
|
|
||||||
playerOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInUse() {
|
|
||||||
return !this.getViewers().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getSize() {
|
|
||||||
return super.getSize() + 4;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack getItem(int i) {
|
|
||||||
NonNullList<ItemStack> list = this.items;
|
|
||||||
|
|
||||||
if (i >= list.size()) {
|
|
||||||
i -= list.size();
|
|
||||||
list = this.armor;
|
|
||||||
} else {
|
|
||||||
i = getReversedItemSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= list.size()) {
|
|
||||||
i -= list.size();
|
|
||||||
list = this.extraSlots;
|
|
||||||
} else if (list == this.armor) {
|
|
||||||
i = getReversedArmorSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= list.size()) {
|
|
||||||
return ItemStack.a;
|
|
||||||
}
|
|
||||||
|
|
||||||
return list.get(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack splitStack(int i, int j) {
|
|
||||||
NonNullList<ItemStack> list = this.items;
|
|
||||||
|
|
||||||
if (i >= list.size()) {
|
|
||||||
i -= list.size();
|
|
||||||
list = this.armor;
|
|
||||||
} else {
|
|
||||||
i = getReversedItemSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= list.size()) {
|
|
||||||
i -= list.size();
|
|
||||||
list = this.extraSlots;
|
|
||||||
} else if (list == this.armor) {
|
|
||||||
i = getReversedArmorSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= list.size()) {
|
|
||||||
return ItemStack.a;
|
|
||||||
}
|
|
||||||
|
|
||||||
return list == null || list.get(i).isEmpty() ? ItemStack.a : ContainerUtil.a(list, i, j);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack splitWithoutUpdate(int i) {
|
|
||||||
NonNullList<ItemStack> list = this.items;
|
|
||||||
|
|
||||||
if (i >= list.size()) {
|
|
||||||
i -= list.size();
|
|
||||||
list = this.armor;
|
|
||||||
} else {
|
|
||||||
i = getReversedItemSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= list.size()) {
|
|
||||||
i -= list.size();
|
|
||||||
list = this.extraSlots;
|
|
||||||
} else if (list == this.armor) {
|
|
||||||
i = getReversedArmorSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= list.size()) {
|
|
||||||
return ItemStack.a;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (list != null && !list.get(i).isEmpty()) {
|
|
||||||
ItemStack itemstack = list.get(i);
|
|
||||||
|
|
||||||
list.set(i, ItemStack.a);
|
|
||||||
return itemstack;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ItemStack.a;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setItem(int i, ItemStack itemstack) {
|
|
||||||
NonNullList<ItemStack> list = this.items;
|
|
||||||
|
|
||||||
if (i >= list.size()) {
|
|
||||||
i -= list.size();
|
|
||||||
list = this.armor;
|
|
||||||
} else {
|
|
||||||
i = getReversedItemSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= list.size()) {
|
|
||||||
i -= list.size();
|
|
||||||
list = this.extraSlots;
|
|
||||||
} else if (list == this.armor) {
|
|
||||||
i = getReversedArmorSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= list.size()) {
|
|
||||||
player.drop(itemstack, true);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (list != null) {
|
|
||||||
list.set(i, itemstack);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedItemSlotNum(int i) {
|
|
||||||
if (i >= 27) {
|
|
||||||
return i - 27;
|
|
||||||
}
|
|
||||||
return i + 9;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedArmorSlotNum(int i) {
|
|
||||||
if (i == 0) {
|
|
||||||
return 3;
|
|
||||||
}
|
|
||||||
if (i == 1) {
|
|
||||||
return 2;
|
|
||||||
}
|
|
||||||
if (i == 2) {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
if (i == 3) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName() {
|
|
||||||
if (player.getName().length() > 16) {
|
|
||||||
return player.getName().substring(0, 16);
|
|
||||||
}
|
|
||||||
return player.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean a(EntityHuman entityhuman) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvinternal</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>openinvadapter1_4_R1</artifactId>
|
|
||||||
<name>OpenInvAdapter1_4_R1</name>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.bukkit</groupId>
|
|
||||||
<artifactId>craftbukkit</artifactId>
|
|
||||||
<version>1.4.7-R1.0</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvcommon</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@@ -1,168 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_4_R1;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IAnySilentContainer;
|
|
||||||
|
|
||||||
import org.bukkit.ChatColor;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_4_R1.AxisAlignedBB;
|
|
||||||
import net.minecraft.server.v1_4_R1.BlockEnderChest;
|
|
||||||
import net.minecraft.server.v1_4_R1.Container;
|
|
||||||
import net.minecraft.server.v1_4_R1.EntityOcelot;
|
|
||||||
import net.minecraft.server.v1_4_R1.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_4_R1.IInventory;
|
|
||||||
import net.minecraft.server.v1_4_R1.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_4_R1.InventoryLargeChest;
|
|
||||||
import net.minecraft.server.v1_4_R1.Packet100OpenWindow;
|
|
||||||
import net.minecraft.server.v1_4_R1.TileEntityChest;
|
|
||||||
import net.minecraft.server.v1_4_R1.TileEntityEnderChest;
|
|
||||||
import net.minecraft.server.v1_4_R1.World;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_4_R1.event.CraftEventFactory;
|
|
||||||
|
|
||||||
public class AnySilentContainer implements IAnySilentContainer {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnySilentContainer(org.bukkit.block.Block block) {
|
|
||||||
return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
|
|
||||||
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
World world = player.world;
|
|
||||||
|
|
||||||
if (block instanceof BlockEnderChest) {
|
|
||||||
// Ender chests are not blocked by ocelots.
|
|
||||||
return world.t(block.getX(), block.getY() + 1, block.getZ());
|
|
||||||
}
|
|
||||||
|
|
||||||
// If block or ocelot on top
|
|
||||||
if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
// If block next to chest is chest and has a block or ocelot on top
|
|
||||||
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
|
|
||||||
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
|
|
||||||
} else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
|
|
||||||
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
|
|
||||||
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
|
|
||||||
return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
|
|
||||||
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
|
|
||||||
return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isBlockedChest(World world, int x, int y, int z) {
|
|
||||||
return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean hasOcelotOnTop(World world, int x, int y, int z) {
|
|
||||||
for (Object localEntity : world.a(EntityOcelot.class,
|
|
||||||
AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
|
|
||||||
EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
|
|
||||||
if (localEntityOcelot.isSitting()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
|
|
||||||
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
|
|
||||||
// Silent ender chest is API-only
|
|
||||||
if (silentchest && block.getType() == Material.ENDER_CHEST) {
|
|
||||||
p.openInventory(p.getEnderChest());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
World world = player.world;
|
|
||||||
Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
if (tile == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tile instanceof TileEntityEnderChest) {
|
|
||||||
// Anychest ender chest. See net.minecraft.server.BlockEnderChest
|
|
||||||
InventoryEnderChest enderChest = player.getEnderChest();
|
|
||||||
enderChest.a((TileEntityEnderChest) tile);
|
|
||||||
player.openContainer(enderChest);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(tile instanceof IInventory)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
IInventory inventory = (IInventory) tile;
|
|
||||||
int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
|
|
||||||
} else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
|
|
||||||
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
|
|
||||||
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
// AnyChest only
|
|
||||||
if (!silentchest) {
|
|
||||||
player.openContainer(inventory);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// SilentChest
|
|
||||||
try {
|
|
||||||
// Call InventoryOpenEvent
|
|
||||||
Container container = new SilentContainerChest(player.inventory, inventory);
|
|
||||||
container = CraftEventFactory.callInventoryOpenEvent(player, container);
|
|
||||||
if (container == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Open window
|
|
||||||
int windowId = player.nextContainerCounter();
|
|
||||||
player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize()));
|
|
||||||
player.activeContainer = container;
|
|
||||||
player.activeContainer.windowId = windowId;
|
|
||||||
player.activeContainer.addSlotListener(player);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
p.sendMessage(ChatColor.RED + "Error while sending silent container.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_4_R1;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IInventoryAccess;
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
import com.lishid.openinv.util.InternalAccessor;
|
|
||||||
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_4_R1.IInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class InventoryAccess implements IInventoryAccess {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialPlayerInventory) {
|
|
||||||
return (SpecialPlayerInventory) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialEnderChest(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialEnderChest) {
|
|
||||||
return (SpecialEnderChest) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_4_R1;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collection;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IPlayerDataManager;
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.OfflinePlayer;
|
|
||||||
import org.bukkit.Server;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_4_R1.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_4_R1.MinecraftServer;
|
|
||||||
import net.minecraft.server.v1_4_R1.PlayerInteractManager;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_4_R1.CraftServer;
|
|
||||||
import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
|
|
||||||
|
|
||||||
|
|
||||||
public class PlayerDataManager implements IPlayerDataManager {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Player loadPlayer(OfflinePlayer offline) {
|
|
||||||
// Ensure the player has data
|
|
||||||
if (offline == null || !offline.hasPlayedBefore()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
|
|
||||||
|
|
||||||
// Create an entity to load the player data
|
|
||||||
EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
|
|
||||||
new PlayerInteractManager(server.getWorldServer(0)));
|
|
||||||
|
|
||||||
// Get the bukkit entity
|
|
||||||
Player target = (entity == null) ? null : entity.getBukkitEntity();
|
|
||||||
if (target != null) {
|
|
||||||
// Load data
|
|
||||||
target.loadData();
|
|
||||||
}
|
|
||||||
// Return the entity
|
|
||||||
return target;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getPlayerDataID(OfflinePlayer player) {
|
|
||||||
return player.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public OfflinePlayer getPlayerByID(String identifier) {
|
|
||||||
OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
|
|
||||||
// Ensure player is a real player, otherwise return null
|
|
||||||
if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return player;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<? extends Player> getOnlinePlayers() {
|
|
||||||
return Arrays.asList(Bukkit.getOnlinePlayers());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static EntityPlayer getHandle(Player player) {
|
|
||||||
if (player instanceof CraftPlayer) {
|
|
||||||
return ((CraftPlayer) player).getHandle();
|
|
||||||
}
|
|
||||||
|
|
||||||
Server server = player.getServer();
|
|
||||||
EntityPlayer nmsPlayer = null;
|
|
||||||
|
|
||||||
if (server instanceof CraftServer) {
|
|
||||||
nmsPlayer = ((CraftServer) server).getHandle().f(player.getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nmsPlayer == null) {
|
|
||||||
// Could use reflection to examine fields, but it's honestly not worth the bother.
|
|
||||||
throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
|
|
||||||
}
|
|
||||||
|
|
||||||
return nmsPlayer;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_4_R1;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_4_R1.ContainerChest;
|
|
||||||
import net.minecraft.server.v1_4_R1.EntityHuman;
|
|
||||||
import net.minecraft.server.v1_4_R1.IInventory;
|
|
||||||
import net.minecraft.server.v1_4_R1.ItemStack;
|
|
||||||
import net.minecraft.server.v1_4_R1.PlayerInventory;
|
|
||||||
|
|
||||||
public class SilentContainerChest extends ContainerChest {
|
|
||||||
|
|
||||||
public SilentContainerChest(IInventory i1, IInventory i2) {
|
|
||||||
super(i1, i2);
|
|
||||||
// Send close signal
|
|
||||||
i2.f();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void b(EntityHuman entityHuman) {
|
|
||||||
// Don't send close signal twice, might screw up
|
|
||||||
PlayerInventory playerinventory = entityHuman.inventory;
|
|
||||||
|
|
||||||
if (playerinventory.getCarried() != null) {
|
|
||||||
ItemStack carried = playerinventory.getCarried();
|
|
||||||
playerinventory.setCarried(null);
|
|
||||||
entityHuman.drop(carried);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,129 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_4_R1;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
|
|
||||||
import org.bukkit.entity.HumanEntity;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
import org.bukkit.inventory.InventoryHolder;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_4_R1.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_4_R1.IInventory;
|
|
||||||
import net.minecraft.server.v1_4_R1.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_4_R1.InventorySubcontainer;
|
|
||||||
import net.minecraft.server.v1_4_R1.ItemStack;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_4_R1.entity.CraftHumanEntity;
|
|
||||||
import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
|
|
||||||
import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
|
|
||||||
|
|
||||||
private final InventoryEnderChest enderChest;
|
|
||||||
private final CraftInventory inventory = new CraftInventory(this);
|
|
||||||
private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
|
|
||||||
private boolean playerOnline = false;
|
|
||||||
private CraftPlayer owner;
|
|
||||||
private int maxStack = MAX_STACK;
|
|
||||||
|
|
||||||
public SpecialEnderChest(Player player, Boolean online) {
|
|
||||||
super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
|
|
||||||
PlayerDataManager.getHandle(player).getEnderChest().getSize());
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.enderChest = nmsPlayer.getEnderChest();
|
|
||||||
this.owner = nmsPlayer.getBukkitEntity();
|
|
||||||
this.items = enderChest.getContents();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Inventory getBukkitInventory() {
|
|
||||||
return inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOnline(Player player) {
|
|
||||||
if (!playerOnline) {
|
|
||||||
try {
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.owner = nmsPlayer.getBukkitEntity();
|
|
||||||
InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
|
|
||||||
Field field = playerEnderChest.getClass().getField("items");
|
|
||||||
field.setAccessible(true);
|
|
||||||
field.set(playerEnderChest, this.items);
|
|
||||||
} catch (Exception e) {}
|
|
||||||
playerOnline = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOffline() {
|
|
||||||
playerOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInUse() {
|
|
||||||
return !this.getViewers().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack[] getContents() {
|
|
||||||
return this.items;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onOpen(CraftHumanEntity who) {
|
|
||||||
transaction.add(who);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onClose(CraftHumanEntity who) {
|
|
||||||
transaction.remove(who);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<HumanEntity> getViewers() {
|
|
||||||
return transaction;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public InventoryHolder getOwner() {
|
|
||||||
return this.owner;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setMaxStackSize(int size) {
|
|
||||||
maxStack = size;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getMaxStackSize() {
|
|
||||||
return maxStack;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void update() {
|
|
||||||
super.update();
|
|
||||||
enderChest.update();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,235 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_4_R1;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_4_R1.ItemStack;
|
|
||||||
import net.minecraft.server.v1_4_R1.PlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
|
|
||||||
|
|
||||||
private final ItemStack[] extra = new ItemStack[5];
|
|
||||||
private final CraftInventory inventory = new CraftInventory(this);
|
|
||||||
private boolean playerOnline = false;
|
|
||||||
|
|
||||||
public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
|
|
||||||
super(PlayerDataManager.getHandle(bukkitPlayer));
|
|
||||||
this.playerOnline = online;
|
|
||||||
this.items = player.inventory.items;
|
|
||||||
this.armor = player.inventory.armor;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Inventory getBukkitInventory() {
|
|
||||||
return inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOnline(Player player) {
|
|
||||||
if (!playerOnline) {
|
|
||||||
this.player = PlayerDataManager.getHandle(player);
|
|
||||||
this.player.inventory.items = this.items;
|
|
||||||
this.player.inventory.armor = this.armor;
|
|
||||||
playerOnline = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOffline() {
|
|
||||||
playerOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInUse() {
|
|
||||||
return !this.getViewers().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack[] getContents() {
|
|
||||||
ItemStack[] contents = new ItemStack[getSize()];
|
|
||||||
System.arraycopy(items, 0, contents, 0, items.length);
|
|
||||||
System.arraycopy(armor, 0, contents, items.length, armor.length);
|
|
||||||
return contents;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getSize() {
|
|
||||||
return super.getSize() + 5;
|
|
||||||
}
|
|
||||||
|
|
||||||
@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, 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) {
|
|
||||||
ItemStack itemstack = is[i];
|
|
||||||
|
|
||||||
is[i] = null;
|
|
||||||
return itemstack;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setItem(int i, ItemStack itemstack) {
|
|
||||||
ItemStack[] is = this.items;
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.armor;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
i = getReversedItemSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.extra;
|
|
||||||
}
|
|
||||||
else if (is == this.armor) {
|
|
||||||
i = getReversedArmorSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Effects
|
|
||||||
if (is == this.extra) {
|
|
||||||
player.drop(itemstack);
|
|
||||||
itemstack = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
is[i] = itemstack;
|
|
||||||
|
|
||||||
player.defaultContainer.b();
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedItemSlotNum(int i) {
|
|
||||||
if (i >= 27)
|
|
||||||
return i - 27;
|
|
||||||
else
|
|
||||||
return i + 9;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedArmorSlotNum(int i) {
|
|
||||||
if (i == 0)
|
|
||||||
return 3;
|
|
||||||
if (i == 1)
|
|
||||||
return 2;
|
|
||||||
if (i == 2)
|
|
||||||
return 1;
|
|
||||||
if (i == 3)
|
|
||||||
return 0;
|
|
||||||
else
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName() {
|
|
||||||
if (player.getName().length() > 16) {
|
|
||||||
return player.getName().substring(0, 16);
|
|
||||||
}
|
|
||||||
return player.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvinternal</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>openinvadapter1_5_R2</artifactId>
|
|
||||||
<name>OpenInvAdapter1_5_R2</name>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.bukkit</groupId>
|
|
||||||
<artifactId>craftbukkit</artifactId>
|
|
||||||
<version>1.5.1-R0.2</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvcommon</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@@ -1,168 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_5_R2;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IAnySilentContainer;
|
|
||||||
|
|
||||||
import org.bukkit.ChatColor;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_5_R2.AxisAlignedBB;
|
|
||||||
import net.minecraft.server.v1_5_R2.BlockEnderChest;
|
|
||||||
import net.minecraft.server.v1_5_R2.Container;
|
|
||||||
import net.minecraft.server.v1_5_R2.EntityOcelot;
|
|
||||||
import net.minecraft.server.v1_5_R2.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_5_R2.IInventory;
|
|
||||||
import net.minecraft.server.v1_5_R2.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_5_R2.InventoryLargeChest;
|
|
||||||
import net.minecraft.server.v1_5_R2.Packet100OpenWindow;
|
|
||||||
import net.minecraft.server.v1_5_R2.TileEntityChest;
|
|
||||||
import net.minecraft.server.v1_5_R2.TileEntityEnderChest;
|
|
||||||
import net.minecraft.server.v1_5_R2.World;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_5_R2.event.CraftEventFactory;
|
|
||||||
|
|
||||||
public class AnySilentContainer implements IAnySilentContainer {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnySilentContainer(org.bukkit.block.Block block) {
|
|
||||||
return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
|
|
||||||
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
World world = player.world;
|
|
||||||
|
|
||||||
if (block instanceof BlockEnderChest) {
|
|
||||||
// Ender chests are not blocked by ocelots.
|
|
||||||
return world.t(block.getX(), block.getY() + 1, block.getZ());
|
|
||||||
}
|
|
||||||
|
|
||||||
// If block or ocelot on top
|
|
||||||
if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
// If block next to chest is chest and has a block or ocelot on top
|
|
||||||
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
|
|
||||||
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
|
|
||||||
} else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
|
|
||||||
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
|
|
||||||
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
|
|
||||||
return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
|
|
||||||
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
|
|
||||||
return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isBlockedChest(World world, int x, int y, int z) {
|
|
||||||
return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean hasOcelotOnTop(World world, int x, int y, int z) {
|
|
||||||
for (Object localEntity : world.a(EntityOcelot.class,
|
|
||||||
AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
|
|
||||||
EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
|
|
||||||
if (localEntityOcelot.isSitting()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
|
|
||||||
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
|
|
||||||
// Silent ender chest is API-only
|
|
||||||
if (silentchest && block.getType() == Material.ENDER_CHEST) {
|
|
||||||
p.openInventory(p.getEnderChest());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
World world = player.world;
|
|
||||||
Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
if (tile == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tile instanceof TileEntityEnderChest) {
|
|
||||||
// Anychest ender chest. See net.minecraft.server.BlockEnderChest
|
|
||||||
InventoryEnderChest enderChest = player.getEnderChest();
|
|
||||||
enderChest.a((TileEntityEnderChest) tile);
|
|
||||||
player.openContainer(enderChest);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(tile instanceof IInventory)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
IInventory inventory = (IInventory) tile;
|
|
||||||
int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
|
|
||||||
} else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
|
|
||||||
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
|
|
||||||
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
// AnyChest only
|
|
||||||
if (!silentchest) {
|
|
||||||
player.openContainer(inventory);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// SilentChest
|
|
||||||
try {
|
|
||||||
// Call InventoryOpenEvent
|
|
||||||
Container container = new SilentContainerChest(player.inventory, inventory);
|
|
||||||
container = CraftEventFactory.callInventoryOpenEvent(player, container);
|
|
||||||
if (container == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Open window
|
|
||||||
int windowId = player.nextContainerCounter();
|
|
||||||
player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize(), true));
|
|
||||||
player.activeContainer = container;
|
|
||||||
player.activeContainer.windowId = windowId;
|
|
||||||
player.activeContainer.addSlotListener(player);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
p.sendMessage(ChatColor.RED + "Error while sending silent container.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_5_R2;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IInventoryAccess;
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
import com.lishid.openinv.util.InternalAccessor;
|
|
||||||
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_5_R2.IInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class InventoryAccess implements IInventoryAccess {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialPlayerInventory) {
|
|
||||||
return (SpecialPlayerInventory) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialEnderChest(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialEnderChest) {
|
|
||||||
return (SpecialEnderChest) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,101 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_5_R2;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collection;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IPlayerDataManager;
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.OfflinePlayer;
|
|
||||||
import org.bukkit.Server;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_5_R2.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_5_R2.MinecraftServer;
|
|
||||||
import net.minecraft.server.v1_5_R2.PlayerInteractManager;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_5_R2.CraftServer;
|
|
||||||
import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
|
|
||||||
|
|
||||||
public class PlayerDataManager implements IPlayerDataManager {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Player loadPlayer(OfflinePlayer offline) {
|
|
||||||
// Ensure the player has data
|
|
||||||
if (offline == null || !offline.hasPlayedBefore()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
|
|
||||||
|
|
||||||
// Create an entity to load the player data
|
|
||||||
EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
|
|
||||||
new PlayerInteractManager(server.getWorldServer(0)));
|
|
||||||
|
|
||||||
// Get the bukkit entity
|
|
||||||
Player target = (entity == null) ? null : entity.getBukkitEntity();
|
|
||||||
if (target != null) {
|
|
||||||
// Load data
|
|
||||||
target.loadData();
|
|
||||||
}
|
|
||||||
// Return the entity
|
|
||||||
return target;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getPlayerDataID(OfflinePlayer player) {
|
|
||||||
return player.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public OfflinePlayer getPlayerByID(String identifier) {
|
|
||||||
OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
|
|
||||||
// Ensure player is a real player, otherwise return null
|
|
||||||
if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return player;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<? extends Player> getOnlinePlayers() {
|
|
||||||
return Arrays.asList(Bukkit.getOnlinePlayers());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static EntityPlayer getHandle(Player player) {
|
|
||||||
if (player instanceof CraftPlayer) {
|
|
||||||
return ((CraftPlayer) player).getHandle();
|
|
||||||
}
|
|
||||||
|
|
||||||
Server server = player.getServer();
|
|
||||||
EntityPlayer nmsPlayer = null;
|
|
||||||
|
|
||||||
if (server instanceof CraftServer) {
|
|
||||||
nmsPlayer = ((CraftServer) server).getHandle().f(player.getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nmsPlayer == null) {
|
|
||||||
// Could use reflection to examine fields, but it's honestly not worth the bother.
|
|
||||||
throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
|
|
||||||
}
|
|
||||||
|
|
||||||
return nmsPlayer;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_5_R2;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_5_R2.ContainerChest;
|
|
||||||
import net.minecraft.server.v1_5_R2.EntityHuman;
|
|
||||||
import net.minecraft.server.v1_5_R2.IInventory;
|
|
||||||
import net.minecraft.server.v1_5_R2.ItemStack;
|
|
||||||
import net.minecraft.server.v1_5_R2.PlayerInventory;
|
|
||||||
|
|
||||||
public class SilentContainerChest extends ContainerChest {
|
|
||||||
|
|
||||||
public SilentContainerChest(IInventory i1, IInventory i2) {
|
|
||||||
super(i1, i2);
|
|
||||||
// Send close signal
|
|
||||||
i2.g();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void b(EntityHuman entityHuman) {
|
|
||||||
// Don't send close signal twice, might screw up
|
|
||||||
PlayerInventory playerinventory = entityHuman.inventory;
|
|
||||||
|
|
||||||
if (playerinventory.getCarried() != null) {
|
|
||||||
ItemStack carried = playerinventory.getCarried();
|
|
||||||
playerinventory.setCarried(null);
|
|
||||||
entityHuman.drop(carried);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,130 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_5_R2;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
|
|
||||||
import org.bukkit.entity.HumanEntity;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
import org.bukkit.inventory.InventoryHolder;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_5_R2.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_5_R2.IInventory;
|
|
||||||
import net.minecraft.server.v1_5_R2.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_5_R2.InventorySubcontainer;
|
|
||||||
import net.minecraft.server.v1_5_R2.ItemStack;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_5_R2.entity.CraftHumanEntity;
|
|
||||||
import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
|
|
||||||
import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
|
|
||||||
|
|
||||||
private final InventoryEnderChest enderChest;
|
|
||||||
private final CraftInventory inventory = new CraftInventory(this);
|
|
||||||
private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
|
|
||||||
private boolean playerOnline = false;
|
|
||||||
private CraftPlayer owner;
|
|
||||||
private int maxStack = MAX_STACK;
|
|
||||||
|
|
||||||
public SpecialEnderChest(Player player, Boolean online) {
|
|
||||||
super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
|
|
||||||
PlayerDataManager.getHandle(player).getEnderChest().c(),
|
|
||||||
PlayerDataManager.getHandle(player).getEnderChest().getSize());
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.enderChest = nmsPlayer.getEnderChest();
|
|
||||||
this.owner = nmsPlayer.getBukkitEntity();
|
|
||||||
this.items = enderChest.getContents();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Inventory getBukkitInventory() {
|
|
||||||
return inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOnline(Player player) {
|
|
||||||
if (!playerOnline) {
|
|
||||||
try {
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.owner = nmsPlayer.getBukkitEntity();
|
|
||||||
InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
|
|
||||||
Field field = playerEnderChest.getClass().getField("items");
|
|
||||||
field.setAccessible(true);
|
|
||||||
field.set(playerEnderChest, this.items);
|
|
||||||
} catch (Exception e) {}
|
|
||||||
playerOnline = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOffline() {
|
|
||||||
playerOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInUse() {
|
|
||||||
return !this.getViewers().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack[] getContents() {
|
|
||||||
return this.items;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onOpen(CraftHumanEntity who) {
|
|
||||||
transaction.add(who);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onClose(CraftHumanEntity who) {
|
|
||||||
transaction.remove(who);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<HumanEntity> getViewers() {
|
|
||||||
return transaction;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public InventoryHolder getOwner() {
|
|
||||||
return this.owner;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setMaxStackSize(int size) {
|
|
||||||
maxStack = size;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getMaxStackSize() {
|
|
||||||
return maxStack;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void update() {
|
|
||||||
super.update();
|
|
||||||
enderChest.update();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,227 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_5_R2;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_5_R2.ItemStack;
|
|
||||||
import net.minecraft.server.v1_5_R2.PlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
|
|
||||||
|
|
||||||
private final ItemStack[] extra = new ItemStack[5];
|
|
||||||
private final CraftInventory inventory = new CraftInventory(this);
|
|
||||||
private boolean playerOnline = false;
|
|
||||||
|
|
||||||
public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
|
|
||||||
super(PlayerDataManager.getHandle(bukkitPlayer));
|
|
||||||
this.playerOnline = online;
|
|
||||||
this.items = player.inventory.items;
|
|
||||||
this.armor = player.inventory.armor;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Inventory getBukkitInventory() {
|
|
||||||
return inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOnline(Player player) {
|
|
||||||
if (!playerOnline) {
|
|
||||||
this.player = PlayerDataManager.getHandle(player);
|
|
||||||
this.player.inventory.items = this.items;
|
|
||||||
this.player.inventory.armor = this.armor;
|
|
||||||
playerOnline = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOffline() {
|
|
||||||
playerOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInUse() {
|
|
||||||
return !this.getViewers().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack[] getContents() {
|
|
||||||
ItemStack[] contents = new ItemStack[getSize()];
|
|
||||||
System.arraycopy(items, 0, contents, 0, items.length);
|
|
||||||
System.arraycopy(armor, 0, contents, items.length, armor.length);
|
|
||||||
return contents;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getSize() {
|
|
||||||
return super.getSize() + 5;
|
|
||||||
}
|
|
||||||
|
|
||||||
@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, 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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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) {
|
|
||||||
ItemStack itemstack = is[i];
|
|
||||||
|
|
||||||
is[i] = null;
|
|
||||||
return itemstack;
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setItem(int i, ItemStack itemstack) {
|
|
||||||
ItemStack[] is = this.items;
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.armor;
|
|
||||||
} else {
|
|
||||||
i = getReversedItemSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.extra;
|
|
||||||
} else if (is == this.armor) {
|
|
||||||
i = getReversedArmorSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Effects
|
|
||||||
if (is == this.extra) {
|
|
||||||
player.drop(itemstack);
|
|
||||||
itemstack = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
is[i] = itemstack;
|
|
||||||
|
|
||||||
player.defaultContainer.b();
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedItemSlotNum(int i) {
|
|
||||||
if (i >= 27) {
|
|
||||||
return i - 27;
|
|
||||||
}
|
|
||||||
return i + 9;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedArmorSlotNum(int i) {
|
|
||||||
if (i == 0) {
|
|
||||||
return 3;
|
|
||||||
}
|
|
||||||
if (i == 1) {
|
|
||||||
return 2;
|
|
||||||
}
|
|
||||||
if (i == 2) {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
if (i == 3) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName() {
|
|
||||||
if (player.getName().length() > 16) {
|
|
||||||
return player.getName().substring(0, 16);
|
|
||||||
}
|
|
||||||
return player.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvinternal</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>openinvadapter1_5_R3</artifactId>
|
|
||||||
<name>OpenInvAdapter1_5_R3</name>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.bukkit</groupId>
|
|
||||||
<artifactId>craftbukkit</artifactId>
|
|
||||||
<version>1.5.2-R1.0</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvcommon</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@@ -1,168 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_5_R3;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IAnySilentContainer;
|
|
||||||
|
|
||||||
import org.bukkit.ChatColor;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_5_R3.AxisAlignedBB;
|
|
||||||
import net.minecraft.server.v1_5_R3.BlockEnderChest;
|
|
||||||
import net.minecraft.server.v1_5_R3.Container;
|
|
||||||
import net.minecraft.server.v1_5_R3.EntityOcelot;
|
|
||||||
import net.minecraft.server.v1_5_R3.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_5_R3.IInventory;
|
|
||||||
import net.minecraft.server.v1_5_R3.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_5_R3.InventoryLargeChest;
|
|
||||||
import net.minecraft.server.v1_5_R3.Packet100OpenWindow;
|
|
||||||
import net.minecraft.server.v1_5_R3.TileEntityChest;
|
|
||||||
import net.minecraft.server.v1_5_R3.TileEntityEnderChest;
|
|
||||||
import net.minecraft.server.v1_5_R3.World;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_5_R3.event.CraftEventFactory;
|
|
||||||
|
|
||||||
public class AnySilentContainer implements IAnySilentContainer {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnySilentContainer(org.bukkit.block.Block block) {
|
|
||||||
return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
|
|
||||||
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
World world = player.world;
|
|
||||||
|
|
||||||
if (block instanceof BlockEnderChest) {
|
|
||||||
// Ender chests are not blocked by ocelots.
|
|
||||||
return world.t(block.getX(), block.getY() + 1, block.getZ());
|
|
||||||
}
|
|
||||||
|
|
||||||
// If block or ocelot on top
|
|
||||||
if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
// If block next to chest is chest and has a block or ocelot on top
|
|
||||||
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
|
|
||||||
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
|
|
||||||
} else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
|
|
||||||
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
|
|
||||||
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
|
|
||||||
return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
|
|
||||||
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
|
|
||||||
return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isBlockedChest(World world, int x, int y, int z) {
|
|
||||||
return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean hasOcelotOnTop(World world, int x, int y, int z) {
|
|
||||||
for (Object localEntity : world.a(EntityOcelot.class,
|
|
||||||
AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
|
|
||||||
EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
|
|
||||||
if (localEntityOcelot.isSitting()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
|
|
||||||
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
|
|
||||||
// Silent ender chest is API-only
|
|
||||||
if (silentchest && block.getType() == Material.ENDER_CHEST) {
|
|
||||||
p.openInventory(p.getEnderChest());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
World world = player.world;
|
|
||||||
Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
if (tile == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tile instanceof TileEntityEnderChest) {
|
|
||||||
// Anychest ender chest. See net.minecraft.server.BlockEnderChest
|
|
||||||
InventoryEnderChest enderChest = player.getEnderChest();
|
|
||||||
enderChest.a((TileEntityEnderChest) tile);
|
|
||||||
player.openContainer(enderChest);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(tile instanceof IInventory)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
IInventory inventory = (IInventory) tile;
|
|
||||||
int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
|
|
||||||
} else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
|
|
||||||
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
|
|
||||||
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
// AnyChest only
|
|
||||||
if (!silentchest) {
|
|
||||||
player.openContainer(inventory);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// SilentChest
|
|
||||||
try {
|
|
||||||
// Call InventoryOpenEvent
|
|
||||||
Container container = new SilentContainerChest(player.inventory, inventory);
|
|
||||||
container = CraftEventFactory.callInventoryOpenEvent(player, container);
|
|
||||||
if (container == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Open window
|
|
||||||
int windowId = player.nextContainerCounter();
|
|
||||||
player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize(), true));
|
|
||||||
player.activeContainer = container;
|
|
||||||
player.activeContainer.windowId = windowId;
|
|
||||||
player.activeContainer.addSlotListener(player);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
p.sendMessage(ChatColor.RED + "Error while sending silent container.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_5_R3;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IInventoryAccess;
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
import com.lishid.openinv.util.InternalAccessor;
|
|
||||||
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_5_R3.IInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class InventoryAccess implements IInventoryAccess {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialPlayerInventory) {
|
|
||||||
return (SpecialPlayerInventory) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialEnderChest(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialEnderChest) {
|
|
||||||
return (SpecialEnderChest) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,101 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_5_R3;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collection;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IPlayerDataManager;
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.OfflinePlayer;
|
|
||||||
import org.bukkit.Server;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_5_R3.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_5_R3.MinecraftServer;
|
|
||||||
import net.minecraft.server.v1_5_R3.PlayerInteractManager;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_5_R3.CraftServer;
|
|
||||||
import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
|
|
||||||
|
|
||||||
public class PlayerDataManager implements IPlayerDataManager {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Player loadPlayer(OfflinePlayer offline) {
|
|
||||||
// Ensure the player has data
|
|
||||||
if (offline == null || !offline.hasPlayedBefore()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
|
|
||||||
|
|
||||||
// Create an entity to load the player data
|
|
||||||
EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
|
|
||||||
new PlayerInteractManager(server.getWorldServer(0)));
|
|
||||||
|
|
||||||
// Get the bukkit entity
|
|
||||||
Player target = (entity == null) ? null : entity.getBukkitEntity();
|
|
||||||
if (target != null) {
|
|
||||||
// Load data
|
|
||||||
target.loadData();
|
|
||||||
}
|
|
||||||
// Return the entity
|
|
||||||
return target;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getPlayerDataID(OfflinePlayer player) {
|
|
||||||
return player.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public OfflinePlayer getPlayerByID(String identifier) {
|
|
||||||
OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
|
|
||||||
// Ensure player is a real player, otherwise return null
|
|
||||||
if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return player;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<? extends Player> getOnlinePlayers() {
|
|
||||||
return Arrays.asList(Bukkit.getOnlinePlayers());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static EntityPlayer getHandle(Player player) {
|
|
||||||
if (player instanceof CraftPlayer) {
|
|
||||||
return ((CraftPlayer) player).getHandle();
|
|
||||||
}
|
|
||||||
|
|
||||||
Server server = player.getServer();
|
|
||||||
EntityPlayer nmsPlayer = null;
|
|
||||||
|
|
||||||
if (server instanceof CraftServer) {
|
|
||||||
nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nmsPlayer == null) {
|
|
||||||
// Could use reflection to examine fields, but it's honestly not worth the bother.
|
|
||||||
throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
|
|
||||||
}
|
|
||||||
|
|
||||||
return nmsPlayer;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_5_R3;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_5_R3.ContainerChest;
|
|
||||||
import net.minecraft.server.v1_5_R3.EntityHuman;
|
|
||||||
import net.minecraft.server.v1_5_R3.IInventory;
|
|
||||||
import net.minecraft.server.v1_5_R3.ItemStack;
|
|
||||||
import net.minecraft.server.v1_5_R3.PlayerInventory;
|
|
||||||
|
|
||||||
public class SilentContainerChest extends ContainerChest { public IInventory inv;
|
|
||||||
|
|
||||||
public SilentContainerChest(IInventory i1, IInventory i2) {
|
|
||||||
super(i1, i2);
|
|
||||||
// Send close signal
|
|
||||||
i2.g();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void b(EntityHuman entityHuman) {
|
|
||||||
// Don't send close signal twice, might screw up
|
|
||||||
PlayerInventory playerinventory = entityHuman.inventory;
|
|
||||||
|
|
||||||
if (playerinventory.getCarried() != null) {
|
|
||||||
ItemStack carried = playerinventory.getCarried();
|
|
||||||
playerinventory.setCarried(null);
|
|
||||||
entityHuman.drop(carried);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,130 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_5_R3;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
|
|
||||||
import org.bukkit.entity.HumanEntity;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
import org.bukkit.inventory.InventoryHolder;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_5_R3.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_5_R3.IInventory;
|
|
||||||
import net.minecraft.server.v1_5_R3.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_5_R3.InventorySubcontainer;
|
|
||||||
import net.minecraft.server.v1_5_R3.ItemStack;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_5_R3.entity.CraftHumanEntity;
|
|
||||||
import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
|
|
||||||
import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
|
|
||||||
|
|
||||||
private final InventoryEnderChest enderChest;
|
|
||||||
private final CraftInventory inventory = new CraftInventory(this);
|
|
||||||
private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
|
|
||||||
private boolean playerOnline = false;
|
|
||||||
private CraftPlayer owner;
|
|
||||||
private int maxStack = MAX_STACK;
|
|
||||||
|
|
||||||
public SpecialEnderChest(Player player, Boolean online) {
|
|
||||||
super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
|
|
||||||
PlayerDataManager.getHandle(player).getEnderChest().c(),
|
|
||||||
PlayerDataManager.getHandle(player).getEnderChest().getSize());
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.enderChest = nmsPlayer.getEnderChest();
|
|
||||||
this.owner = nmsPlayer.getBukkitEntity();
|
|
||||||
this.items = enderChest.getContents();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Inventory getBukkitInventory() {
|
|
||||||
return inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOnline(Player player) {
|
|
||||||
if (!playerOnline) {
|
|
||||||
try {
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.owner = nmsPlayer.getBukkitEntity();
|
|
||||||
InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
|
|
||||||
Field field = playerEnderChest.getClass().getField("items");
|
|
||||||
field.setAccessible(true);
|
|
||||||
field.set(playerEnderChest, this.items);
|
|
||||||
} catch (Exception e) {}
|
|
||||||
playerOnline = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOffline() {
|
|
||||||
playerOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInUse() {
|
|
||||||
return !this.getViewers().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack[] getContents() {
|
|
||||||
return this.items;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onOpen(CraftHumanEntity who) {
|
|
||||||
transaction.add(who);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onClose(CraftHumanEntity who) {
|
|
||||||
transaction.remove(who);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<HumanEntity> getViewers() {
|
|
||||||
return transaction;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public InventoryHolder getOwner() {
|
|
||||||
return this.owner;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setMaxStackSize(int size) {
|
|
||||||
maxStack = size;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getMaxStackSize() {
|
|
||||||
return maxStack;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void update() {
|
|
||||||
super.update();
|
|
||||||
enderChest.update();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,227 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_5_R3;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_5_R3.ItemStack;
|
|
||||||
import net.minecraft.server.v1_5_R3.PlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
|
|
||||||
|
|
||||||
private final ItemStack[] extra = new ItemStack[5];
|
|
||||||
private final CraftInventory inventory = new CraftInventory(this);
|
|
||||||
private boolean playerOnline = false;
|
|
||||||
|
|
||||||
public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
|
|
||||||
super(PlayerDataManager.getHandle(bukkitPlayer));
|
|
||||||
this.playerOnline = online;
|
|
||||||
this.items = player.inventory.items;
|
|
||||||
this.armor = player.inventory.armor;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Inventory getBukkitInventory() {
|
|
||||||
return inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOnline(Player player) {
|
|
||||||
if (!playerOnline) {
|
|
||||||
this.player = PlayerDataManager.getHandle(player);
|
|
||||||
this.player.inventory.items = this.items;
|
|
||||||
this.player.inventory.armor = this.armor;
|
|
||||||
playerOnline = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOffline() {
|
|
||||||
playerOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInUse() {
|
|
||||||
return !this.getViewers().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack[] getContents() {
|
|
||||||
ItemStack[] contents = new ItemStack[getSize()];
|
|
||||||
System.arraycopy(items, 0, contents, 0, items.length);
|
|
||||||
System.arraycopy(armor, 0, contents, items.length, armor.length);
|
|
||||||
return contents;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getSize() {
|
|
||||||
return super.getSize() + 5;
|
|
||||||
}
|
|
||||||
|
|
||||||
@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, 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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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) {
|
|
||||||
ItemStack itemstack = is[i];
|
|
||||||
|
|
||||||
is[i] = null;
|
|
||||||
return itemstack;
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setItem(int i, ItemStack itemstack) {
|
|
||||||
ItemStack[] is = this.items;
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.armor;
|
|
||||||
} else {
|
|
||||||
i = getReversedItemSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.extra;
|
|
||||||
} else if (is == this.armor) {
|
|
||||||
i = getReversedArmorSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Effects
|
|
||||||
if (is == this.extra) {
|
|
||||||
player.drop(itemstack);
|
|
||||||
itemstack = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
is[i] = itemstack;
|
|
||||||
|
|
||||||
player.defaultContainer.b();
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedItemSlotNum(int i) {
|
|
||||||
if (i >= 27) {
|
|
||||||
return i - 27;
|
|
||||||
}
|
|
||||||
return i + 9;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedArmorSlotNum(int i) {
|
|
||||||
if (i == 0) {
|
|
||||||
return 3;
|
|
||||||
}
|
|
||||||
if (i == 1) {
|
|
||||||
return 2;
|
|
||||||
}
|
|
||||||
if (i == 2) {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
if (i == 3) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName() {
|
|
||||||
if (player.getName().length() > 16) {
|
|
||||||
return player.getName().substring(0, 16);
|
|
||||||
}
|
|
||||||
return player.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvinternal</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>openinvadapter1_6_R1</artifactId>
|
|
||||||
<name>OpenInvAdapter1_6_R1</name>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.bukkit</groupId>
|
|
||||||
<artifactId>craftbukkit</artifactId>
|
|
||||||
<version>1.6.1-R0.1-SNAPSHOT</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvcommon</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@@ -1,168 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_6_R1;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IAnySilentContainer;
|
|
||||||
|
|
||||||
import org.bukkit.ChatColor;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_6_R1.AxisAlignedBB;
|
|
||||||
import net.minecraft.server.v1_6_R1.BlockEnderChest;
|
|
||||||
import net.minecraft.server.v1_6_R1.Container;
|
|
||||||
import net.minecraft.server.v1_6_R1.EntityOcelot;
|
|
||||||
import net.minecraft.server.v1_6_R1.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_6_R1.IInventory;
|
|
||||||
import net.minecraft.server.v1_6_R1.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_6_R1.InventoryLargeChest;
|
|
||||||
import net.minecraft.server.v1_6_R1.Packet100OpenWindow;
|
|
||||||
import net.minecraft.server.v1_6_R1.TileEntityChest;
|
|
||||||
import net.minecraft.server.v1_6_R1.TileEntityEnderChest;
|
|
||||||
import net.minecraft.server.v1_6_R1.World;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R1.event.CraftEventFactory;
|
|
||||||
|
|
||||||
public class AnySilentContainer implements IAnySilentContainer {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnySilentContainer(org.bukkit.block.Block block) {
|
|
||||||
return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
|
|
||||||
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
World world = player.world;
|
|
||||||
|
|
||||||
if (block instanceof BlockEnderChest) {
|
|
||||||
// Ender chests are not blocked by ocelots.
|
|
||||||
return world.t(block.getX(), block.getY() + 1, block.getZ());
|
|
||||||
}
|
|
||||||
|
|
||||||
// If block or ocelot on top
|
|
||||||
if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
// If block next to chest is chest and has a block or ocelot on top
|
|
||||||
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
|
|
||||||
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
|
|
||||||
} else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
|
|
||||||
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
|
|
||||||
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
|
|
||||||
return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
|
|
||||||
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
|
|
||||||
return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isBlockedChest(World world, int x, int y, int z) {
|
|
||||||
return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean hasOcelotOnTop(World world, int x, int y, int z) {
|
|
||||||
for (Object localEntity : world.a(EntityOcelot.class,
|
|
||||||
AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
|
|
||||||
EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
|
|
||||||
if (localEntityOcelot.isSitting()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
|
|
||||||
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
|
|
||||||
// Silent ender chest is API-only
|
|
||||||
if (silentchest && block.getType() == Material.ENDER_CHEST) {
|
|
||||||
p.openInventory(p.getEnderChest());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
World world = player.world;
|
|
||||||
Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
if (tile == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tile instanceof TileEntityEnderChest) {
|
|
||||||
// Anychest ender chest. See net.minecraft.server.BlockEnderChest
|
|
||||||
InventoryEnderChest enderChest = player.getEnderChest();
|
|
||||||
enderChest.a((TileEntityEnderChest) tile);
|
|
||||||
player.openContainer(enderChest);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(tile instanceof IInventory)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
IInventory inventory = (IInventory) tile;
|
|
||||||
int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
|
|
||||||
} else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
|
|
||||||
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
|
|
||||||
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
// AnyChest only
|
|
||||||
if (!silentchest) {
|
|
||||||
player.openContainer(inventory);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// SilentChest
|
|
||||||
try {
|
|
||||||
// Call InventoryOpenEvent
|
|
||||||
Container container = new SilentContainerChest(player.inventory, inventory);
|
|
||||||
container = CraftEventFactory.callInventoryOpenEvent(player, container);
|
|
||||||
if (container == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Open window
|
|
||||||
int windowId = player.nextContainerCounter();
|
|
||||||
player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize(), true));
|
|
||||||
player.activeContainer = container;
|
|
||||||
player.activeContainer.windowId = windowId;
|
|
||||||
player.activeContainer.addSlotListener(player);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
p.sendMessage(ChatColor.RED + "Error while sending silent container.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_6_R1;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IInventoryAccess;
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
import com.lishid.openinv.util.InternalAccessor;
|
|
||||||
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_6_R1.IInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class InventoryAccess implements IInventoryAccess {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialPlayerInventory) {
|
|
||||||
return (SpecialPlayerInventory) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialEnderChest(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialEnderChest) {
|
|
||||||
return (SpecialEnderChest) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,101 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_6_R1;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collection;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IPlayerDataManager;
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.OfflinePlayer;
|
|
||||||
import org.bukkit.Server;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_6_R1.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_6_R1.MinecraftServer;
|
|
||||||
import net.minecraft.server.v1_6_R1.PlayerInteractManager;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R1.CraftServer;
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
|
|
||||||
|
|
||||||
public class PlayerDataManager implements IPlayerDataManager {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Player loadPlayer(OfflinePlayer offline) {
|
|
||||||
// Ensure the player has data
|
|
||||||
if (offline == null || !offline.hasPlayedBefore()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
|
|
||||||
|
|
||||||
// Create an entity to load the player data
|
|
||||||
EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
|
|
||||||
new PlayerInteractManager(server.getWorldServer(0)));
|
|
||||||
|
|
||||||
// Get the bukkit entity
|
|
||||||
Player target = (entity == null) ? null : entity.getBukkitEntity();
|
|
||||||
if (target != null) {
|
|
||||||
// Load data
|
|
||||||
target.loadData();
|
|
||||||
}
|
|
||||||
// Return the entity
|
|
||||||
return target;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getPlayerDataID(OfflinePlayer player) {
|
|
||||||
return player.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public OfflinePlayer getPlayerByID(String identifier) {
|
|
||||||
OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
|
|
||||||
// Ensure player is a real player, otherwise return null
|
|
||||||
if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return player;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<? extends Player> getOnlinePlayers() {
|
|
||||||
return Arrays.asList(Bukkit.getOnlinePlayers());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static EntityPlayer getHandle(Player player) {
|
|
||||||
if (player instanceof CraftPlayer) {
|
|
||||||
return ((CraftPlayer) player).getHandle();
|
|
||||||
}
|
|
||||||
|
|
||||||
Server server = player.getServer();
|
|
||||||
EntityPlayer nmsPlayer = null;
|
|
||||||
|
|
||||||
if (server instanceof CraftServer) {
|
|
||||||
nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nmsPlayer == null) {
|
|
||||||
// Could use reflection to examine fields, but it's honestly not worth the bother.
|
|
||||||
throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
|
|
||||||
}
|
|
||||||
|
|
||||||
return nmsPlayer;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_6_R1;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_6_R1.ContainerChest;
|
|
||||||
import net.minecraft.server.v1_6_R1.EntityHuman;
|
|
||||||
import net.minecraft.server.v1_6_R1.IInventory;
|
|
||||||
import net.minecraft.server.v1_6_R1.ItemStack;
|
|
||||||
import net.minecraft.server.v1_6_R1.PlayerInventory;
|
|
||||||
|
|
||||||
public class SilentContainerChest extends ContainerChest {
|
|
||||||
|
|
||||||
public SilentContainerChest(IInventory i1, IInventory i2) {
|
|
||||||
super(i1, i2);
|
|
||||||
// Send close signal
|
|
||||||
i2.g();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void b(EntityHuman entityHuman) {
|
|
||||||
// Don't send close signal twice, might screw up
|
|
||||||
PlayerInventory playerinventory = entityHuman.inventory;
|
|
||||||
|
|
||||||
if (playerinventory.getCarried() != null) {
|
|
||||||
ItemStack carried = playerinventory.getCarried();
|
|
||||||
playerinventory.setCarried(null);
|
|
||||||
entityHuman.drop(carried);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,130 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_6_R1;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
|
|
||||||
import org.bukkit.entity.HumanEntity;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
import org.bukkit.inventory.InventoryHolder;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_6_R1.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_6_R1.IInventory;
|
|
||||||
import net.minecraft.server.v1_6_R1.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_6_R1.InventorySubcontainer;
|
|
||||||
import net.minecraft.server.v1_6_R1.ItemStack;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R1.entity.CraftHumanEntity;
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
|
|
||||||
|
|
||||||
private final InventoryEnderChest enderChest;
|
|
||||||
private final CraftInventory inventory = new CraftInventory(this);
|
|
||||||
private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
|
|
||||||
private boolean playerOnline = false;
|
|
||||||
private CraftPlayer owner;
|
|
||||||
private int maxStack = MAX_STACK;
|
|
||||||
|
|
||||||
public SpecialEnderChest(Player player, Boolean online) {
|
|
||||||
super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
|
|
||||||
PlayerDataManager.getHandle(player).getEnderChest().c(),
|
|
||||||
PlayerDataManager.getHandle(player).getEnderChest().getSize());
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.enderChest = nmsPlayer.getEnderChest();
|
|
||||||
this.owner = nmsPlayer.getBukkitEntity();
|
|
||||||
this.items = enderChest.getContents();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Inventory getBukkitInventory() {
|
|
||||||
return inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOnline(Player player) {
|
|
||||||
if (!playerOnline) {
|
|
||||||
try {
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.owner = nmsPlayer.getBukkitEntity();
|
|
||||||
InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
|
|
||||||
Field field = playerEnderChest.getClass().getField("items");
|
|
||||||
field.setAccessible(true);
|
|
||||||
field.set(playerEnderChest, this.items);
|
|
||||||
} catch (Exception e) {}
|
|
||||||
playerOnline = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOffline() {
|
|
||||||
playerOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInUse() {
|
|
||||||
return !this.getViewers().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack[] getContents() {
|
|
||||||
return this.items;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onOpen(CraftHumanEntity who) {
|
|
||||||
transaction.add(who);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onClose(CraftHumanEntity who) {
|
|
||||||
transaction.remove(who);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<HumanEntity> getViewers() {
|
|
||||||
return transaction;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public InventoryHolder getOwner() {
|
|
||||||
return this.owner;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setMaxStackSize(int size) {
|
|
||||||
maxStack = size;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getMaxStackSize() {
|
|
||||||
return maxStack;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void update() {
|
|
||||||
super.update();
|
|
||||||
enderChest.update();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,227 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_6_R1;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_6_R1.ItemStack;
|
|
||||||
import net.minecraft.server.v1_6_R1.PlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
|
|
||||||
|
|
||||||
private final ItemStack[] extra = new ItemStack[5];
|
|
||||||
private final CraftInventory inventory = new CraftInventory(this);
|
|
||||||
private boolean playerOnline = false;
|
|
||||||
|
|
||||||
public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
|
|
||||||
super(PlayerDataManager.getHandle(bukkitPlayer));
|
|
||||||
this.playerOnline = online;
|
|
||||||
this.items = player.inventory.items;
|
|
||||||
this.armor = player.inventory.armor;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Inventory getBukkitInventory() {
|
|
||||||
return inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOnline(Player player) {
|
|
||||||
if (!playerOnline) {
|
|
||||||
this.player = PlayerDataManager.getHandle(player);
|
|
||||||
this.player.inventory.items = this.items;
|
|
||||||
this.player.inventory.armor = this.armor;
|
|
||||||
playerOnline = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOffline() {
|
|
||||||
playerOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInUse() {
|
|
||||||
return !this.getViewers().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack[] getContents() {
|
|
||||||
ItemStack[] contents = new ItemStack[getSize()];
|
|
||||||
System.arraycopy(items, 0, contents, 0, items.length);
|
|
||||||
System.arraycopy(armor, 0, contents, items.length, armor.length);
|
|
||||||
return contents;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getSize() {
|
|
||||||
return super.getSize() + 5;
|
|
||||||
}
|
|
||||||
|
|
||||||
@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, 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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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) {
|
|
||||||
ItemStack itemstack = is[i];
|
|
||||||
|
|
||||||
is[i] = null;
|
|
||||||
return itemstack;
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setItem(int i, ItemStack itemstack) {
|
|
||||||
ItemStack[] is = this.items;
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.armor;
|
|
||||||
} else {
|
|
||||||
i = getReversedItemSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.extra;
|
|
||||||
} else if (is == this.armor) {
|
|
||||||
i = getReversedArmorSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Effects
|
|
||||||
if (is == this.extra) {
|
|
||||||
player.drop(itemstack);
|
|
||||||
itemstack = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
is[i] = itemstack;
|
|
||||||
|
|
||||||
player.defaultContainer.b();
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedItemSlotNum(int i) {
|
|
||||||
if (i >= 27) {
|
|
||||||
return i - 27;
|
|
||||||
}
|
|
||||||
return i + 9;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedArmorSlotNum(int i) {
|
|
||||||
if (i == 0) {
|
|
||||||
return 3;
|
|
||||||
}
|
|
||||||
if (i == 1) {
|
|
||||||
return 2;
|
|
||||||
}
|
|
||||||
if (i == 2) {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
if (i == 3) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName() {
|
|
||||||
if (player.getName().length() > 16) {
|
|
||||||
return player.getName().substring(0, 16);
|
|
||||||
}
|
|
||||||
return player.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvinternal</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>openinvadapter1_6_R2</artifactId>
|
|
||||||
<name>OpenInvAdapter1_6_R2</name>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.bukkit</groupId>
|
|
||||||
<artifactId>craftbukkit</artifactId>
|
|
||||||
<version>1.6.2-R1.0</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvcommon</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@@ -1,168 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_6_R2;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IAnySilentContainer;
|
|
||||||
|
|
||||||
import org.bukkit.ChatColor;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_6_R2.AxisAlignedBB;
|
|
||||||
import net.minecraft.server.v1_6_R2.BlockEnderChest;
|
|
||||||
import net.minecraft.server.v1_6_R2.Container;
|
|
||||||
import net.minecraft.server.v1_6_R2.EntityOcelot;
|
|
||||||
import net.minecraft.server.v1_6_R2.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_6_R2.IInventory;
|
|
||||||
import net.minecraft.server.v1_6_R2.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_6_R2.InventoryLargeChest;
|
|
||||||
import net.minecraft.server.v1_6_R2.Packet100OpenWindow;
|
|
||||||
import net.minecraft.server.v1_6_R2.TileEntityChest;
|
|
||||||
import net.minecraft.server.v1_6_R2.TileEntityEnderChest;
|
|
||||||
import net.minecraft.server.v1_6_R2.World;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R2.event.CraftEventFactory;
|
|
||||||
|
|
||||||
public class AnySilentContainer implements IAnySilentContainer {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnySilentContainer(org.bukkit.block.Block block) {
|
|
||||||
return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
|
|
||||||
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
World world = player.world;
|
|
||||||
|
|
||||||
if (block instanceof BlockEnderChest) {
|
|
||||||
// Ender chests are not blocked by ocelots.
|
|
||||||
return world.t(block.getX(), block.getY() + 1, block.getZ());
|
|
||||||
}
|
|
||||||
|
|
||||||
// If block or ocelot on top
|
|
||||||
if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
// If block next to chest is chest and has a block or ocelot on top
|
|
||||||
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
|
|
||||||
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
|
|
||||||
} else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
|
|
||||||
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
|
|
||||||
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
|
|
||||||
return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
|
|
||||||
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
|
|
||||||
return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isBlockedChest(World world, int x, int y, int z) {
|
|
||||||
return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean hasOcelotOnTop(World world, int x, int y, int z) {
|
|
||||||
for (Object localEntity : world.a(EntityOcelot.class,
|
|
||||||
AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
|
|
||||||
EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
|
|
||||||
if (localEntityOcelot.isSitting()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
|
|
||||||
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
|
|
||||||
// Silent ender chest is API-only
|
|
||||||
if (silentchest && block.getType() == Material.ENDER_CHEST) {
|
|
||||||
p.openInventory(p.getEnderChest());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
World world = player.world;
|
|
||||||
Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
if (tile == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tile instanceof TileEntityEnderChest) {
|
|
||||||
// Anychest ender chest. See net.minecraft.server.BlockEnderChest
|
|
||||||
InventoryEnderChest enderChest = player.getEnderChest();
|
|
||||||
enderChest.a((TileEntityEnderChest) tile);
|
|
||||||
player.openContainer(enderChest);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(tile instanceof IInventory)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
IInventory inventory = (IInventory) tile;
|
|
||||||
int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
|
|
||||||
} else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
|
|
||||||
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
|
|
||||||
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
// AnyChest only
|
|
||||||
if (!silentchest) {
|
|
||||||
player.openContainer(inventory);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// SilentChest
|
|
||||||
try {
|
|
||||||
// Call InventoryOpenEvent
|
|
||||||
Container container = new SilentContainerChest(player.inventory, inventory);
|
|
||||||
container = CraftEventFactory.callInventoryOpenEvent(player, container);
|
|
||||||
if (container == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Open window
|
|
||||||
int windowId = player.nextContainerCounter();
|
|
||||||
player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize(), true));
|
|
||||||
player.activeContainer = container;
|
|
||||||
player.activeContainer.windowId = windowId;
|
|
||||||
player.activeContainer.addSlotListener(player);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
p.sendMessage(ChatColor.RED + "Error while sending silent container.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_6_R2;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IInventoryAccess;
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
import com.lishid.openinv.util.InternalAccessor;
|
|
||||||
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_6_R2.IInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class InventoryAccess implements IInventoryAccess {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialPlayerInventory) {
|
|
||||||
return (SpecialPlayerInventory) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialEnderChest(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialEnderChest) {
|
|
||||||
return (SpecialEnderChest) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,101 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_6_R2;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collection;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IPlayerDataManager;
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.OfflinePlayer;
|
|
||||||
import org.bukkit.Server;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_6_R2.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_6_R2.MinecraftServer;
|
|
||||||
import net.minecraft.server.v1_6_R2.PlayerInteractManager;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R2.CraftServer;
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
|
|
||||||
|
|
||||||
public class PlayerDataManager implements IPlayerDataManager {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Player loadPlayer(OfflinePlayer offline) {
|
|
||||||
// Ensure the player has data
|
|
||||||
if (offline == null || !offline.hasPlayedBefore()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
|
|
||||||
|
|
||||||
// Create an entity to load the player data
|
|
||||||
EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
|
|
||||||
new PlayerInteractManager(server.getWorldServer(0)));
|
|
||||||
|
|
||||||
// Get the bukkit entity
|
|
||||||
Player target = (entity == null) ? null : entity.getBukkitEntity();
|
|
||||||
if (target != null) {
|
|
||||||
// Load data
|
|
||||||
target.loadData();
|
|
||||||
}
|
|
||||||
// Return the entity
|
|
||||||
return target;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getPlayerDataID(OfflinePlayer player) {
|
|
||||||
return player.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public OfflinePlayer getPlayerByID(String identifier) {
|
|
||||||
OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
|
|
||||||
// Ensure player is a real player, otherwise return null
|
|
||||||
if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return player;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<? extends Player> getOnlinePlayers() {
|
|
||||||
return Arrays.asList(Bukkit.getOnlinePlayers());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static EntityPlayer getHandle(Player player) {
|
|
||||||
if (player instanceof CraftPlayer) {
|
|
||||||
return ((CraftPlayer) player).getHandle();
|
|
||||||
}
|
|
||||||
|
|
||||||
Server server = player.getServer();
|
|
||||||
EntityPlayer nmsPlayer = null;
|
|
||||||
|
|
||||||
if (server instanceof CraftServer) {
|
|
||||||
nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nmsPlayer == null) {
|
|
||||||
// Could use reflection to examine fields, but it's honestly not worth the bother.
|
|
||||||
throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
|
|
||||||
}
|
|
||||||
|
|
||||||
return nmsPlayer;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_6_R2;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_6_R2.ContainerChest;
|
|
||||||
import net.minecraft.server.v1_6_R2.EntityHuman;
|
|
||||||
import net.minecraft.server.v1_6_R2.IInventory;
|
|
||||||
import net.minecraft.server.v1_6_R2.ItemStack;
|
|
||||||
import net.minecraft.server.v1_6_R2.PlayerInventory;
|
|
||||||
|
|
||||||
public class SilentContainerChest extends ContainerChest {
|
|
||||||
|
|
||||||
public SilentContainerChest(IInventory i1, IInventory i2) {
|
|
||||||
super(i1, i2);
|
|
||||||
// Send close signal
|
|
||||||
i2.g();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void b(EntityHuman entityHuman) {
|
|
||||||
// Don't send close signal twice, might screw up
|
|
||||||
PlayerInventory playerinventory = entityHuman.inventory;
|
|
||||||
|
|
||||||
if (playerinventory.getCarried() != null) {
|
|
||||||
ItemStack carried = playerinventory.getCarried();
|
|
||||||
playerinventory.setCarried(null);
|
|
||||||
entityHuman.drop(carried);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,130 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_6_R2;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
|
|
||||||
import org.bukkit.entity.HumanEntity;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
import org.bukkit.inventory.InventoryHolder;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_6_R2.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_6_R2.IInventory;
|
|
||||||
import net.minecraft.server.v1_6_R2.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_6_R2.InventorySubcontainer;
|
|
||||||
import net.minecraft.server.v1_6_R2.ItemStack;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R2.entity.CraftHumanEntity;
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
|
|
||||||
|
|
||||||
private final InventoryEnderChest enderChest;
|
|
||||||
private final CraftInventory inventory = new CraftInventory(this);
|
|
||||||
private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
|
|
||||||
private boolean playerOnline = false;
|
|
||||||
private CraftPlayer owner;
|
|
||||||
private int maxStack = MAX_STACK;
|
|
||||||
|
|
||||||
public SpecialEnderChest(Player player, Boolean online) {
|
|
||||||
super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
|
|
||||||
PlayerDataManager.getHandle(player).getEnderChest().c(),
|
|
||||||
PlayerDataManager.getHandle(player).getEnderChest().getSize());
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.enderChest = nmsPlayer.getEnderChest();
|
|
||||||
this.owner = nmsPlayer.getBukkitEntity();
|
|
||||||
this.items = enderChest.getContents();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Inventory getBukkitInventory() {
|
|
||||||
return inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOnline(Player player) {
|
|
||||||
if (!playerOnline) {
|
|
||||||
try {
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.owner = nmsPlayer.getBukkitEntity();
|
|
||||||
InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
|
|
||||||
Field field = playerEnderChest.getClass().getField("items");
|
|
||||||
field.setAccessible(true);
|
|
||||||
field.set(playerEnderChest, this.items);
|
|
||||||
} catch (Exception e) {}
|
|
||||||
playerOnline = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOffline() {
|
|
||||||
playerOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInUse() {
|
|
||||||
return !this.getViewers().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack[] getContents() {
|
|
||||||
return this.items;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onOpen(CraftHumanEntity who) {
|
|
||||||
transaction.add(who);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onClose(CraftHumanEntity who) {
|
|
||||||
transaction.remove(who);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<HumanEntity> getViewers() {
|
|
||||||
return transaction;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public InventoryHolder getOwner() {
|
|
||||||
return this.owner;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setMaxStackSize(int size) {
|
|
||||||
maxStack = size;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getMaxStackSize() {
|
|
||||||
return maxStack;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void update() {
|
|
||||||
super.update();
|
|
||||||
enderChest.update();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,227 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_6_R2;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_6_R2.ItemStack;
|
|
||||||
import net.minecraft.server.v1_6_R2.PlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
|
|
||||||
|
|
||||||
private final ItemStack[] extra = new ItemStack[5];
|
|
||||||
private final CraftInventory inventory = new CraftInventory(this);
|
|
||||||
private boolean playerOnline = false;
|
|
||||||
|
|
||||||
public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
|
|
||||||
super(PlayerDataManager.getHandle(bukkitPlayer));
|
|
||||||
this.playerOnline = online;
|
|
||||||
this.items = player.inventory.items;
|
|
||||||
this.armor = player.inventory.armor;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Inventory getBukkitInventory() {
|
|
||||||
return inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOnline(Player player) {
|
|
||||||
if (!playerOnline) {
|
|
||||||
this.player = PlayerDataManager.getHandle(player);
|
|
||||||
this.player.inventory.items = this.items;
|
|
||||||
this.player.inventory.armor = this.armor;
|
|
||||||
playerOnline = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOffline() {
|
|
||||||
playerOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInUse() {
|
|
||||||
return !this.getViewers().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack[] getContents() {
|
|
||||||
ItemStack[] contents = new ItemStack[getSize()];
|
|
||||||
System.arraycopy(items, 0, contents, 0, items.length);
|
|
||||||
System.arraycopy(armor, 0, contents, items.length, armor.length);
|
|
||||||
return contents;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getSize() {
|
|
||||||
return super.getSize() + 5;
|
|
||||||
}
|
|
||||||
|
|
||||||
@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, 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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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) {
|
|
||||||
ItemStack itemstack = is[i];
|
|
||||||
|
|
||||||
is[i] = null;
|
|
||||||
return itemstack;
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setItem(int i, ItemStack itemstack) {
|
|
||||||
ItemStack[] is = this.items;
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.armor;
|
|
||||||
} else {
|
|
||||||
i = getReversedItemSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.extra;
|
|
||||||
} else if (is == this.armor) {
|
|
||||||
i = getReversedArmorSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Effects
|
|
||||||
if (is == this.extra) {
|
|
||||||
player.drop(itemstack);
|
|
||||||
itemstack = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
is[i] = itemstack;
|
|
||||||
|
|
||||||
player.defaultContainer.b();
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedItemSlotNum(int i) {
|
|
||||||
if (i >= 27) {
|
|
||||||
return i - 27;
|
|
||||||
}
|
|
||||||
return i + 9;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedArmorSlotNum(int i) {
|
|
||||||
if (i == 0) {
|
|
||||||
return 3;
|
|
||||||
}
|
|
||||||
if (i == 1) {
|
|
||||||
return 2;
|
|
||||||
}
|
|
||||||
if (i == 2) {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
if (i == 3) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName() {
|
|
||||||
if (player.getName().length() > 16) {
|
|
||||||
return player.getName().substring(0, 16);
|
|
||||||
}
|
|
||||||
return player.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvinternal</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>openinvadapter1_6_R3</artifactId>
|
|
||||||
<name>OpenInvAdapter1_6_R3</name>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.bukkit</groupId>
|
|
||||||
<artifactId>craftbukkit</artifactId>
|
|
||||||
<version>1.6.4-R2.0</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvcommon</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@@ -1,168 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_6_R3;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IAnySilentContainer;
|
|
||||||
|
|
||||||
import org.bukkit.ChatColor;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_6_R3.AxisAlignedBB;
|
|
||||||
import net.minecraft.server.v1_6_R3.BlockEnderChest;
|
|
||||||
import net.minecraft.server.v1_6_R3.Container;
|
|
||||||
import net.minecraft.server.v1_6_R3.EntityOcelot;
|
|
||||||
import net.minecraft.server.v1_6_R3.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_6_R3.IInventory;
|
|
||||||
import net.minecraft.server.v1_6_R3.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_6_R3.InventoryLargeChest;
|
|
||||||
import net.minecraft.server.v1_6_R3.Packet100OpenWindow;
|
|
||||||
import net.minecraft.server.v1_6_R3.TileEntityChest;
|
|
||||||
import net.minecraft.server.v1_6_R3.TileEntityEnderChest;
|
|
||||||
import net.minecraft.server.v1_6_R3.World;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R3.event.CraftEventFactory;
|
|
||||||
|
|
||||||
public class AnySilentContainer implements IAnySilentContainer {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnySilentContainer(org.bukkit.block.Block block) {
|
|
||||||
return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
|
|
||||||
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
World world = player.world;
|
|
||||||
|
|
||||||
if (block instanceof BlockEnderChest) {
|
|
||||||
// Ender chests are not blocked by ocelots.
|
|
||||||
return world.t(block.getX(), block.getY() + 1, block.getZ());
|
|
||||||
}
|
|
||||||
|
|
||||||
// If block or ocelot on top
|
|
||||||
if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
// If block next to chest is chest and has a block or ocelot on top
|
|
||||||
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
|
|
||||||
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
|
|
||||||
} else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
|
|
||||||
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
|
|
||||||
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
|
|
||||||
return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
|
|
||||||
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
|
|
||||||
return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isBlockedChest(World world, int x, int y, int z) {
|
|
||||||
return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean hasOcelotOnTop(World world, int x, int y, int z) {
|
|
||||||
for (Object localEntity : world.a(EntityOcelot.class,
|
|
||||||
AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
|
|
||||||
EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
|
|
||||||
if (localEntityOcelot.isSitting()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
|
|
||||||
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
|
|
||||||
// Silent ender chest is API-only
|
|
||||||
if (silentchest && block.getType() == Material.ENDER_CHEST) {
|
|
||||||
p.openInventory(p.getEnderChest());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
World world = player.world;
|
|
||||||
Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
if (tile == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tile instanceof TileEntityEnderChest) {
|
|
||||||
// Anychest ender chest. See net.minecraft.server.BlockEnderChest
|
|
||||||
InventoryEnderChest enderChest = player.getEnderChest();
|
|
||||||
enderChest.a((TileEntityEnderChest) tile);
|
|
||||||
player.openContainer(enderChest);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(tile instanceof IInventory)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
IInventory inventory = (IInventory) tile;
|
|
||||||
int id = world.getTypeId(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
|
|
||||||
} else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
|
|
||||||
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
|
|
||||||
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
// AnyChest only
|
|
||||||
if (!silentchest) {
|
|
||||||
player.openContainer(inventory);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// SilentChest
|
|
||||||
try {
|
|
||||||
// Call InventoryOpenEvent
|
|
||||||
Container container = new SilentContainerChest(player.inventory, inventory);
|
|
||||||
container = CraftEventFactory.callInventoryOpenEvent(player, container);
|
|
||||||
if (container == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Open window
|
|
||||||
int windowId = player.nextContainerCounter();
|
|
||||||
player.playerConnection.sendPacket(new Packet100OpenWindow(windowId, 0, inventory.getName(), inventory.getSize(), true));
|
|
||||||
player.activeContainer = container;
|
|
||||||
player.activeContainer.windowId = windowId;
|
|
||||||
player.activeContainer.addSlotListener(player);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
p.sendMessage(ChatColor.RED + "Error while sending silent container.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_6_R3;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IInventoryAccess;
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
import com.lishid.openinv.util.InternalAccessor;
|
|
||||||
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_6_R3.IInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class InventoryAccess implements IInventoryAccess {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialPlayerInventory) {
|
|
||||||
return (SpecialPlayerInventory) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialEnderChest(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialEnderChest) {
|
|
||||||
return (SpecialEnderChest) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,101 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_6_R3;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collection;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IPlayerDataManager;
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.OfflinePlayer;
|
|
||||||
import org.bukkit.Server;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_6_R3.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_6_R3.MinecraftServer;
|
|
||||||
import net.minecraft.server.v1_6_R3.PlayerInteractManager;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R3.CraftServer;
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
|
|
||||||
|
|
||||||
public class PlayerDataManager implements IPlayerDataManager {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Player loadPlayer(OfflinePlayer offline) {
|
|
||||||
// Ensure the player has data
|
|
||||||
if (offline == null || !offline.hasPlayedBefore()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
|
|
||||||
|
|
||||||
// Create an entity to load the player data
|
|
||||||
EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), offline.getName(),
|
|
||||||
new PlayerInteractManager(server.getWorldServer(0)));
|
|
||||||
|
|
||||||
// Get the bukkit entity
|
|
||||||
Player target = (entity == null) ? null : entity.getBukkitEntity();
|
|
||||||
if (target != null) {
|
|
||||||
// Load data
|
|
||||||
target.loadData();
|
|
||||||
}
|
|
||||||
// Return the entity
|
|
||||||
return target;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getPlayerDataID(OfflinePlayer player) {
|
|
||||||
return player.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public OfflinePlayer getPlayerByID(String identifier) {
|
|
||||||
OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
|
|
||||||
// Ensure player is a real player, otherwise return null
|
|
||||||
if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return player;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<? extends Player> getOnlinePlayers() {
|
|
||||||
return Arrays.asList(Bukkit.getOnlinePlayers());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static EntityPlayer getHandle(Player player) {
|
|
||||||
if (player instanceof CraftPlayer) {
|
|
||||||
return ((CraftPlayer) player).getHandle();
|
|
||||||
}
|
|
||||||
|
|
||||||
Server server = player.getServer();
|
|
||||||
EntityPlayer nmsPlayer = null;
|
|
||||||
|
|
||||||
if (server instanceof CraftServer) {
|
|
||||||
nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nmsPlayer == null) {
|
|
||||||
// Could use reflection to examine fields, but it's honestly not worth the bother.
|
|
||||||
throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
|
|
||||||
}
|
|
||||||
|
|
||||||
return nmsPlayer;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_6_R3;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_6_R3.ContainerChest;
|
|
||||||
import net.minecraft.server.v1_6_R3.EntityHuman;
|
|
||||||
import net.minecraft.server.v1_6_R3.IInventory;
|
|
||||||
import net.minecraft.server.v1_6_R3.ItemStack;
|
|
||||||
import net.minecraft.server.v1_6_R3.PlayerInventory;
|
|
||||||
|
|
||||||
public class SilentContainerChest extends ContainerChest {
|
|
||||||
|
|
||||||
public SilentContainerChest(IInventory i1, IInventory i2) {
|
|
||||||
super(i1, i2);
|
|
||||||
// Send close signal
|
|
||||||
i2.g();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void b(EntityHuman entityHuman) {
|
|
||||||
// Don't send close signal twice, might screw up
|
|
||||||
PlayerInventory playerinventory = entityHuman.inventory;
|
|
||||||
|
|
||||||
if (playerinventory.getCarried() != null) {
|
|
||||||
ItemStack carried = playerinventory.getCarried();
|
|
||||||
playerinventory.setCarried(null);
|
|
||||||
entityHuman.drop(carried);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,130 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_6_R3;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
|
|
||||||
import org.bukkit.entity.HumanEntity;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
import org.bukkit.inventory.InventoryHolder;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_6_R3.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_6_R3.IInventory;
|
|
||||||
import net.minecraft.server.v1_6_R3.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_6_R3.InventorySubcontainer;
|
|
||||||
import net.minecraft.server.v1_6_R3.ItemStack;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R3.entity.CraftHumanEntity;
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
|
|
||||||
import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
|
|
||||||
|
|
||||||
private final InventoryEnderChest enderChest;
|
|
||||||
private final CraftInventory inventory = new CraftInventory(this);
|
|
||||||
private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
|
|
||||||
private boolean playerOnline = false;
|
|
||||||
private CraftPlayer owner;
|
|
||||||
private int maxStack = MAX_STACK;
|
|
||||||
|
|
||||||
public SpecialEnderChest(Player player, Boolean online) {
|
|
||||||
super(PlayerDataManager.getHandle(player).getEnderChest().getName(),
|
|
||||||
PlayerDataManager.getHandle(player).getEnderChest().c(),
|
|
||||||
PlayerDataManager.getHandle(player).getEnderChest().getSize());
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.enderChest = nmsPlayer.getEnderChest();
|
|
||||||
this.owner = nmsPlayer.getBukkitEntity();
|
|
||||||
this.items = enderChest.getContents();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Inventory getBukkitInventory() {
|
|
||||||
return inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOnline(Player player) {
|
|
||||||
if (!playerOnline) {
|
|
||||||
try {
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.owner = nmsPlayer.getBukkitEntity();
|
|
||||||
InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
|
|
||||||
Field field = playerEnderChest.getClass().getField("items");
|
|
||||||
field.setAccessible(true);
|
|
||||||
field.set(playerEnderChest, this.items);
|
|
||||||
} catch (Exception e) {}
|
|
||||||
playerOnline = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOffline() {
|
|
||||||
playerOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInUse() {
|
|
||||||
return !this.getViewers().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack[] getContents() {
|
|
||||||
return this.items;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onOpen(CraftHumanEntity who) {
|
|
||||||
transaction.add(who);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onClose(CraftHumanEntity who) {
|
|
||||||
transaction.remove(who);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<HumanEntity> getViewers() {
|
|
||||||
return transaction;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public InventoryHolder getOwner() {
|
|
||||||
return this.owner;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setMaxStackSize(int size) {
|
|
||||||
maxStack = size;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getMaxStackSize() {
|
|
||||||
return maxStack;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void update() {
|
|
||||||
super.update();
|
|
||||||
enderChest.update();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvinternal</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>openinvadapter1_7_R1</artifactId>
|
|
||||||
<name>OpenInvAdapter1_7_R1</name>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.bukkit</groupId>
|
|
||||||
<artifactId>craftbukkit</artifactId>
|
|
||||||
<version>1.7.2-R0.4</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvcommon</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@@ -1,169 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_7_R1;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IAnySilentContainer;
|
|
||||||
|
|
||||||
import org.bukkit.ChatColor;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_7_R1.AxisAlignedBB;
|
|
||||||
import net.minecraft.server.v1_7_R1.Block;
|
|
||||||
import net.minecraft.server.v1_7_R1.BlockEnderChest;
|
|
||||||
import net.minecraft.server.v1_7_R1.Container;
|
|
||||||
import net.minecraft.server.v1_7_R1.EntityOcelot;
|
|
||||||
import net.minecraft.server.v1_7_R1.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_7_R1.IInventory;
|
|
||||||
import net.minecraft.server.v1_7_R1.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_7_R1.InventoryLargeChest;
|
|
||||||
import net.minecraft.server.v1_7_R1.PacketPlayOutOpenWindow;
|
|
||||||
import net.minecraft.server.v1_7_R1.TileEntityChest;
|
|
||||||
import net.minecraft.server.v1_7_R1.TileEntityEnderChest;
|
|
||||||
import net.minecraft.server.v1_7_R1.World;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_7_R1.event.CraftEventFactory;
|
|
||||||
|
|
||||||
public class AnySilentContainer implements IAnySilentContainer {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnySilentContainer(org.bukkit.block.Block block) {
|
|
||||||
return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
|
|
||||||
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
World world = player.world;
|
|
||||||
|
|
||||||
if (block instanceof BlockEnderChest) {
|
|
||||||
// Ender chests are not blocked by ocelots.
|
|
||||||
return world.t(block.getX(), block.getY() + 1, block.getZ());
|
|
||||||
}
|
|
||||||
|
|
||||||
// If block or ocelot on top
|
|
||||||
if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
int id = Block.b(world.getType(block.getX(), block.getY(), block.getZ()));
|
|
||||||
|
|
||||||
// If block next to chest is chest and has a block or ocelot on top
|
|
||||||
if (Block.b(world.getType(block.getX(), block.getY(), block.getZ() + 1)) == id) {
|
|
||||||
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
|
|
||||||
} else if(Block.b(world.getType(block.getX(), block.getY(), block.getZ() - 1)) == id) {
|
|
||||||
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
|
|
||||||
} else if (Block.b(world.getType(block.getX() + 1, block.getY(), block.getZ())) == id) {
|
|
||||||
return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
|
|
||||||
} else if (Block.b(world.getType(block.getX() - 1, block.getY(), block.getZ())) == id) {
|
|
||||||
return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isBlockedChest(World world, int x, int y, int z) {
|
|
||||||
return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean hasOcelotOnTop(World world, int x, int y, int z) {
|
|
||||||
for (Object localEntity : world.a(EntityOcelot.class,
|
|
||||||
AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
|
|
||||||
EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
|
|
||||||
if (localEntityOcelot.isSitting()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
|
|
||||||
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
|
|
||||||
// Silent ender chest is API-only
|
|
||||||
if (silentchest && block.getType() == Material.ENDER_CHEST) {
|
|
||||||
p.openInventory(p.getEnderChest());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
World world = player.world;
|
|
||||||
Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
if (tile == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tile instanceof TileEntityEnderChest) {
|
|
||||||
// Anychest ender chest. See net.minecraft.server.BlockEnderChest
|
|
||||||
InventoryEnderChest enderChest = player.getEnderChest();
|
|
||||||
enderChest.a((TileEntityEnderChest) tile);
|
|
||||||
player.openContainer(enderChest);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(tile instanceof IInventory)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
IInventory inventory = (IInventory) tile;
|
|
||||||
int id = Block.b(world.getType(block.getX(), block.getY(), block.getZ()));
|
|
||||||
|
|
||||||
if (Block.b(world.getType(block.getX(), block.getY(), block.getZ() + 1)) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
|
|
||||||
} else if(Block.b(world.getType(block.getX(), block.getY(), block.getZ() - 1)) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
|
|
||||||
} else if (Block.b(world.getType(block.getX() + 1, block.getY(), block.getZ())) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
|
|
||||||
} else if (Block.b(world.getType(block.getX() - 1, block.getY(), block.getZ())) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
// AnyChest only
|
|
||||||
if (!silentchest) {
|
|
||||||
player.openContainer(inventory);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// SilentChest
|
|
||||||
try {
|
|
||||||
// Call InventoryOpenEvent
|
|
||||||
Container container = new SilentContainerChest(player.inventory, inventory);
|
|
||||||
container = CraftEventFactory.callInventoryOpenEvent(player, container);
|
|
||||||
if (container == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Open window
|
|
||||||
int windowId = player.nextContainerCounter();
|
|
||||||
player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, 0, inventory.getInventoryName(), inventory.getSize(), true));
|
|
||||||
player.activeContainer = container;
|
|
||||||
player.activeContainer.windowId = windowId;
|
|
||||||
player.activeContainer.addSlotListener(player);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
p.sendMessage(ChatColor.RED + "Error while sending silent container.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_7_R1;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IInventoryAccess;
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
import com.lishid.openinv.util.InternalAccessor;
|
|
||||||
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_7_R1.IInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_7_R1.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class InventoryAccess implements IInventoryAccess {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialPlayerInventory) {
|
|
||||||
return (SpecialPlayerInventory) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialEnderChest(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialEnderChest) {
|
|
||||||
return (SpecialEnderChest) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_7_R1;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collection;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IPlayerDataManager;
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.OfflinePlayer;
|
|
||||||
import org.bukkit.Server;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_7_R1.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_7_R1.MinecraftServer;
|
|
||||||
import net.minecraft.server.v1_7_R1.PlayerInteractManager;
|
|
||||||
import net.minecraft.util.com.mojang.authlib.GameProfile;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_7_R1.CraftServer;
|
|
||||||
import org.bukkit.craftbukkit.v1_7_R1.entity.CraftPlayer;
|
|
||||||
|
|
||||||
public class PlayerDataManager implements IPlayerDataManager {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Player loadPlayer(OfflinePlayer offline) {
|
|
||||||
// Ensure the player has data
|
|
||||||
if (offline == null || !offline.hasPlayedBefore()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create a profile and entity to load the player data
|
|
||||||
GameProfile profile = new GameProfile(null, offline.getName());
|
|
||||||
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
|
|
||||||
EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
|
|
||||||
new PlayerInteractManager(server.getWorldServer(0)));
|
|
||||||
|
|
||||||
// Get the bukkit entity
|
|
||||||
Player target = (entity == null) ? null : entity.getBukkitEntity();
|
|
||||||
if (target != null) {
|
|
||||||
// Load data
|
|
||||||
target.loadData();
|
|
||||||
}
|
|
||||||
// Return the entity
|
|
||||||
return target;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getPlayerDataID(OfflinePlayer player) {
|
|
||||||
return player.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public OfflinePlayer getPlayerByID(String identifier) {
|
|
||||||
OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
|
|
||||||
// Ensure player is a real player, otherwise return null
|
|
||||||
if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return player;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<? extends Player> getOnlinePlayers() {
|
|
||||||
return Arrays.asList(Bukkit.getOnlinePlayers());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static EntityPlayer getHandle(Player player) {
|
|
||||||
if (player instanceof CraftPlayer) {
|
|
||||||
return ((CraftPlayer) player).getHandle();
|
|
||||||
}
|
|
||||||
|
|
||||||
Server server = player.getServer();
|
|
||||||
EntityPlayer nmsPlayer = null;
|
|
||||||
|
|
||||||
if (server instanceof CraftServer) {
|
|
||||||
nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nmsPlayer == null) {
|
|
||||||
// Could use reflection to examine fields, but it's honestly not worth the bother.
|
|
||||||
throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
|
|
||||||
}
|
|
||||||
|
|
||||||
return nmsPlayer;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_7_R1;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_7_R1.ContainerChest;
|
|
||||||
import net.minecraft.server.v1_7_R1.EntityHuman;
|
|
||||||
import net.minecraft.server.v1_7_R1.IInventory;
|
|
||||||
import net.minecraft.server.v1_7_R1.ItemStack;
|
|
||||||
import net.minecraft.server.v1_7_R1.PlayerInventory;
|
|
||||||
|
|
||||||
public class SilentContainerChest extends ContainerChest {
|
|
||||||
|
|
||||||
public SilentContainerChest(IInventory i1, IInventory i2) {
|
|
||||||
super(i1, i2);
|
|
||||||
// Send close signal
|
|
||||||
i2.l_();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void b(EntityHuman entityHuman) {
|
|
||||||
// Don't send close signal twice, might screw up
|
|
||||||
PlayerInventory playerinventory = entityHuman.inventory;
|
|
||||||
|
|
||||||
if (playerinventory.getCarried() != null) {
|
|
||||||
ItemStack carried = playerinventory.getCarried();
|
|
||||||
playerinventory.setCarried(null);
|
|
||||||
entityHuman.drop(carried, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,130 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_7_R1;
|
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
|
|
||||||
import org.bukkit.entity.HumanEntity;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
import org.bukkit.inventory.InventoryHolder;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_7_R1.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_7_R1.IInventory;
|
|
||||||
import net.minecraft.server.v1_7_R1.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_7_R1.InventorySubcontainer;
|
|
||||||
import net.minecraft.server.v1_7_R1.ItemStack;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_7_R1.entity.CraftHumanEntity;
|
|
||||||
import org.bukkit.craftbukkit.v1_7_R1.entity.CraftPlayer;
|
|
||||||
import org.bukkit.craftbukkit.v1_7_R1.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
|
|
||||||
|
|
||||||
private final InventoryEnderChest enderChest;
|
|
||||||
private final CraftInventory inventory = new CraftInventory(this);
|
|
||||||
private final List<HumanEntity> transaction = new ArrayList<HumanEntity>();
|
|
||||||
private boolean playerOnline = false;
|
|
||||||
private CraftPlayer owner;
|
|
||||||
private int maxStack = MAX_STACK;
|
|
||||||
|
|
||||||
public SpecialEnderChest(Player player, Boolean online) {
|
|
||||||
super(PlayerDataManager.getHandle(player).getEnderChest().getInventoryName(),
|
|
||||||
PlayerDataManager.getHandle(player).getEnderChest().k_(),
|
|
||||||
PlayerDataManager.getHandle(player).getEnderChest().getSize());
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.enderChest = nmsPlayer.getEnderChest();
|
|
||||||
this.owner = nmsPlayer.getBukkitEntity();
|
|
||||||
this.items = enderChest.getContents();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Inventory getBukkitInventory() {
|
|
||||||
return inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOnline(Player player) {
|
|
||||||
if (!playerOnline) {
|
|
||||||
try {
|
|
||||||
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
|
|
||||||
this.owner = nmsPlayer.getBukkitEntity();
|
|
||||||
InventoryEnderChest playerEnderChest = nmsPlayer.getEnderChest();
|
|
||||||
Field field = playerEnderChest.getClass().getField("items");
|
|
||||||
field.setAccessible(true);
|
|
||||||
field.set(playerEnderChest, this.items);
|
|
||||||
} catch (Exception e) {}
|
|
||||||
playerOnline = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOffline() {
|
|
||||||
playerOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInUse() {
|
|
||||||
return !this.getViewers().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack[] getContents() {
|
|
||||||
return this.items;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onOpen(CraftHumanEntity who) {
|
|
||||||
transaction.add(who);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onClose(CraftHumanEntity who) {
|
|
||||||
transaction.remove(who);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<HumanEntity> getViewers() {
|
|
||||||
return transaction;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public InventoryHolder getOwner() {
|
|
||||||
return this.owner;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setMaxStackSize(int size) {
|
|
||||||
maxStack = size;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getMaxStackSize() {
|
|
||||||
return maxStack;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void update() {
|
|
||||||
super.update();
|
|
||||||
enderChest.update();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,227 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_7_R1;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_7_R1.ItemStack;
|
|
||||||
import net.minecraft.server.v1_7_R1.PlayerInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_7_R1.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
|
|
||||||
|
|
||||||
private final ItemStack[] extra = new ItemStack[5];
|
|
||||||
private final CraftInventory inventory = new CraftInventory(this);
|
|
||||||
private boolean playerOnline = false;
|
|
||||||
|
|
||||||
public SpecialPlayerInventory(Player bukkitPlayer, Boolean online) {
|
|
||||||
super(PlayerDataManager.getHandle(bukkitPlayer));
|
|
||||||
this.playerOnline = online;
|
|
||||||
this.items = player.inventory.items;
|
|
||||||
this.armor = player.inventory.armor;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Inventory getBukkitInventory() {
|
|
||||||
return inventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOnline(Player player) {
|
|
||||||
if (!playerOnline) {
|
|
||||||
this.player = PlayerDataManager.getHandle(player);
|
|
||||||
this.player.inventory.items = this.items;
|
|
||||||
this.player.inventory.armor = this.armor;
|
|
||||||
playerOnline = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setPlayerOffline() {
|
|
||||||
playerOnline = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInUse() {
|
|
||||||
return !this.getViewers().isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack[] getContents() {
|
|
||||||
ItemStack[] contents = new ItemStack[getSize()];
|
|
||||||
System.arraycopy(items, 0, contents, 0, items.length);
|
|
||||||
System.arraycopy(armor, 0, contents, items.length, armor.length);
|
|
||||||
return contents;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getSize() {
|
|
||||||
return super.getSize() + 5;
|
|
||||||
}
|
|
||||||
|
|
||||||
@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, 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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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) {
|
|
||||||
ItemStack itemstack = is[i];
|
|
||||||
|
|
||||||
is[i] = null;
|
|
||||||
return itemstack;
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setItem(int i, ItemStack itemstack) {
|
|
||||||
ItemStack[] is = this.items;
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.armor;
|
|
||||||
} else {
|
|
||||||
i = getReversedItemSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i >= is.length) {
|
|
||||||
i -= is.length;
|
|
||||||
is = this.extra;
|
|
||||||
} else if (is == this.armor) {
|
|
||||||
i = getReversedArmorSlotNum(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Effects
|
|
||||||
if (is == this.extra) {
|
|
||||||
player.drop(itemstack, true);
|
|
||||||
itemstack = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
is[i] = itemstack;
|
|
||||||
|
|
||||||
player.defaultContainer.b();
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedItemSlotNum(int i) {
|
|
||||||
if (i >= 27) {
|
|
||||||
return i - 27;
|
|
||||||
}
|
|
||||||
return i + 9;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int getReversedArmorSlotNum(int i) {
|
|
||||||
if (i == 0) {
|
|
||||||
return 3;
|
|
||||||
}
|
|
||||||
if (i == 1) {
|
|
||||||
return 2;
|
|
||||||
}
|
|
||||||
if (i == 2) {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
if (i == 3) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getInventoryName() {
|
|
||||||
if (player.getName().length() > 16) {
|
|
||||||
return player.getName().substring(0, 16);
|
|
||||||
}
|
|
||||||
return player.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvinternal</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<artifactId>openinvadapter1_7_R2</artifactId>
|
|
||||||
<name>OpenInvAdapter1_7_R2</name>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.bukkit</groupId>
|
|
||||||
<artifactId>craftbukkit</artifactId>
|
|
||||||
<version>1.7.5-R0.1</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.lishid</groupId>
|
|
||||||
<artifactId>openinvcommon</artifactId>
|
|
||||||
<version>3.1.2</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@@ -1,169 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_7_R2;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IAnySilentContainer;
|
|
||||||
|
|
||||||
import org.bukkit.ChatColor;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_7_R2.AxisAlignedBB;
|
|
||||||
import net.minecraft.server.v1_7_R2.Block;
|
|
||||||
import net.minecraft.server.v1_7_R2.BlockEnderChest;
|
|
||||||
import net.minecraft.server.v1_7_R2.Container;
|
|
||||||
import net.minecraft.server.v1_7_R2.EntityOcelot;
|
|
||||||
import net.minecraft.server.v1_7_R2.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_7_R2.IInventory;
|
|
||||||
import net.minecraft.server.v1_7_R2.InventoryEnderChest;
|
|
||||||
import net.minecraft.server.v1_7_R2.InventoryLargeChest;
|
|
||||||
import net.minecraft.server.v1_7_R2.PacketPlayOutOpenWindow;
|
|
||||||
import net.minecraft.server.v1_7_R2.TileEntityChest;
|
|
||||||
import net.minecraft.server.v1_7_R2.TileEntityEnderChest;
|
|
||||||
import net.minecraft.server.v1_7_R2.World;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_7_R2.event.CraftEventFactory;
|
|
||||||
|
|
||||||
public class AnySilentContainer implements IAnySilentContainer {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnySilentContainer(org.bukkit.block.Block block) {
|
|
||||||
return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) {
|
|
||||||
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
World world = player.world;
|
|
||||||
|
|
||||||
if (block instanceof BlockEnderChest) {
|
|
||||||
// Ender chests are not blocked by ocelots.
|
|
||||||
return world.t(block.getX(), block.getY() + 1, block.getZ());
|
|
||||||
}
|
|
||||||
|
|
||||||
// If block or ocelot on top
|
|
||||||
if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
int id = Block.b(world.getType(block.getX(), block.getY(), block.getZ()));
|
|
||||||
|
|
||||||
// If block next to chest is chest and has a block or ocelot on top
|
|
||||||
if (Block.b(world.getType(block.getX(), block.getY(), block.getZ() + 1)) == id) {
|
|
||||||
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1);
|
|
||||||
} else if(Block.b(world.getType(block.getX(), block.getY(), block.getZ() - 1)) == id) {
|
|
||||||
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1);
|
|
||||||
} else if (Block.b(world.getType(block.getX() + 1, block.getY(), block.getZ())) == id) {
|
|
||||||
return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ());
|
|
||||||
} else if (Block.b(world.getType(block.getX() - 1, block.getY(), block.getZ())) == id) {
|
|
||||||
return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ());
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isBlockedChest(World world, int x, int y, int z) {
|
|
||||||
return world.t(x, y + 1, z) || hasOcelotOnTop(world, x, y, z);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean hasOcelotOnTop(World world, int x, int y, int z) {
|
|
||||||
for (Object localEntity : world.a(EntityOcelot.class,
|
|
||||||
AxisAlignedBB.a(x, y + 1, z, x + 1, y + 2, z + 1))) {
|
|
||||||
EntityOcelot localEntityOcelot = (EntityOcelot) localEntity;
|
|
||||||
if (localEntityOcelot.isSitting()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) {
|
|
||||||
|
|
||||||
EntityPlayer player = PlayerDataManager.getHandle(p);
|
|
||||||
|
|
||||||
// Silent ender chest is API-only
|
|
||||||
if (silentchest && block.getType() == Material.ENDER_CHEST) {
|
|
||||||
p.openInventory(p.getEnderChest());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
World world = player.world;
|
|
||||||
Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ());
|
|
||||||
|
|
||||||
if (tile == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tile instanceof TileEntityEnderChest) {
|
|
||||||
// Anychest ender chest. See net.minecraft.server.BlockEnderChest
|
|
||||||
InventoryEnderChest enderChest = player.getEnderChest();
|
|
||||||
enderChest.a((TileEntityEnderChest) tile);
|
|
||||||
player.openContainer(enderChest);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(tile instanceof IInventory)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
IInventory inventory = (IInventory) tile;
|
|
||||||
int id = Block.b(world.getType(block.getX(), block.getY(), block.getZ()));
|
|
||||||
|
|
||||||
if (Block.b(world.getType(block.getX(), block.getY(), block.getZ() + 1)) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1));
|
|
||||||
} else if(Block.b(world.getType(block.getX(), block.getY(), block.getZ() - 1)) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory);
|
|
||||||
} else if (Block.b(world.getType(block.getX() + 1, block.getY(), block.getZ())) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ()));
|
|
||||||
} else if (Block.b(world.getType(block.getX() - 1, block.getY(), block.getZ())) == id) {
|
|
||||||
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
// AnyChest only
|
|
||||||
if (!silentchest) {
|
|
||||||
player.openContainer(inventory);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// SilentChest
|
|
||||||
try {
|
|
||||||
// Call InventoryOpenEvent
|
|
||||||
Container container = new SilentContainerChest(player.inventory, inventory);
|
|
||||||
container = CraftEventFactory.callInventoryOpenEvent(player, container);
|
|
||||||
if (container == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Open window
|
|
||||||
int windowId = player.nextContainerCounter();
|
|
||||||
player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(windowId, 0, inventory.getInventoryName(), inventory.getSize(), true));
|
|
||||||
player.activeContainer = container;
|
|
||||||
player.activeContainer.windowId = windowId;
|
|
||||||
player.activeContainer.addSlotListener(player);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
p.sendMessage(ChatColor.RED + "Error while sending silent container.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_7_R2;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IInventoryAccess;
|
|
||||||
import com.lishid.openinv.internal.ISpecialEnderChest;
|
|
||||||
import com.lishid.openinv.internal.ISpecialPlayerInventory;
|
|
||||||
import com.lishid.openinv.util.InternalAccessor;
|
|
||||||
|
|
||||||
import org.bukkit.inventory.Inventory;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_7_R2.IInventory;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_7_R2.inventory.CraftInventory;
|
|
||||||
|
|
||||||
public class InventoryAccess implements IInventoryAccess {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialPlayerInventory;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialPlayerInventory) {
|
|
||||||
return (SpecialPlayerInventory) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isSpecialEnderChest(Inventory inventory) {
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
return InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory) instanceof ISpecialEnderChest;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) {
|
|
||||||
IInventory inv;
|
|
||||||
if (inventory instanceof CraftInventory) {
|
|
||||||
inv = ((CraftInventory) inventory).getInventory();
|
|
||||||
} else {
|
|
||||||
inv = InternalAccessor.grabFieldOfTypeFromObject(IInventory.class, inventory);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (inv instanceof SpecialEnderChest) {
|
|
||||||
return (SpecialEnderChest) inv;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,103 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_7_R2;
|
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collection;
|
|
||||||
|
|
||||||
import com.lishid.openinv.internal.IPlayerDataManager;
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.OfflinePlayer;
|
|
||||||
import org.bukkit.Server;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_7_R2.EntityPlayer;
|
|
||||||
import net.minecraft.server.v1_7_R2.MinecraftServer;
|
|
||||||
import net.minecraft.server.v1_7_R2.PlayerInteractManager;
|
|
||||||
import net.minecraft.util.com.mojang.authlib.GameProfile;
|
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.v1_7_R2.CraftServer;
|
|
||||||
import org.bukkit.craftbukkit.v1_7_R2.entity.CraftPlayer;
|
|
||||||
|
|
||||||
@SuppressWarnings("deprecation") // Deprecated methods are used properly and will not change.
|
|
||||||
public class PlayerDataManager implements IPlayerDataManager {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Player loadPlayer(OfflinePlayer offline) {
|
|
||||||
// Ensure the player has data
|
|
||||||
if (offline == null || !offline.hasPlayedBefore()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create a profile and entity to load the player data
|
|
||||||
GameProfile profile = new GameProfile(null, offline.getName());
|
|
||||||
MinecraftServer server = ((CraftServer) Bukkit.getServer()).getServer();
|
|
||||||
EntityPlayer entity = new EntityPlayer(server, server.getWorldServer(0), profile,
|
|
||||||
new PlayerInteractManager(server.getWorldServer(0)));
|
|
||||||
|
|
||||||
// Get the bukkit entity
|
|
||||||
Player target = (entity == null) ? null : entity.getBukkitEntity();
|
|
||||||
if (target != null) {
|
|
||||||
// Load data
|
|
||||||
target.loadData();
|
|
||||||
}
|
|
||||||
// Return the entity
|
|
||||||
return target;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getPlayerDataID(OfflinePlayer player) {
|
|
||||||
return player.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public OfflinePlayer getPlayerByID(String identifier) {
|
|
||||||
OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
|
|
||||||
// Ensure player is a real player, otherwise return null
|
|
||||||
if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return player;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<? extends Player> getOnlinePlayers() {
|
|
||||||
return Arrays.asList(Bukkit.getOnlinePlayers());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static EntityPlayer getHandle(Player player) {
|
|
||||||
if (player instanceof CraftPlayer) {
|
|
||||||
return ((CraftPlayer) player).getHandle();
|
|
||||||
}
|
|
||||||
|
|
||||||
Server server = player.getServer();
|
|
||||||
EntityPlayer nmsPlayer = null;
|
|
||||||
|
|
||||||
if (server instanceof CraftServer) {
|
|
||||||
nmsPlayer = ((CraftServer) server).getHandle().getPlayer(player.getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nmsPlayer == null) {
|
|
||||||
// Could use reflection to examine fields, but it's honestly not worth the bother.
|
|
||||||
throw new RuntimeException("Unable to fetch EntityPlayer from provided Player implementation");
|
|
||||||
}
|
|
||||||
|
|
||||||
return nmsPlayer;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2011-2014 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 com.lishid.openinv.internal.v1_7_R2;
|
|
||||||
|
|
||||||
import net.minecraft.server.v1_7_R2.ContainerChest;
|
|
||||||
import net.minecraft.server.v1_7_R2.EntityHuman;
|
|
||||||
import net.minecraft.server.v1_7_R2.IInventory;
|
|
||||||
import net.minecraft.server.v1_7_R2.ItemStack;
|
|
||||||
import net.minecraft.server.v1_7_R2.PlayerInventory;
|
|
||||||
|
|
||||||
public class SilentContainerChest extends ContainerChest {
|
|
||||||
|
|
||||||
public SilentContainerChest(IInventory i1, IInventory i2) {
|
|
||||||
super(i1, i2);
|
|
||||||
// Send close signal
|
|
||||||
i2.l_();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void b(EntityHuman entityHuman) {
|
|
||||||
// Don't send close signal twice, might screw up
|
|
||||||
PlayerInventory playerinventory = entityHuman.inventory;
|
|
||||||
|
|
||||||
if (playerinventory.getCarried() != null) {
|
|
||||||
ItemStack carried = playerinventory.getCarried();
|
|
||||||
playerinventory.setCarried(null);
|
|
||||||
entityHuman.drop(carried, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user