TotalFreedomMC/OpenInv
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/OpenInv.git synced 2025-08-07 04:53:15 +00:00
Code Issues Projects Releases Wiki Activity

Prepare for 1.14

Browse source 
To continue providing renamed ender chests/player inventories we can no longer just provide an Inventory, a full InventoryView is required. To avoid confusion the old method has been removed entirely, leading to a major API revision bump.
This commit is contained in:
Jikoo 2019-04-28 20:37:05 -04:00
parent adc35e9ad5
commit 9e37cbbca8
173 changed files with 2572 additions and 1911 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvparent</artifactId> <artifactId>openinvparent</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>openinvapi</artifactId> <artifactId>openinvapi</artifactId>

76
api/src/main/java/com/lishid/openinv/IOpenInv.java
View file

@ -16,16 +16,15 @@
package com.lishid.openinv; package com.lishid.openinv;
import javax.annotation.Nullable;
import com.lishid.openinv.internal.IAnySilentContainer; import com.lishid.openinv.internal.IAnySilentContainer;
import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.IInventoryAccess;
import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialEnderChest;
import com.lishid.openinv.internal.ISpecialPlayerInventory; import com.lishid.openinv.internal.ISpecialPlayerInventory;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/** /**
* Interface defining behavior for the OpenInv plugin. * Interface defining behavior for the OpenInv plugin.
@ -45,49 +44,21 @@ public interface IOpenInv {
boolean disableSaving(); boolean disableSaving();
/** /**
* Gets the active ISilentContainer implementation. May return null if the server version is * Gets the active ISilentContainer implementation.
* unsupported.
* *
* @return the ISilentContainer * @return the ISilentContainer
* @throws IllegalStateException if the server version is unsupported * @throws IllegalStateException if the server version is unsupported
*/ */
@NotNull
IAnySilentContainer getAnySilentContainer(); IAnySilentContainer getAnySilentContainer();
/** /**
* Gets an ISpecialEnderChest for the given Player. Returns null if the ISpecialEnderChest could * Gets the active IInventoryAccess implementation.
* not be instantiated.
*
* @param player the Player
* @param online true if the Player is currently online
* @return the ISpecialEnderChest
* @throws IllegalStateException if the server version is unsupported
* @deprecated Use {@link IOpenInv#getSpecialEnderChest(Player, boolean)}
*/
@Deprecated
@Nullable
ISpecialEnderChest getEnderChest(Player player, boolean online);
/**
* Gets an ISpecialPlayerInventory for the given Player. Returns null if the
* ISpecialPlayerInventory could not be instantiated.
*
* @param player the Player
* @param online true if the Player is currently online
* @return the ISpecialPlayerInventory
* @throws IllegalStateException if the server version is unsupported
* @deprecated Use {@link IOpenInv#getSpecialInventory(Player, boolean)}
*/
@Deprecated
@Nullable
ISpecialPlayerInventory getInventory(Player player, boolean online);
/**
* Gets the active IInventoryAccess implementation. May return null if the server version is
* unsupported.
* *
* @return the IInventoryAccess * @return the IInventoryAccess
* @throws IllegalStateException if the server version is unsupported * @throws IllegalStateException if the server version is unsupported
*/ */
@NotNull
IInventoryAccess getInventoryAccess(); IInventoryAccess getInventoryAccess();
/** /**
@ -97,7 +68,7 @@ public interface IOpenInv {
* @return true if AnyChest is enabled * @return true if AnyChest is enabled
* @throws IllegalStateException if the server version is unsupported * @throws IllegalStateException if the server version is unsupported
*/ */
boolean getPlayerAnyChestStatus(OfflinePlayer player); boolean getPlayerAnyChestStatus(@NotNull OfflinePlayer player);
/** /**
* Gets a unique identifier by which the OfflinePlayer can be referenced. Using the value * Gets a unique identifier by which the OfflinePlayer can be referenced. Using the value
@ -107,16 +78,17 @@ public interface IOpenInv {
* @return the identifier * @return the identifier
* @throws IllegalStateException if the server version is unsupported * @throws IllegalStateException if the server version is unsupported
*/ */
String getPlayerID(OfflinePlayer offline); @NotNull
String getPlayerID(@NotNull OfflinePlayer offline);
/** /**
* Gets a player's SilentChest setting. * Gets a player's SilentChest setting.
* *
* @param player the OfflinePlayer * @param offline the OfflinePlayer
* @return true if SilentChest is enabled * @return true if SilentChest is enabled
* @throws IllegalStateException if the server version is unsupported * @throws IllegalStateException if the server version is unsupported
*/ */
boolean getPlayerSilentChestStatus(OfflinePlayer player); boolean getPlayerSilentChestStatus(@NotNull OfflinePlayer offline);
/** /**
* Gets an ISpecialEnderChest for the given Player. * Gets an ISpecialEnderChest for the given Player.
@ -127,7 +99,8 @@ public interface IOpenInv {
* @throws IllegalStateException if the server version is unsupported * @throws IllegalStateException if the server version is unsupported
* @throws InstantiationException if the ISpecialEnderChest could not be instantiated * @throws InstantiationException if the ISpecialEnderChest could not be instantiated
*/ */
ISpecialEnderChest getSpecialEnderChest(Player player, boolean online) throws InstantiationException; @NotNull
ISpecialEnderChest getSpecialEnderChest(@NotNull Player player, boolean online) throws InstantiationException;
/** /**
* Gets an ISpecialPlayerInventory for the given Player. * Gets an ISpecialPlayerInventory for the given Player.
@ -138,7 +111,8 @@ public interface IOpenInv {
* @throws IllegalStateException if the server version is unsupported * @throws IllegalStateException if the server version is unsupported
* @throws InstantiationException if the ISpecialPlayerInventory could not be instantiated * @throws InstantiationException if the ISpecialPlayerInventory could not be instantiated
*/ */
ISpecialPlayerInventory getSpecialInventory(Player player, boolean online) throws InstantiationException; @NotNull
ISpecialPlayerInventory getSpecialInventory(@NotNull Player player, boolean online) throws InstantiationException;
/** /**
* Checks if the server version is supported by OpenInv. * Checks if the server version is supported by OpenInv.
@ -155,7 +129,7 @@ public interface IOpenInv {
* @throws IllegalStateException if the server version is unsupported * @throws IllegalStateException if the server version is unsupported
*/ */
@Nullable @Nullable
Player loadPlayer(final OfflinePlayer offline); Player loadPlayer(@NotNull final OfflinePlayer offline);
/** /**
* Get an OfflinePlayer by name. * Get an OfflinePlayer by name.
@ -168,7 +142,7 @@ public interface IOpenInv {
* @return the OfflinePlayer with the closest matching name or null if no players have ever logged in * @return the OfflinePlayer with the closest matching name or null if no players have ever logged in
*/ */
@Nullable @Nullable
OfflinePlayer matchPlayer(String name); OfflinePlayer matchPlayer(@NotNull String name);
/** /**
* Check the configuration value for whether or not OpenInv displays a notification to the user * Check the configuration value for whether or not OpenInv displays a notification to the user
@ -194,7 +168,7 @@ public interface IOpenInv {
* @param plugin the Plugin no longer holding a reference to the Player * @param plugin the Plugin no longer holding a reference to the Player
* @throws IllegalStateException if the server version is unsupported * @throws IllegalStateException if the server version is unsupported
*/ */
void releasePlayer(Player player, Plugin plugin); void releasePlayer(@NotNull Player player, @NotNull Plugin plugin);
/** /**
* Mark a Player as in use by a Plugin to prevent it from being removed from the cache. Used to * Mark a Player as in use by a Plugin to prevent it from being removed from the cache. Used to
@ -219,32 +193,32 @@ public interface IOpenInv {
* @param plugin the Plugin holding the reference to the Player * @param plugin the Plugin holding the reference to the Player
* @throws IllegalStateException if the server version is unsupported * @throws IllegalStateException if the server version is unsupported
*/ */
void retainPlayer(Player player, Plugin plugin); void retainPlayer(@NotNull Player player, @NotNull Plugin plugin);
/** /**
* Sets a player's AnyChest setting. * Sets a player's AnyChest setting.
* *
* @param player the OfflinePlayer * @param offline the OfflinePlayer
* @param status the status * @param status the status
* @throws IllegalStateException if the server version is unsupported * @throws IllegalStateException if the server version is unsupported
*/ */
void setPlayerAnyChestStatus(OfflinePlayer player, boolean status); void setPlayerAnyChestStatus(@NotNull OfflinePlayer offline, boolean status);
/** /**
* Sets a player's SilentChest setting. * Sets a player's SilentChest setting.
* *
* @param player the OfflinePlayer * @param offline the OfflinePlayer
* @param status the status * @param status the status
* @throws IllegalStateException if the server version is unsupported * @throws IllegalStateException if the server version is unsupported
*/ */
void setPlayerSilentChestStatus(OfflinePlayer player, boolean status); void setPlayerSilentChestStatus(@NotNull OfflinePlayer offline, boolean status);
/** /**
* Forcibly unload a cached Player's data. * Forcibly unload a cached Player's data.
* *
* @param player the OfflinePlayer to unload * @param offline the OfflinePlayer to unload
* @throws IllegalStateException if the server version is unsupported * @throws IllegalStateException if the server version is unsupported
*/ */
void unload(OfflinePlayer player); void unload(@NotNull OfflinePlayer offline);
} }

11
api/src/main/java/com/lishid/openinv/internal/IAnySilentContainer.java
View file

@ -18,6 +18,7 @@ package com.lishid.openinv.internal;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public interface IAnySilentContainer { public interface IAnySilentContainer {
@ -27,18 +28,18 @@ public interface IAnySilentContainer {
* first. * first.
* *
* @param player the Player opening the container * @param player the Player opening the container
* @param silentchest whether the container's noise is to be silenced * @param silent whether the container's noise is to be silenced
* @param block the Block * @param block the Block
* @return true if the container can be opened * @return true if the container can be opened
*/ */
boolean activateContainer(Player player, boolean silentchest, Block block); boolean activateContainer(@NotNull Player player, boolean silent, @NotNull Block block);
/** /**
* Closes the Player's currently open container silently, if necessary. * Closes the Player's currently open container silently, if necessary.
* *
* @param player the Player closing a container * @param player the Player closing a container
*/ */
void deactivateContainer(Player player); void deactivateContainer(@NotNull Player player);
/** /**
* Checks if the container at the given coordinates is blocked. * Checks if the container at the given coordinates is blocked.
@ -47,7 +48,7 @@ public interface IAnySilentContainer {
* @param block the Block * @param block the Block
* @return true if the container is blocked * @return true if the container is blocked
*/ */
boolean isAnyContainerNeeded(Player player, Block block); boolean isAnyContainerNeeded(@NotNull Player player, @NotNull Block block);
/** /**
* Checks if the given block is a container which can be unblocked or silenced. * Checks if the given block is a container which can be unblocked or silenced.
@ -55,6 +56,6 @@ public interface IAnySilentContainer {
* @param block the BlockState * @param block the BlockState
* @return true if the Block is a supported container * @return true if the Block is a supported container
*/ */
boolean isAnySilentContainer(Block block); boolean isAnySilentContainer(@NotNull Block block);
} }

12
api/src/main/java/com/lishid/openinv/internal/IInventoryAccess.java
View file

@ -16,9 +16,9 @@
package com.lishid.openinv.internal; package com.lishid.openinv.internal;
import javax.annotation.Nullable;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public interface IInventoryAccess { public interface IInventoryAccess {
@ -30,7 +30,7 @@ public interface IInventoryAccess {
* @return the ISpecialEnderChest or null * @return the ISpecialEnderChest or null
*/ */
@Nullable @Nullable
ISpecialEnderChest getSpecialEnderChest(Inventory inventory); ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory);
/** /**
* Gets an ISpecialPlayerInventory from an Inventory or null if the Inventory is not backed by * Gets an ISpecialPlayerInventory from an Inventory or null if the Inventory is not backed by
@ -40,7 +40,7 @@ public interface IInventoryAccess {
* @return the ISpecialPlayerInventory or null * @return the ISpecialPlayerInventory or null
*/ */
@Nullable @Nullable
ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory); ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory);
/** /**
* Check if an Inventory is an ISpecialEnderChest implementation. * Check if an Inventory is an ISpecialEnderChest implementation.
@ -48,7 +48,7 @@ public interface IInventoryAccess {
* @param inventory the Inventory * @param inventory the Inventory
* @return true if the Inventory is backed by an ISpecialEnderChest * @return true if the Inventory is backed by an ISpecialEnderChest
*/ */
boolean isSpecialEnderChest(Inventory inventory); boolean isSpecialEnderChest(@NotNull Inventory inventory);
/** /**
* Check if an Inventory is an ISpecialPlayerInventory implementation. * Check if an Inventory is an ISpecialPlayerInventory implementation.
@ -56,6 +56,6 @@ public interface IInventoryAccess {
* @param inventory the Inventory * @param inventory the Inventory
* @return true if the Inventory is backed by an ISpecialPlayerInventory * @return true if the Inventory is backed by an ISpecialPlayerInventory
*/ */
boolean isSpecialPlayerInventory(Inventory inventory); boolean isSpecialPlayerInventory(@NotNull Inventory inventory);
} }

14
api/src/main/java/com/lishid/openinv/internal/ISpecialEnderChest.java
View file

@ -17,23 +17,27 @@
package com.lishid.openinv.internal; package com.lishid.openinv.internal;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public interface ISpecialEnderChest { public interface ISpecialEnderChest {
/** /**
* Gets the Inventory associated with this ISpecialEnderChest. * Gets the InventoryView associated with this ISpecialEnderChest.
* *
* @return the Inventory * @param viewer the Player opening the ISpecialEnderChest
* @return the InventoryView
*/ */
Inventory getBukkitInventory(); @NotNull
InventoryView getBukkitView(@Nullable Player viewer);
/** /**
* Sets the Player associated with this ISpecialEnderChest online. * Sets the Player associated with this ISpecialEnderChest online.
* *
* @param player the Player coming online * @param player the Player coming online
*/ */
void setPlayerOnline(Player player); void setPlayerOnline(@NotNull Player player);
/** /**
* Sets the Player associated with this ISpecialEnderChest offline. * Sets the Player associated with this ISpecialEnderChest offline.

14
api/src/main/java/com/lishid/openinv/internal/ISpecialPlayerInventory.java
View file

@ -17,23 +17,27 @@
package com.lishid.openinv.internal; package com.lishid.openinv.internal;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public interface ISpecialPlayerInventory { public interface ISpecialPlayerInventory {
/** /**
* Gets the Inventory associated with this ISpecialPlayerInventory. * Gets the InventoryView associated with this ISpecialPlayerInventory.
* *
* @return the Inventory * @param viewer the Player opening the ISpecialPlayerInventory
* @return the InventoryView
*/ */
Inventory getBukkitInventory(); @NotNull
InventoryView getBukkitView(@Nullable Player viewer);
/** /**
* Sets the Player associated with this ISpecialPlayerInventory online. * Sets the Player associated with this ISpecialPlayerInventory online.
* *
* @param player the Player coming online * @param player the Player coming online
*/ */
void setPlayerOnline(Player player); void setPlayerOnline(@NotNull Player player);
/** /**
* Sets the Player associated with this ISpecialPlayerInventory offline. * Sets the Player associated with this ISpecialPlayerInventory offline.

2
assembly/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvparent</artifactId> <artifactId>openinvparent</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>openinvassembly</artifactId> <artifactId>openinvassembly</artifactId>

4
common/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvparent</artifactId> <artifactId>openinvparent</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>openinvcommon</artifactId> <artifactId>openinvcommon</artifactId>
@ -38,7 +38,7 @@
<dependency> <dependency>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvapi</artifactId> <artifactId>openinvapi</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

13
common/src/main/java/com/lishid/openinv/internal/IPlayerDataManager.java
View file

@ -17,9 +17,10 @@
package com.lishid.openinv.internal; package com.lishid.openinv.internal;
import java.util.Collection; import java.util.Collection;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public interface IPlayerDataManager { public interface IPlayerDataManager {
@ -31,7 +32,8 @@ public interface IPlayerDataManager {
* @param offline the OfflinePlayer * @param offline the OfflinePlayer
* @return the Player loaded * @return the Player loaded
*/ */
Player loadPlayer(OfflinePlayer offline); @Nullable
Player loadPlayer(@NotNull OfflinePlayer offline);
/** /**
* Gets a unique identifying string for an OfflinePlayer. * Gets a unique identifying string for an OfflinePlayer.
@ -39,7 +41,8 @@ public interface IPlayerDataManager {
* @param offline the OfflinePlayer * @param offline the OfflinePlayer
* @return the unique identifier * @return the unique identifier
*/ */
String getPlayerDataID(OfflinePlayer offline); @NotNull
String getPlayerDataID(@NotNull OfflinePlayer offline);
/** /**
* Gets an OfflinePlayer by the given unique identifier. * Gets an OfflinePlayer by the given unique identifier.
@ -47,13 +50,15 @@ public interface IPlayerDataManager {
* @param identifier the unique identifier * @param identifier the unique identifier
* @return the OfflinePlayer, or null if no exact match was found * @return the OfflinePlayer, or null if no exact match was found
*/ */
OfflinePlayer getPlayerByID(String identifier); @Nullable
OfflinePlayer getPlayerByID(@NotNull String identifier);
/** /**
* Gets a Collection of all Players currently online. * Gets a Collection of all Players currently online.
* *
* @return the Collection of Players * @return the Collection of Players
*/ */
@NotNull
Collection<? extends Player> getOnlinePlayers(); Collection<? extends Player> getOnlinePlayers();
} }

5
common/src/main/java/com/lishid/openinv/util/Cache.java
View file

@ -16,6 +16,8 @@
package com.lishid.openinv.util; package com.lishid.openinv.util;
import com.google.common.collect.Multimap;
import com.google.common.collect.TreeMultimap;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
@ -23,9 +25,6 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; 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. * A minimal thread-safe time-based cache implementation backed by a HashMap and TreeMultimap.
* *

11
common/src/main/java/com/lishid/openinv/util/InternalAccessor.java
View file

@ -16,16 +16,14 @@
package com.lishid.openinv.util; package com.lishid.openinv.util;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import com.lishid.openinv.internal.IAnySilentContainer; import com.lishid.openinv.internal.IAnySilentContainer;
import com.lishid.openinv.internal.IInventoryAccess; import com.lishid.openinv.internal.IInventoryAccess;
import com.lishid.openinv.internal.IPlayerDataManager; import com.lishid.openinv.internal.IPlayerDataManager;
import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialEnderChest;
import com.lishid.openinv.internal.ISpecialPlayerInventory; import com.lishid.openinv.internal.ISpecialPlayerInventory;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
@ -63,13 +61,14 @@ public class InternalAccessor {
this.version = packageName.substring(packageName.lastIndexOf('.') + 1); this.version = packageName.substring(packageName.lastIndexOf('.') + 1);
try { try {
// TODO: implement support for CraftMagicNumbers#getMappingsVersion
Class.forName("com.lishid.openinv.internal." + this.version + ".SpecialPlayerInventory"); Class.forName("com.lishid.openinv.internal." + this.version + ".SpecialPlayerInventory");
Class.forName("com.lishid.openinv.internal." + this.version + ".SpecialEnderChest"); Class.forName("com.lishid.openinv.internal." + this.version + ".SpecialEnderChest");
this.playerDataManager = this.createObject(IPlayerDataManager.class, "PlayerDataManager"); this.playerDataManager = this.createObject(IPlayerDataManager.class, "PlayerDataManager");
this.inventoryAccess = this.createObject(IInventoryAccess.class, "InventoryAccess"); this.inventoryAccess = this.createObject(IInventoryAccess.class, "InventoryAccess");
this.anySilentContainer = this.createObject(IAnySilentContainer.class, "AnySilentContainer"); this.anySilentContainer = this.createObject(IAnySilentContainer.class, "AnySilentContainer");
this.supported = true; this.supported = true;
} catch (Exception e) {} } catch (Exception ignored) {}
} }
private <T> T createObject(final Class<? extends T> assignableClass, final String className, private <T> T createObject(final Class<? extends T> assignableClass, final String className,

4
internal/1_4_5/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvinternal</artifactId> <artifactId>openinvinternal</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>openinvadapter1_4_5</artifactId> <artifactId>openinvadapter1_4_5</artifactId>
@ -37,7 +37,7 @@
<dependency> <dependency>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvcommon</artifactId> <artifactId>openinvcommon</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

78
internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/AnySilentContainer.java
View file

@ -17,11 +17,6 @@
package com.lishid.openinv.internal.v1_4_5; package com.lishid.openinv.internal.v1_4_5;
import com.lishid.openinv.internal.IAnySilentContainer; 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.AxisAlignedBB;
import net.minecraft.server.v1_4_5.BlockEnderChest; import net.minecraft.server.v1_4_5.BlockEnderChest;
import net.minecraft.server.v1_4_5.Container; import net.minecraft.server.v1_4_5.Container;
@ -34,43 +29,46 @@ import net.minecraft.server.v1_4_5.Packet100OpenWindow;
import net.minecraft.server.v1_4_5.TileEntityChest; import net.minecraft.server.v1_4_5.TileEntityChest;
import net.minecraft.server.v1_4_5.TileEntityEnderChest; import net.minecraft.server.v1_4_5.TileEntityEnderChest;
import net.minecraft.server.v1_4_5.World; import net.minecraft.server.v1_4_5.World;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_4_5.event.CraftEventFactory; import org.bukkit.craftbukkit.v1_4_5.event.CraftEventFactory;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class AnySilentContainer implements IAnySilentContainer { public class AnySilentContainer implements IAnySilentContainer {
@Override @Override
public boolean isAnySilentContainer(org.bukkit.block.Block block) { public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest; return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
} }
@Override @Override
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) { public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
EntityPlayer player = PlayerDataManager.getHandle(p); World world = PlayerDataManager.getHandle(bukkitPlayer).world;
World world = player.world;
if (block instanceof BlockEnderChest) { if (bukkitBlock instanceof BlockEnderChest) {
// Ender chests are not blocked by ocelots. // Ender chests are not blocked by ocelots.
return world.t(block.getX(), block.getY() + 1, block.getZ()); return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
} }
// If block or ocelot on top // If block or ocelot on top
if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) { if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
return true; return true;
} }
int id = world.getTypeId(block.getX(), block.getY(), block.getZ()); int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
// If block next to chest is chest and has a block or ocelot on top // 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) { if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1); return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() + 1);
} else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) { } else if(world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1); return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() - 1);
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ()); return isBlockedChest(world, bukkitBlock.getX() + 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ()); return isBlockedChest(world, bukkitBlock.getX() - 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
} }
return false; return false;
@ -93,18 +91,18 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) { public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
EntityPlayer player = PlayerDataManager.getHandle(p); EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
// Silent ender chest is API-only // Silent ender chest is API-only
if (silentchest && block.getType() == Material.ENDER_CHEST) { if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
p.openInventory(p.getEnderChest()); bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
return true; return true;
} }
World world = player.world; World world = player.world;
Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ()); Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
if (tile == null) { if (tile == null) {
return false; return false;
@ -123,20 +121,20 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
IInventory inventory = (IInventory) tile; IInventory inventory = (IInventory) tile;
int id = world.getTypeId(block.getX(), block.getY(), block.getZ()); int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) { if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1)); inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1));
} else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) { } else if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory); inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1), inventory);
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ())); inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()));
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory); inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()), inventory);
} }
// AnyChest only // AnyChest only
if (!silentchest) { if (!silent) {
player.openContainer(inventory); player.openContainer(inventory);
return true; return true;
} }
@ -160,12 +158,12 @@ public class AnySilentContainer implements IAnySilentContainer {
return true; return true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
p.sendMessage(ChatColor.RED + "Error while sending silent container."); bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
return false; return false;
} }
} }
@Override @Override
public void deactivateContainer(final Player bukkitPlayer) {} public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
} }

