From e7e25513e5e922cf7036469c94094aafcd6e1435 Mon Sep 17 00:00:00 2001 From: twisti <76837088+twisti-dev@users.noreply.github.com> Date: Sun, 19 Apr 2026 22:00:47 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(nms):=20remov?= =?UTF-8?q?e=20ITEM=5FPROXY=20from=20V26=5F1Reflection=20and=20update=20it?= =?UTF-8?q?em=20component=20binding?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - eliminate unused ITEM_PROXY property and initialization in V26_1Reflection - replace ITEM_PROXY usage with direct call to bindComponents in V26_1SurfPaperNmsItemBridgeImpl --- .../bridges/V26_1SurfPaperNmsItemBridgeImpl.kt | 5 ++--- .../server/nms/v26_1/reflection/V26_1ItemProxy.kt | 13 ------------- .../server/nms/v26_1/reflection/V26_1Reflection.kt | 3 --- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 surf-api-paper/surf-api-paper-nms/surf-api-paper-nms-v26-1/src/main/kotlin/dev/slne/surf/api/paper/server/nms/v26_1/reflection/V26_1ItemProxy.kt diff --git a/surf-api-paper/surf-api-paper-nms/surf-api-paper-nms-v26-1/src/main/kotlin/dev/slne/surf/api/paper/server/nms/v26_1/bridges/V26_1SurfPaperNmsItemBridgeImpl.kt b/surf-api-paper/surf-api-paper-nms/surf-api-paper-nms-v26-1/src/main/kotlin/dev/slne/surf/api/paper/server/nms/v26_1/bridges/V26_1SurfPaperNmsItemBridgeImpl.kt index aa16475b7..d0533fcd3 100644 --- a/surf-api-paper/surf-api-paper-nms/surf-api-paper-nms-v26-1/src/main/kotlin/dev/slne/surf/api/paper/server/nms/v26_1/bridges/V26_1SurfPaperNmsItemBridgeImpl.kt +++ b/surf-api-paper/surf-api-paper-nms/surf-api-paper-nms-v26-1/src/main/kotlin/dev/slne/surf/api/paper/server/nms/v26_1/bridges/V26_1SurfPaperNmsItemBridgeImpl.kt @@ -3,7 +3,6 @@ package dev.slne.surf.api.paper.server.nms.v26_1.bridges import dev.slne.surf.api.paper.nms.NmsUseWithCaution import dev.slne.surf.api.paper.nms.bridges.SurfPaperNmsItemBridge import dev.slne.surf.api.paper.server.nms.v26_1.extensions.nms -import dev.slne.surf.api.paper.server.nms.v26_1.reflection.V26_1Reflection import net.minecraft.core.component.DataComponentMap import net.minecraft.core.component.DataComponents import org.bukkit.inventory.ItemType @@ -20,7 +19,7 @@ class V26_1SurfPaperNmsItemBridgeImpl : SurfPaperNmsItemBridge { .set(DataComponents.MAX_STACK_SIZE, maxStackSize) .build() - - V26_1Reflection.ITEM_PROXY.setComponents(nmsItem, updatedComponents) + @Suppress("DEPRECATION") + nmsItem.builtInRegistryHolder().bindComponents(updatedComponents) } } diff --git a/surf-api-paper/surf-api-paper-nms/surf-api-paper-nms-v26-1/src/main/kotlin/dev/slne/surf/api/paper/server/nms/v26_1/reflection/V26_1ItemProxy.kt b/surf-api-paper/surf-api-paper-nms/surf-api-paper-nms-v26-1/src/main/kotlin/dev/slne/surf/api/paper/server/nms/v26_1/reflection/V26_1ItemProxy.kt deleted file mode 100644 index 8d6349e96..000000000 --- a/surf-api-paper/surf-api-paper-nms/surf-api-paper-nms-v26-1/src/main/kotlin/dev/slne/surf/api/paper/server/nms/v26_1/reflection/V26_1ItemProxy.kt +++ /dev/null @@ -1,13 +0,0 @@ -package dev.slne.surf.api.paper.server.nms.v26_1.reflection - -import net.minecraft.core.component.DataComponentMap -import net.minecraft.world.item.Item -import xyz.jpenilla.reflectionremapper.proxy.annotation.FieldSetter -import xyz.jpenilla.reflectionremapper.proxy.annotation.Proxies - -@Proxies(Item::class) -@Suppress("ClassName") -interface V26_1ItemProxy { - @FieldSetter("components") - fun setComponents(item: Item, components: DataComponentMap) -} \ No newline at end of file diff --git a/surf-api-paper/surf-api-paper-nms/surf-api-paper-nms-v26-1/src/main/kotlin/dev/slne/surf/api/paper/server/nms/v26_1/reflection/V26_1Reflection.kt b/surf-api-paper/surf-api-paper-nms/surf-api-paper-nms-v26-1/src/main/kotlin/dev/slne/surf/api/paper/server/nms/v26_1/reflection/V26_1Reflection.kt index bc62d38b4..f1580f600 100644 --- a/surf-api-paper/surf-api-paper-nms/surf-api-paper-nms-v26-1/src/main/kotlin/dev/slne/surf/api/paper/server/nms/v26_1/reflection/V26_1Reflection.kt +++ b/surf-api-paper/surf-api-paper-nms/surf-api-paper-nms-v26-1/src/main/kotlin/dev/slne/surf/api/paper/server/nms/v26_1/reflection/V26_1Reflection.kt @@ -12,8 +12,6 @@ object V26_1Reflection { private set lateinit var ENTITY_PROXY: V26_1EntityProxy private set - lateinit var ITEM_PROXY: V26_1ItemProxy - private set lateinit var SERVER_CONNECTION_LISTENER_PROXY: V26_1ServerConnectionListenerProxy private set lateinit var VANILLA_ARGUMENT_PROVIDER_IMPL_PROXY: V26_1VanillaArgumentProviderImplProxy @@ -28,7 +26,6 @@ object V26_1Reflection { SERVER_STATS_COUNTER_PROXY = proxyFactory.reflectionProxy() ENTITY_PROXY = proxyFactory.reflectionProxy() - ITEM_PROXY = proxyFactory.reflectionProxy() SERVER_CONNECTION_LISTENER_PROXY = proxyFactory.reflectionProxy() VANILLA_ARGUMENT_PROVIDER_IMPL_PROXY = From 89b8304afe616ab035e25c98aaf7169658bc35e3 Mon Sep 17 00:00:00 2001 From: twisti <76837088+twisti-dev@users.noreply.github.com> Date: Sun, 19 Apr 2026 22:01:14 +0200 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=94=A7=20chore:=20bump=20version=20to?= =?UTF-8?q?=203.2.2=20in=20gradle.properties?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 01755ac13..a356ca757 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,6 +7,6 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled javaVersion=25 mcVersion=26.1.1 group=dev.slne.surf.api -version=3.2.1 +version=3.2.2 relocationPrefix=dev.slne.surf.api.libs snapshot=false