minster586/OpenInv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

Revert API changes, fix SpecialPlayerInventory implementation

Browse Source
This commit is contained in:
Jikoo
2019-05-05 12:40:47 -04:00
parent e4d0020296
commit 185f037254
51 changed files with 121 additions and 1091 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
internal/v1_13_R2/src/main/java/com/lishid/openinv/internal/v1_13_R2/SpecialEnderChest.java
View File

@@ -35,52 +35,29 @@ import org.bukkit.craftbukkit.v1_13_R2.entity.CraftHumanEntity;
import org.bukkit.craftbukkit.v1_13_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 implements IInventory, ISpecialEnderChest, AutoRecipeOutput {
private EntityPlayer owner;
private final IChatBaseComponent displayName;
private final CraftInventory inventory;
private NonNullList<ItemStack> items;
private final CraftInventory inventory = new CraftInventory(this);
private boolean playerOnline;
public SpecialEnderChest(final Player player, final Boolean online) {
this.owner = PlayerDataManager.getHandle(player);
this.displayName = this.owner.getEnderChest().getDisplayName();
this.playerOnline = online;
this.inventory = new CraftInventory(this);
this.items = this.owner.getEnderChest().items;
this.playerOnline = online;
}
@NotNull
@Override
public InventoryView getBukkitView(final Player viewer) {
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;
}
};
public @NotNull Inventory getBukkitInventory() {
return this.inventory;
}
@Override

28
internal/v1_13_R2/src/main/java/com/lishid/openinv/internal/v1_13_R2/SpecialPlayerInventory.java
View File

@@ -47,10 +47,8 @@ import org.bukkit.craftbukkit.v1_13_R2.entity.CraftHumanEntity;
import org.bukkit.craftbukkit.v1_13_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 SpecialPlayerInventory extends PlayerInventory implements ISpecialPlayerInventory {
@@ -88,31 +86,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
return true;
}
@NotNull
@Override
public InventoryView getBukkitView(final Player viewer) {
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;
}
};
public @NotNull Inventory getBukkitInventory() {
return inventory;
}
@Override