14
internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/InventoryAccess.java
View file

@ -20,17 +20,15 @@ import com.lishid.openinv.internal.IInventoryAccess;
import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialEnderChest;
import com.lishid.openinv.internal.ISpecialPlayerInventory; import com.lishid.openinv.internal.ISpecialPlayerInventory;
import com.lishid.openinv.util.InternalAccessor; import com.lishid.openinv.util.InternalAccessor;
import org.bukkit.inventory.Inventory;
import net.minecraft.server.v1_4_5.IInventory; import net.minecraft.server.v1_4_5.IInventory;
import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventory;
import org.bukkit.inventory.Inventory;
import org.jetbrains.annotations.NotNull;
public class InventoryAccess implements IInventoryAccess { public class InventoryAccess implements IInventoryAccess {
@Override @Override
public boolean isSpecialPlayerInventory(Inventory inventory) { public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory; return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
} }
@ -38,7 +36,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) { public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();
@ -53,7 +51,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public boolean isSpecialEnderChest(Inventory inventory) { public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest; return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
} }
@ -61,7 +59,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) { public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();

27
internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/PlayerDataManager.java
View file

@ -16,29 +16,26 @@
package com.lishid.openinv.internal.v1_4_5; package com.lishid.openinv.internal.v1_4_5;
import com.lishid.openinv.internal.IPlayerDataManager;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; 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.EntityPlayer;
import net.minecraft.server.v1_4_5.ItemInWorldManager; import net.minecraft.server.v1_4_5.ItemInWorldManager;
import net.minecraft.server.v1_4_5.MinecraftServer; import net.minecraft.server.v1_4_5.MinecraftServer;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_4_5.CraftServer; import org.bukkit.craftbukkit.v1_4_5.CraftServer;
import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager { public class PlayerDataManager implements IPlayerDataManager {
@Override @Override
public Player loadPlayer(OfflinePlayer offline) { public Player loadPlayer(@NotNull OfflinePlayer offline) {
// Ensure the player has data // Ensure the player has data
if (offline == null || !offline.hasPlayedBefore()) { if (!offline.hasPlayedBefore()) {
return null; return null;
} }
@ -49,7 +46,7 @@ public class PlayerDataManager implements IPlayerDataManager {
new ItemInWorldManager(server.getWorldServer(0))); new ItemInWorldManager(server.getWorldServer(0)));
// Get the bukkit entity // Get the bukkit entity
Player target = (entity == null) ? null : entity.getBukkitEntity(); Player target = entity.getBukkitEntity();
if (target != null) { if (target != null) {
// Load data // Load data
target.loadData(); target.loadData();
@ -58,13 +55,14 @@ public class PlayerDataManager implements IPlayerDataManager {
return target; return target;
} }
@NotNull
@Override @Override
public String getPlayerDataID(OfflinePlayer offline) { public String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getName(); return offline.getName();
} }
@Override @Override
public OfflinePlayer getPlayerByID(String identifier) { public OfflinePlayer getPlayerByID(@NotNull String identifier) {
OfflinePlayer player = Bukkit.getOfflinePlayer(identifier); OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
// Ensure player is a real player, otherwise return null // Ensure player is a real player, otherwise return null
if (player == null || !player.hasPlayedBefore() && !player.isOnline()) { if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
@ -73,6 +71,7 @@ public class PlayerDataManager implements IPlayerDataManager {
return player; return player;
} }
@NotNull
@Override @Override
public Collection<? extends Player> getOnlinePlayers() { public Collection<? extends Player> getOnlinePlayers() {
return Arrays.asList(Bukkit.getOnlinePlayers()); return Arrays.asList(Bukkit.getOnlinePlayers());

2
internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SilentContainerChest.java
View file

@ -24,7 +24,7 @@ import net.minecraft.server.v1_4_5.PlayerInventory;
class SilentContainerChest extends ContainerChest { class SilentContainerChest extends ContainerChest {
public SilentContainerChest(IInventory i1, IInventory i2) { SilentContainerChest(IInventory i1, IInventory i2) {
super(i1, i2); super(i1, i2);
// Send close signal // Send close signal
i2.f(); i2.f();

41
internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SpecialEnderChest.java
View file

@ -16,26 +16,25 @@
package com.lishid.openinv.internal.v1_4_5; package com.lishid.openinv.internal.v1_4_5;
import com.lishid.openinv.internal.ISpecialEnderChest;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; 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.EntityPlayer;
import net.minecraft.server.v1_4_5.IInventory; import net.minecraft.server.v1_4_5.IInventory;
import net.minecraft.server.v1_4_5.InventoryEnderChest; import net.minecraft.server.v1_4_5.InventoryEnderChest;
import net.minecraft.server.v1_4_5.InventorySubcontainer; import net.minecraft.server.v1_4_5.InventorySubcontainer;
import net.minecraft.server.v1_4_5.ItemStack; 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.CraftHumanEntity;
import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_4_5.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest { public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
@ -56,13 +55,31 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
this.items = enderChest.getContents(); this.items = enderChest.getContents();
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory; return inventory;
} }
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.ENDER_CHEST;
}
};
}
@Override @Override
public void setPlayerOnline(Player player) { public void setPlayerOnline(@NotNull Player player) {
if (!playerOnline) { if (!playerOnline) {
try { try {
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
@ -71,7 +88,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
Field field = playerEnderChest.getClass().getField("items"); Field field = playerEnderChest.getClass().getField("items");
field.setAccessible(true); field.setAccessible(true);
field.set(playerEnderChest, this.items); field.set(playerEnderChest, this.items);
} catch (Exception e) {} } catch (Exception ignored) {}
playerOnline = true; playerOnline = true;
} }
} }

33
internal/1_4_5/src/main/java/com/lishid/openinv/internal/v1_4_5/SpecialPlayerInventory.java
View file

@ -17,14 +17,15 @@
package com.lishid.openinv.internal.v1_4_5; package com.lishid.openinv.internal.v1_4_5;
import com.lishid.openinv.internal.ISpecialPlayerInventory; 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.ItemStack;
import net.minecraft.server.v1_4_5.PlayerInventory; import net.minecraft.server.v1_4_5.PlayerInventory;
import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_4_5.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory { public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@ -39,13 +40,31 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
this.armor = player.inventory.armor; this.armor = player.inventory.armor;
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory; return inventory;
} }
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.PLAYER;
}
};
}
@Override @Override
public void setPlayerOnline(Player player) { public void setPlayerOnline(@NotNull Player player) {
if (!playerOnline) { if (!playerOnline) {
this.player = PlayerDataManager.getHandle(player); this.player = PlayerDataManager.getHandle(player);
this.player.inventory.items = this.items; this.player.inventory.items = this.items;

4
internal/1_4_6/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvinternal</artifactId> <artifactId>openinvinternal</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>openinvadapter1_4_6</artifactId> <artifactId>openinvadapter1_4_6</artifactId>
@ -37,7 +37,7 @@
<dependency> <dependency>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvcommon</artifactId> <artifactId>openinvcommon</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

78
internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/AnySilentContainer.java
View file

@ -17,11 +17,6 @@
package com.lishid.openinv.internal.v1_4_6; package com.lishid.openinv.internal.v1_4_6;
import com.lishid.openinv.internal.IAnySilentContainer; 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.AxisAlignedBB;
import net.minecraft.server.v1_4_6.BlockEnderChest; import net.minecraft.server.v1_4_6.BlockEnderChest;
import net.minecraft.server.v1_4_6.Container; import net.minecraft.server.v1_4_6.Container;
@ -34,43 +29,46 @@ import net.minecraft.server.v1_4_6.Packet100OpenWindow;
import net.minecraft.server.v1_4_6.TileEntityChest; import net.minecraft.server.v1_4_6.TileEntityChest;
import net.minecraft.server.v1_4_6.TileEntityEnderChest; import net.minecraft.server.v1_4_6.TileEntityEnderChest;
import net.minecraft.server.v1_4_6.World; import net.minecraft.server.v1_4_6.World;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_4_6.event.CraftEventFactory; import org.bukkit.craftbukkit.v1_4_6.event.CraftEventFactory;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class AnySilentContainer implements IAnySilentContainer { public class AnySilentContainer implements IAnySilentContainer {
@Override @Override
public boolean isAnySilentContainer(org.bukkit.block.Block block) { public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest; return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
} }
@Override @Override
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) { public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
EntityPlayer player = PlayerDataManager.getHandle(p); World world = PlayerDataManager.getHandle(bukkitPlayer).world;
World world = player.world;
if (block instanceof BlockEnderChest) { if (bukkitBlock instanceof BlockEnderChest) {
// Ender chests are not blocked by ocelots. // Ender chests are not blocked by ocelots.
return world.t(block.getX(), block.getY() + 1, block.getZ()); return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
} }
// If block or ocelot on top // If block or ocelot on top
if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) { if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
return true; return true;
} }
int id = world.getTypeId(block.getX(), block.getY(), block.getZ()); int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
// If block next to chest is chest and has a block or ocelot on top // 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) { if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1); return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() + 1);
} else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) { } else if(world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1); return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() - 1);
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ()); return isBlockedChest(world, bukkitBlock.getX() + 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ()); return isBlockedChest(world, bukkitBlock.getX() - 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
} }
return false; return false;
@ -93,18 +91,18 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) { public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
EntityPlayer player = PlayerDataManager.getHandle(p); EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
// Silent ender chest is API-only // Silent ender chest is API-only
if (silentchest && block.getType() == Material.ENDER_CHEST) { if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
p.openInventory(p.getEnderChest()); bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
return true; return true;
} }
World world = player.world; World world = player.world;
Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ()); Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
if (tile == null) { if (tile == null) {
return false; return false;
@ -123,20 +121,20 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
IInventory inventory = (IInventory) tile; IInventory inventory = (IInventory) tile;
int id = world.getTypeId(block.getX(), block.getY(), block.getZ()); int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) { if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1)); inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1));
} else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) { } else if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory); inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1), inventory);
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ())); inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()));
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory); inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()), inventory);
} }
// AnyChest only // AnyChest only
if (!silentchest) { if (!silent) {
player.openContainer(inventory); player.openContainer(inventory);
return true; return true;
} }
@ -160,12 +158,12 @@ public class AnySilentContainer implements IAnySilentContainer {
return true; return true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
p.sendMessage(ChatColor.RED + "Error while sending silent container."); bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
return false; return false;
} }
} }
@Override @Override
public void deactivateContainer(final Player bukkitPlayer) {} public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
} }

14
internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/InventoryAccess.java
View file

