Update for Paper changes

Author: jpenilla

build.gradle.kts

@@ -21,6 +21,7 @@ dependencies {
   devBundle(libs.mappingsTestDevBundle)
   testImplementation(libs.junit.jupiter.api)
   testRuntimeOnly(libs.junit.jupiter.engine)
+  testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks.shadowJar {

buildSrc/src/main/kotlin/ExtractMappings.kt

@@ -25,7 +25,7 @@ abstract class ExtractMappings : DefaultTask() {
     Files.deleteIfExists(out.get().asFile.toPath())
     val bundleZip = devBundleZip.get().asFile
     FileSystems.newFileSystem(URI.create("jar:${bundleZip.toURI()}"), HashMap<String, Any>()).use { fs ->
-      Files.copy(fs.getPath("/data/mojang+yarn-spigot-reobf.tiny"), out.get().asFile.toPath())
+      Files.copy(fs.getPath("/data/mojang-spigot-reobf.tiny"), out.get().asFile.toPath())
     }
   }
 }

buildSrc/src/main/kotlin/build-logic.gradle.kts

@@ -1,10 +1,16 @@
+import io.papermc.paperweight.attribute.DevBundleOutput
+
 plugins {
   id("base-conventions")
   id("publishing-conventions")
   id("net.kyori.indra.publishing.sonatype")
 }
 
-val devBundle: Configuration by configurations.creating
+val devBundle: Configuration by configurations.creating {
+  attributes {
+    attribute(DevBundleOutput.ATTRIBUTE, objects.named(DevBundleOutput.ZIP))
+  }
+}
 val memoryMeasurer: Configuration by configurations.creating
 
 tasks {

gradle/libs.versions.toml

@@ -4,8 +4,8 @@ shadow = { id = "com.gradleup.shadow", version = "8.3.6" }
 
 [versions]
 indra = "3.1.3"
-testPluginDevBundle = "1.20.2-R0.1-SNAPSHOT"
-mappingsTestDevBundle = "1.20.2-R0.1-SNAPSHOT"
+testPluginDevBundle = "1.21.5-R0.1-SNAPSHOT"
+mappingsTestDevBundle = "1.21.5-R0.1-SNAPSHOT"
 
 [libraries]
 indra-common = { group = "net.kyori", name = "indra-common", version.ref = "indra" }

src/main/java/xyz/jpenilla/reflectionremapper/MappingNamespace.java

@@ -18,8 +18,13 @@
 package xyz.jpenilla.reflectionremapper;
 
 final class MappingNamespace {
+  @Deprecated
   public static final String DEOBF = "mojang+yarn";
+  @Deprecated
   public static final String OBF = "spigot";
+  public static final String MOJANG_PLUS_YARN = "mojang+yarn";
+  public static final String MOJANG = "mojang";
+  public static final String SPIGOT = "spigot";
 
   private MappingNamespace() {
   }

src/main/java/xyz/jpenilla/reflectionremapper/ReflectionRemapper.java

@@ -34,6 +34,7 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.checkerframework.framework.qual.DefaultQualifier;
 
+import static xyz.jpenilla.reflectionremapper.internal.util.Util.firstLine;
 import static xyz.jpenilla.reflectionremapper.internal.util.Util.mojangMapped;
 
 /**
@@ -194,7 +195,11 @@ static ReflectionRemapper forPaperReobfMappings(final Path mappings) {
       return noop();
     }
 
-    return forMappings(mappings, MappingNamespace.DEOBF, MappingNamespace.OBF);
+    try (final InputStream inputStream = Files.newInputStream(mappings)) {
+      return forPaperReobfMappings(inputStream);
+    } catch (final IOException e) {
+      throw new RuntimeException("Failed to read mappings.", e);
+    }
   }
 
   /**
@@ -213,7 +218,10 @@ static ReflectionRemapper forPaperReobfMappings(final InputStream mappings) {
       return noop();
     }
 
-    return forMappings(mappings, MappingNamespace.DEOBF, MappingNamespace.OBF);
+    if (firstLine(mappings).contains(MappingNamespace.MOJANG_PLUS_YARN)) {
+      return forMappings(mappings, MappingNamespace.MOJANG_PLUS_YARN, MappingNamespace.SPIGOT);
+    }
+    return forMappings(mappings, MappingNamespace.MOJANG, MappingNamespace.SPIGOT);
   }
 
   /**

src/main/java/xyz/jpenilla/reflectionremapper/internal/util/Util.java

@@ -17,11 +17,17 @@
  */
 package xyz.jpenilla.reflectionremapper.internal.util;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UncheckedIOException;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -191,4 +197,16 @@ public static String descriptorString(final Class<?> clazz) {
 
     return 'L' + clazz.getName().replace('.', '/') + ';';
   }
+
+  public static String firstLine(final InputStream mappings) {
+    try {
+      mappings.mark(1024);
+      final BufferedReader reader = new BufferedReader(new InputStreamReader(mappings, StandardCharsets.UTF_8));
+      final String line = reader.readLine();
+      mappings.reset();
+      return line;
+    } catch (final IOException e) {
+      throw new UncheckedIOException("Failed to read first line of input stream", e);
+    }
+  }
 }

test-plugin/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 
 indra {
   javaVersions {
-    target(17)
+    target(21)
   }
 }
 

test-plugin/src/main/java/xyz/jpenilla/reflectionremapper/testplugin/TestPlugin.java

@@ -17,12 +17,12 @@
  */
 package xyz.jpenilla.reflectionremapper.testplugin;
 
-import io.papermc.paper.util.MCUtil;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
+import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.checkerframework.checker.nullness.qual.NonNull;
@@ -31,7 +31,7 @@
 import org.incendo.cloud.context.CommandContext;
 import org.incendo.cloud.execution.ExecutionCoordinator;
 import org.incendo.cloud.minecraft.extras.MinecraftExceptionHandler;
-import org.incendo.cloud.paper.PaperCommandManager;
+import org.incendo.cloud.paper.LegacyPaperCommandManager;
 import xyz.jpenilla.reflectionremapper.ReflectionRemapper;
 import xyz.jpenilla.reflectionremapper.proxy.ReflectionProxyFactory;
 import xyz.jpenilla.reflectionremapper.proxy.annotation.Proxies;
@@ -42,11 +42,11 @@ public final class TestPlugin extends JavaPlugin {
   public void onEnable() {
     Reflection.class.getClassLoader(); // init Reflection
 
-    final PaperCommandManager<CommandSender> commandManager = createCommandManager(this);
+    final LegacyPaperCommandManager<CommandSender> commandManager = createCommandManager(this);
     this.registerCommands(commandManager);
   }
 
-  private void registerCommands(final PaperCommandManager<CommandSender> manager) {
+  private void registerCommands(final LegacyPaperCommandManager<CommandSender> manager) {
     final Command.Builder<Player> createEndPlatform = manager.commandBuilder("create_end_platform")
       .senderType(Player.class)
       .handler(this::executeCreateEndPlatform);
@@ -66,7 +66,8 @@ private void executeCreateEndPlatform(final CommandContext<Player> ctx) {
   private void executeStrikeLightning(final CommandContext<Player> ctx) {
     final ServerPlayer serverPlayer = ((CraftPlayer) ctx.sender()).getHandle();
     final BlockPos lightningTarget = Reflection.SERVER_LEVEL.findLightningTargetAround((ServerLevel) serverPlayer.level(), serverPlayer.blockPosition());
-    ctx.sender().getWorld().strikeLightning(MCUtil.toLocation(serverPlayer.level(), lightningTarget));
+    ctx.sender().getWorld().strikeLightning(new Location(
+      serverPlayer.level().getWorld(), lightningTarget.getX(), lightningTarget.getY(), lightningTarget.getZ()));
   }
 
   public static final class Reflection {
@@ -95,8 +96,8 @@ private interface ServerPlayerProxy {
     void createEndPlatform(ServerPlayer instance, ServerLevel world, BlockPos centerPos);
   }
 
-  private static PaperCommandManager<CommandSender> createCommandManager(final JavaPlugin plugin) {
-    final PaperCommandManager<CommandSender> manager = PaperCommandManager.createNative(plugin, ExecutionCoordinator.simpleCoordinator());
+  private static LegacyPaperCommandManager<CommandSender> createCommandManager(final JavaPlugin plugin) {
+    final LegacyPaperCommandManager<CommandSender> manager = LegacyPaperCommandManager.createNative(plugin, ExecutionCoordinator.simpleCoordinator());
     manager.registerBrigadier();
     MinecraftExceptionHandler.<CommandSender>createNative()
       .defaultHandlers()