Update string-remapper and switch to advanced pattern in PlayerUtilsImpl

This commit is contained in:
NichtStudioCode 2023-05-22 21:35:06 +02:00
parent 18270da64e
commit dad97bff4c
12 changed files with 42 additions and 90 deletions

@ -36,9 +36,9 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>xyz.xenondevs</groupId> <groupId>xyz.xenondevs.string-remapper</groupId>
<artifactId>string-remapper-maven-plugin</artifactId> <artifactId>string-remapper-maven-plugin</artifactId>
<version>0.6</version> <version>1.2</version>
<executions> <executions>
<execution> <execution>
@ -47,14 +47,10 @@
<goal>remap</goal> <goal>remap</goal>
</goals> </goals>
<configuration> <configuration>
<remapGoal>spigot</remapGoal> <spigotVersion>${spigot.version}</spigotVersion>
<goal>spigot</goal>
<classesIn>${project.build.directory}/classes</classesIn> <classesIn>${project.build.directory}/classes</classesIn>
<classesOut>${project.build.directory}/classes-spigot</classesOut> <classesOut>${project.build.directory}/classes-spigot</classesOut>
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
<mapsSpigot>
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
</mapsSpigot>
</configuration> </configuration>
</execution> </execution>
@ -64,14 +60,10 @@
<goal>remap</goal> <goal>remap</goal>
</goals> </goals>
<configuration> <configuration>
<remapGoal>mojang</remapGoal> <spigotVersion>${spigot.version}</spigotVersion>
<goal>mojang</goal>
<classesIn>${project.build.directory}/classes</classesIn> <classesIn>${project.build.directory}/classes</classesIn>
<classesOut>${project.build.directory}/classes-mojang</classesOut> <classesOut>${project.build.directory}/classes-mojang</classesOut>
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
<mapsSpigot>
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
</mapsSpigot>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