@ -20,17 +20,15 @@ import com.lishid.openinv.internal.IInventoryAccess;
import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialEnderChest;
import com.lishid.openinv.internal.ISpecialPlayerInventory; import com.lishid.openinv.internal.ISpecialPlayerInventory;
import com.lishid.openinv.util.InternalAccessor; import com.lishid.openinv.util.InternalAccessor;
import org.bukkit.inventory.Inventory;
import net.minecraft.server.v1_4_6.IInventory; import net.minecraft.server.v1_4_6.IInventory;
import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory;
import org.bukkit.inventory.Inventory;
import org.jetbrains.annotations.NotNull;
public class InventoryAccess implements IInventoryAccess { public class InventoryAccess implements IInventoryAccess {
@Override @Override
public boolean isSpecialPlayerInventory(Inventory inventory) { public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory; return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
} }
@ -38,7 +36,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) { public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();
@ -53,7 +51,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public boolean isSpecialEnderChest(Inventory inventory) { public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest; return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
} }
@ -61,7 +59,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) { public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();

27
internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/PlayerDataManager.java
View file

@ -16,29 +16,26 @@
package com.lishid.openinv.internal.v1_4_6; package com.lishid.openinv.internal.v1_4_6;
import com.lishid.openinv.internal.IPlayerDataManager;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; 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.EntityPlayer;
import net.minecraft.server.v1_4_6.MinecraftServer; import net.minecraft.server.v1_4_6.MinecraftServer;
import net.minecraft.server.v1_4_6.PlayerInteractManager; import net.minecraft.server.v1_4_6.PlayerInteractManager;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_4_6.CraftServer; import org.bukkit.craftbukkit.v1_4_6.CraftServer;
import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager { public class PlayerDataManager implements IPlayerDataManager {
@Override @Override
public Player loadPlayer(OfflinePlayer offline) { public Player loadPlayer(@NotNull OfflinePlayer offline) {
// Ensure the player has data // Ensure the player has data
if (offline == null || !offline.hasPlayedBefore()) { if (!offline.hasPlayedBefore()) {
return null; return null;
} }
@ -49,7 +46,7 @@ public class PlayerDataManager implements IPlayerDataManager {
new PlayerInteractManager(server.getWorldServer(0))); new PlayerInteractManager(server.getWorldServer(0)));
// Get the bukkit entity // Get the bukkit entity
Player target = (entity == null) ? null : entity.getBukkitEntity(); Player target = entity.getBukkitEntity();
if (target != null) { if (target != null) {
// Load data // Load data
target.loadData(); target.loadData();
@ -58,13 +55,14 @@ public class PlayerDataManager implements IPlayerDataManager {
return target; return target;
} }
@NotNull
@Override @Override
public String getPlayerDataID(OfflinePlayer offline) { public String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getName(); return offline.getName();
} }
@Override @Override
public OfflinePlayer getPlayerByID(String identifier) { public OfflinePlayer getPlayerByID(@NotNull String identifier) {
OfflinePlayer player = Bukkit.getOfflinePlayer(identifier); OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
// Ensure player is a real player, otherwise return null // Ensure player is a real player, otherwise return null
if (player == null || !player.hasPlayedBefore() && !player.isOnline()) { if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
@ -73,6 +71,7 @@ public class PlayerDataManager implements IPlayerDataManager {
return player; return player;
} }
@NotNull
@Override @Override
public Collection<? extends Player> getOnlinePlayers() { public Collection<? extends Player> getOnlinePlayers() {
return Arrays.asList(Bukkit.getOnlinePlayers()); return Arrays.asList(Bukkit.getOnlinePlayers());

2
internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SilentContainerChest.java
View file

@ -24,7 +24,7 @@ import net.minecraft.server.v1_4_6.PlayerInventory;
class SilentContainerChest extends ContainerChest { class SilentContainerChest extends ContainerChest {
public SilentContainerChest(IInventory i1, IInventory i2) { SilentContainerChest(IInventory i1, IInventory i2) {
super(i1, i2); super(i1, i2);
// Send close signal // Send close signal
i2.f(); i2.f();

41
internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SpecialEnderChest.java
View file

@ -16,26 +16,25 @@
package com.lishid.openinv.internal.v1_4_6; package com.lishid.openinv.internal.v1_4_6;
import com.lishid.openinv.internal.ISpecialEnderChest;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; 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.EntityPlayer;
import net.minecraft.server.v1_4_6.IInventory; import net.minecraft.server.v1_4_6.IInventory;
import net.minecraft.server.v1_4_6.InventoryEnderChest; import net.minecraft.server.v1_4_6.InventoryEnderChest;
import net.minecraft.server.v1_4_6.InventorySubcontainer; import net.minecraft.server.v1_4_6.InventorySubcontainer;
import net.minecraft.server.v1_4_6.ItemStack; 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.CraftHumanEntity;
import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_4_6.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest { public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
@ -56,13 +55,31 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
this.items = enderChest.getContents(); this.items = enderChest.getContents();
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory; return inventory;
} }
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.ENDER_CHEST;
}
};
}
@Override @Override
public void setPlayerOnline(Player player) { public void setPlayerOnline(@NotNull Player player) {
if (!playerOnline) { if (!playerOnline) {
try { try {
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
@ -71,7 +88,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
Field field = playerEnderChest.getClass().getField("items"); Field field = playerEnderChest.getClass().getField("items");
field.setAccessible(true); field.setAccessible(true);
field.set(playerEnderChest, this.items); field.set(playerEnderChest, this.items);
} catch (Exception e) {} } catch (Exception ignored) {}
playerOnline = true; playerOnline = true;
} }
} }

33
internal/1_4_6/src/main/java/com/lishid/openinv/internal/v1_4_6/SpecialPlayerInventory.java
View file

@ -17,14 +17,15 @@
package com.lishid.openinv.internal.v1_4_6; package com.lishid.openinv.internal.v1_4_6;
import com.lishid.openinv.internal.ISpecialPlayerInventory; 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.ItemStack;
import net.minecraft.server.v1_4_6.PlayerInventory; import net.minecraft.server.v1_4_6.PlayerInventory;
import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_4_6.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory { public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@ -39,13 +40,31 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
this.armor = player.inventory.armor; this.armor = player.inventory.armor;
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory; return inventory;
} }
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.PLAYER;
}
};
}
@Override @Override
public void setPlayerOnline(Player player) { public void setPlayerOnline(@NotNull Player player) {
if (!playerOnline) { if (!playerOnline) {
this.player = PlayerDataManager.getHandle(player); this.player = PlayerDataManager.getHandle(player);
this.player.inventory.items = this.items; this.player.inventory.items = this.items;

2
internal/pom.xml
View file

@ -20,7 +20,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvparent</artifactId> <artifactId>openinvparent</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>openinvinternal</artifactId> <artifactId>openinvinternal</artifactId>

4
internal/v1_10_R1/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvinternal</artifactId> <artifactId>openinvinternal</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>openinvadapter1_10_R1</artifactId> <artifactId>openinvadapter1_10_R1</artifactId>
@ -37,7 +37,7 @@
<dependency> <dependency>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvcommon</artifactId> <artifactId>openinvcommon</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

38
internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/AnySilentContainer.java
View file

@ -16,14 +16,8 @@
package com.lishid.openinv.internal.v1_10_R1; package com.lishid.openinv.internal.v1_10_R1;
import java.lang.reflect.Field;
import com.lishid.openinv.internal.IAnySilentContainer; import com.lishid.openinv.internal.IAnySilentContainer;
import java.lang.reflect.Field;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import net.minecraft.server.v1_10_R1.AxisAlignedBB; import net.minecraft.server.v1_10_R1.AxisAlignedBB;
import net.minecraft.server.v1_10_R1.Block; import net.minecraft.server.v1_10_R1.Block;
import net.minecraft.server.v1_10_R1.BlockChest; import net.minecraft.server.v1_10_R1.BlockChest;
@ -43,6 +37,10 @@ import net.minecraft.server.v1_10_R1.TileEntity;
import net.minecraft.server.v1_10_R1.TileEntityChest; import net.minecraft.server.v1_10_R1.TileEntityChest;
import net.minecraft.server.v1_10_R1.TileEntityEnderChest; import net.minecraft.server.v1_10_R1.TileEntityEnderChest;
import net.minecraft.server.v1_10_R1.World; import net.minecraft.server.v1_10_R1.World;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class AnySilentContainer implements IAnySilentContainer { public class AnySilentContainer implements IAnySilentContainer {
@ -59,15 +57,15 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public boolean isAnySilentContainer(org.bukkit.block.Block block) { public boolean isAnySilentContainer(@NotNull org.bukkit.block.Block bukkitBlock) {
return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest; return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
} }
@Override @Override
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block b) { public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull org.bukkit.block.Block bukkitBlock) {
EntityPlayer player = PlayerDataManager.getHandle(p);
World world = player.world; World world = PlayerDataManager.getHandle(bukkitPlayer).world;
BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ()); BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
Block block = world.getType(blockPosition).getBlock(); Block block = world.getType(blockPosition).getBlock();
if (block instanceof BlockEnderChest) { if (block instanceof BlockEnderChest) {
@ -122,19 +120,19 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block b) { public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull org.bukkit.block.Block bukkitBlock) {
EntityPlayer player = PlayerDataManager.getHandle(p); EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
// Silent ender chest is pretty much API-only // Silent ender chest is pretty much API-only
if (silentchest && b.getType() == Material.ENDER_CHEST) { if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
p.openInventory(p.getEnderChest()); bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
player.b(StatisticList.X); player.b(StatisticList.X);
return true; return true;
} }
World world = player.world; World world = player.world;
BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ()); BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
Object tile = world.getTileEntity(blockPosition); Object tile = world.getTileEntity(blockPosition);
if (tile == null) { if (tile == null) {
@ -190,7 +188,7 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
// AnyChest only - SilentChest not active, container unsupported, or unnecessary. // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
if (!silentchest || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) { if (!silent || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) {
player.openContainer(tileInventory); player.openContainer(tileInventory);
return true; return true;
} }
@ -208,7 +206,7 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public void deactivateContainer(final Player bukkitPlayer) { public void deactivateContainer(@NotNull final Player bukkitPlayer) {
if (this.playerInteractManagerGamemode == null) { if (this.playerInteractManagerGamemode == null) {
return; return;
} }

14
internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/InventoryAccess.java
View file

@ -20,17 +20,15 @@ import com.lishid.openinv.internal.IInventoryAccess;
import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialEnderChest;
import com.lishid.openinv.internal.ISpecialPlayerInventory; import com.lishid.openinv.internal.ISpecialPlayerInventory;
import com.lishid.openinv.util.InternalAccessor; import com.lishid.openinv.util.InternalAccessor;
import org.bukkit.inventory.Inventory;
import net.minecraft.server.v1_10_R1.IInventory; import net.minecraft.server.v1_10_R1.IInventory;
import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory;
import org.bukkit.inventory.Inventory;
import org.jetbrains.annotations.NotNull;
public class InventoryAccess implements IInventoryAccess { public class InventoryAccess implements IInventoryAccess {
@Override @Override
public boolean isSpecialPlayerInventory(Inventory inventory) { public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory; return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
} }
@ -38,7 +36,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) { public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();
@ -53,7 +51,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public boolean isSpecialEnderChest(Inventory inventory) { public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest; return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
} }
@ -61,7 +59,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) { public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();

30
internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/PlayerDataManager.java
View file

@ -16,31 +16,27 @@
package com.lishid.openinv.internal.v1_10_R1; package com.lishid.openinv.internal.v1_10_R1;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.mojang.authlib.GameProfile;
import java.util.Collection; import java.util.Collection;
import java.util.UUID; 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.EntityPlayer;
import net.minecraft.server.v1_10_R1.MinecraftServer; import net.minecraft.server.v1_10_R1.MinecraftServer;
import net.minecraft.server.v1_10_R1.PlayerInteractManager; import net.minecraft.server.v1_10_R1.PlayerInteractManager;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_10_R1.CraftServer; import org.bukkit.craftbukkit.v1_10_R1.CraftServer;
import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_10_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager { public class PlayerDataManager implements IPlayerDataManager {
@Override @Override
public Player loadPlayer(OfflinePlayer offline) { public Player loadPlayer(@NotNull OfflinePlayer offline) {
// Ensure player has data // Ensure player has data
if (offline == null || !offline.hasPlayedBefore()) { if (!offline.hasPlayedBefore()) {
return null; return null;
} }
@ -51,7 +47,7 @@ public class PlayerDataManager implements IPlayerDataManager {
new PlayerInteractManager(server.getWorldServer(0))); new PlayerInteractManager(server.getWorldServer(0)));
// Get the bukkit entity // Get the bukkit entity
Player target = (entity == null) ? null : entity.getBukkitEntity(); Player target = entity.getBukkitEntity();
if (target != null) { if (target != null) {
// Load data // Load data
target.loadData(); target.loadData();
@ -60,13 +56,14 @@ public class PlayerDataManager implements IPlayerDataManager {
return target; return target;
} }
@NotNull
@Override @Override
public String getPlayerDataID(OfflinePlayer offline) { public String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getUniqueId().toString(); return offline.getUniqueId().toString();
} }
@Override @Override
public OfflinePlayer getPlayerByID(String identifier) { public OfflinePlayer getPlayerByID(@NotNull String identifier) {
try { try {
UUID uuid = UUID.fromString(identifier); UUID uuid = UUID.fromString(identifier);
OfflinePlayer player = Bukkit.getOfflinePlayer(uuid); OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
@ -81,6 +78,7 @@ public class PlayerDataManager implements IPlayerDataManager {
} }
} }
@NotNull
@Override @Override
public Collection<? extends Player> getOnlinePlayers() { public Collection<? extends Player> getOnlinePlayers() {
return Bukkit.getOnlinePlayers(); return Bukkit.getOnlinePlayers();

38
internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/SpecialEnderChest.java
View file

@ -16,21 +16,21 @@
package com.lishid.openinv.internal.v1_10_R1; package com.lishid.openinv.internal.v1_10_R1;
import com.lishid.openinv.internal.ISpecialEnderChest;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier; 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.EntityPlayer;
import net.minecraft.server.v1_10_R1.IInventory; import net.minecraft.server.v1_10_R1.IInventory;
import net.minecraft.server.v1_10_R1.InventoryEnderChest; import net.minecraft.server.v1_10_R1.InventoryEnderChest;
import net.minecraft.server.v1_10_R1.InventorySubcontainer; import net.minecraft.server.v1_10_R1.InventorySubcontainer;
import net.minecraft.server.v1_10_R1.ItemStack; import net.minecraft.server.v1_10_R1.ItemStack;
import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest { public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
@ -69,19 +69,37 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
} }
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory; return inventory;
} }
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.ENDER_CHEST;
}
};
}
@Override @Override
public void setPlayerOnline(Player player) { public void setPlayerOnline(@NotNull Player player) {
if (!playerOnline) { if (!playerOnline) {
try { try {
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
this.bukkitOwner = nmsPlayer.getBukkitEntity(); this.bukkitOwner = nmsPlayer.getBukkitEntity();
setItemArrays(nmsPlayer.getEnderChest(), this.items); setItemArrays(nmsPlayer.getEnderChest(), this.items);
} catch (Exception e) {} } catch (Exception ignored) {}
playerOnline = true; playerOnline = true;
} }
} }

36
internal/v1_10_R1/src/main/java/com/lishid/openinv/internal/v1_10_R1/SpecialPlayerInventory.java
View file

@ -16,19 +16,19 @@
package com.lishid.openinv.internal.v1_10_R1; package com.lishid.openinv.internal.v1_10_R1;
import com.lishid.openinv.internal.ISpecialPlayerInventory;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier; 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.EntityHuman;
import net.minecraft.server.v1_10_R1.ItemStack; import net.minecraft.server.v1_10_R1.ItemStack;
import net.minecraft.server.v1_10_R1.PlayerInventory; import net.minecraft.server.v1_10_R1.PlayerInventory;
import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory { public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@ -79,13 +79,31 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory; return inventory;
} }
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.PLAYER;
}
};
}
@Override @Override
public void setPlayerOnline(Player player) { public void setPlayerOnline(@NotNull Player player) {
if (!playerOnline) { if (!playerOnline) {
this.player = PlayerDataManager.getHandle(player); this.player = PlayerDataManager.getHandle(player);
setItemArrays(this.player.inventory, items, armor, extraSlots); setItemArrays(this.player.inventory, items, armor, extraSlots);

4
internal/v1_11_R1/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvinternal</artifactId> <artifactId>openinvinternal</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>openinvadapter1_11_R1</artifactId> <artifactId>openinvadapter1_11_R1</artifactId>
@ -37,7 +37,7 @@
<dependency> <dependency>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvcommon</artifactId> <artifactId>openinvcommon</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

46
internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/AnySilentContainer.java
View file

@ -16,15 +16,8 @@
package com.lishid.openinv.internal.v1_11_R1; package com.lishid.openinv.internal.v1_11_R1;
import java.lang.reflect.Field;
import com.lishid.openinv.internal.IAnySilentContainer; import com.lishid.openinv.internal.IAnySilentContainer;
import java.lang.reflect.Field;
import org.bukkit.Material;
import org.bukkit.block.BlockState;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import net.minecraft.server.v1_11_R1.AxisAlignedBB; import net.minecraft.server.v1_11_R1.AxisAlignedBB;
import net.minecraft.server.v1_11_R1.Block; import net.minecraft.server.v1_11_R1.Block;
import net.minecraft.server.v1_11_R1.BlockChest; import net.minecraft.server.v1_11_R1.BlockChest;
@ -35,18 +28,23 @@ import net.minecraft.server.v1_11_R1.Entity;
import net.minecraft.server.v1_11_R1.EntityOcelot; import net.minecraft.server.v1_11_R1.EntityOcelot;
import net.minecraft.server.v1_11_R1.EntityPlayer; import net.minecraft.server.v1_11_R1.EntityPlayer;
import net.minecraft.server.v1_11_R1.EnumDirection; import net.minecraft.server.v1_11_R1.EnumDirection;
import net.minecraft.server.v1_11_R1.EnumGamemode;
import net.minecraft.server.v1_11_R1.IBlockData; import net.minecraft.server.v1_11_R1.IBlockData;
import net.minecraft.server.v1_11_R1.ITileInventory; import net.minecraft.server.v1_11_R1.ITileInventory;
import net.minecraft.server.v1_11_R1.InventoryEnderChest; import net.minecraft.server.v1_11_R1.InventoryEnderChest;
import net.minecraft.server.v1_11_R1.InventoryLargeChest; import net.minecraft.server.v1_11_R1.InventoryLargeChest;
import net.minecraft.server.v1_11_R1.PlayerInteractManager;
import net.minecraft.server.v1_11_R1.StatisticList; import net.minecraft.server.v1_11_R1.StatisticList;
import net.minecraft.server.v1_11_R1.TileEntity; import net.minecraft.server.v1_11_R1.TileEntity;
import net.minecraft.server.v1_11_R1.TileEntityChest; import net.minecraft.server.v1_11_R1.TileEntityChest;
import net.minecraft.server.v1_11_R1.TileEntityEnderChest; import net.minecraft.server.v1_11_R1.TileEntityEnderChest;
import net.minecraft.server.v1_11_R1.TileEntityShulkerBox; import net.minecraft.server.v1_11_R1.TileEntityShulkerBox;
import net.minecraft.server.v1_11_R1.World; import net.minecraft.server.v1_11_R1.World;
import net.minecraft.server.v1_11_R1.EnumGamemode; import org.bukkit.Material;
import net.minecraft.server.v1_11_R1.PlayerInteractManager; import org.bukkit.block.BlockState;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class AnySilentContainer implements IAnySilentContainer { public class AnySilentContainer implements IAnySilentContainer {
@ -63,19 +61,19 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public boolean isAnySilentContainer(org.bukkit.block.Block block) { public boolean isAnySilentContainer(@NotNull org.bukkit.block.Block bukkitBlock) {
if (block.getType() == Material.ENDER_CHEST) { if (bukkitBlock.getType() == Material.ENDER_CHEST) {
return true; return true;
} }
BlockState state = block.getState(); BlockState state = bukkitBlock.getState();
return state instanceof org.bukkit.block.Chest || state instanceof org.bukkit.block.ShulkerBox; return state instanceof org.bukkit.block.Chest || state instanceof org.bukkit.block.ShulkerBox;
} }
@Override @Override
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block b) { public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull org.bukkit.block.Block bukkitBlock) {
EntityPlayer player = PlayerDataManager.getHandle(p);
World world = player.world; World world = PlayerDataManager.getHandle(bukkitPlayer).world;
BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ()); BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
IBlockData blockData = world.getType(blockPosition); IBlockData blockData = world.getType(blockPosition);
Block block = blockData.getBlock(); Block block = blockData.getBlock();
@ -162,19 +160,19 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block b) { public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull org.bukkit.block.Block bukkitBlock) {
EntityPlayer player = PlayerDataManager.getHandle(p); EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
// Silent ender chest is pretty much API-only // Silent ender chest is pretty much API-only
if (silentchest && b.getType() == Material.ENDER_CHEST) { if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
p.openInventory(p.getEnderChest()); bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
player.b(StatisticList.getStatistic("stat.enderchestOpened")); player.b(StatisticList.getStatistic("stat.enderchestOpened"));
return true; return true;
} }
final World world = player.world; final World world = player.world;
final BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ()); final BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
final Object tile = world.getTileEntity(blockPosition); final Object tile = world.getTileEntity(blockPosition);
if (tile == null) { if (tile == null) {
@ -234,7 +232,7 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
// AnyChest only - SilentChest not active, container unsupported, or unnecessary. // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
if (!silentchest || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) { if (!silent || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) {
player.openContainer(tileInventory); player.openContainer(tileInventory);
return true; return true;
} }
@ -252,7 +250,7 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public void deactivateContainer(final Player bukkitPlayer) { public void deactivateContainer(@NotNull final Player bukkitPlayer) {
if (this.playerInteractManagerGamemode == null) { if (this.playerInteractManagerGamemode == null) {
return; return;
} }

14
internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/InventoryAccess.java
View file

@ -20,17 +20,15 @@ import com.lishid.openinv.internal.IInventoryAccess;
import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialEnderChest;
import com.lishid.openinv.internal.ISpecialPlayerInventory; import com.lishid.openinv.internal.ISpecialPlayerInventory;
import com.lishid.openinv.util.InternalAccessor; import com.lishid.openinv.util.InternalAccessor;
import org.bukkit.inventory.Inventory;
import net.minecraft.server.v1_11_R1.IInventory; import net.minecraft.server.v1_11_R1.IInventory;
import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftInventory;
import org.bukkit.inventory.Inventory;
import org.jetbrains.annotations.NotNull;
public class InventoryAccess implements IInventoryAccess { public class InventoryAccess implements IInventoryAccess {
@Override @Override
public boolean isSpecialPlayerInventory(Inventory inventory) { public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory; return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
} }
@ -38,7 +36,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) { public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();
@ -53,7 +51,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public boolean isSpecialEnderChest(Inventory inventory) { public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest; return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
} }
@ -61,7 +59,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) { public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();

30
internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/PlayerDataManager.java
View file

@ -16,31 +16,27 @@
package com.lishid.openinv.internal.v1_11_R1; package com.lishid.openinv.internal.v1_11_R1;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.mojang.authlib.GameProfile;
import java.util.Collection; import java.util.Collection;
import java.util.UUID; 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.EntityPlayer;
import net.minecraft.server.v1_11_R1.MinecraftServer; import net.minecraft.server.v1_11_R1.MinecraftServer;
import net.minecraft.server.v1_11_R1.PlayerInteractManager; import net.minecraft.server.v1_11_R1.PlayerInteractManager;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_11_R1.CraftServer; import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager { public class PlayerDataManager implements IPlayerDataManager {
@Override @Override
public Player loadPlayer(OfflinePlayer offline) { public Player loadPlayer(@NotNull OfflinePlayer offline) {
// Ensure player has data // Ensure player has data
if (offline == null || !offline.hasPlayedBefore()) { if (!offline.hasPlayedBefore()) {
return null; return null;
} }
@ -51,7 +47,7 @@ public class PlayerDataManager implements IPlayerDataManager {
new PlayerInteractManager(server.getWorldServer(0))); new PlayerInteractManager(server.getWorldServer(0)));
// Get the bukkit entity // Get the bukkit entity
Player target = (entity == null) ? null : entity.getBukkitEntity(); Player target = entity.getBukkitEntity();
if (target != null) { if (target != null) {
// Load data // Load data
target.loadData(); target.loadData();
@ -60,13 +56,14 @@ public class PlayerDataManager implements IPlayerDataManager {
return target; return target;
} }
@NotNull
@Override @Override
public String getPlayerDataID(OfflinePlayer offline) { public String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getUniqueId().toString(); return offline.getUniqueId().toString();
} }
@Override @Override
public OfflinePlayer getPlayerByID(String identifier) { public OfflinePlayer getPlayerByID(@NotNull String identifier) {
try { try {
UUID uuid = UUID.fromString(identifier); UUID uuid = UUID.fromString(identifier);
OfflinePlayer player = Bukkit.getOfflinePlayer(uuid); OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
@ -81,6 +78,7 @@ public class PlayerDataManager implements IPlayerDataManager {
} }
} }
@NotNull
@Override @Override
public Collection<? extends Player> getOnlinePlayers() { public Collection<? extends Player> getOnlinePlayers() {
return Bukkit.getOnlinePlayers(); return Bukkit.getOnlinePlayers();

38
internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SpecialEnderChest.java
View file

@ -16,22 +16,22 @@
package com.lishid.openinv.internal.v1_11_R1; package com.lishid.openinv.internal.v1_11_R1;
import com.lishid.openinv.internal.ISpecialEnderChest;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.List; 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.EntityPlayer;
import net.minecraft.server.v1_11_R1.IInventory; import net.minecraft.server.v1_11_R1.IInventory;
import net.minecraft.server.v1_11_R1.InventoryEnderChest; import net.minecraft.server.v1_11_R1.InventoryEnderChest;
import net.minecraft.server.v1_11_R1.InventorySubcontainer; import net.minecraft.server.v1_11_R1.InventorySubcontainer;
import net.minecraft.server.v1_11_R1.ItemStack; import net.minecraft.server.v1_11_R1.ItemStack;
import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest { public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
@ -70,19 +70,37 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
} }
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory; return inventory;
} }
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.ENDER_CHEST;
}
};
}
@Override @Override
public void setPlayerOnline(Player player) { public void setPlayerOnline(@NotNull Player player) {
if (!playerOnline) { if (!playerOnline) {
try { try {
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
this.bukkitOwner = nmsPlayer.getBukkitEntity(); this.bukkitOwner = nmsPlayer.getBukkitEntity();
setItemLists(nmsPlayer.getEnderChest(), this.items); setItemLists(nmsPlayer.getEnderChest(), this.items);
} catch (Exception e) {} } catch (Exception ignored) {}
playerOnline = true; playerOnline = true;
} }
} }

36
internal/v1_11_R1/src/main/java/com/lishid/openinv/internal/v1_11_R1/SpecialPlayerInventory.java
View file

@ -16,22 +16,22 @@
package com.lishid.openinv.internal.v1_11_R1; package com.lishid.openinv.internal.v1_11_R1;
import com.lishid.openinv.internal.ISpecialPlayerInventory;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.Arrays; 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.ContainerUtil;
import net.minecraft.server.v1_11_R1.EntityHuman; import net.minecraft.server.v1_11_R1.EntityHuman;
import net.minecraft.server.v1_11_R1.ItemStack; import net.minecraft.server.v1_11_R1.ItemStack;
import net.minecraft.server.v1_11_R1.NonNullList; import net.minecraft.server.v1_11_R1.NonNullList;
import net.minecraft.server.v1_11_R1.PlayerInventory; import net.minecraft.server.v1_11_R1.PlayerInventory;
import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory { public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@ -81,13 +81,31 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory; return inventory;
} }
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.PLAYER;
}
};
}
@Override @Override
public void setPlayerOnline(Player player) { public void setPlayerOnline(@NotNull Player player) {
if (!playerOnline) { if (!playerOnline) {
this.player = PlayerDataManager.getHandle(player); this.player = PlayerDataManager.getHandle(player);
setItemArrays(this.player.inventory, items, armor, extraSlots); setItemArrays(this.player.inventory, items, armor, extraSlots);

4
internal/v1_12_R1/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvinternal</artifactId> <artifactId>openinvinternal</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>openinvadapter1_12_R1</artifactId> <artifactId>openinvadapter1_12_R1</artifactId>
@ -37,7 +37,7 @@
<dependency> <dependency>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvcommon</artifactId> <artifactId>openinvcommon</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

36
internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/AnySilentContainer.java
View file

@ -16,16 +16,8 @@
package com.lishid.openinv.internal.v1_12_R1; package com.lishid.openinv.internal.v1_12_R1;
import java.lang.reflect.Field;
import com.lishid.openinv.internal.IAnySilentContainer; import com.lishid.openinv.internal.IAnySilentContainer;
import java.lang.reflect.Field;
import org.bukkit.Material;
import org.bukkit.Statistic;
import org.bukkit.block.BlockState;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import net.minecraft.server.v1_12_R1.AxisAlignedBB; import net.minecraft.server.v1_12_R1.AxisAlignedBB;
import net.minecraft.server.v1_12_R1.Block; import net.minecraft.server.v1_12_R1.Block;
import net.minecraft.server.v1_12_R1.BlockChest; import net.minecraft.server.v1_12_R1.BlockChest;
@ -47,6 +39,12 @@ import net.minecraft.server.v1_12_R1.TileEntityChest;
import net.minecraft.server.v1_12_R1.TileEntityEnderChest; import net.minecraft.server.v1_12_R1.TileEntityEnderChest;
import net.minecraft.server.v1_12_R1.TileEntityShulkerBox; import net.minecraft.server.v1_12_R1.TileEntityShulkerBox;
import net.minecraft.server.v1_12_R1.World; import net.minecraft.server.v1_12_R1.World;
import org.bukkit.Material;
import org.bukkit.Statistic;
import org.bukkit.block.BlockState;
import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class AnySilentContainer implements IAnySilentContainer { public class AnySilentContainer implements IAnySilentContainer {
@ -63,20 +61,20 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public boolean isAnySilentContainer(final org.bukkit.block.Block block) { public boolean isAnySilentContainer(@NotNull final org.bukkit.block.Block bukkitBlock) {
if (block.getType() == Material.ENDER_CHEST) { if (bukkitBlock.getType() == Material.ENDER_CHEST) {
return true; return true;
} }
BlockState state = block.getState(); BlockState state = bukkitBlock.getState();
return state instanceof org.bukkit.block.Chest return state instanceof org.bukkit.block.Chest
|| state instanceof org.bukkit.block.ShulkerBox; || state instanceof org.bukkit.block.ShulkerBox;
} }
@Override @Override
public boolean isAnyContainerNeeded(final Player p, final org.bukkit.block.Block b) { public boolean isAnyContainerNeeded(@NotNull final Player p, @NotNull final org.bukkit.block.Block bukkitBlock) {
EntityPlayer player = PlayerDataManager.getHandle(p);
World world = player.world; World world = PlayerDataManager.getHandle(p).world;
BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ()); BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
IBlockData blockData = world.getType(blockPosition); IBlockData blockData = world.getType(blockPosition);
Block block = blockData.getBlock(); Block block = blockData.getBlock();
@ -158,8 +156,8 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public boolean activateContainer(final Player bukkitPlayer, final boolean silentchest, public boolean activateContainer(@NotNull final Player bukkitPlayer, final boolean silentchest,
final org.bukkit.block.Block bukkitBlock) { @NotNull final org.bukkit.block.Block bukkitBlock) {
// Silent ender chest is API-only // Silent ender chest is API-only
if (silentchest && bukkitBlock.getType() == Material.ENDER_CHEST) { if (silentchest && bukkitBlock.getType() == Material.ENDER_CHEST) {
@ -250,7 +248,7 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public void deactivateContainer(final Player bukkitPlayer) { public void deactivateContainer(@NotNull final Player bukkitPlayer) {
if (this.playerInteractManagerGamemode == null) { if (this.playerInteractManagerGamemode == null) {
return; return;
} }

14
internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/InventoryAccess.java
View file

@ -20,17 +20,15 @@ import com.lishid.openinv.internal.IInventoryAccess;
import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialEnderChest;
import com.lishid.openinv.internal.ISpecialPlayerInventory; import com.lishid.openinv.internal.ISpecialPlayerInventory;
import com.lishid.openinv.util.InternalAccessor; import com.lishid.openinv.util.InternalAccessor;
import org.bukkit.inventory.Inventory;
import net.minecraft.server.v1_12_R1.IInventory; import net.minecraft.server.v1_12_R1.IInventory;
import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory;
import org.bukkit.inventory.Inventory;
import org.jetbrains.annotations.NotNull;
public class InventoryAccess implements IInventoryAccess { public class InventoryAccess implements IInventoryAccess {
@Override @Override
public ISpecialEnderChest getSpecialEnderChest(final Inventory inventory) { public ISpecialEnderChest getSpecialEnderChest(@NotNull final Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();
@ -45,7 +43,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialPlayerInventory getSpecialPlayerInventory(final Inventory inventory) { public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull final Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();
@ -60,7 +58,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public boolean isSpecialEnderChest(final Inventory inventory) { public boolean isSpecialEnderChest(@NotNull final Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest; return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
} }
@ -69,7 +67,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public boolean isSpecialPlayerInventory(final Inventory inventory) { public boolean isSpecialPlayerInventory(@NotNull final Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory; return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
} }

30
internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/PlayerDataManager.java
View file

@ -16,24 +16,20 @@
package com.lishid.openinv.internal.v1_12_R1; package com.lishid.openinv.internal.v1_12_R1;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.mojang.authlib.GameProfile;
import java.util.Collection; import java.util.Collection;
import java.util.UUID; 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_12_R1.EntityPlayer; import net.minecraft.server.v1_12_R1.EntityPlayer;
import net.minecraft.server.v1_12_R1.MinecraftServer; import net.minecraft.server.v1_12_R1.MinecraftServer;
import net.minecraft.server.v1_12_R1.PlayerInteractManager; import net.minecraft.server.v1_12_R1.PlayerInteractManager;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.craftbukkit.v1_12_R1.CraftServer;
import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager { public class PlayerDataManager implements IPlayerDataManager {
@ -58,13 +54,14 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer; return nmsPlayer;
} }
@NotNull
@Override @Override
public Collection<? extends Player> getOnlinePlayers() { public Collection<? extends Player> getOnlinePlayers() {
return Bukkit.getOnlinePlayers(); return Bukkit.getOnlinePlayers();
} }
@Override @Override
public OfflinePlayer getPlayerByID(final String identifier) { public OfflinePlayer getPlayerByID(@NotNull final String identifier) {
try { try {
UUID uuid = UUID.fromString(identifier); UUID uuid = UUID.fromString(identifier);
OfflinePlayer player = Bukkit.getOfflinePlayer(uuid); OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
@ -79,15 +76,16 @@ public class PlayerDataManager implements IPlayerDataManager {
} }
} }
@NotNull
@Override @Override
public String getPlayerDataID(final OfflinePlayer offline) { public String getPlayerDataID(@NotNull final OfflinePlayer offline) {
return offline.getUniqueId().toString(); return offline.getUniqueId().toString();
} }
@Override @Override
public Player loadPlayer(final OfflinePlayer offline) { public Player loadPlayer(@NotNull final OfflinePlayer offline) {
// Ensure player has data // Ensure player has data
if (offline == null || !offline.hasPlayedBefore()) { if (!offline.hasPlayedBefore()) {
return null; return null;
} }
@ -98,7 +96,7 @@ public class PlayerDataManager implements IPlayerDataManager {
new PlayerInteractManager(server.getWorldServer(0))); new PlayerInteractManager(server.getWorldServer(0)));
// Get the bukkit entity // Get the bukkit entity
Player target = entity == null ? null : entity.getBukkitEntity(); Player target = entity.getBukkitEntity();
if (target != null) { if (target != null) {
// Load data // Load data
target.loadData(); target.loadData();

40
internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/SpecialEnderChest.java
View file

@ -16,22 +16,22 @@
package com.lishid.openinv.internal.v1_12_R1; package com.lishid.openinv.internal.v1_12_R1;
import com.lishid.openinv.internal.ISpecialEnderChest;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.List; 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_12_R1.EntityPlayer; import net.minecraft.server.v1_12_R1.EntityPlayer;
import net.minecraft.server.v1_12_R1.IInventory; import net.minecraft.server.v1_12_R1.IInventory;
import net.minecraft.server.v1_12_R1.InventoryEnderChest; import net.minecraft.server.v1_12_R1.InventoryEnderChest;
import net.minecraft.server.v1_12_R1.InventorySubcontainer; import net.minecraft.server.v1_12_R1.InventorySubcontainer;
import net.minecraft.server.v1_12_R1.ItemStack; import net.minecraft.server.v1_12_R1.ItemStack;
import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialEnderChest extends InventorySubcontainer public class SpecialEnderChest extends InventorySubcontainer
implements IInventory, ISpecialEnderChest { implements IInventory, ISpecialEnderChest {
@ -51,9 +51,27 @@ public class SpecialEnderChest extends InventorySubcontainer
this.setItemLists(this, this.enderChest.getContents()); this.setItemLists(this, this.enderChest.getContents());
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return this.inventory; return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory;
}
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.ENDER_CHEST;
}
};
} }
@Override @Override
@ -83,13 +101,13 @@ public class SpecialEnderChest extends InventorySubcontainer
} }
@Override @Override
public void setPlayerOnline(final Player player) { public void setPlayerOnline(@NotNull final Player player) {
if (!this.playerOnline) { if (!this.playerOnline) {
try { try {
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
this.bukkitOwner = nmsPlayer.getBukkitEntity(); this.bukkitOwner = nmsPlayer.getBukkitEntity();
this.setItemLists(nmsPlayer.getEnderChest(), this.items); this.setItemLists(nmsPlayer.getEnderChest(), this.items);
} catch (Exception e) {} } catch (Exception ignored) {}
this.playerOnline = true; this.playerOnline = true;
} }
} }

38
internal/v1_12_R1/src/main/java/com/lishid/openinv/internal/v1_12_R1/SpecialPlayerInventory.java
View file

@ -16,22 +16,22 @@
package com.lishid.openinv.internal.v1_12_R1; package com.lishid.openinv.internal.v1_12_R1;
import com.lishid.openinv.internal.ISpecialPlayerInventory;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.Arrays; 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_12_R1.ContainerUtil; import net.minecraft.server.v1_12_R1.ContainerUtil;
import net.minecraft.server.v1_12_R1.EntityHuman; import net.minecraft.server.v1_12_R1.EntityHuman;
import net.minecraft.server.v1_12_R1.ItemStack; import net.minecraft.server.v1_12_R1.ItemStack;
import net.minecraft.server.v1_12_R1.NonNullList; import net.minecraft.server.v1_12_R1.NonNullList;
import net.minecraft.server.v1_12_R1.PlayerInventory; import net.minecraft.server.v1_12_R1.PlayerInventory;
import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_12_R1.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory { public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@ -50,9 +50,27 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
return true; return true;
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return this.inventory; return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory;
}
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.PLAYER;
}
};
} }
@Override @Override
@ -191,7 +209,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public void setPlayerOnline(final Player player) { public void setPlayerOnline(@NotNull final Player player) {
if (!this.playerOnline) { if (!this.playerOnline) {
this.player = PlayerDataManager.getHandle(player); this.player = PlayerDataManager.getHandle(player);
this.setItemArrays(this.player.inventory, this.items, this.armor, this.extraSlots); this.setItemArrays(this.player.inventory, this.items, this.armor, this.extraSlots);

4
internal/v1_13_R1/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvinternal</artifactId> <artifactId>openinvinternal</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>openinvadapter1_13_R1</artifactId> <artifactId>openinvadapter1_13_R1</artifactId>
@ -37,7 +37,7 @@
<dependency> <dependency>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvcommon</artifactId> <artifactId>openinvcommon</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

28
internal/v1_13_R1/src/main/java/com/lishid/openinv/internal/v1_13_R1/AnySilentContainer.java
View file

@ -17,6 +17,7 @@
package com.lishid.openinv.internal.v1_13_R1; package com.lishid.openinv.internal.v1_13_R1;
import com.lishid.openinv.internal.IAnySilentContainer; import com.lishid.openinv.internal.IAnySilentContainer;
import java.lang.reflect.Field;
import net.minecraft.server.v1_13_R1.AxisAlignedBB; import net.minecraft.server.v1_13_R1.AxisAlignedBB;
import net.minecraft.server.v1_13_R1.Block; import net.minecraft.server.v1_13_R1.Block;
import net.minecraft.server.v1_13_R1.BlockChest; import net.minecraft.server.v1_13_R1.BlockChest;
@ -47,8 +48,7 @@ import org.bukkit.Statistic;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
import java.lang.reflect.Field;
public class AnySilentContainer implements IAnySilentContainer { public class AnySilentContainer implements IAnySilentContainer {
@ -65,20 +65,20 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public boolean isAnySilentContainer(final org.bukkit.block.Block block) { public boolean isAnySilentContainer(@NotNull final org.bukkit.block.Block bukkitBlock) {
if (block.getType() == Material.ENDER_CHEST) { if (bukkitBlock.getType() == Material.ENDER_CHEST) {
return true; return true;
} }
BlockState state = block.getState(); BlockState state = bukkitBlock.getState();
return state instanceof org.bukkit.block.Chest return state instanceof org.bukkit.block.Chest
|| state instanceof org.bukkit.block.ShulkerBox; || state instanceof org.bukkit.block.ShulkerBox;
} }
@Override @Override
public boolean isAnyContainerNeeded(final Player p, final org.bukkit.block.Block b) { public boolean isAnyContainerNeeded(@NotNull final Player bukkitPlayer, @NotNull final org.bukkit.block.Block bukkitBlock) {
EntityPlayer player = com.lishid.openinv.internal.v1_13_R1.PlayerDataManager.getHandle(p);
World world = player.world; World world = PlayerDataManager.getHandle(bukkitPlayer).world;
BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ()); BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
IBlockData blockData = world.getType(blockPosition); IBlockData blockData = world.getType(blockPosition);
Block block = blockData.getBlock(); Block block = blockData.getBlock();
@ -160,11 +160,11 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public boolean activateContainer(final Player bukkitPlayer, final boolean silentchest, public boolean activateContainer(@NotNull final Player bukkitPlayer, final boolean silentsilent,
final org.bukkit.block.Block bukkitBlock) { @NotNull final org.bukkit.block.Block bukkitBlock) {
// Silent ender chest is API-only // Silent ender chest is API-only
if (silentchest && bukkitBlock.getType() == Material.ENDER_CHEST) { if (silentsilent && bukkitBlock.getType() == Material.ENDER_CHEST) {
bukkitPlayer.openInventory(bukkitPlayer.getEnderChest()); bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED); bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
return true; return true;
@ -236,7 +236,7 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
// AnyChest only - SilentChest not active, container unsupported, or unnecessary. // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
if (!silentchest || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) { if (!silentsilent || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) {
player.openContainer(tileInventory); player.openContainer(tileInventory);
return true; return true;
} }
@ -254,7 +254,7 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public void deactivateContainer(final Player bukkitPlayer) { public void deactivateContainer(@NotNull final Player bukkitPlayer) {
if (this.playerInteractManagerGamemode == null) { if (this.playerInteractManagerGamemode == null) {
return; return;
} }

14
internal/v1_13_R1/src/main/java/com/lishid/openinv/internal/v1_13_R1/InventoryAccess.java
View file

@ -20,17 +20,15 @@ import com.lishid.openinv.internal.IInventoryAccess;
import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialEnderChest;
import com.lishid.openinv.internal.ISpecialPlayerInventory; import com.lishid.openinv.internal.ISpecialPlayerInventory;
import com.lishid.openinv.util.InternalAccessor; import com.lishid.openinv.util.InternalAccessor;
import org.bukkit.inventory.Inventory;
import net.minecraft.server.v1_13_R1.IInventory; import net.minecraft.server.v1_13_R1.IInventory;
import org.bukkit.craftbukkit.v1_13_R1.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_13_R1.inventory.CraftInventory;
import org.bukkit.inventory.Inventory;
import org.jetbrains.annotations.NotNull;
public class InventoryAccess implements IInventoryAccess { public class InventoryAccess implements IInventoryAccess {
@Override @Override
public ISpecialEnderChest getSpecialEnderChest(final Inventory inventory) { public ISpecialEnderChest getSpecialEnderChest(@NotNull final Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();
@ -45,7 +43,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialPlayerInventory getSpecialPlayerInventory(final Inventory inventory) { public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull final Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();
@ -60,7 +58,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public boolean isSpecialEnderChest(final Inventory inventory) { public boolean isSpecialEnderChest(@NotNull final Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest; return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
} }
@ -69,7 +67,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public boolean isSpecialPlayerInventory(final Inventory inventory) { public boolean isSpecialPlayerInventory(@NotNull final Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory; return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
} }

28
internal/v1_13_R1/src/main/java/com/lishid/openinv/internal/v1_13_R1/PlayerDataManager.java
View file

@ -16,24 +16,20 @@
package com.lishid.openinv.internal.v1_13_R1; package com.lishid.openinv.internal.v1_13_R1;
import com.lishid.openinv.internal.IPlayerDataManager;
import com.mojang.authlib.GameProfile;
import java.util.Collection; import java.util.Collection;
import java.util.UUID; 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_13_R1.EntityPlayer; import net.minecraft.server.v1_13_R1.EntityPlayer;
import net.minecraft.server.v1_13_R1.MinecraftServer; import net.minecraft.server.v1_13_R1.MinecraftServer;
import net.minecraft.server.v1_13_R1.PlayerInteractManager; import net.minecraft.server.v1_13_R1.PlayerInteractManager;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_13_R1.CraftServer; import org.bukkit.craftbukkit.v1_13_R1.CraftServer;
import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_13_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager { public class PlayerDataManager implements IPlayerDataManager {
@ -57,13 +53,14 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer; return nmsPlayer;
} }
@NotNull
@Override @Override
public Collection<? extends Player> getOnlinePlayers() { public Collection<? extends Player> getOnlinePlayers() {
return Bukkit.getOnlinePlayers(); return Bukkit.getOnlinePlayers();
} }
@Override @Override
public OfflinePlayer getPlayerByID(final String identifier) { public OfflinePlayer getPlayerByID(@NotNull final String identifier) {
try { try {
UUID uuid = UUID.fromString(identifier); UUID uuid = UUID.fromString(identifier);
OfflinePlayer player = Bukkit.getOfflinePlayer(uuid); OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
@ -78,15 +75,16 @@ public class PlayerDataManager implements IPlayerDataManager {
} }
} }
@NotNull
@Override @Override
public String getPlayerDataID(final OfflinePlayer offline) { public String getPlayerDataID(@NotNull final OfflinePlayer offline) {
return offline.getUniqueId().toString(); return offline.getUniqueId().toString();
} }
@Override @Override
public Player loadPlayer(final OfflinePlayer offline) { public Player loadPlayer(@NotNull final OfflinePlayer offline) {
// Ensure player has data // Ensure player has data
if (offline == null || !offline.hasPlayedBefore()) { if (!offline.hasPlayedBefore()) {
return null; return null;
} }

40
internal/v1_13_R1/src/main/java/com/lishid/openinv/internal/v1_13_R1/SpecialEnderChest.java
View file

@ -16,22 +16,22 @@
package com.lishid.openinv.internal.v1_13_R1; package com.lishid.openinv.internal.v1_13_R1;
import com.lishid.openinv.internal.ISpecialEnderChest;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.List; 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_13_R1.EntityPlayer; import net.minecraft.server.v1_13_R1.EntityPlayer;
import net.minecraft.server.v1_13_R1.IInventory; import net.minecraft.server.v1_13_R1.IInventory;
import net.minecraft.server.v1_13_R1.InventoryEnderChest; import net.minecraft.server.v1_13_R1.InventoryEnderChest;
import net.minecraft.server.v1_13_R1.InventorySubcontainer; import net.minecraft.server.v1_13_R1.InventorySubcontainer;
import net.minecraft.server.v1_13_R1.ItemStack; import net.minecraft.server.v1_13_R1.ItemStack;
import org.bukkit.craftbukkit.v1_13_R1.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_13_R1.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialEnderChest extends InventorySubcontainer public class SpecialEnderChest extends InventorySubcontainer
implements IInventory, ISpecialEnderChest { implements IInventory, ISpecialEnderChest {
@ -48,9 +48,27 @@ public class SpecialEnderChest extends InventorySubcontainer
this.setItemLists(this, this.enderChest.getContents()); this.setItemLists(this, this.enderChest.getContents());
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return this.inventory; return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory;
}
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.ENDER_CHEST;
}
};
} }
@Override @Override
@ -79,13 +97,13 @@ public class SpecialEnderChest extends InventorySubcontainer
} }
@Override @Override
public void setPlayerOnline(final Player player) { public void setPlayerOnline(@NotNull final Player player) {
if (!this.playerOnline) { if (!this.playerOnline) {
try { try {
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
this.bukkitOwner = nmsPlayer.getBukkitEntity(); this.bukkitOwner = nmsPlayer.getBukkitEntity();
this.setItemLists(nmsPlayer.getEnderChest(), this.items); this.setItemLists(nmsPlayer.getEnderChest(), this.items);
} catch (Exception e) {} } catch (Exception ignored) {}
this.playerOnline = true; this.playerOnline = true;
} }
} }

40
internal/v1_13_R1/src/main/java/com/lishid/openinv/internal/v1_13_R1/SpecialPlayerInventory.java
View file

@ -16,24 +16,24 @@
package com.lishid.openinv.internal.v1_13_R1; package com.lishid.openinv.internal.v1_13_R1;
import com.lishid.openinv.internal.ISpecialPlayerInventory;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.Arrays; import java.util.Arrays;
import com.lishid.openinv.internal.ISpecialPlayerInventory;
import net.minecraft.server.v1_13_R1.ChatMessage; import net.minecraft.server.v1_13_R1.ChatMessage;
import net.minecraft.server.v1_13_R1.IChatBaseComponent;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import net.minecraft.server.v1_13_R1.ContainerUtil; import net.minecraft.server.v1_13_R1.ContainerUtil;
import net.minecraft.server.v1_13_R1.EntityHuman; import net.minecraft.server.v1_13_R1.EntityHuman;
import net.minecraft.server.v1_13_R1.IChatBaseComponent;
import net.minecraft.server.v1_13_R1.ItemStack; import net.minecraft.server.v1_13_R1.ItemStack;
import net.minecraft.server.v1_13_R1.NonNullList; import net.minecraft.server.v1_13_R1.NonNullList;
import net.minecraft.server.v1_13_R1.PlayerInventory; import net.minecraft.server.v1_13_R1.PlayerInventory;
import org.bukkit.craftbukkit.v1_13_R1.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_13_R1.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory { public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@ -52,9 +52,27 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
return true; return true;
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return this.inventory; return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory;
}
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.PLAYER;
}
};
} }
@Override @Override
@ -190,7 +208,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public void setPlayerOnline(final Player player) { public void setPlayerOnline(@NotNull final Player player) {
if (!this.playerOnline) { if (!this.playerOnline) {
this.player = PlayerDataManager.getHandle(player); this.player = PlayerDataManager.getHandle(player);
this.setItemArrays(this.player.inventory, this.items, this.armor, this.extraSlots); this.setItemArrays(this.player.inventory, this.items, this.armor, this.extraSlots);

4
internal/v1_13_R2/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvinternal</artifactId> <artifactId>openinvinternal</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>openinvadapter1_13_R2</artifactId> <artifactId>openinvadapter1_13_R2</artifactId>
@ -37,7 +37,7 @@
<dependency> <dependency>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvcommon</artifactId> <artifactId>openinvcommon</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

32
internal/v1_13_R2/src/main/java/com/lishid/openinv/internal/v1_13_R2/AnySilentContainer.java
View file

@ -17,6 +17,9 @@
package com.lishid.openinv.internal.v1_13_R2; package com.lishid.openinv.internal.v1_13_R2;
import com.lishid.openinv.internal.IAnySilentContainer; import com.lishid.openinv.internal.IAnySilentContainer;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import net.minecraft.server.v1_13_R2.AxisAlignedBB; import net.minecraft.server.v1_13_R2.AxisAlignedBB;
import net.minecraft.server.v1_13_R2.Block; import net.minecraft.server.v1_13_R2.Block;
import net.minecraft.server.v1_13_R2.BlockChest; import net.minecraft.server.v1_13_R2.BlockChest;
@ -48,10 +51,7 @@ import org.bukkit.Statistic;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
public class AnySilentContainer implements IAnySilentContainer { public class AnySilentContainer implements IAnySilentContainer {
@ -68,20 +68,20 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public boolean isAnySilentContainer(final org.bukkit.block.Block block) { public boolean isAnySilentContainer(@NotNull final org.bukkit.block.Block bukkitBlock) {
if (block.getType() == Material.ENDER_CHEST) { if (bukkitBlock.getType() == Material.ENDER_CHEST) {
return true; return true;
} }
BlockState state = block.getState(); BlockState state = bukkitBlock.getState();
return state instanceof org.bukkit.block.Chest return state instanceof org.bukkit.block.Chest
|| state instanceof org.bukkit.block.ShulkerBox; || state instanceof org.bukkit.block.ShulkerBox;
} }
@Override @Override
public boolean isAnyContainerNeeded(final Player p, final org.bukkit.block.Block b) { public boolean isAnyContainerNeeded(@NotNull final Player bukkitPlayer, @NotNull final org.bukkit.block.Block bukkitBlock) {
EntityPlayer player = PlayerDataManager.getHandle(p);
World world = player.world; World world = PlayerDataManager.getHandle(bukkitPlayer).world;
BlockPosition blockPosition = new BlockPosition(b.getX(), b.getY(), b.getZ()); BlockPosition blockPosition = new BlockPosition(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
IBlockData blockData = world.getType(blockPosition); IBlockData blockData = world.getType(blockPosition);
Block block = blockData.getBlock(); Block block = blockData.getBlock();
@ -172,11 +172,11 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public boolean activateContainer(final Player bukkitPlayer, final boolean silentchest, public boolean activateContainer(@NotNull final Player bukkitPlayer, final boolean silent,
final org.bukkit.block.Block bukkitBlock) { @NotNull final org.bukkit.block.Block bukkitBlock) {
// Silent ender chest is API-only // Silent ender chest is API-only
if (silentchest && bukkitBlock.getType() == Material.ENDER_CHEST) { if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
bukkitPlayer.openInventory(bukkitPlayer.getEnderChest()); bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED); bukkitPlayer.incrementStatistic(Statistic.ENDERCHEST_OPENED);
return true; return true;
@ -248,7 +248,7 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
// AnyChest only - SilentChest not active, container unsupported, or unnecessary. // AnyChest only - SilentChest not active, container unsupported, or unnecessary.
if (!silentchest || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) { if (!silent || player.playerInteractManager.getGameMode() == EnumGamemode.SPECTATOR) {
player.openContainer(tileInventory); player.openContainer(tileInventory);
return true; return true;
} }
@ -266,7 +266,7 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public void deactivateContainer(final Player bukkitPlayer) { public void deactivateContainer(@NotNull final Player bukkitPlayer) {
if (this.playerInteractManagerGamemode == null) { if (this.playerInteractManagerGamemode == null) {
return; return;
} }

9
internal/v1_13_R2/src/main/java/com/lishid/openinv/internal/v1_13_R2/InventoryAccess.java
View file

@ -23,11 +23,12 @@ import com.lishid.openinv.util.InternalAccessor;
import net.minecraft.server.v1_13_R2.IInventory; import net.minecraft.server.v1_13_R2.IInventory;
import org.bukkit.craftbukkit.v1_13_R2.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_13_R2.inventory.CraftInventory;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.jetbrains.annotations.NotNull;
public class InventoryAccess implements IInventoryAccess { public class InventoryAccess implements IInventoryAccess {
@Override @Override
public ISpecialEnderChest getSpecialEnderChest(final Inventory inventory) { public ISpecialEnderChest getSpecialEnderChest(@NotNull final Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();
@ -42,7 +43,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialPlayerInventory getSpecialPlayerInventory(final Inventory inventory) { public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull final Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();
@ -57,7 +58,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public boolean isSpecialEnderChest(final Inventory inventory) { public boolean isSpecialEnderChest(@NotNull final Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest; return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
} }
@ -66,7 +67,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public boolean isSpecialPlayerInventory(final Inventory inventory) { public boolean isSpecialPlayerInventory(@NotNull final Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory; return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
} }

18
internal/v1_13_R2/src/main/java/com/lishid/openinv/internal/v1_13_R2/PlayerDataManager.java
View file

@ -18,6 +18,8 @@ package com.lishid.openinv.internal.v1_13_R2;
import com.lishid.openinv.internal.IPlayerDataManager; import com.lishid.openinv.internal.IPlayerDataManager;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import java.util.Collection;
import java.util.UUID;
import net.minecraft.server.v1_13_R2.DimensionManager; import net.minecraft.server.v1_13_R2.DimensionManager;
import net.minecraft.server.v1_13_R2.EntityPlayer; import net.minecraft.server.v1_13_R2.EntityPlayer;
import net.minecraft.server.v1_13_R2.MinecraftServer; import net.minecraft.server.v1_13_R2.MinecraftServer;
@ -28,9 +30,7 @@ import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_13_R2.CraftServer; import org.bukkit.craftbukkit.v1_13_R2.CraftServer;
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_13_R2.entity.CraftPlayer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Collection;
import java.util.UUID;
public class PlayerDataManager implements IPlayerDataManager { public class PlayerDataManager implements IPlayerDataManager {
@ -54,18 +54,19 @@ public class PlayerDataManager implements IPlayerDataManager {
return nmsPlayer; return nmsPlayer;
} }
@NotNull
@Override @Override
public Collection<? extends Player> getOnlinePlayers() { public Collection<? extends Player> getOnlinePlayers() {
return Bukkit.getOnlinePlayers(); return Bukkit.getOnlinePlayers();
} }
@Override @Override
public OfflinePlayer getPlayerByID(final String identifier) { public OfflinePlayer getPlayerByID(@NotNull final String identifier) {
try { try {
UUID uuid = UUID.fromString(identifier); UUID uuid = UUID.fromString(identifier);
OfflinePlayer player = Bukkit.getOfflinePlayer(uuid); OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
// Ensure player is a real player, otherwise return null // Ensure player is a real player, otherwise return null
if (player == null || !player.hasPlayedBefore() && !player.isOnline()) { if (!player.hasPlayedBefore() && !player.isOnline()) {
return null; return null;
} }
return player; return player;
@ -75,15 +76,16 @@ public class PlayerDataManager implements IPlayerDataManager {
} }
} }
@NotNull
@Override @Override
public String getPlayerDataID(final OfflinePlayer offline) { public String getPlayerDataID(@NotNull final OfflinePlayer offline) {
return offline.getUniqueId().toString(); return offline.getUniqueId().toString();
} }
@Override @Override
public Player loadPlayer(final OfflinePlayer offline) { public Player loadPlayer(@NotNull final OfflinePlayer offline) {
// Ensure player has data // Ensure player has data
if (offline == null || !offline.hasPlayedBefore()) { if (!offline.hasPlayedBefore()) {
return null; return null;
} }

48
internal/v1_13_R2/src/main/java/com/lishid/openinv/internal/v1_13_R2/SpecialEnderChest.java
View file

@ -17,17 +17,29 @@
package com.lishid.openinv.internal.v1_13_R2; package com.lishid.openinv.internal.v1_13_R2;
import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialEnderChest;
import net.minecraft.server.v1_13_R2.*; import java.util.List;
import javax.annotation.Nullable;
import net.minecraft.server.v1_13_R2.AutoRecipeOutput;
import net.minecraft.server.v1_13_R2.AutoRecipeStackManager;
import net.minecraft.server.v1_13_R2.ContainerUtil;
import net.minecraft.server.v1_13_R2.EntityHuman;
import net.minecraft.server.v1_13_R2.EntityPlayer;
import net.minecraft.server.v1_13_R2.IChatBaseComponent;
import net.minecraft.server.v1_13_R2.IInventory;
import net.minecraft.server.v1_13_R2.IInventoryListener;
import net.minecraft.server.v1_13_R2.InventoryEnderChest;
import net.minecraft.server.v1_13_R2.ItemStack;
import net.minecraft.server.v1_13_R2.NonNullList;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_13_R2.entity.CraftHumanEntity; import org.bukkit.craftbukkit.v1_13_R2.entity.CraftHumanEntity;
import org.bukkit.craftbukkit.v1_13_R2.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_13_R2.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity; import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.InventoryView;
import javax.annotation.Nullable; import org.jetbrains.annotations.NotNull;
import java.util.List;
public class SpecialEnderChest implements IInventory, ISpecialEnderChest, AutoRecipeOutput { public class SpecialEnderChest implements IInventory, ISpecialEnderChest, AutoRecipeOutput {
@ -44,9 +56,31 @@ public class SpecialEnderChest implements IInventory, ISpecialEnderChest, AutoRe
this.items = this.owner.getEnderChest().items; this.items = this.owner.getEnderChest().items;
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return this.inventory; return new InventoryView() {
@NotNull
@Override
public Inventory getTopInventory() {
return inventory;
}
@NotNull
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@NotNull
@Override
public HumanEntity getPlayer() {
return viewer;
}
@NotNull
@Override
public InventoryType getType() {
return InventoryType.ENDER_CHEST;
}
};
} }
@Override @Override
@ -60,7 +94,7 @@ public class SpecialEnderChest implements IInventory, ISpecialEnderChest, AutoRe
} }
@Override @Override
public void setPlayerOnline(final Player player) { public void setPlayerOnline(@NotNull final Player player) {
if (!this.playerOnline) { if (!this.playerOnline) {
try { try {
this.owner = PlayerDataManager.getHandle(player); this.owner = PlayerDataManager.getHandle(player);

44
internal/v1_13_R2/src/main/java/com/lishid/openinv/internal/v1_13_R2/SpecialPlayerInventory.java
View file

@ -18,6 +18,11 @@ package com.lishid.openinv.internal.v1_13_R2;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.lishid.openinv.internal.ISpecialPlayerInventory; import com.lishid.openinv.internal.ISpecialPlayerInventory;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.function.Predicate;
import javax.annotation.Nullable;
import net.minecraft.server.v1_13_R2.AutoRecipeStackManager; import net.minecraft.server.v1_13_R2.AutoRecipeStackManager;
import net.minecraft.server.v1_13_R2.ChatMessage; import net.minecraft.server.v1_13_R2.ChatMessage;
import net.minecraft.server.v1_13_R2.ContainerUtil; import net.minecraft.server.v1_13_R2.ContainerUtil;
@ -42,14 +47,11 @@ import org.bukkit.craftbukkit.v1_13_R2.entity.CraftHumanEntity;
import org.bukkit.craftbukkit.v1_13_R2.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_13_R2.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity; import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.InventoryView;
import javax.annotation.Nullable; import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.function.Predicate;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory { public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@ -68,7 +70,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
} }
@Override @Override
public void setPlayerOnline(final Player player) { public void setPlayerOnline(@NotNull final Player player) {
if (!this.playerOnline) { if (!this.playerOnline) {
EntityPlayer entityPlayer = PlayerDataManager.getHandle(player); EntityPlayer entityPlayer = PlayerDataManager.getHandle(player);
entityPlayer.inventory.transaction.addAll(this.transaction); entityPlayer.inventory.transaction.addAll(this.transaction);
@ -86,9 +88,31 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
return true; return true;
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return this.inventory; return new InventoryView() {
@NotNull
@Override
public Inventory getTopInventory() {
return inventory;
}
@NotNull
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@NotNull
@Override
public HumanEntity getPlayer() {
return viewer;
}
@NotNull
@Override
public InventoryType getType() {
return InventoryType.PLAYER;
}
};
} }
@Override @Override
@ -614,7 +638,7 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
int j = nbttagcompound.getByte("Slot") & 255; int j = nbttagcompound.getByte("Slot") & 255;
ItemStack itemstack = ItemStack.a(nbttagcompound); ItemStack itemstack = ItemStack.a(nbttagcompound);
if (!itemstack.isEmpty()) { if (!itemstack.isEmpty()) {
if (j >= 0 && j < this.items.size()) { if (j < this.items.size()) {
this.items.set(j, itemstack); this.items.set(j, itemstack);
} else if (j >= 100 && j < this.armor.size() + 100) { } else if (j >= 100 && j < this.armor.size() + 100) {
this.armor.set(j - 100, itemstack); this.armor.set(j - 100, itemstack);

4
internal/v1_4_R1/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvinternal</artifactId> <artifactId>openinvinternal</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>openinvadapter1_4_R1</artifactId> <artifactId>openinvadapter1_4_R1</artifactId>
@ -37,7 +37,7 @@
<dependency> <dependency>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvcommon</artifactId> <artifactId>openinvcommon</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

78
internal/v1_4_R1/src/main/java/com/lishid/openinv/internal/v1_4_R1/AnySilentContainer.java
View file

@ -17,11 +17,6 @@
package com.lishid.openinv.internal.v1_4_R1; package com.lishid.openinv.internal.v1_4_R1;
import com.lishid.openinv.internal.IAnySilentContainer; 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.AxisAlignedBB;
import net.minecraft.server.v1_4_R1.BlockEnderChest; import net.minecraft.server.v1_4_R1.BlockEnderChest;
import net.minecraft.server.v1_4_R1.Container; import net.minecraft.server.v1_4_R1.Container;
@ -34,43 +29,46 @@ import net.minecraft.server.v1_4_R1.Packet100OpenWindow;
import net.minecraft.server.v1_4_R1.TileEntityChest; import net.minecraft.server.v1_4_R1.TileEntityChest;
import net.minecraft.server.v1_4_R1.TileEntityEnderChest; import net.minecraft.server.v1_4_R1.TileEntityEnderChest;
import net.minecraft.server.v1_4_R1.World; import net.minecraft.server.v1_4_R1.World;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_4_R1.event.CraftEventFactory; import org.bukkit.craftbukkit.v1_4_R1.event.CraftEventFactory;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class AnySilentContainer implements IAnySilentContainer { public class AnySilentContainer implements IAnySilentContainer {
@Override @Override
public boolean isAnySilentContainer(org.bukkit.block.Block block) { public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest; return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
} }
@Override @Override
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) { public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
EntityPlayer player = PlayerDataManager.getHandle(p); World world = PlayerDataManager.getHandle(bukkitPlayer).world;
World world = player.world;
if (block instanceof BlockEnderChest) { if (bukkitBlock instanceof BlockEnderChest) {
// Ender chests are not blocked by ocelots. // Ender chests are not blocked by ocelots.
return world.t(block.getX(), block.getY() + 1, block.getZ()); return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
} }
// If block or ocelot on top // If block or ocelot on top
if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) { if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
return true; return true;
} }
int id = world.getTypeId(block.getX(), block.getY(), block.getZ()); int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
// If block next to chest is chest and has a block or ocelot on top // 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) { if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1); return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() + 1);
} else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) { } else if(world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1); return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() - 1);
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ()); return isBlockedChest(world, bukkitBlock.getX() + 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ()); return isBlockedChest(world, bukkitBlock.getX() - 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
} }
return false; return false;
@ -93,18 +91,18 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) { public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
EntityPlayer player = PlayerDataManager.getHandle(p); EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
// Silent ender chest is API-only // Silent ender chest is API-only
if (silentchest && block.getType() == Material.ENDER_CHEST) { if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
p.openInventory(p.getEnderChest()); bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
return true; return true;
} }
World world = player.world; World world = player.world;
Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ()); Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
if (tile == null) { if (tile == null) {
return false; return false;
@ -123,20 +121,20 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
IInventory inventory = (IInventory) tile; IInventory inventory = (IInventory) tile;
int id = world.getTypeId(block.getX(), block.getY(), block.getZ()); int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) { if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1)); inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1));
} else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) { } else if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory); inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1), inventory);
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ())); inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()));
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory); inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()), inventory);
} }
// AnyChest only // AnyChest only
if (!silentchest) { if (!silent) {
player.openContainer(inventory); player.openContainer(inventory);
return true; return true;
} }
@ -160,12 +158,12 @@ public class AnySilentContainer implements IAnySilentContainer {
return true; return true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
p.sendMessage(ChatColor.RED + "Error while sending silent container."); bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
return false; return false;
} }
} }
@Override @Override
public void deactivateContainer(final Player bukkitPlayer) {} public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
} }

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

@ -20,17 +20,15 @@ import com.lishid.openinv.internal.IInventoryAccess;
import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialEnderChest;
import com.lishid.openinv.internal.ISpecialPlayerInventory; import com.lishid.openinv.internal.ISpecialPlayerInventory;
import com.lishid.openinv.util.InternalAccessor; import com.lishid.openinv.util.InternalAccessor;
import org.bukkit.inventory.Inventory;
import net.minecraft.server.v1_4_R1.IInventory; import net.minecraft.server.v1_4_R1.IInventory;
import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory;
import org.bukkit.inventory.Inventory;
import org.jetbrains.annotations.NotNull;
public class InventoryAccess implements IInventoryAccess { public class InventoryAccess implements IInventoryAccess {
@Override @Override
public boolean isSpecialPlayerInventory(Inventory inventory) { public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory; return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
} }
@ -38,7 +36,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) { public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();
@ -53,7 +51,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public boolean isSpecialEnderChest(Inventory inventory) { public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest; return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
} }
@ -61,7 +59,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) { public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();

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

@ -16,30 +16,27 @@
package com.lishid.openinv.internal.v1_4_R1; package com.lishid.openinv.internal.v1_4_R1;
import com.lishid.openinv.internal.IPlayerDataManager;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; 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.EntityPlayer;
import net.minecraft.server.v1_4_R1.MinecraftServer; import net.minecraft.server.v1_4_R1.MinecraftServer;
import net.minecraft.server.v1_4_R1.PlayerInteractManager; import net.minecraft.server.v1_4_R1.PlayerInteractManager;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_4_R1.CraftServer; import org.bukkit.craftbukkit.v1_4_R1.CraftServer;
import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager { public class PlayerDataManager implements IPlayerDataManager {
@Override @Override
public Player loadPlayer(OfflinePlayer offline) { public Player loadPlayer(@NotNull OfflinePlayer offline) {
// Ensure the player has data // Ensure the player has data
if (offline == null || !offline.hasPlayedBefore()) { if (!offline.hasPlayedBefore()) {
return null; return null;
} }
@ -50,7 +47,7 @@ public class PlayerDataManager implements IPlayerDataManager {
new PlayerInteractManager(server.getWorldServer(0))); new PlayerInteractManager(server.getWorldServer(0)));
// Get the bukkit entity // Get the bukkit entity
Player target = (entity == null) ? null : entity.getBukkitEntity(); Player target = entity.getBukkitEntity();
if (target != null) { if (target != null) {
// Load data // Load data
target.loadData(); target.loadData();
@ -59,13 +56,14 @@ public class PlayerDataManager implements IPlayerDataManager {
return target; return target;
} }
@NotNull
@Override @Override
public String getPlayerDataID(OfflinePlayer offline) { public String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getName(); return offline.getName();
} }
@Override @Override
public OfflinePlayer getPlayerByID(String identifier) { public OfflinePlayer getPlayerByID(@NotNull String identifier) {
OfflinePlayer player = Bukkit.getOfflinePlayer(identifier); OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
// Ensure player is a real player, otherwise return null // Ensure player is a real player, otherwise return null
if (player == null || !player.hasPlayedBefore() && !player.isOnline()) { if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
@ -74,6 +72,7 @@ public class PlayerDataManager implements IPlayerDataManager {
return player; return player;
} }
@NotNull
@Override @Override
public Collection<? extends Player> getOnlinePlayers() { public Collection<? extends Player> getOnlinePlayers() {
return Arrays.asList(Bukkit.getOnlinePlayers()); return Arrays.asList(Bukkit.getOnlinePlayers());

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

@ -24,7 +24,7 @@ import net.minecraft.server.v1_4_R1.PlayerInventory;
class SilentContainerChest extends ContainerChest { class SilentContainerChest extends ContainerChest {
public SilentContainerChest(IInventory i1, IInventory i2) { SilentContainerChest(IInventory i1, IInventory i2) {
super(i1, i2); super(i1, i2);
// Send close signal // Send close signal
i2.f(); i2.f();

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

@ -16,26 +16,25 @@
package com.lishid.openinv.internal.v1_4_R1; package com.lishid.openinv.internal.v1_4_R1;
import com.lishid.openinv.internal.ISpecialEnderChest;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; 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.EntityPlayer;
import net.minecraft.server.v1_4_R1.IInventory; import net.minecraft.server.v1_4_R1.IInventory;
import net.minecraft.server.v1_4_R1.InventoryEnderChest; import net.minecraft.server.v1_4_R1.InventoryEnderChest;
import net.minecraft.server.v1_4_R1.InventorySubcontainer; import net.minecraft.server.v1_4_R1.InventorySubcontainer;
import net.minecraft.server.v1_4_R1.ItemStack; 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.CraftHumanEntity;
import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_4_R1.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest { public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
@ -56,13 +55,31 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
this.items = enderChest.getContents(); this.items = enderChest.getContents();
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory; return inventory;
} }
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.ENDER_CHEST;
}
};
}
@Override @Override
public void setPlayerOnline(Player player) { public void setPlayerOnline(@NotNull Player player) {
if (!playerOnline) { if (!playerOnline) {
try { try {
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
@ -71,7 +88,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
Field field = playerEnderChest.getClass().getField("items"); Field field = playerEnderChest.getClass().getField("items");
field.setAccessible(true); field.setAccessible(true);
field.set(playerEnderChest, this.items); field.set(playerEnderChest, this.items);
} catch (Exception e) {} } catch (Exception ignored) {}
playerOnline = true; playerOnline = true;
} }
} }

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

@ -17,14 +17,15 @@
package com.lishid.openinv.internal.v1_4_R1; package com.lishid.openinv.internal.v1_4_R1;
import com.lishid.openinv.internal.ISpecialPlayerInventory; 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.ItemStack;
import net.minecraft.server.v1_4_R1.PlayerInventory; import net.minecraft.server.v1_4_R1.PlayerInventory;
import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_4_R1.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory { public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@ -39,13 +40,31 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
this.armor = player.inventory.armor; this.armor = player.inventory.armor;
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory; return inventory;
} }
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.PLAYER;
}
};
}
@Override @Override
public void setPlayerOnline(Player player) { public void setPlayerOnline(@NotNull Player player) {
if (!playerOnline) { if (!playerOnline) {
this.player = PlayerDataManager.getHandle(player); this.player = PlayerDataManager.getHandle(player);
this.player.inventory.items = this.items; this.player.inventory.items = this.items;

4
internal/v1_5_R2/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvinternal</artifactId> <artifactId>openinvinternal</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>openinvadapter1_5_R2</artifactId> <artifactId>openinvadapter1_5_R2</artifactId>
@ -37,7 +37,7 @@
<dependency> <dependency>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvcommon</artifactId> <artifactId>openinvcommon</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

78
internal/v1_5_R2/src/main/java/com/lishid/openinv/internal/v1_5_R2/AnySilentContainer.java
View file

@ -17,11 +17,6 @@
package com.lishid.openinv.internal.v1_5_R2; package com.lishid.openinv.internal.v1_5_R2;
import com.lishid.openinv.internal.IAnySilentContainer; 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.AxisAlignedBB;
import net.minecraft.server.v1_5_R2.BlockEnderChest; import net.minecraft.server.v1_5_R2.BlockEnderChest;
import net.minecraft.server.v1_5_R2.Container; import net.minecraft.server.v1_5_R2.Container;
@ -34,43 +29,46 @@ import net.minecraft.server.v1_5_R2.Packet100OpenWindow;
import net.minecraft.server.v1_5_R2.TileEntityChest; import net.minecraft.server.v1_5_R2.TileEntityChest;
import net.minecraft.server.v1_5_R2.TileEntityEnderChest; import net.minecraft.server.v1_5_R2.TileEntityEnderChest;
import net.minecraft.server.v1_5_R2.World; import net.minecraft.server.v1_5_R2.World;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_5_R2.event.CraftEventFactory; import org.bukkit.craftbukkit.v1_5_R2.event.CraftEventFactory;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class AnySilentContainer implements IAnySilentContainer { public class AnySilentContainer implements IAnySilentContainer {
@Override @Override
public boolean isAnySilentContainer(org.bukkit.block.Block block) { public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest; return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
} }
@Override @Override
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) { public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
EntityPlayer player = PlayerDataManager.getHandle(p); World world = PlayerDataManager.getHandle(bukkitPlayer).world;
World world = player.world;
if (block instanceof BlockEnderChest) { if (bukkitBlock instanceof BlockEnderChest) {
// Ender chests are not blocked by ocelots. // Ender chests are not blocked by ocelots.
return world.t(block.getX(), block.getY() + 1, block.getZ()); return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
} }
// If block or ocelot on top // If block or ocelot on top
if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) { if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
return true; return true;
} }
int id = world.getTypeId(block.getX(), block.getY(), block.getZ()); int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
// If block next to chest is chest and has a block or ocelot on top // 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) { if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1); return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() + 1);
} else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) { } else if(world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1); return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() - 1);
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ()); return isBlockedChest(world, bukkitBlock.getX() + 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ()); return isBlockedChest(world, bukkitBlock.getX() - 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
} }
return false; return false;
@ -93,18 +91,18 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) { public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
EntityPlayer player = PlayerDataManager.getHandle(p); EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
// Silent ender chest is API-only // Silent ender chest is API-only
if (silentchest && block.getType() == Material.ENDER_CHEST) { if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
p.openInventory(p.getEnderChest()); bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
return true; return true;
} }
World world = player.world; World world = player.world;
Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ()); Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
if (tile == null) { if (tile == null) {
return false; return false;
@ -123,20 +121,20 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
IInventory inventory = (IInventory) tile; IInventory inventory = (IInventory) tile;
int id = world.getTypeId(block.getX(), block.getY(), block.getZ()); int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) { if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1)); inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1));
} else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) { } else if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory); inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1), inventory);
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ())); inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()));
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory); inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()), inventory);
} }
// AnyChest only // AnyChest only
if (!silentchest) { if (!silent) {
player.openContainer(inventory); player.openContainer(inventory);
return true; return true;
} }
@ -160,12 +158,12 @@ public class AnySilentContainer implements IAnySilentContainer {
return true; return true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
p.sendMessage(ChatColor.RED + "Error while sending silent container."); bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
return false; return false;
} }
} }
@Override @Override
public void deactivateContainer(final Player bukkitPlayer) {} public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
} }

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

@ -20,17 +20,15 @@ import com.lishid.openinv.internal.IInventoryAccess;
import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialEnderChest;
import com.lishid.openinv.internal.ISpecialPlayerInventory; import com.lishid.openinv.internal.ISpecialPlayerInventory;
import com.lishid.openinv.util.InternalAccessor; import com.lishid.openinv.util.InternalAccessor;
import org.bukkit.inventory.Inventory;
import net.minecraft.server.v1_5_R2.IInventory; import net.minecraft.server.v1_5_R2.IInventory;
import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventory;
import org.bukkit.inventory.Inventory;
import org.jetbrains.annotations.NotNull;
public class InventoryAccess implements IInventoryAccess { public class InventoryAccess implements IInventoryAccess {
@Override @Override
public boolean isSpecialPlayerInventory(Inventory inventory) { public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory; return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
} }
@ -38,7 +36,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) { public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();
@ -53,7 +51,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public boolean isSpecialEnderChest(Inventory inventory) { public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest; return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
} }
@ -61,7 +59,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) { public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();

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

@ -16,29 +16,26 @@
package com.lishid.openinv.internal.v1_5_R2; package com.lishid.openinv.internal.v1_5_R2;
import com.lishid.openinv.internal.IPlayerDataManager;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; 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.EntityPlayer;
import net.minecraft.server.v1_5_R2.MinecraftServer; import net.minecraft.server.v1_5_R2.MinecraftServer;
import net.minecraft.server.v1_5_R2.PlayerInteractManager; import net.minecraft.server.v1_5_R2.PlayerInteractManager;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_5_R2.CraftServer; import org.bukkit.craftbukkit.v1_5_R2.CraftServer;
import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager { public class PlayerDataManager implements IPlayerDataManager {
@Override @Override
public Player loadPlayer(OfflinePlayer offline) { public Player loadPlayer(@NotNull OfflinePlayer offline) {
// Ensure the player has data // Ensure the player has data
if (offline == null || !offline.hasPlayedBefore()) { if (!offline.hasPlayedBefore()) {
return null; return null;
} }
@ -49,7 +46,7 @@ public class PlayerDataManager implements IPlayerDataManager {
new PlayerInteractManager(server.getWorldServer(0))); new PlayerInteractManager(server.getWorldServer(0)));
// Get the bukkit entity // Get the bukkit entity
Player target = (entity == null) ? null : entity.getBukkitEntity(); Player target = entity.getBukkitEntity();
if (target != null) { if (target != null) {
// Load data // Load data
target.loadData(); target.loadData();
@ -58,13 +55,14 @@ public class PlayerDataManager implements IPlayerDataManager {
return target; return target;
} }
@NotNull
@Override @Override
public String getPlayerDataID(OfflinePlayer offline) { public String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getName(); return offline.getName();
} }
@Override @Override
public OfflinePlayer getPlayerByID(String identifier) { public OfflinePlayer getPlayerByID(@NotNull String identifier) {
OfflinePlayer player = Bukkit.getOfflinePlayer(identifier); OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
// Ensure player is a real player, otherwise return null // Ensure player is a real player, otherwise return null
if (player == null || !player.hasPlayedBefore() && !player.isOnline()) { if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
@ -73,6 +71,7 @@ public class PlayerDataManager implements IPlayerDataManager {
return player; return player;
} }
@NotNull
@Override @Override
public Collection<? extends Player> getOnlinePlayers() { public Collection<? extends Player> getOnlinePlayers() {
return Arrays.asList(Bukkit.getOnlinePlayers()); return Arrays.asList(Bukkit.getOnlinePlayers());

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

@ -24,7 +24,7 @@ import net.minecraft.server.v1_5_R2.PlayerInventory;
class SilentContainerChest extends ContainerChest { class SilentContainerChest extends ContainerChest {
public SilentContainerChest(IInventory i1, IInventory i2) { SilentContainerChest(IInventory i1, IInventory i2) {
super(i1, i2); super(i1, i2);
// Send close signal // Send close signal
i2.g(); i2.g();

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

@ -16,26 +16,25 @@
package com.lishid.openinv.internal.v1_5_R2; package com.lishid.openinv.internal.v1_5_R2;
import com.lishid.openinv.internal.ISpecialEnderChest;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; 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.EntityPlayer;
import net.minecraft.server.v1_5_R2.IInventory; import net.minecraft.server.v1_5_R2.IInventory;
import net.minecraft.server.v1_5_R2.InventoryEnderChest; import net.minecraft.server.v1_5_R2.InventoryEnderChest;
import net.minecraft.server.v1_5_R2.InventorySubcontainer; import net.minecraft.server.v1_5_R2.InventorySubcontainer;
import net.minecraft.server.v1_5_R2.ItemStack; 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.CraftHumanEntity;
import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest { public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
@ -57,13 +56,31 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
this.items = enderChest.getContents(); this.items = enderChest.getContents();
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory; return inventory;
} }
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.ENDER_CHEST;
}
};
}
@Override @Override
public void setPlayerOnline(Player player) { public void setPlayerOnline(@NotNull Player player) {
if (!playerOnline) { if (!playerOnline) {
try { try {
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
@ -72,7 +89,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
Field field = playerEnderChest.getClass().getField("items"); Field field = playerEnderChest.getClass().getField("items");
field.setAccessible(true); field.setAccessible(true);
field.set(playerEnderChest, this.items); field.set(playerEnderChest, this.items);
} catch (Exception e) {} } catch (Exception ignored) {}
playerOnline = true; playerOnline = true;
} }
} }

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

@ -17,14 +17,15 @@
package com.lishid.openinv.internal.v1_5_R2; package com.lishid.openinv.internal.v1_5_R2;
import com.lishid.openinv.internal.ISpecialPlayerInventory; 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.ItemStack;
import net.minecraft.server.v1_5_R2.PlayerInventory; import net.minecraft.server.v1_5_R2.PlayerInventory;
import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory { public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@ -39,13 +40,31 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
this.armor = player.inventory.armor; this.armor = player.inventory.armor;
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory; return inventory;
} }
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.PLAYER;
}
};
}
@Override @Override
public void setPlayerOnline(Player player) { public void setPlayerOnline(@NotNull Player player) {
if (!playerOnline) { if (!playerOnline) {
this.player = PlayerDataManager.getHandle(player); this.player = PlayerDataManager.getHandle(player);
this.player.inventory.items = this.items; this.player.inventory.items = this.items;

4
internal/v1_5_R3/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvinternal</artifactId> <artifactId>openinvinternal</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>openinvadapter1_5_R3</artifactId> <artifactId>openinvadapter1_5_R3</artifactId>
@ -37,7 +37,7 @@
<dependency> <dependency>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvcommon</artifactId> <artifactId>openinvcommon</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

78
internal/v1_5_R3/src/main/java/com/lishid/openinv/internal/v1_5_R3/AnySilentContainer.java
View file

@ -17,11 +17,6 @@
package com.lishid.openinv.internal.v1_5_R3; package com.lishid.openinv.internal.v1_5_R3;
import com.lishid.openinv.internal.IAnySilentContainer; 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.AxisAlignedBB;
import net.minecraft.server.v1_5_R3.BlockEnderChest; import net.minecraft.server.v1_5_R3.BlockEnderChest;
import net.minecraft.server.v1_5_R3.Container; import net.minecraft.server.v1_5_R3.Container;
@ -34,43 +29,46 @@ import net.minecraft.server.v1_5_R3.Packet100OpenWindow;
import net.minecraft.server.v1_5_R3.TileEntityChest; import net.minecraft.server.v1_5_R3.TileEntityChest;
import net.minecraft.server.v1_5_R3.TileEntityEnderChest; import net.minecraft.server.v1_5_R3.TileEntityEnderChest;
import net.minecraft.server.v1_5_R3.World; import net.minecraft.server.v1_5_R3.World;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_5_R3.event.CraftEventFactory; import org.bukkit.craftbukkit.v1_5_R3.event.CraftEventFactory;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class AnySilentContainer implements IAnySilentContainer { public class AnySilentContainer implements IAnySilentContainer {
@Override @Override
public boolean isAnySilentContainer(org.bukkit.block.Block block) { public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest; return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
} }
@Override @Override
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) { public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
EntityPlayer player = PlayerDataManager.getHandle(p); World world = PlayerDataManager.getHandle(bukkitPlayer).world;
World world = player.world;
if (block instanceof BlockEnderChest) { if (bukkitBlock instanceof BlockEnderChest) {
// Ender chests are not blocked by ocelots. // Ender chests are not blocked by ocelots.
return world.t(block.getX(), block.getY() + 1, block.getZ()); return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
} }
// If block or ocelot on top // If block or ocelot on top
if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) { if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
return true; return true;
} }
int id = world.getTypeId(block.getX(), block.getY(), block.getZ()); int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
// If block next to chest is chest and has a block or ocelot on top // 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) { if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1); return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() + 1);
} else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) { } else if(world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1); return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() - 1);
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ()); return isBlockedChest(world, bukkitBlock.getX() + 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ()); return isBlockedChest(world, bukkitBlock.getX() - 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
} }
return false; return false;
@ -93,18 +91,18 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) { public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
EntityPlayer player = PlayerDataManager.getHandle(p); EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
// Silent ender chest is API-only // Silent ender chest is API-only
if (silentchest && block.getType() == Material.ENDER_CHEST) { if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
p.openInventory(p.getEnderChest()); bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
return true; return true;
} }
World world = player.world; World world = player.world;
Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ()); Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
if (tile == null) { if (tile == null) {
return false; return false;
@ -123,20 +121,20 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
IInventory inventory = (IInventory) tile; IInventory inventory = (IInventory) tile;
int id = world.getTypeId(block.getX(), block.getY(), block.getZ()); int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) { if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1)); inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1));
} else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) { } else if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory); inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1), inventory);
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ())); inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()));
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory); inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()), inventory);
} }
// AnyChest only // AnyChest only
if (!silentchest) { if (!silent) {
player.openContainer(inventory); player.openContainer(inventory);
return true; return true;
} }
@ -160,12 +158,12 @@ public class AnySilentContainer implements IAnySilentContainer {
return true; return true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
p.sendMessage(ChatColor.RED + "Error while sending silent container."); bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
return false; return false;
} }
} }
@Override @Override
public void deactivateContainer(final Player bukkitPlayer) {} public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
} }

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

