Elaria/AuxProtect-Folia
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move InventoryView handling to separate modules

Browse Source
This commit is contained in:
Heliosares
2024-07-18 19:31:14 -04:00
parent 841a085f74
commit 95c9b22eb2
4 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AuxProtect_1.20/src/main/java/dev/heliosares/auxprotect/utils/InventoryUtil_1_20.java
View File

@@ -1,4 +1,10 @@
package dev.heliosares.auxprotect.utils; package dev.heliosares.auxprotect.utils;
import org.bukkit.entity.HumanEntity;
import org.bukkit.inventory.Inventory;
public class InventoryUtil_1_20 { public class InventoryUtil_1_20 {
public static Inventory getTopInventory(HumanEntity player) {
return player.getOpenInventory().getTopInventory();
}
} }

6
AuxProtect_1.21/src/main/java/dev/heliosares/auxprotect/utils/InventoryUtil_1_21.java
View File

@@ -1,4 +1,10 @@
package dev.heliosares.auxprotect.utils; package dev.heliosares.auxprotect.utils;
import org.bukkit.entity.HumanEntity;
import org.bukkit.inventory.Inventory;
public class InventoryUtil_1_21 { public class InventoryUtil_1_21 {
public static Inventory getTopInventory(HumanEntity player) {
return player.getOpenInventory().getTopInventory();
}
} }

1
AuxProtect_Core/pom.xml
View File

@@ -51,6 +51,7 @@
<artifactSet> <artifactSet>
<includes> <includes>
<include>org.json:json</include> <include>org.json:json</include>
<include>dev.heliosares:*</include>
</includes> </includes>
</artifactSet> </artifactSet>
<minimizeJar>true</minimizeJar> <minimizeJar>true</minimizeJar>

8
AuxProtect_Core/src/main/java/dev/heliosares/auxprotect/spigot/listeners/InventoryListener.java
View File

@@ -7,6 +7,8 @@ import dev.heliosares.auxprotect.database.EntryAction;
import dev.heliosares.auxprotect.database.SingleItemEntry; import dev.heliosares.auxprotect.database.SingleItemEntry;
import dev.heliosares.auxprotect.spigot.AuxProtectSpigot; import dev.heliosares.auxprotect.spigot.AuxProtectSpigot;
import dev.heliosares.auxprotect.utils.InvSerialization; import dev.heliosares.auxprotect.utils.InvSerialization;
import dev.heliosares.auxprotect.utils.InventoryUtil_1_20;
import dev.heliosares.auxprotect.utils.InventoryUtil_1_21;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@@ -86,7 +88,11 @@ public class InventoryListener implements Listener {
InventoryType type; InventoryType type;
type = e.getWhoClicked().getOpenInventory().getTopInventory().getType(); if (plugin.getCompatabilityVersion() < 21) {
type = InventoryUtil_1_20.getTopInventory(e.getWhoClicked()).getType();
} else {
type = InventoryUtil_1_21.getTopInventory(e.getWhoClicked()).getType();
}
if (e.getSlotType() != InventoryType.SlotType.RESULT) return; if (e.getSlotType() != InventoryType.SlotType.RESULT) return;