[Idea]: Folia support for OpenInv #196

Closed
reabuc wants to merge 137 commits from master into master
20 changed files with 282 additions and 89 deletions
Showing only changes of commit 6c4818dfd9 - Show all commits

View File

@@ -16,6 +16,7 @@
package com.lishid.openinv.internal; package com.lishid.openinv.internal;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -48,4 +49,11 @@ public interface ISpecialInventory {
*/ */
boolean isInUse(); boolean isInUse();
/**
* Gets the Player associated with this ISpecialInventory.
*
* @return the HumanEntity
*/
@NotNull HumanEntity getPlayer();
} }

View File

@@ -80,6 +80,11 @@ public class SpecialEnderChest extends InventoryEnderChest implements ISpecialEn
} }
} }
@Override
public @NotNull Player getPlayer() {
return owner.getBukkitEntity();
}
@Override @Override
public void update() { public void update() {
this.owner.getEnderChest().update(); this.owner.getEnderChest().update();

View File

@@ -212,6 +212,11 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
this.playerOnline = false; this.playerOnline = false;
} }
@Override
public @NotNull HumanEntity getPlayer() {
return this.player.getBukkitEntity();
}
@Override @Override
public ItemStack splitStack(int i, final int j) { public ItemStack splitStack(int i, final int j) {
List<ItemStack> list = this.items; List<ItemStack> list = this.items;

View File

@@ -17,7 +17,6 @@
package com.lishid.openinv.internal; package com.lishid.openinv.internal;
import com.lishid.openinv.OpenInv; import com.lishid.openinv.OpenInv;
import java.util.Objects;
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.event.inventory.InventoryType;
@@ -63,7 +62,7 @@ public class OpenInventoryView extends InventoryView {
@Override @Override
public @NotNull String getTitle() { public @NotNull String getTitle() {
if (title == null) { if (title == null) {
HumanEntity owner = (HumanEntity) Objects.requireNonNull(inventory.getBukkitInventory().getHolder()); HumanEntity owner = inventory.getPlayer();
String localTitle = OpenInv.getPlugin(OpenInv.class) String localTitle = OpenInv.getPlugin(OpenInv.class)
.getLocalizedMessage( .getLocalizedMessage(

View File

@@ -199,7 +199,7 @@ public class InventoryListener implements Listener {
} }
// Only specially handle actions in the player's own inventory. // Only specially handle actions in the player's own inventory.
return !event.getWhoClicked().equals(event.getView().getTopInventory().getHolder()); return !event.getWhoClicked().equals(playerInventory.getPlayer());
} }
} }