Skip to content

Update for plugin remapping removal in Paper 26.1.2 #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dreeam-qwq wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update for plugin remapping removal in Paper 26.1.2 #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d72724
Update for plugin remapping removal in Paper 26.1.2
Dreeam-qwq Jun 21, 2026
a187d6e
Fix conditions
Dreeam-qwq Jun 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ setupProject()
setupViaPublishing()

dependencies {
compileOnly("com.viaversion:viaversion-api:4.10.0")
compileOnly("com.viaversion:viaversion-api:5.10.0")
compileOnly("org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT")
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ org.gradle.parallel=true
org.gradle.configuration-cache=true

# Project Details
project_jvm_version=8
project_jvm_version=17

project_group=com.viaversion
project_version=1.5.5-SNAPSHOT
Expand Down
16 changes: 10 additions & 6 deletions src/main/java/com/viaversion/viarewind/legacysupport/feature/BlockCollisionChanges.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package com.viaversion.viarewind.legacysupport.feature;

import com.viaversion.viarewind.legacysupport.util.NMSUtil;
import com.viaversion.viarewind.legacysupport.util.ReflectionUtil;
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import java.lang.reflect.Constructor;
Expand All @@ -37,7 +38,9 @@ public class BlockCollisionChanges {

public static void fixLilyPad(final Logger logger, final ProtocolVersion serverVersion) {
try {
final Field boundingBoxField = getFieldAccessible(getNMSBlockClass("BlockWaterLily"), serverVersion.olderThanOrEqualTo(ProtocolVersion.v1_20_2) ? "a" : "b");
final String BlockWaterLilyClassName = NMSUtil.NEWER_THAN_V26_1 ? "LilyPadBlock" : "BlockWaterLily";
final String boundingBoxFieldName = NMSUtil.NEWER_THAN_V26_1 ? "SHAPE" : serverVersion.newerThanOrEqualTo(ProtocolVersion.v1_20_3) ? "b" : "a";
final Field boundingBoxField = getFieldAccessible(getNMSBlockClass(BlockWaterLilyClassName), boundingBoxFieldName);

setBoundingBox(boundingBoxField.get(null), 0.0625, 0.0, 0.0625, 0.9375, 0.015625, 0.9375);
} catch (Exception ex) {
Expand All @@ -47,9 +50,10 @@ public static void fixLilyPad(final Logger logger, final ProtocolVersion serverV

public static void fixCarpet(final Logger logger, final ProtocolVersion serverVersion) {
try {
final Class<?> blockCarpetClass = serverVersion.olderThanOrEqualTo(ProtocolVersion.v1_16_4) ? getNMSBlockClass("BlockCarpet") : getNMSBlockClass("CarpetBlock");
final String boundingBoxFieldName = NMSUtil.NEWER_THAN_V26_1 ? "SHAPE" : serverVersion.newerThanOrEqualTo(ProtocolVersion.v1_20_3) ? "b" : "a";
final String blockCarpetClassName = serverVersion.newerThanOrEqualTo(ProtocolVersion.v1_17) ? "CarpetBlock" : "BlockCarpet";
final Field boundingBoxField = getFieldAccessible(getNMSBlockClass(blockCarpetClassName), boundingBoxFieldName);

final Field boundingBoxField = getFieldAccessible(blockCarpetClass, serverVersion.olderThanOrEqualTo(ProtocolVersion.v1_20_2) ? "a" : "b");
setBoundingBox(boundingBoxField.get(0), 0.0D, -0.0000001D, 0.0D, 1.0D, 0.0000001D, 1.0D);
} catch (Exception ex) {
logger.log(Level.SEVERE, "Could not fix carpet bounding box.", ex);
Expand All @@ -59,9 +63,9 @@ public static void fixCarpet(final Logger logger, final ProtocolVersion serverVe
public static void fixLadder(final Logger logger, final ProtocolVersion serverVersion) {
try {
if (serverVersion.newerThanOrEqualTo(ProtocolVersion.v1_20_5)) {
final Class<?> blockLadderClass = getNMSBlockClass("BlockLadder");
final Class<?> blockLadderClass = getNMSBlockClass(NMSUtil.NEWER_THAN_V26_1 ? "LadderBlock" : "BlockLadder");

final Map<String, double[]> overrides = new HashMap<String, double[]>();
final Map<String, double[]> overrides = new HashMap<>();
overrides.put("EAST", new double[]{0.0D, 0.0D, 0.0D, 0.125D, 1.0D, 1.0D});
overrides.put("WEST", new double[]{0.875D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D});
overrides.put("SOUTH", new double[]{0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.125D});
Expand Down Expand Up @@ -187,7 +191,7 @@ private static void setVoxelShapeArray(final Object voxelShapeArray, final doubl
// Handle Paper voxel shape caching by clearing the cache
final Class<?> voxelShape = voxelShapeArray.getClass().getSuperclass();

final Field shape = getFieldAccessible(voxelShape, "a");
final Field shape = getFieldAccessible(voxelShape, NMSUtil.NEWER_THAN_V26_1 ? "shape" : "a");
final Field cachedShapeData = getFieldAccessible(shape.getType(), "cachedShapeData");
if (cachedShapeData == null) { // No Paper or too old version
return;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/viaversion/viarewind/legacysupport/feature/ElytraVelocityEmulator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ private boolean isGliding(final ProtocolVersion version, final Player player) {
if (nmsPlayer == null) return false;

try {
final Method getFlag = ReflectionUtil.getMethod(nmsPlayer.getClass(), "getFlag", int.class);
final Method getFlag = ReflectionUtil.findMethod(nmsPlayer.getClass(), new String[]{"getSharedFlag", "getFlag"}, int.class);
return (boolean) getFlag.invoke(nmsPlayer, 7);
} catch (Exception e) {
BukkitPlugin.getInstance().getLogger().log(Level.SEVERE, "Failed to get player flag", e);
Expand Down
20 changes: 14 additions & 6 deletions src/main/java/com/viaversion/viarewind/legacysupport/util/NMSUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@

public class NMSUtil {

public static final boolean NEWER_THAN_V26_1 = BukkitPlugin.getInstance().getServerProtocol().newerThanOrEqualTo(ProtocolVersion.v26_1);
public static final boolean NEWER_THAN_V1_20_5 = BukkitPlugin.getInstance().getServerProtocol().newerThanOrEqualTo(ProtocolVersion.v1_20_5);
public static final boolean NEWER_THAN_V1_17 = BukkitPlugin.getInstance().getServerProtocol().newerThanOrEqualTo(ProtocolVersion.v1_17);
public static String nmsVersionPackage;
private static Field playerConnectionField;

Expand All @@ -41,47 +43,53 @@ public class NMSUtil {
}

public static Class<?> getBlockPositionClass() {
if (BukkitPlugin.getInstance().getServerProtocol().newerThanOrEqualTo(ProtocolVersion.v1_17)) {
if (NEWER_THAN_V26_1) {
return failSafeGetClass("net.minecraft.core.BlockPos");
} else if (NEWER_THAN_V1_17) {
return failSafeGetClass("net.minecraft.core.BlockPosition");
} else {
return getLegacyNMSClass("BlockPosition");
}
}

public static Class<?> getNMSBlockClass(final String name) {
if (BukkitPlugin.getInstance().getServerProtocol().newerThanOrEqualTo(ProtocolVersion.v1_17)) {
if (NEWER_THAN_V1_17) {
return failSafeGetClass("net.minecraft.world.level.block." + name);
} else {
return getLegacyNMSClass(name);
}
}

public static Class getSoundCategoryClass() { // Bypass generics
if (BukkitPlugin.getInstance().getServerProtocol().newerThanOrEqualTo(ProtocolVersion.v1_17)) {
if (NEWER_THAN_V26_1) {
return failSafeGetClass("net.minecraft.sounds.SoundSource");
} else if (NEWER_THAN_V1_17) {
return failSafeGetClass("net.minecraft.sounds.SoundCategory");
} else {
return getLegacyNMSClass("SoundCategory");
}
}

public static Class<?> getPacketClass() {
if (BukkitPlugin.getInstance().getServerProtocol().newerThanOrEqualTo(ProtocolVersion.v1_17)) {
if (NEWER_THAN_V1_17) {
return failSafeGetClass("net.minecraft.network.protocol.Packet");
} else {
return getLegacyNMSClass("Packet");
}
}

public static Class<?> getGamePacketClass(final String packet) {
if (BukkitPlugin.getInstance().getServerProtocol().newerThanOrEqualTo(ProtocolVersion.v1_17)) {
if (NEWER_THAN_V1_17) {
return failSafeGetClass("net.minecraft.network.protocol.game." + packet);
} else {
return getLegacyNMSClass(packet);
}
}

public static Class<?> getPlayerConnectionClass() {
if (BukkitPlugin.getInstance().getServerProtocol().newerThanOrEqualTo(ProtocolVersion.v1_17)) {
if (NEWER_THAN_V26_1) {
return failSafeGetClass("net.minecraft.server.network.ServerGamePacketListenerImpl");
} else if (NEWER_THAN_V1_17) {
return failSafeGetClass("net.minecraft.server.network.PlayerConnection");
} else {
return getLegacyNMSClass("PlayerConnection");
Expand Down
Loading