From d5a57204a80558c24822d5c6b3a5b840c29a82f1 Mon Sep 17 00:00:00 2001 From: chorusfruit <564005180@qq.com> Date: Thu, 16 Jul 2026 16:54:11 +0800 Subject: [PATCH] Support Minecraft 26.2 in v26_R1 --- .../src/main/java/com/andavin/util/MinecraftVersion.java | 1 + Images-v26_R1/pom.xml | 4 ++-- .../main/java/com/andavin/images/v26_R1/PacketListener.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Images-Common/src/main/java/com/andavin/util/MinecraftVersion.java b/Images-Common/src/main/java/com/andavin/util/MinecraftVersion.java index 2ebdde7..74b1938 100644 --- a/Images-Common/src/main/java/com/andavin/util/MinecraftVersion.java +++ b/Images-Common/src/main/java/com/andavin/util/MinecraftVersion.java @@ -445,6 +445,7 @@ private static String matchVersion(String version) { case "26.1": case "26.1.1": case "26.1.2": + case "26.2": return "R1"; case "1.21.3": return "R2"; diff --git a/Images-v26_R1/pom.xml b/Images-v26_R1/pom.xml index c7547e8..0670579 100644 --- a/Images-v26_R1/pom.xml +++ b/Images-v26_R1/pom.xml @@ -29,7 +29,7 @@ org.spigotmc spigot-api - 26.1.2-R0.1-SNAPSHOT + 26.2-R0.1-SNAPSHOT provided @@ -40,7 +40,7 @@ org.spigotmc spigot - 26.1.2-R0.1-SNAPSHOT + 26.2-R0.1-SNAPSHOT provided diff --git a/Images-v26_R1/src/main/java/com/andavin/images/v26_R1/PacketListener.java b/Images-v26_R1/src/main/java/com/andavin/images/v26_R1/PacketListener.java index 4ae3df6..d7a48dc 100644 --- a/Images-v26_R1/src/main/java/com/andavin/images/v26_R1/PacketListener.java +++ b/Images-v26_R1/src/main/java/com/andavin/images/v26_R1/PacketListener.java @@ -31,6 +31,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; import net.minecraft.core.component.DataComponents; import net.minecraft.network.Connection; import net.minecraft.network.protocol.game.ServerboundInteractPacket; @@ -40,7 +41,6 @@ import net.minecraft.server.network.ServerGamePacketListenerImpl; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.decoration.ItemFrame; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -131,7 +131,7 @@ private static void tryPickItem(ServerGamePacketListenerImpl connection, ItemSta } else { // NOTE: create an entity to prevent an NPE, but isn't the real entity // This may cause some plugins a minor confusion, but I think it'll be okay - ItemFrame frame = new ItemFrame(EntityType.ITEM_FRAME, level); + ItemFrame frame = new ItemFrame(level, BlockPos.ZERO, Direction.NORTH); invokeMethod(TRY_PICK_ITEM, connection, item, null, frame, true); } }