@ -20,17 +20,15 @@ import com.lishid.openinv.internal.IInventoryAccess;
import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialEnderChest;
import com.lishid.openinv.internal.ISpecialPlayerInventory; import com.lishid.openinv.internal.ISpecialPlayerInventory;
import com.lishid.openinv.util.InternalAccessor; import com.lishid.openinv.util.InternalAccessor;
import org.bukkit.inventory.Inventory;
import net.minecraft.server.v1_5_R3.IInventory; import net.minecraft.server.v1_5_R3.IInventory;
import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventory;
import org.bukkit.inventory.Inventory;
import org.jetbrains.annotations.NotNull;
public class InventoryAccess implements IInventoryAccess { public class InventoryAccess implements IInventoryAccess {
@Override @Override
public boolean isSpecialPlayerInventory(Inventory inventory) { public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory; return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
} }
@ -38,7 +36,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) { public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();
@ -53,7 +51,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public boolean isSpecialEnderChest(Inventory inventory) { public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest; return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
} }
@ -61,7 +59,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) { public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();

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

@ -16,29 +16,26 @@
package com.lishid.openinv.internal.v1_5_R3; package com.lishid.openinv.internal.v1_5_R3;
import com.lishid.openinv.internal.IPlayerDataManager;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; 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.EntityPlayer;
import net.minecraft.server.v1_5_R3.MinecraftServer; import net.minecraft.server.v1_5_R3.MinecraftServer;
import net.minecraft.server.v1_5_R3.PlayerInteractManager; import net.minecraft.server.v1_5_R3.PlayerInteractManager;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_5_R3.CraftServer; import org.bukkit.craftbukkit.v1_5_R3.CraftServer;
import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager { public class PlayerDataManager implements IPlayerDataManager {
@Override @Override
public Player loadPlayer(OfflinePlayer offline) { public Player loadPlayer(@NotNull OfflinePlayer offline) {
// Ensure the player has data // Ensure the player has data
if (offline == null || !offline.hasPlayedBefore()) { if (!offline.hasPlayedBefore()) {
return null; return null;
} }
@ -49,7 +46,7 @@ public class PlayerDataManager implements IPlayerDataManager {
new PlayerInteractManager(server.getWorldServer(0))); new PlayerInteractManager(server.getWorldServer(0)));
// Get the bukkit entity // Get the bukkit entity
Player target = (entity == null) ? null : entity.getBukkitEntity(); Player target = entity.getBukkitEntity();
if (target != null) { if (target != null) {
// Load data // Load data
target.loadData(); target.loadData();
@ -58,13 +55,14 @@ public class PlayerDataManager implements IPlayerDataManager {
return target; return target;
} }
@NotNull
@Override @Override
public String getPlayerDataID(OfflinePlayer offline) { public String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getName(); return offline.getName();
} }
@Override @Override
public OfflinePlayer getPlayerByID(String identifier) { public OfflinePlayer getPlayerByID(@NotNull String identifier) {
OfflinePlayer player = Bukkit.getOfflinePlayer(identifier); OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
// Ensure player is a real player, otherwise return null // Ensure player is a real player, otherwise return null
if (player == null || !player.hasPlayedBefore() && !player.isOnline()) { if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
@ -73,6 +71,7 @@ public class PlayerDataManager implements IPlayerDataManager {
return player; return player;
} }
@NotNull
@Override @Override
public Collection<? extends Player> getOnlinePlayers() { public Collection<? extends Player> getOnlinePlayers() {
return Arrays.asList(Bukkit.getOnlinePlayers()); return Arrays.asList(Bukkit.getOnlinePlayers());

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

@ -24,7 +24,7 @@ import net.minecraft.server.v1_5_R3.PlayerInventory;
class SilentContainerChest extends ContainerChest { class SilentContainerChest extends ContainerChest {
public SilentContainerChest(IInventory i1, IInventory i2) { SilentContainerChest(IInventory i1, IInventory i2) {
super(i1, i2); super(i1, i2);
// Send close signal // Send close signal
i2.g(); i2.g();

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

@ -16,26 +16,25 @@
package com.lishid.openinv.internal.v1_5_R3; package com.lishid.openinv.internal.v1_5_R3;
import com.lishid.openinv.internal.ISpecialEnderChest;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; 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.EntityPlayer;
import net.minecraft.server.v1_5_R3.IInventory; import net.minecraft.server.v1_5_R3.IInventory;
import net.minecraft.server.v1_5_R3.InventoryEnderChest; import net.minecraft.server.v1_5_R3.InventoryEnderChest;
import net.minecraft.server.v1_5_R3.InventorySubcontainer; import net.minecraft.server.v1_5_R3.InventorySubcontainer;
import net.minecraft.server.v1_5_R3.ItemStack; 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.CraftHumanEntity;
import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest { public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
@ -57,13 +56,31 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
this.items = enderChest.getContents(); this.items = enderChest.getContents();
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory; return inventory;
} }
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.ENDER_CHEST;
}
};
}
@Override @Override
public void setPlayerOnline(Player player) { public void setPlayerOnline(@NotNull Player player) {
if (!playerOnline) { if (!playerOnline) {
try { try {
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
@ -72,7 +89,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
Field field = playerEnderChest.getClass().getField("items"); Field field = playerEnderChest.getClass().getField("items");
field.setAccessible(true); field.setAccessible(true);
field.set(playerEnderChest, this.items); field.set(playerEnderChest, this.items);
} catch (Exception e) {} } catch (Exception ignored) {}
playerOnline = true; playerOnline = true;
} }
} }

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

@ -17,14 +17,15 @@
package com.lishid.openinv.internal.v1_5_R3; package com.lishid.openinv.internal.v1_5_R3;
import com.lishid.openinv.internal.ISpecialPlayerInventory; 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.ItemStack;
import net.minecraft.server.v1_5_R3.PlayerInventory; import net.minecraft.server.v1_5_R3.PlayerInventory;
import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory { public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@ -39,13 +40,31 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
this.armor = player.inventory.armor; this.armor = player.inventory.armor;
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory; return inventory;
} }
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.PLAYER;
}
};
}
@Override @Override
public void setPlayerOnline(Player player) { public void setPlayerOnline(@NotNull Player player) {
if (!playerOnline) { if (!playerOnline) {
this.player = PlayerDataManager.getHandle(player); this.player = PlayerDataManager.getHandle(player);
this.player.inventory.items = this.items; this.player.inventory.items = this.items;

4
internal/v1_6_R1/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvinternal</artifactId> <artifactId>openinvinternal</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>openinvadapter1_6_R1</artifactId> <artifactId>openinvadapter1_6_R1</artifactId>
@ -37,7 +37,7 @@
<dependency> <dependency>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvcommon</artifactId> <artifactId>openinvcommon</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

78
internal/v1_6_R1/src/main/java/com/lishid/openinv/internal/v1_6_R1/AnySilentContainer.java
View file

@ -17,11 +17,6 @@
package com.lishid.openinv.internal.v1_6_R1; package com.lishid.openinv.internal.v1_6_R1;
import com.lishid.openinv.internal.IAnySilentContainer; 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.AxisAlignedBB;
import net.minecraft.server.v1_6_R1.BlockEnderChest; import net.minecraft.server.v1_6_R1.BlockEnderChest;
import net.minecraft.server.v1_6_R1.Container; import net.minecraft.server.v1_6_R1.Container;
@ -34,43 +29,46 @@ import net.minecraft.server.v1_6_R1.Packet100OpenWindow;
import net.minecraft.server.v1_6_R1.TileEntityChest; import net.minecraft.server.v1_6_R1.TileEntityChest;
import net.minecraft.server.v1_6_R1.TileEntityEnderChest; import net.minecraft.server.v1_6_R1.TileEntityEnderChest;
import net.minecraft.server.v1_6_R1.World; import net.minecraft.server.v1_6_R1.World;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_6_R1.event.CraftEventFactory; import org.bukkit.craftbukkit.v1_6_R1.event.CraftEventFactory;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class AnySilentContainer implements IAnySilentContainer { public class AnySilentContainer implements IAnySilentContainer {
@Override @Override
public boolean isAnySilentContainer(org.bukkit.block.Block block) { public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest; return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
} }
@Override @Override
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) { public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
EntityPlayer player = PlayerDataManager.getHandle(p); World world = PlayerDataManager.getHandle(bukkitPlayer).world;
World world = player.world;
if (block instanceof BlockEnderChest) { if (bukkitBlock instanceof BlockEnderChest) {
// Ender chests are not blocked by ocelots. // Ender chests are not blocked by ocelots.
return world.t(block.getX(), block.getY() + 1, block.getZ()); return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
} }
// If block or ocelot on top // If block or ocelot on top
if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) { if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
return true; return true;
} }
int id = world.getTypeId(block.getX(), block.getY(), block.getZ()); int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
// If block next to chest is chest and has a block or ocelot on top // 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) { if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1); return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() + 1);
} else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) { } else if(world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1); return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() - 1);
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ()); return isBlockedChest(world, bukkitBlock.getX() + 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ()); return isBlockedChest(world, bukkitBlock.getX() - 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
} }
return false; return false;
@ -93,18 +91,18 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) { public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
EntityPlayer player = PlayerDataManager.getHandle(p); EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
// Silent ender chest is API-only // Silent ender chest is API-only
if (silentchest && block.getType() == Material.ENDER_CHEST) { if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
p.openInventory(p.getEnderChest()); bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
return true; return true;
} }
World world = player.world; World world = player.world;
Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ()); Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
if (tile == null) { if (tile == null) {
return false; return false;
@ -123,20 +121,20 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
IInventory inventory = (IInventory) tile; IInventory inventory = (IInventory) tile;
int id = world.getTypeId(block.getX(), block.getY(), block.getZ()); int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) { if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1)); inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1));
} else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) { } else if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory); inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1), inventory);
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ())); inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()));
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory); inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()), inventory);
} }
// AnyChest only // AnyChest only
if (!silentchest) { if (!silent) {
player.openContainer(inventory); player.openContainer(inventory);
return true; return true;
} }
@ -160,12 +158,12 @@ public class AnySilentContainer implements IAnySilentContainer {
return true; return true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
p.sendMessage(ChatColor.RED + "Error while sending silent container."); bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
return false; return false;
} }
} }
@Override @Override
public void deactivateContainer(final Player bukkitPlayer) {} public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
} }

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

