diff --git a/1_10_R1/pom.xml b/1_10_R1/pom.xml index 9ae22ef5..48b6b183 100644 --- a/1_10_R1/pom.xml +++ b/1_10_R1/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_10_R1 diff --git a/1_11_R1/pom.xml b/1_11_R1/pom.xml index f5986acf..f9210867 100644 --- a/1_11_R1/pom.xml +++ b/1_11_R1/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_11_R1 diff --git a/1_12_R1/pom.xml b/1_12_R1/pom.xml index 745be089..27d1f4c0 100644 --- a/1_12_R1/pom.xml +++ b/1_12_R1/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_12_R1 diff --git a/1_13_R1/pom.xml b/1_13_R1/pom.xml index 09514426..a50623a5 100644 --- a/1_13_R1/pom.xml +++ b/1_13_R1/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_13_R1 diff --git a/1_13_R2/pom.xml b/1_13_R2/pom.xml index 8c8b79d1..989cccc9 100644 --- a/1_13_R2/pom.xml +++ b/1_13_R2/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_13_R2 diff --git a/1_14_4_R1/pom.xml b/1_14_4_R1/pom.xml index 39a757c1..983f3cc1 100644 --- a/1_14_4_R1/pom.xml +++ b/1_14_4_R1/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_14_4_R1 diff --git a/1_14_R1/pom.xml b/1_14_R1/pom.xml index 170cd934..946dceff 100644 --- a/1_14_R1/pom.xml +++ b/1_14_R1/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_14_R1 diff --git a/1_15_R1/pom.xml b/1_15_R1/pom.xml index ac6ab122..998ee529 100644 --- a/1_15_R1/pom.xml +++ b/1_15_R1/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_15_R1 diff --git a/1_16_R1/pom.xml b/1_16_R1/pom.xml index 52713f20..735fc7f4 100644 --- a/1_16_R1/pom.xml +++ b/1_16_R1/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_16_R1 diff --git a/1_16_R2/pom.xml b/1_16_R2/pom.xml index 43646811..212c6ca4 100644 --- a/1_16_R2/pom.xml +++ b/1_16_R2/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_16_R2 diff --git a/1_16_R3/pom.xml b/1_16_R3/pom.xml index a74fe9c2..d7c90541 100644 --- a/1_16_R3/pom.xml +++ b/1_16_R3/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_16_R3 diff --git a/1_17_1_R1/pom.xml b/1_17_1_R1/pom.xml index f3e7bd80..92c93867 100644 --- a/1_17_1_R1/pom.xml +++ b/1_17_1_R1/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_17_1_R1 diff --git a/1_17_R1/pom.xml b/1_17_R1/pom.xml index 7d302224..534df429 100644 --- a/1_17_R1/pom.xml +++ b/1_17_R1/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_17_R1 diff --git a/1_18_R1/pom.xml b/1_18_R1/pom.xml index 67556f02..2cb3c2cd 100644 --- a/1_18_R1/pom.xml +++ b/1_18_R1/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_18_R1 diff --git a/1_18_R2/pom.xml b/1_18_R2/pom.xml index 92c797ed..c49fed5b 100644 --- a/1_18_R2/pom.xml +++ b/1_18_R2/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_18_R2 diff --git a/1_19_1_R1/pom.xml b/1_19_1_R1/pom.xml index 62e470dc..3b2865ae 100644 --- a/1_19_1_R1/pom.xml +++ b/1_19_1_R1/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_19_1_R1 diff --git a/1_19_R1/pom.xml b/1_19_R1/pom.xml index 91d9541f..3ca2c6bf 100644 --- a/1_19_R1/pom.xml +++ b/1_19_R1/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_19_R1 diff --git a/1_19_R2/pom.xml b/1_19_R2/pom.xml index 7ac3c70a..fe4bd2c8 100644 --- a/1_19_R2/pom.xml +++ b/1_19_R2/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_19_R2 diff --git a/1_19_R3/pom.xml b/1_19_R3/pom.xml index fdccd6ce..43edb2a4 100644 --- a/1_19_R3/pom.xml +++ b/1_19_R3/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_19_R3 diff --git a/1_20_R1/pom.xml b/1_20_R1/pom.xml index 14fce9f4..07d1288e 100644 --- a/1_20_R1/pom.xml +++ b/1_20_R1/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_20_R1 diff --git a/1_20_R2/pom.xml b/1_20_R2/pom.xml index b5a6cc94..f16bef79 100644 --- a/1_20_R2/pom.xml +++ b/1_20_R2/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_20_R2 diff --git a/1_20_R3/pom.xml b/1_20_R3/pom.xml index 441871ea..deb51147 100644 --- a/1_20_R3/pom.xml +++ b/1_20_R3/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_20_R3 diff --git a/1_20_R4/pom.xml b/1_20_R4/pom.xml index 72f3a81b..50eed8e9 100644 --- a/1_20_R4/pom.xml +++ b/1_20_R4/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_20_R4 diff --git a/1_21_R1/pom.xml b/1_21_R1/pom.xml index 12d69e78..86abdb02 100644 --- a/1_21_R1/pom.xml +++ b/1_21_R1/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_21_R1 diff --git a/1_21_R2/pom.xml b/1_21_R2/pom.xml index 33629949..fac57a71 100644 --- a/1_21_R2/pom.xml +++ b/1_21_R2/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_21_R2 diff --git a/1_21_R3/pom.xml b/1_21_R3/pom.xml index 6d9bbfa0..38e0ad87 100644 --- a/1_21_R3/pom.xml +++ b/1_21_R3/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_21_R3 diff --git a/1_21_R4/pom.xml b/1_21_R4/pom.xml index fe252724..92587c2c 100644 --- a/1_21_R4/pom.xml +++ b/1_21_R4/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_21_R4 diff --git a/1_21_R5/pom.xml b/1_21_R5/pom.xml index b0b9ea90..69c86965 100644 --- a/1_21_R5/pom.xml +++ b/1_21_R5/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_21_R5 diff --git a/1_21_R6/pom.xml b/1_21_R6/pom.xml index f020232b..65f8189b 100644 --- a/1_21_R6/pom.xml +++ b/1_21_R6/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_21_R6 diff --git a/1_21_R7/pom.xml b/1_21_R7/pom.xml index d6be10fd..99b1fac9 100644 --- a/1_21_R7/pom.xml +++ b/1_21_R7/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_21_R7 diff --git a/1_7_R4/pom.xml b/1_7_R4/pom.xml index 888b97af..a7da54e5 100644 --- a/1_7_R4/pom.xml +++ b/1_7_R4/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_7_R4 diff --git a/1_8_R1/pom.xml b/1_8_R1/pom.xml index 89fcb116..c2d8c2a2 100644 --- a/1_8_R1/pom.xml +++ b/1_8_R1/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_8_R1 diff --git a/1_8_R2/pom.xml b/1_8_R2/pom.xml index b72c256e..333d60ff 100644 --- a/1_8_R2/pom.xml +++ b/1_8_R2/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_8_R2 diff --git a/1_8_R3/pom.xml b/1_8_R3/pom.xml index 041b7984..fc2414da 100644 --- a/1_8_R3/pom.xml +++ b/1_8_R3/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_8_R3 diff --git a/1_9_R1/pom.xml b/1_9_R1/pom.xml index ebd605f7..1fd59f2a 100644 --- a/1_9_R1/pom.xml +++ b/1_9_R1/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_9_R1 diff --git a/1_9_R2/pom.xml b/1_9_R2/pom.xml index e086649f..7fdb6f86 100644 --- a/1_9_R2/pom.xml +++ b/1_9_R2/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-1_9_R2 diff --git a/26_R1/pom.xml b/26_R1/pom.xml index 1c2c3495..ae81cb9e 100644 --- a/26_R1/pom.xml +++ b/26_R1/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-26_R1 diff --git a/26_R2/pom.xml b/26_R2/pom.xml new file mode 100644 index 00000000..8d94cda7 --- /dev/null +++ b/26_R2/pom.xml @@ -0,0 +1,43 @@ + + + 4.0.0 + + + net.wesjd + anvilgui-parent + 1.10.14-SNAPSHOT + + + anvilgui-26_R2 + + + + org.spigotmc + spigot + 26.2-R0.1-SNAPSHOT + provided + + + net.wesjd + anvilgui-abstraction + ${project.parent.version} + provided + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 25 + 25 + + + + + diff --git a/26_R2/src/main/java/net/wesjd/anvilgui/version/Wrapper26_R2.java b/26_R2/src/main/java/net/wesjd/anvilgui/version/Wrapper26_R2.java new file mode 100644 index 00000000..2dc3ccea --- /dev/null +++ b/26_R2/src/main/java/net/wesjd/anvilgui/version/Wrapper26_R2.java @@ -0,0 +1,183 @@ +package net.wesjd.anvilgui.version; + +import java.lang.reflect.Method; +import java.util.Arrays; +import net.minecraft.core.BlockPos; +import net.minecraft.core.component.DataComponents; +import net.minecraft.network.chat.Component; +import net.minecraft.network.protocol.game.ClientboundContainerClosePacket; +import net.minecraft.network.protocol.game.ClientboundOpenScreenPacket; +import net.minecraft.network.protocol.game.ClientboundSetExperiencePacket; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.Container; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.AnvilMenu; +import net.minecraft.world.inventory.ContainerLevelAccess; +import net.minecraft.world.inventory.MenuType; +import net.minecraft.world.inventory.Slot; +import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.entity.CraftPlayer; +import org.bukkit.craftbukkit.event.CraftEventFactory; +import org.bukkit.craftbukkit.util.CraftChatMessage; +import org.bukkit.entity.Player; +import org.bukkit.inventory.Inventory; + +public final class Wrapper26_R2 implements VersionWrapper { + + private Class inventoryCloseEventReasonClass; + private Method paperHandleInventoryCloseEventMethod; + + private int getRealNextContainerId(Player player) { + return toNMS(player).nextContainerCounter(); + } + + /** + * Turns a {@link Player} into an NMS one + * + * @param player The player to be converted + * @return the NMS EntityPlayer + */ + private ServerPlayer toNMS(Player player) { + return ((CraftPlayer) player).getHandle(); + } + + @Override + public int getNextContainerId(Player player, AnvilContainerWrapper container) { + return ((AnvilContainer) container).getContainerId(); + } + + @Override + public void handleInventoryCloseEvent(Player player) { + try { + // As of 1.21.5, this method only exists on Spigot, not on Paper. + // It was removed from Paper here: + // https://github.com/PaperMC/Paper/commit/f00727c57e564f3a8cb875183a54142feb693db7 + CraftEventFactory.handleInventoryCloseEvent(toNMS(player)); + } catch (NoSuchMethodError ignored) { + // Workaround for Paper servers + try { + if (inventoryCloseEventReasonClass == null) { + inventoryCloseEventReasonClass = + Class.forName("org.bukkit.event.inventory.InventoryCloseEvent$Reason"); + } + if (paperHandleInventoryCloseEventMethod == null) { + paperHandleInventoryCloseEventMethod = Arrays.stream(CraftEventFactory.class.getMethods()) + .filter(m -> m.getName().equals("handleInventoryCloseEvent")) + .findFirst() + .orElseThrow(); + } + paperHandleInventoryCloseEventMethod.invoke( + null, + toNMS(player), + inventoryCloseEventReasonClass.getField("UNKNOWN").get(null)); + } catch (ReflectiveOperationException e) { + throw new RuntimeException(e); + } + } + toNMS(player).doCloseContainer(); + } + + @Override + public void sendPacketOpenWindow(Player player, int containerId, Object inventoryTitle) { + toNMS(player).connection.send(new ClientboundOpenScreenPacket(containerId, MenuType.ANVIL, (Component) + inventoryTitle)); + } + + @Override + public void sendPacketCloseWindow(Player player, int containerId) { + toNMS(player).connection.send(new ClientboundContainerClosePacket(containerId)); + } + + @Override + public void sendPacketExperienceChange(Player player, int experienceLevel) { + toNMS(player).connection.send(new ClientboundSetExperiencePacket(0f, 0, experienceLevel)); + } + + @Override + public void setActiveContainerDefault(Player player) { + toNMS(player).containerMenu = toNMS(player).inventoryMenu; + } + + @Override + public void setActiveContainer(Player player, AnvilContainerWrapper container) { + toNMS(player).containerMenu = (AbstractContainerMenu) container; + } + + @Override + public void setActiveContainerId(AnvilContainerWrapper container, int containerId) {} + + @Override + public void addActiveContainerSlotListener(AnvilContainerWrapper container, Player player) { + toNMS(player).initMenu((AbstractContainerMenu) container); + } + + @Override + public AnvilContainerWrapper newContainerAnvil(Player player, Object title) { + return new AnvilContainer(player, getRealNextContainerId(player), (Component) title); + } + + @Override + public Object literalChatComponent(String content) { + return Component.literal(content); + } + + @Override + public Object jsonChatComponent(String json) { + return CraftChatMessage.fromJSON(json); + } + + private static class AnvilContainer extends AnvilMenu implements AnvilContainerWrapper { + public AnvilContainer(Player player, int containerId, Component guiTitle) { + super( + containerId, + ((CraftPlayer) player).getHandle().getInventory(), + ContainerLevelAccess.create(((CraftWorld) player.getWorld()).getHandle(), new BlockPos(0, 0, 0))); + this.checkReachable = false; + setTitle(guiTitle); + } + + @Override + public void createResult() { + // If the output is empty copy the left input into the output + Slot output = this.getSlot(2); + if (!output.hasItem()) { + output.set(this.getSlot(0).getItem().copy()); + } + + this.cost.set(0); + + // Sync to the client + this.sendAllDataToRemote(); + this.broadcastChanges(); + } + + @Override + public void removed(net.minecraft.world.entity.player.Player player) {} + + @Override + protected void clearContainer(net.minecraft.world.entity.player.Player player, Container container) {} + + public int getContainerId() { + return this.containerId; + } + + @Override + public String getRenameText() { + return this.itemName; + } + + @Override + public void setRenameText(String text) { + // If an item is present in the left input slot change its hover name to the literal text. + Slot inputLeft = this.getSlot(0); + if (inputLeft.hasItem()) { + inputLeft.getItem().set(DataComponents.CUSTOM_NAME, Component.literal(text)); + } + } + + @Override + public Inventory getBukkitInventory() { + return this.getBukkitView().getTopInventory(); + } + } +} diff --git a/README.md b/README.md index 756914b1..6b0ffb61 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Add the repository and dependency to your POM: net.wesjd anvilgui - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT compile ``` diff --git a/abstraction/pom.xml b/abstraction/pom.xml index ed240d35..1a56a375 100644 --- a/abstraction/pom.xml +++ b/abstraction/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui-abstraction diff --git a/api/pom.xml b/api/pom.xml index 5faf7c97..52e87061 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -7,7 +7,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT anvilgui @@ -247,6 +247,12 @@ ${project.parent.version} compile + + net.wesjd + anvilgui-26_R2 + ${project.parent.version} + compile + org.geysermc.geyser api diff --git a/api/src/main/java/net/wesjd/anvilgui/version/VersionMatcher.java b/api/src/main/java/net/wesjd/anvilgui/version/VersionMatcher.java index 050ae066..4a508516 100644 --- a/api/src/main/java/net/wesjd/anvilgui/version/VersionMatcher.java +++ b/api/src/main/java/net/wesjd/anvilgui/version/VersionMatcher.java @@ -35,10 +35,12 @@ public class VersionMatcher { this.put("1.21.11", "1_21_R7"); this.put("26.1", "26_R1"); this.put("26.1.1", "26_R1"); + this.put("26.1.2", "26_R1"); + this.put("26.2", "26_R2"); } }; /* This needs to be updated to reflect the newest available version wrapper */ - private static final String FALLBACK_REVISION = "26_R1"; + private static final String FALLBACK_REVISION = "26_R2"; /** * Matches the server version to it's {@link VersionWrapper} diff --git a/pom.xml b/pom.xml index 774d79c1..e3486b32 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.wesjd anvilgui-parent - 1.10.13-SNAPSHOT + 1.10.14-SNAPSHOT pom @@ -53,6 +53,7 @@ 1_21_R6 1_21_R7 26_R1 + 26_R2