@ -30,7 +30,7 @@ class PlayerUtilsImpl implements PlayerUtils {
private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod( private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod(
PlayerAdvancements.class, PlayerAdvancements.class,
true, true,
"SRM(net.minecraft.server.PlayerAdvancements registerListeners)", "ASRM(net/minecraft/server/PlayerAdvancements.registerListeners(Lnet/minecraft/server/ServerAdvancementManager;)V)",
ServerAdvancementManager.class ServerAdvancementManager.class
); );

@ -36,9 +36,9 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>xyz.xenondevs</groupId> <groupId>xyz.xenondevs.string-remapper</groupId>
<artifactId>string-remapper-maven-plugin</artifactId> <artifactId>string-remapper-maven-plugin</artifactId>
<version>0.6</version> <version>1.2</version>
<executions> <executions>
<execution> <execution>
@ -47,14 +47,10 @@
<goal>remap</goal> <goal>remap</goal>
</goals> </goals>
<configuration> <configuration>
<remapGoal>spigot</remapGoal> <spigotVersion>${spigot.version}</spigotVersion>
<goal>spigot</goal>
<classesIn>${project.build.directory}/classes</classesIn> <classesIn>${project.build.directory}/classes</classesIn>
<classesOut>${project.build.directory}/classes-spigot</classesOut> <classesOut>${project.build.directory}/classes-spigot</classesOut>
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
<mapsSpigot>
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
</mapsSpigot>
</configuration> </configuration>
</execution> </execution>
@ -64,14 +60,10 @@
<goal>remap</goal> <goal>remap</goal>
</goals> </goals>
<configuration> <configuration>
<remapGoal>mojang</remapGoal> <spigotVersion>${spigot.version}</spigotVersion>
<goal>mojang</goal>
<classesIn>${project.build.directory}/classes</classesIn> <classesIn>${project.build.directory}/classes</classesIn>
<classesOut>${project.build.directory}/classes-mojang</classesOut> <classesOut>${project.build.directory}/classes-mojang</classesOut>
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
<mapsSpigot>
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
</mapsSpigot>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

@ -30,7 +30,7 @@ class PlayerUtilsImpl implements PlayerUtils {
private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod( private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod(
PlayerAdvancements.class, PlayerAdvancements.class,
true, true,
"SRM(net.minecraft.server.PlayerAdvancements registerListeners)", "ASRM(net/minecraft/server/PlayerAdvancements.registerListeners(Lnet/minecraft/server/ServerAdvancementManager;)V)",
ServerAdvancementManager.class ServerAdvancementManager.class
); );

@ -36,9 +36,9 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>xyz.xenondevs</groupId> <groupId>xyz.xenondevs.string-remapper</groupId>
<artifactId>string-remapper-maven-plugin</artifactId> <artifactId>string-remapper-maven-plugin</artifactId>
<version>0.6</version> <version>1.2</version>
<executions> <executions>
<execution> <execution>
@ -47,14 +47,10 @@
<goal>remap</goal> <goal>remap</goal>
</goals> </goals>
<configuration> <configuration>
<remapGoal>spigot</remapGoal> <spigotVersion>${spigot.version}</spigotVersion>
<goal>spigot</goal>
<classesIn>${project.build.directory}/classes</classesIn> <classesIn>${project.build.directory}/classes</classesIn>
<classesOut>${project.build.directory}/classes-spigot</classesOut> <classesOut>${project.build.directory}/classes-spigot</classesOut>
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
<mapsSpigot>
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
</mapsSpigot>
</configuration> </configuration>
</execution> </execution>
@ -64,14 +60,10 @@
<goal>remap</goal> <goal>remap</goal>
</goals> </goals>
<configuration> <configuration>
<remapGoal>mojang</remapGoal> <spigotVersion>${spigot.version}</spigotVersion>
<goal>mojang</goal>
<classesIn>${project.build.directory}/classes</classesIn> <classesIn>${project.build.directory}/classes</classesIn>
<classesOut>${project.build.directory}/classes-mojang</classesOut> <classesOut>${project.build.directory}/classes-mojang</classesOut>
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
<mapsSpigot>
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
</mapsSpigot>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

@ -30,7 +30,7 @@ class PlayerUtilsImpl implements PlayerUtils {
private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod( private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod(
PlayerAdvancements.class, PlayerAdvancements.class,
true, true,
"SRM(net.minecraft.server.PlayerAdvancements registerListeners)", "ASRM(net/minecraft/server/PlayerAdvancements.registerListeners(Lnet/minecraft/server/ServerAdvancementManager;)V)",
ServerAdvancementManager.class ServerAdvancementManager.class
); );

@ -36,9 +36,9 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>xyz.xenondevs</groupId> <groupId>xyz.xenondevs.string-remapper</groupId>
<artifactId>string-remapper-maven-plugin</artifactId> <artifactId>string-remapper-maven-plugin</artifactId>
<version>0.6</version> <version>1.2</version>
<executions> <executions>
<execution> <execution>
@ -47,14 +47,10 @@
<goal>remap</goal> <goal>remap</goal>
</goals> </goals>
<configuration> <configuration>
<remapGoal>spigot</remapGoal> <spigotVersion>${spigot.version}</spigotVersion>
<goal>spigot</goal>
<classesIn>${project.build.directory}/classes</classesIn> <classesIn>${project.build.directory}/classes</classesIn>
<classesOut>${project.build.directory}/classes-spigot</classesOut> <classesOut>${project.build.directory}/classes-spigot</classesOut>
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
<mapsSpigot>
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
</mapsSpigot>
</configuration> </configuration>
</execution> </execution>
@ -64,14 +60,10 @@
<goal>remap</goal> <goal>remap</goal>
</goals> </goals>
<configuration> <configuration>
<remapGoal>mojang</remapGoal> <spigotVersion>${spigot.version}</spigotVersion>
<goal>mojang</goal>
<classesIn>${project.build.directory}/classes</classesIn> <classesIn>${project.build.directory}/classes</classesIn>
<classesOut>${project.build.directory}/classes-mojang</classesOut> <classesOut>${project.build.directory}/classes-mojang</classesOut>
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
<mapsSpigot>
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
</mapsSpigot>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

@ -30,7 +30,7 @@ class PlayerUtilsImpl implements PlayerUtils {
private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod( private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod(
PlayerAdvancements.class, PlayerAdvancements.class,
true, true,
"SRM(net.minecraft.server.PlayerAdvancements registerListeners)", "ASRM(net/minecraft/server/PlayerAdvancements.registerListeners(Lnet/minecraft/server/ServerAdvancementManager;)V)",
ServerAdvancementManager.class ServerAdvancementManager.class
); );

@ -36,9 +36,9 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>xyz.xenondevs</groupId> <groupId>xyz.xenondevs.string-remapper</groupId>
<artifactId>string-remapper-maven-plugin</artifactId> <artifactId>string-remapper-maven-plugin</artifactId>
<version>0.6</version> <version>1.2</version>
<executions> <executions>
<execution> <execution>
@ -47,14 +47,10 @@
<goal>remap</goal> <goal>remap</goal>
</goals> </goals>
<configuration> <configuration>
<remapGoal>spigot</remapGoal> <spigotVersion>${spigot.version}</spigotVersion>
<goal>spigot</goal>
<classesIn>${project.build.directory}/classes</classesIn> <classesIn>${project.build.directory}/classes</classesIn>
<classesOut>${project.build.directory}/classes-spigot</classesOut> <classesOut>${project.build.directory}/classes-spigot</classesOut>
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
<mapsSpigot>
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
</mapsSpigot>
</configuration> </configuration>
</execution> </execution>
@ -64,14 +60,10 @@
<goal>remap</goal> <goal>remap</goal>
</goals> </goals>
<configuration> <configuration>
<remapGoal>mojang</remapGoal> <spigotVersion>${spigot.version}</spigotVersion>
<goal>mojang</goal>
<classesIn>${project.build.directory}/classes</classesIn> <classesIn>${project.build.directory}/classes</classesIn>
<classesOut>${project.build.directory}/classes-mojang</classesOut> <classesOut>${project.build.directory}/classes-mojang</classesOut>
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
<mapsSpigot>
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
</mapsSpigot>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

@ -30,7 +30,7 @@ class PlayerUtilsImpl implements PlayerUtils {
private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod( private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod(
PlayerAdvancements.class, PlayerAdvancements.class,
true, true,
"SRM(net.minecraft.server.PlayerAdvancements registerListeners)", "ASRM(net/minecraft/server/PlayerAdvancements.registerListeners(Lnet/minecraft/server/ServerAdvancementManager;)V)",
ServerAdvancementManager.class ServerAdvancementManager.class
); );

@ -36,9 +36,9 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>xyz.xenondevs</groupId> <groupId>xyz.xenondevs.string-remapper</groupId>
<artifactId>string-remapper-maven-plugin</artifactId> <artifactId>string-remapper-maven-plugin</artifactId>
<version>0.6</version> <version>1.2</version>
<executions> <executions>
<execution> <execution>
@ -47,14 +47,10 @@
<goal>remap</goal> <goal>remap</goal>
</goals> </goals>
<configuration> <configuration>
<remapGoal>spigot</remapGoal> <spigotVersion>${spigot.version}</spigotVersion>
<goal>spigot</goal>
<classesIn>${project.build.directory}/classes</classesIn> <classesIn>${project.build.directory}/classes</classesIn>
<classesOut>${project.build.directory}/classes-spigot</classesOut> <classesOut>${project.build.directory}/classes-spigot</classesOut>
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
<mapsSpigot>
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
</mapsSpigot>
</configuration> </configuration>
</execution> </execution>
@ -64,14 +60,10 @@
<goal>remap</goal> <goal>remap</goal>
</goals> </goals>
<configuration> <configuration>
<remapGoal>mojang</remapGoal> <spigotVersion>${spigot.version}</spigotVersion>
<goal>mojang</goal>
<classesIn>${project.build.directory}/classes</classesIn> <classesIn>${project.build.directory}/classes</classesIn>
<classesOut>${project.build.directory}/classes-mojang</classesOut> <classesOut>${project.build.directory}/classes-mojang</classesOut>
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
<mapsSpigot>
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
</mapsSpigot>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

@ -30,7 +30,7 @@ class PlayerUtilsImpl implements PlayerUtils {
private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod( private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod(
PlayerAdvancements.class, PlayerAdvancements.class,
true, true,
"SRM(net.minecraft.server.PlayerAdvancements registerListeners)", "ASRM(net/minecraft/server/PlayerAdvancements.registerListeners(Lnet/minecraft/server/ServerAdvancementManager;)V)",
ServerAdvancementManager.class ServerAdvancementManager.class
); );