@ -20,17 +20,15 @@ import com.lishid.openinv.internal.IInventoryAccess;
import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialEnderChest;
import com.lishid.openinv.internal.ISpecialPlayerInventory; import com.lishid.openinv.internal.ISpecialPlayerInventory;
import com.lishid.openinv.util.InternalAccessor; import com.lishid.openinv.util.InternalAccessor;
import org.bukkit.inventory.Inventory;
import net.minecraft.server.v1_6_R1.IInventory; import net.minecraft.server.v1_6_R1.IInventory;
import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventory;
import org.bukkit.inventory.Inventory;
import org.jetbrains.annotations.NotNull;
public class InventoryAccess implements IInventoryAccess { public class InventoryAccess implements IInventoryAccess {
@Override @Override
public boolean isSpecialPlayerInventory(Inventory inventory) { public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory; return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
} }
@ -38,7 +36,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) { public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();
@ -53,7 +51,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public boolean isSpecialEnderChest(Inventory inventory) { public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest; return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
} }
@ -61,7 +59,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) { public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();

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

@ -16,29 +16,26 @@
package com.lishid.openinv.internal.v1_6_R1; package com.lishid.openinv.internal.v1_6_R1;
import com.lishid.openinv.internal.IPlayerDataManager;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; 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.EntityPlayer;
import net.minecraft.server.v1_6_R1.MinecraftServer; import net.minecraft.server.v1_6_R1.MinecraftServer;
import net.minecraft.server.v1_6_R1.PlayerInteractManager; import net.minecraft.server.v1_6_R1.PlayerInteractManager;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_6_R1.CraftServer; import org.bukkit.craftbukkit.v1_6_R1.CraftServer;
import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager { public class PlayerDataManager implements IPlayerDataManager {
@Override @Override
public Player loadPlayer(OfflinePlayer offline) { public Player loadPlayer(@NotNull OfflinePlayer offline) {
// Ensure the player has data // Ensure the player has data
if (offline == null || !offline.hasPlayedBefore()) { if (!offline.hasPlayedBefore()) {
return null; return null;
} }
@ -49,7 +46,7 @@ public class PlayerDataManager implements IPlayerDataManager {
new PlayerInteractManager(server.getWorldServer(0))); new PlayerInteractManager(server.getWorldServer(0)));
// Get the bukkit entity // Get the bukkit entity
Player target = (entity == null) ? null : entity.getBukkitEntity(); Player target = entity.getBukkitEntity();
if (target != null) { if (target != null) {
// Load data // Load data
target.loadData(); target.loadData();
@ -58,13 +55,14 @@ public class PlayerDataManager implements IPlayerDataManager {
return target; return target;
} }
@NotNull
@Override @Override
public String getPlayerDataID(OfflinePlayer offline) { public String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getName(); return offline.getName();
} }
@Override @Override
public OfflinePlayer getPlayerByID(String identifier) { public OfflinePlayer getPlayerByID(@NotNull String identifier) {
OfflinePlayer player = Bukkit.getOfflinePlayer(identifier); OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
// Ensure player is a real player, otherwise return null // Ensure player is a real player, otherwise return null
if (player == null || !player.hasPlayedBefore() && !player.isOnline()) { if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
@ -73,6 +71,7 @@ public class PlayerDataManager implements IPlayerDataManager {
return player; return player;
} }
@NotNull
@Override @Override
public Collection<? extends Player> getOnlinePlayers() { public Collection<? extends Player> getOnlinePlayers() {
return Arrays.asList(Bukkit.getOnlinePlayers()); return Arrays.asList(Bukkit.getOnlinePlayers());

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

@ -24,7 +24,7 @@ import net.minecraft.server.v1_6_R1.PlayerInventory;
class SilentContainerChest extends ContainerChest { class SilentContainerChest extends ContainerChest {
public SilentContainerChest(IInventory i1, IInventory i2) { SilentContainerChest(IInventory i1, IInventory i2) {
super(i1, i2); super(i1, i2);
// Send close signal // Send close signal
i2.g(); i2.g();

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

@ -16,26 +16,25 @@
package com.lishid.openinv.internal.v1_6_R1; package com.lishid.openinv.internal.v1_6_R1;
import com.lishid.openinv.internal.ISpecialEnderChest;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; 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.EntityPlayer;
import net.minecraft.server.v1_6_R1.IInventory; import net.minecraft.server.v1_6_R1.IInventory;
import net.minecraft.server.v1_6_R1.InventoryEnderChest; import net.minecraft.server.v1_6_R1.InventoryEnderChest;
import net.minecraft.server.v1_6_R1.InventorySubcontainer; import net.minecraft.server.v1_6_R1.InventorySubcontainer;
import net.minecraft.server.v1_6_R1.ItemStack; 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.CraftHumanEntity;
import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_6_R1.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest { public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
@ -57,13 +56,31 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
this.items = enderChest.getContents(); this.items = enderChest.getContents();
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory; return inventory;
} }
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.ENDER_CHEST;
}
};
}
@Override @Override
public void setPlayerOnline(Player player) { public void setPlayerOnline(@NotNull Player player) {
if (!playerOnline) { if (!playerOnline) {
try { try {
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
@ -72,7 +89,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
Field field = playerEnderChest.getClass().getField("items"); Field field = playerEnderChest.getClass().getField("items");
field.setAccessible(true); field.setAccessible(true);
field.set(playerEnderChest, this.items); field.set(playerEnderChest, this.items);
} catch (Exception e) {} } catch (Exception ignored) {}
playerOnline = true; playerOnline = true;
} }
} }

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

@ -17,14 +17,15 @@
package com.lishid.openinv.internal.v1_6_R1; package com.lishid.openinv.internal.v1_6_R1;
import com.lishid.openinv.internal.ISpecialPlayerInventory; 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.ItemStack;
import net.minecraft.server.v1_6_R1.PlayerInventory; import net.minecraft.server.v1_6_R1.PlayerInventory;
import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_6_R1.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory { public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@ -39,13 +40,31 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
this.armor = player.inventory.armor; this.armor = player.inventory.armor;
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory; return inventory;
} }
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.PLAYER;
}
};
}
@Override @Override
public void setPlayerOnline(Player player) { public void setPlayerOnline(@NotNull Player player) {
if (!playerOnline) { if (!playerOnline) {
this.player = PlayerDataManager.getHandle(player); this.player = PlayerDataManager.getHandle(player);
this.player.inventory.items = this.items; this.player.inventory.items = this.items;

4
internal/v1_6_R2/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvinternal</artifactId> <artifactId>openinvinternal</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>openinvadapter1_6_R2</artifactId> <artifactId>openinvadapter1_6_R2</artifactId>
@ -37,7 +37,7 @@
<dependency> <dependency>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvcommon</artifactId> <artifactId>openinvcommon</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

78
internal/v1_6_R2/src/main/java/com/lishid/openinv/internal/v1_6_R2/AnySilentContainer.java
View file

@ -17,11 +17,6 @@
package com.lishid.openinv.internal.v1_6_R2; package com.lishid.openinv.internal.v1_6_R2;
import com.lishid.openinv.internal.IAnySilentContainer; 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.AxisAlignedBB;
import net.minecraft.server.v1_6_R2.BlockEnderChest; import net.minecraft.server.v1_6_R2.BlockEnderChest;
import net.minecraft.server.v1_6_R2.Container; import net.minecraft.server.v1_6_R2.Container;
@ -34,43 +29,46 @@ import net.minecraft.server.v1_6_R2.Packet100OpenWindow;
import net.minecraft.server.v1_6_R2.TileEntityChest; import net.minecraft.server.v1_6_R2.TileEntityChest;
import net.minecraft.server.v1_6_R2.TileEntityEnderChest; import net.minecraft.server.v1_6_R2.TileEntityEnderChest;
import net.minecraft.server.v1_6_R2.World; import net.minecraft.server.v1_6_R2.World;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_6_R2.event.CraftEventFactory; import org.bukkit.craftbukkit.v1_6_R2.event.CraftEventFactory;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class AnySilentContainer implements IAnySilentContainer { public class AnySilentContainer implements IAnySilentContainer {
@Override @Override
public boolean isAnySilentContainer(org.bukkit.block.Block block) { public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest; return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
} }
@Override @Override
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) { public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
EntityPlayer player = PlayerDataManager.getHandle(p); World world = PlayerDataManager.getHandle(bukkitPlayer).world;
World world = player.world;
if (block instanceof BlockEnderChest) { if (bukkitBlock instanceof BlockEnderChest) {
// Ender chests are not blocked by ocelots. // Ender chests are not blocked by ocelots.
return world.t(block.getX(), block.getY() + 1, block.getZ()); return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
} }
// If block or ocelot on top // If block or ocelot on top
if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) { if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
return true; return true;
} }
int id = world.getTypeId(block.getX(), block.getY(), block.getZ()); int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
// If block next to chest is chest and has a block or ocelot on top // 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) { if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1); return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() + 1);
} else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) { } else if(world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1); return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() - 1);
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ()); return isBlockedChest(world, bukkitBlock.getX() + 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ()); return isBlockedChest(world, bukkitBlock.getX() - 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
} }
return false; return false;
@ -93,18 +91,18 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) { public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
EntityPlayer player = PlayerDataManager.getHandle(p); EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
// Silent ender chest is API-only // Silent ender chest is API-only
if (silentchest && block.getType() == Material.ENDER_CHEST) { if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
p.openInventory(p.getEnderChest()); bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
return true; return true;
} }
World world = player.world; World world = player.world;
Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ()); Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
if (tile == null) { if (tile == null) {
return false; return false;
@ -123,20 +121,20 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
IInventory inventory = (IInventory) tile; IInventory inventory = (IInventory) tile;
int id = world.getTypeId(block.getX(), block.getY(), block.getZ()); int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) { if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1)); inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1));
} else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) { } else if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory); inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1), inventory);
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ())); inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()));
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory); inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()), inventory);
} }
// AnyChest only // AnyChest only
if (!silentchest) { if (!silent) {
player.openContainer(inventory); player.openContainer(inventory);
return true; return true;
} }
@ -160,12 +158,12 @@ public class AnySilentContainer implements IAnySilentContainer {
return true; return true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
p.sendMessage(ChatColor.RED + "Error while sending silent container."); bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
return false; return false;
} }
} }
@Override @Override
public void deactivateContainer(final Player bukkitPlayer) {} public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
} }

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

