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

25
internal/v1_13_R1/src/main/java/com/lishid/openinv/internal/v1_13_R1/SpecialEnderChest.java
View File

@@ -26,11 +26,8 @@ import net.minecraft.server.v1_13_R1.InventoryEnderChest;
import net.minecraft.server.v1_13_R1.InventorySubcontainer;
import net.minecraft.server.v1_13_R1.ItemStack;
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
@@ -48,27 +45,9 @@ public class SpecialEnderChest extends InventorySubcontainer
this.setItemLists(this, this.enderChest.getContents());
}
@NotNull
@Override
public InventoryView getBukkitView(final Player viewer) {
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;
}
};
public @NotNull Inventory getBukkitInventory() {
return inventory;
}
@Override

25
internal/v1_13_R1/src/main/java/com/lishid/openinv/internal/v1_13_R1/SpecialPlayerInventory.java
View File

@@ -28,11 +28,8 @@ import net.minecraft.server.v1_13_R1.ItemStack;
import net.minecraft.server.v1_13_R1.NonNullList;
import net.minecraft.server.v1_13_R1.PlayerInventory;
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 {
@@ -52,27 +49,9 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
return true;
}
@NotNull
@Override
public InventoryView getBukkitView(final Player viewer) {
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;
}
};
public @NotNull Inventory getBukkitInventory() {
return inventory;
}
@Override