@ -20,17 +20,15 @@ import com.lishid.openinv.internal.IInventoryAccess;
import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialEnderChest;
import com.lishid.openinv.internal.ISpecialPlayerInventory; import com.lishid.openinv.internal.ISpecialPlayerInventory;
import com.lishid.openinv.util.InternalAccessor; import com.lishid.openinv.util.InternalAccessor;
import org.bukkit.inventory.Inventory;
import net.minecraft.server.v1_6_R2.IInventory; import net.minecraft.server.v1_6_R2.IInventory;
import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventory;
import org.bukkit.inventory.Inventory;
import org.jetbrains.annotations.NotNull;
public class InventoryAccess implements IInventoryAccess { public class InventoryAccess implements IInventoryAccess {
@Override @Override
public boolean isSpecialPlayerInventory(Inventory inventory) { public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory; return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
} }
@ -38,7 +36,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) { public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();
@ -53,7 +51,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public boolean isSpecialEnderChest(Inventory inventory) { public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest; return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
} }
@ -61,7 +59,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) { public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();

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

@ -16,29 +16,26 @@
package com.lishid.openinv.internal.v1_6_R2; package com.lishid.openinv.internal.v1_6_R2;
import com.lishid.openinv.internal.IPlayerDataManager;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; 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.EntityPlayer;
import net.minecraft.server.v1_6_R2.MinecraftServer; import net.minecraft.server.v1_6_R2.MinecraftServer;
import net.minecraft.server.v1_6_R2.PlayerInteractManager; import net.minecraft.server.v1_6_R2.PlayerInteractManager;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_6_R2.CraftServer; import org.bukkit.craftbukkit.v1_6_R2.CraftServer;
import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager { public class PlayerDataManager implements IPlayerDataManager {
@Override @Override
public Player loadPlayer(OfflinePlayer offline) { public Player loadPlayer(@NotNull OfflinePlayer offline) {
// Ensure the player has data // Ensure the player has data
if (offline == null || !offline.hasPlayedBefore()) { if (!offline.hasPlayedBefore()) {
return null; return null;
} }
@ -49,7 +46,7 @@ public class PlayerDataManager implements IPlayerDataManager {
new PlayerInteractManager(server.getWorldServer(0))); new PlayerInteractManager(server.getWorldServer(0)));
// Get the bukkit entity // Get the bukkit entity
Player target = (entity == null) ? null : entity.getBukkitEntity(); Player target = entity.getBukkitEntity();
if (target != null) { if (target != null) {
// Load data // Load data
target.loadData(); target.loadData();
@ -58,13 +55,14 @@ public class PlayerDataManager implements IPlayerDataManager {
return target; return target;
} }
@NotNull
@Override @Override
public String getPlayerDataID(OfflinePlayer offline) { public String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getName(); return offline.getName();
} }
@Override @Override
public OfflinePlayer getPlayerByID(String identifier) { public OfflinePlayer getPlayerByID(@NotNull String identifier) {
OfflinePlayer player = Bukkit.getOfflinePlayer(identifier); OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
// Ensure player is a real player, otherwise return null // Ensure player is a real player, otherwise return null
if (player == null || !player.hasPlayedBefore() && !player.isOnline()) { if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
@ -73,6 +71,7 @@ public class PlayerDataManager implements IPlayerDataManager {
return player; return player;
} }
@NotNull
@Override @Override
public Collection<? extends Player> getOnlinePlayers() { public Collection<? extends Player> getOnlinePlayers() {
return Arrays.asList(Bukkit.getOnlinePlayers()); return Arrays.asList(Bukkit.getOnlinePlayers());

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

@ -24,7 +24,7 @@ import net.minecraft.server.v1_6_R2.PlayerInventory;
class SilentContainerChest extends ContainerChest { class SilentContainerChest extends ContainerChest {
public SilentContainerChest(IInventory i1, IInventory i2) { SilentContainerChest(IInventory i1, IInventory i2) {
super(i1, i2); super(i1, i2);
// Send close signal // Send close signal
i2.g(); i2.g();

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

@ -16,26 +16,25 @@
package com.lishid.openinv.internal.v1_6_R2; package com.lishid.openinv.internal.v1_6_R2;
import com.lishid.openinv.internal.ISpecialEnderChest;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; 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.EntityPlayer;
import net.minecraft.server.v1_6_R2.IInventory; import net.minecraft.server.v1_6_R2.IInventory;
import net.minecraft.server.v1_6_R2.InventoryEnderChest; import net.minecraft.server.v1_6_R2.InventoryEnderChest;
import net.minecraft.server.v1_6_R2.InventorySubcontainer; import net.minecraft.server.v1_6_R2.InventorySubcontainer;
import net.minecraft.server.v1_6_R2.ItemStack; 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.CraftHumanEntity;
import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest { public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
@ -57,13 +56,31 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
this.items = enderChest.getContents(); this.items = enderChest.getContents();
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory; return inventory;
} }
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.ENDER_CHEST;
}
};
}
@Override @Override
public void setPlayerOnline(Player player) { public void setPlayerOnline(@NotNull Player player) {
if (!playerOnline) { if (!playerOnline) {
try { try {
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
@ -72,7 +89,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
Field field = playerEnderChest.getClass().getField("items"); Field field = playerEnderChest.getClass().getField("items");
field.setAccessible(true); field.setAccessible(true);
field.set(playerEnderChest, this.items); field.set(playerEnderChest, this.items);
} catch (Exception e) {} } catch (Exception ignored) {}
playerOnline = true; playerOnline = true;
} }
} }

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

@ -17,14 +17,15 @@
package com.lishid.openinv.internal.v1_6_R2; package com.lishid.openinv.internal.v1_6_R2;
import com.lishid.openinv.internal.ISpecialPlayerInventory; 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.ItemStack;
import net.minecraft.server.v1_6_R2.PlayerInventory; import net.minecraft.server.v1_6_R2.PlayerInventory;
import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory { public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@ -39,13 +40,31 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
this.armor = player.inventory.armor; this.armor = player.inventory.armor;
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory; return inventory;
} }
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.PLAYER;
}
};
}
@Override @Override
public void setPlayerOnline(Player player) { public void setPlayerOnline(@NotNull Player player) {
if (!playerOnline) { if (!playerOnline) {
this.player = PlayerDataManager.getHandle(player); this.player = PlayerDataManager.getHandle(player);
this.player.inventory.items = this.items; this.player.inventory.items = this.items;

4
internal/v1_6_R3/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvinternal</artifactId> <artifactId>openinvinternal</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>openinvadapter1_6_R3</artifactId> <artifactId>openinvadapter1_6_R3</artifactId>
@ -37,7 +37,7 @@
<dependency> <dependency>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvcommon</artifactId> <artifactId>openinvcommon</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

78
internal/v1_6_R3/src/main/java/com/lishid/openinv/internal/v1_6_R3/AnySilentContainer.java
View file

@ -17,11 +17,6 @@
package com.lishid.openinv.internal.v1_6_R3; package com.lishid.openinv.internal.v1_6_R3;
import com.lishid.openinv.internal.IAnySilentContainer; 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.AxisAlignedBB;
import net.minecraft.server.v1_6_R3.BlockEnderChest; import net.minecraft.server.v1_6_R3.BlockEnderChest;
import net.minecraft.server.v1_6_R3.Container; import net.minecraft.server.v1_6_R3.Container;
@ -34,43 +29,46 @@ import net.minecraft.server.v1_6_R3.Packet100OpenWindow;
import net.minecraft.server.v1_6_R3.TileEntityChest; import net.minecraft.server.v1_6_R3.TileEntityChest;
import net.minecraft.server.v1_6_R3.TileEntityEnderChest; import net.minecraft.server.v1_6_R3.TileEntityEnderChest;
import net.minecraft.server.v1_6_R3.World; import net.minecraft.server.v1_6_R3.World;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_6_R3.event.CraftEventFactory; import org.bukkit.craftbukkit.v1_6_R3.event.CraftEventFactory;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class AnySilentContainer implements IAnySilentContainer { public class AnySilentContainer implements IAnySilentContainer {
@Override @Override
public boolean isAnySilentContainer(org.bukkit.block.Block block) { public boolean isAnySilentContainer(@NotNull Block bukkitBlock) {
return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest; return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
} }
@Override @Override
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) { public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull Block bukkitBlock) {
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
EntityPlayer player = PlayerDataManager.getHandle(p); World world = PlayerDataManager.getHandle(bukkitPlayer).world;
World world = player.world;
if (block instanceof BlockEnderChest) { if (bukkitBlock instanceof BlockEnderChest) {
// Ender chests are not blocked by ocelots. // Ender chests are not blocked by ocelots.
return world.t(block.getX(), block.getY() + 1, block.getZ()); return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
} }
// If block or ocelot on top // If block or ocelot on top
if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) { if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
return true; return true;
} }
int id = world.getTypeId(block.getX(), block.getY(), block.getZ()); int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
// If block next to chest is chest and has a block or ocelot on top // 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) { if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1); return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() + 1);
} else if(world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) { } else if(world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1); return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() - 1);
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ()); return isBlockedChest(world, bukkitBlock.getX() + 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ()); return isBlockedChest(world, bukkitBlock.getX() - 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
} }
return false; return false;
@ -93,18 +91,18 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) { public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull Block bukkitBlock) {
EntityPlayer player = PlayerDataManager.getHandle(p); EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
// Silent ender chest is API-only // Silent ender chest is API-only
if (silentchest && block.getType() == Material.ENDER_CHEST) { if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
p.openInventory(p.getEnderChest()); bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
return true; return true;
} }
World world = player.world; World world = player.world;
Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ()); Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
if (tile == null) { if (tile == null) {
return false; return false;
@ -123,20 +121,20 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
IInventory inventory = (IInventory) tile; IInventory inventory = (IInventory) tile;
int id = world.getTypeId(block.getX(), block.getY(), block.getZ()); int id = world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
if (world.getTypeId(block.getX(), block.getY(), block.getZ() + 1) == id) { if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1) == id) {
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1)); inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1));
} else if (world.getTypeId(block.getX(), block.getY(), block.getZ() - 1) == id) { } else if (world.getTypeId(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1) == id) {
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory); inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1), inventory);
} else if (world.getTypeId(block.getX() + 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ())); inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()));
} else if (world.getTypeId(block.getX() - 1, block.getY(), block.getZ()) == id) { } else if (world.getTypeId(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()) == id) {
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory); inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()), inventory);
} }
// AnyChest only // AnyChest only
if (!silentchest) { if (!silent) {
player.openContainer(inventory); player.openContainer(inventory);
return true; return true;
} }
@ -160,12 +158,12 @@ public class AnySilentContainer implements IAnySilentContainer {
return true; return true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
p.sendMessage(ChatColor.RED + "Error while sending silent container."); bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
return false; return false;
} }
} }
@Override @Override
public void deactivateContainer(final Player bukkitPlayer) {} public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
} }

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

@ -20,17 +20,15 @@ import com.lishid.openinv.internal.IInventoryAccess;
import com.lishid.openinv.internal.ISpecialEnderChest; import com.lishid.openinv.internal.ISpecialEnderChest;
import com.lishid.openinv.internal.ISpecialPlayerInventory; import com.lishid.openinv.internal.ISpecialPlayerInventory;
import com.lishid.openinv.util.InternalAccessor; import com.lishid.openinv.util.InternalAccessor;
import org.bukkit.inventory.Inventory;
import net.minecraft.server.v1_6_R3.IInventory; import net.minecraft.server.v1_6_R3.IInventory;
import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventory;
import org.bukkit.inventory.Inventory;
import org.jetbrains.annotations.NotNull;
public class InventoryAccess implements IInventoryAccess { public class InventoryAccess implements IInventoryAccess {
@Override @Override
public boolean isSpecialPlayerInventory(Inventory inventory) { public boolean isSpecialPlayerInventory(@NotNull Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory; return ((CraftInventory) inventory).getInventory() instanceof ISpecialPlayerInventory;
} }
@ -38,7 +36,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialPlayerInventory getSpecialPlayerInventory(Inventory inventory) { public ISpecialPlayerInventory getSpecialPlayerInventory(@NotNull Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();
@ -53,7 +51,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public boolean isSpecialEnderChest(Inventory inventory) { public boolean isSpecialEnderChest(@NotNull Inventory inventory) {
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest; return ((CraftInventory) inventory).getInventory() instanceof ISpecialEnderChest;
} }
@ -61,7 +59,7 @@ public class InventoryAccess implements IInventoryAccess {
} }
@Override @Override
public ISpecialEnderChest getSpecialEnderChest(Inventory inventory) { public ISpecialEnderChest getSpecialEnderChest(@NotNull Inventory inventory) {
IInventory inv; IInventory inv;
if (inventory instanceof CraftInventory) { if (inventory instanceof CraftInventory) {
inv = ((CraftInventory) inventory).getInventory(); inv = ((CraftInventory) inventory).getInventory();

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

@ -16,29 +16,26 @@
package com.lishid.openinv.internal.v1_6_R3; package com.lishid.openinv.internal.v1_6_R3;
import com.lishid.openinv.internal.IPlayerDataManager;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; 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.EntityPlayer;
import net.minecraft.server.v1_6_R3.MinecraftServer; import net.minecraft.server.v1_6_R3.MinecraftServer;
import net.minecraft.server.v1_6_R3.PlayerInteractManager; import net.minecraft.server.v1_6_R3.PlayerInteractManager;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_6_R3.CraftServer; import org.bukkit.craftbukkit.v1_6_R3.CraftServer;
import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class PlayerDataManager implements IPlayerDataManager { public class PlayerDataManager implements IPlayerDataManager {
@Override @Override
public Player loadPlayer(OfflinePlayer offline) { public Player loadPlayer(@NotNull OfflinePlayer offline) {
// Ensure the player has data // Ensure the player has data
if (offline == null || !offline.hasPlayedBefore()) { if (!offline.hasPlayedBefore()) {
return null; return null;
} }
@ -49,7 +46,7 @@ public class PlayerDataManager implements IPlayerDataManager {
new PlayerInteractManager(server.getWorldServer(0))); new PlayerInteractManager(server.getWorldServer(0)));
// Get the bukkit entity // Get the bukkit entity
Player target = (entity == null) ? null : entity.getBukkitEntity(); Player target = entity.getBukkitEntity();
if (target != null) { if (target != null) {
// Load data // Load data
target.loadData(); target.loadData();
@ -58,13 +55,14 @@ public class PlayerDataManager implements IPlayerDataManager {
return target; return target;
} }
@NotNull
@Override @Override
public String getPlayerDataID(OfflinePlayer offline) { public String getPlayerDataID(@NotNull OfflinePlayer offline) {
return offline.getName(); return offline.getName();
} }
@Override @Override
public OfflinePlayer getPlayerByID(String identifier) { public OfflinePlayer getPlayerByID(@NotNull String identifier) {
OfflinePlayer player = Bukkit.getOfflinePlayer(identifier); OfflinePlayer player = Bukkit.getOfflinePlayer(identifier);
// Ensure player is a real player, otherwise return null // Ensure player is a real player, otherwise return null
if (player == null || !player.hasPlayedBefore() && !player.isOnline()) { if (player == null || !player.hasPlayedBefore() && !player.isOnline()) {
@ -73,6 +71,7 @@ public class PlayerDataManager implements IPlayerDataManager {
return player; return player;
} }
@NotNull
@Override @Override
public Collection<? extends Player> getOnlinePlayers() { public Collection<? extends Player> getOnlinePlayers() {
return Arrays.asList(Bukkit.getOnlinePlayers()); return Arrays.asList(Bukkit.getOnlinePlayers());

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

@ -24,7 +24,7 @@ import net.minecraft.server.v1_6_R3.PlayerInventory;
class SilentContainerChest extends ContainerChest { class SilentContainerChest extends ContainerChest {
public SilentContainerChest(IInventory i1, IInventory i2) { SilentContainerChest(IInventory i1, IInventory i2) {
super(i1, i2); super(i1, i2);
// Send close signal // Send close signal
i2.g(); i2.g();

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

@ -16,26 +16,25 @@
package com.lishid.openinv.internal.v1_6_R3; package com.lishid.openinv.internal.v1_6_R3;
import com.lishid.openinv.internal.ISpecialEnderChest;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; 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.EntityPlayer;
import net.minecraft.server.v1_6_R3.IInventory; import net.minecraft.server.v1_6_R3.IInventory;
import net.minecraft.server.v1_6_R3.InventoryEnderChest; import net.minecraft.server.v1_6_R3.InventoryEnderChest;
import net.minecraft.server.v1_6_R3.InventorySubcontainer; import net.minecraft.server.v1_6_R3.InventorySubcontainer;
import net.minecraft.server.v1_6_R3.ItemStack; 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.CraftHumanEntity;
import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_6_R3.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest { public class SpecialEnderChest extends InventorySubcontainer implements IInventory, ISpecialEnderChest {
@ -57,13 +56,31 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
this.items = enderChest.getContents(); this.items = enderChest.getContents();
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory; return inventory;
} }
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.ENDER_CHEST;
}
};
}
@Override @Override
public void setPlayerOnline(Player player) { public void setPlayerOnline(@NotNull Player player) {
if (!playerOnline) { if (!playerOnline) {
try { try {
EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player); EntityPlayer nmsPlayer = PlayerDataManager.getHandle(player);
@ -72,7 +89,7 @@ public class SpecialEnderChest extends InventorySubcontainer implements IInvento
Field field = playerEnderChest.getClass().getField("items"); Field field = playerEnderChest.getClass().getField("items");
field.setAccessible(true); field.setAccessible(true);
field.set(playerEnderChest, this.items); field.set(playerEnderChest, this.items);
} catch (Exception e) {} } catch (Exception ignored) {}
playerOnline = true; playerOnline = true;
} }
} }

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

@ -17,14 +17,15 @@
package com.lishid.openinv.internal.v1_6_R3; package com.lishid.openinv.internal.v1_6_R3;
import com.lishid.openinv.internal.ISpecialPlayerInventory; import com.lishid.openinv.internal.ISpecialPlayerInventory;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import net.minecraft.server.v1_6_R3.ItemStack; import net.minecraft.server.v1_6_R3.ItemStack;
import net.minecraft.server.v1_6_R3.PlayerInventory; import net.minecraft.server.v1_6_R3.PlayerInventory;
import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventory;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryView;
import org.jetbrains.annotations.NotNull;
public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory { public class SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@ -39,13 +40,31 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
this.armor = player.inventory.armor; this.armor = player.inventory.armor;
} }
@NotNull
@Override @Override
public Inventory getBukkitInventory() { public InventoryView getBukkitView(final Player viewer) {
return new InventoryView() {
@Override
public Inventory getTopInventory() {
return inventory; return inventory;
} }
@Override
public Inventory getBottomInventory() {
return viewer.getInventory();
}
@Override
public HumanEntity getPlayer() {
return viewer;
}
@Override
public InventoryType getType() {
return InventoryType.PLAYER;
}
};
}
@Override @Override
public void setPlayerOnline(Player player) { public void setPlayerOnline(@NotNull Player player) {
if (!playerOnline) { if (!playerOnline) {
this.player = PlayerDataManager.getHandle(player); this.player = PlayerDataManager.getHandle(player);
this.player.inventory.items = this.items; this.player.inventory.items = this.items;

4
internal/v1_7_R1/pom.xml
View file

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvinternal</artifactId> <artifactId>openinvinternal</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>openinvadapter1_7_R1</artifactId> <artifactId>openinvadapter1_7_R1</artifactId>
@ -37,7 +37,7 @@
<dependency> <dependency>
<groupId>com.lishid</groupId> <groupId>com.lishid</groupId>
<artifactId>openinvcommon</artifactId> <artifactId>openinvcommon</artifactId>
<version>3.3.8-SNAPSHOT</version> <version>4.0.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>

77
internal/v1_7_R1/src/main/java/com/lishid/openinv/internal/v1_7_R1/AnySilentContainer.java
View file

@ -17,11 +17,6 @@
package com.lishid.openinv.internal.v1_7_R1; package com.lishid.openinv.internal.v1_7_R1;
import com.lishid.openinv.internal.IAnySilentContainer; 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.AxisAlignedBB;
import net.minecraft.server.v1_7_R1.Block; import net.minecraft.server.v1_7_R1.Block;
import net.minecraft.server.v1_7_R1.BlockEnderChest; import net.minecraft.server.v1_7_R1.BlockEnderChest;
@ -35,43 +30,45 @@ import net.minecraft.server.v1_7_R1.PacketPlayOutOpenWindow;
import net.minecraft.server.v1_7_R1.TileEntityChest; import net.minecraft.server.v1_7_R1.TileEntityChest;
import net.minecraft.server.v1_7_R1.TileEntityEnderChest; import net.minecraft.server.v1_7_R1.TileEntityEnderChest;
import net.minecraft.server.v1_7_R1.World; import net.minecraft.server.v1_7_R1.World;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_7_R1.event.CraftEventFactory; import org.bukkit.craftbukkit.v1_7_R1.event.CraftEventFactory;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public class AnySilentContainer implements IAnySilentContainer { public class AnySilentContainer implements IAnySilentContainer {
@Override @Override
public boolean isAnySilentContainer(org.bukkit.block.Block block) { public boolean isAnySilentContainer(@NotNull org.bukkit.block.Block bukkitBlock) {
return block.getType() == Material.ENDER_CHEST || block.getState() instanceof org.bukkit.block.Chest; return bukkitBlock.getType() == Material.ENDER_CHEST || bukkitBlock.getState() instanceof org.bukkit.block.Chest;
} }
@Override @Override
public boolean isAnyContainerNeeded(Player p, org.bukkit.block.Block block) { public boolean isAnyContainerNeeded(@NotNull Player bukkitPlayer, @NotNull org.bukkit.block.Block bukkitBlock) {
// FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest // FOR REFERENCE, LOOK AT net.minecraft.server.BlockChest
EntityPlayer player = PlayerDataManager.getHandle(p); World world = PlayerDataManager.getHandle(bukkitPlayer).world;
World world = player.world;
if (block instanceof BlockEnderChest) { if (bukkitBlock instanceof BlockEnderChest) {
// Ender chests are not blocked by ocelots. // Ender chests are not blocked by ocelots.
return world.t(block.getX(), block.getY() + 1, block.getZ()); return world.t(bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ());
} }
// If block or ocelot on top // If block or ocelot on top
if (isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ())) { if (isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ())) {
return true; return true;
} }
int id = Block.b(world.getType(block.getX(), block.getY(), block.getZ())); int id = Block.b(world.getType(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ()));
// If block next to chest is chest and has a block or ocelot on top // 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) { if (Block.b(world.getType(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1)) == id) {
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() + 1); return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() + 1);
} else if(Block.b(world.getType(block.getX(), block.getY(), block.getZ() - 1)) == id) { } else if(Block.b(world.getType(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1)) == id) {
return isBlockedChest(world, block.getX(), block.getY() + 1, block.getZ() - 1); return isBlockedChest(world, bukkitBlock.getX(), bukkitBlock.getY() + 1, bukkitBlock.getZ() - 1);
} else if (Block.b(world.getType(block.getX() + 1, block.getY(), block.getZ())) == id) { } else if (Block.b(world.getType(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ())) == id) {
return isBlockedChest(world, block.getX() + 1, block.getY() + 1, block.getZ()); return isBlockedChest(world, bukkitBlock.getX() + 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
} else if (Block.b(world.getType(block.getX() - 1, block.getY(), block.getZ())) == id) { } else if (Block.b(world.getType(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ())) == id) {
return isBlockedChest(world, block.getX() - 1, block.getY() + 1, block.getZ()); return isBlockedChest(world, bukkitBlock.getX() - 1, bukkitBlock.getY() + 1, bukkitBlock.getZ());
} }
return false; return false;
@ -94,18 +91,18 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
@Override @Override
public boolean activateContainer(Player p, boolean silentchest, org.bukkit.block.Block block) { public boolean activateContainer(@NotNull Player bukkitPlayer, boolean silent, @NotNull org.bukkit.block.Block bukkitBlock) {
EntityPlayer player = PlayerDataManager.getHandle(p); EntityPlayer player = PlayerDataManager.getHandle(bukkitPlayer);
// Silent ender chest is API-only // Silent ender chest is API-only
if (silentchest && block.getType() == Material.ENDER_CHEST) { if (silent && bukkitBlock.getType() == Material.ENDER_CHEST) {
p.openInventory(p.getEnderChest()); bukkitPlayer.openInventory(bukkitPlayer.getEnderChest());
return true; return true;
} }
World world = player.world; World world = player.world;
Object tile = world.getTileEntity(block.getX(), block.getY(), block.getZ()); Object tile = world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ());
if (tile == null) { if (tile == null) {
return false; return false;
@ -124,20 +121,20 @@ public class AnySilentContainer implements IAnySilentContainer {
} }
IInventory inventory = (IInventory) tile; IInventory inventory = (IInventory) tile;
int id = Block.b(world.getType(block.getX(), block.getY(), block.getZ())); int id = Block.b(world.getType(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ()));
if (Block.b(world.getType(block.getX(), block.getY(), block.getZ() + 1)) == id) { if (Block.b(world.getType(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1)) == id) {
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() + 1)); inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() + 1));
} else if(Block.b(world.getType(block.getX(), block.getY(), block.getZ() - 1)) == id) { } else if(Block.b(world.getType(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1)) == id) {
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX(), block.getY(), block.getZ() - 1), inventory); inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX(), bukkitBlock.getY(), bukkitBlock.getZ() - 1), inventory);
} else if (Block.b(world.getType(block.getX() + 1, block.getY(), block.getZ())) == id) { } else if (Block.b(world.getType(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ())) == id) {
inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(block.getX() + 1, block.getY(), block.getZ())); inventory = new InventoryLargeChest("container.chestDouble", inventory, (TileEntityChest) world.getTileEntity(bukkitBlock.getX() + 1, bukkitBlock.getY(), bukkitBlock.getZ()));
} else if (Block.b(world.getType(block.getX() - 1, block.getY(), block.getZ())) == id) { } else if (Block.b(world.getType(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ())) == id) {
inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(block.getX() - 1, block.getY(), block.getZ()), inventory); inventory = new InventoryLargeChest("container.chestDouble", (TileEntityChest) world.getTileEntity(bukkitBlock.getX() - 1, bukkitBlock.getY(), bukkitBlock.getZ()), inventory);
} }
// AnyChest only // AnyChest only
if (!silentchest) { if (!silent) {
player.openContainer(inventory); player.openContainer(inventory);
return true; return true;
} }
@ -161,12 +158,12 @@ public class AnySilentContainer implements IAnySilentContainer {
return true; return true;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
p.sendMessage(ChatColor.RED + "Error while sending silent container."); bukkitPlayer.sendMessage(ChatColor.RED + "Error while sending silent container.");
return false; return false;
} }
} }
@Override @Override
public void deactivateContainer(final Player bukkitPlayer) {} public void deactivateContainer(@NotNull final Player bukkitPlayer) {}
} }

Some files were not shown because too many files have changed in this diff Show more