Skip to content

Commit dad97bf

Browse files
NichtStudioCodeNichtStudioCode
committed
Update string-remapper and switch to advanced pattern in PlayerUtilsImpl
1 parent 18270da commit dad97bf

12 files changed

Lines changed: 42 additions & 90 deletions

File tree

‎inventoryaccess/inventory-access-r10/pom.xml‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
<build>
3737
<plugins>
3838
<plugin>
39-
<groupId>xyz.xenondevs</groupId>
39+
<groupId>xyz.xenondevs.string-remapper</groupId>
4040
<artifactId>string-remapper-maven-plugin</artifactId>
41-
<version>0.6</version>
41+
<version>1.2</version>
4242

4343
<executions>
4444
<execution>
@@ -47,14 +47,10 @@
4747
<goal>remap</goal>
4848
</goals>
4949
<configuration>
50-
<remapGoal>spigot</remapGoal>
50+
<spigotVersion>${spigot.version}</spigotVersion>
51+
<goal>spigot</goal>
5152
<classesIn>${project.build.directory}/classes</classesIn>
5253
<classesOut>${project.build.directory}/classes-spigot</classesOut>
53-
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
54-
<mapsSpigot>
55-
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
56-
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
57-
</mapsSpigot>
5854
</configuration>
5955
</execution>
6056

@@ -64,14 +60,10 @@
6460
<goal>remap</goal>
6561
</goals>
6662
<configuration>
67-
<remapGoal>mojang</remapGoal>
63+
<spigotVersion>${spigot.version}</spigotVersion>
64+
<goal>mojang</goal>
6865
<classesIn>${project.build.directory}/classes</classesIn>
6966
<classesOut>${project.build.directory}/classes-mojang</classesOut>
70-
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
71-
<mapsSpigot>
72-
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
73-
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
74-
</mapsSpigot>
7567
</configuration>
7668
</execution>
7769
</executions>

‎inventoryaccess/inventory-access-r10/src/main/java/xyz/xenondevs/inventoryaccess/r10/PlayerUtilsImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class PlayerUtilsImpl implements PlayerUtils {
3030
private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod(
3131
PlayerAdvancements.class,
3232
true,
33-
"SRM(net.minecraft.server.PlayerAdvancements registerListeners)",
33+
"ASRM(net/minecraft/server/PlayerAdvancements.registerListeners(Lnet/minecraft/server/ServerAdvancementManager;)V)",
3434
ServerAdvancementManager.class
3535
);
3636

‎inventoryaccess/inventory-access-r11/pom.xml‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
<build>
3737
<plugins>
3838
<plugin>
39-
<groupId>xyz.xenondevs</groupId>
39+
<groupId>xyz.xenondevs.string-remapper</groupId>
4040
<artifactId>string-remapper-maven-plugin</artifactId>
41-
<version>0.6</version>
41+
<version>1.2</version>
4242

4343
<executions>
4444
<execution>
@@ -47,14 +47,10 @@
4747
<goal>remap</goal>
4848
</goals>
4949
<configuration>
50-
<remapGoal>spigot</remapGoal>
50+
<spigotVersion>${spigot.version}</spigotVersion>
51+
<goal>spigot</goal>
5152
<classesIn>${project.build.directory}/classes</classesIn>
5253
<classesOut>${project.build.directory}/classes-spigot</classesOut>
53-
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
54-
<mapsSpigot>
55-
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
56-
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
57-
</mapsSpigot>
5854
</configuration>
5955
</execution>
6056

@@ -64,14 +60,10 @@
6460
<goal>remap</goal>
6561
</goals>
6662
<configuration>
67-
<remapGoal>mojang</remapGoal>
63+
<spigotVersion>${spigot.version}</spigotVersion>
64+
<goal>mojang</goal>
6865
<classesIn>${project.build.directory}/classes</classesIn>
6966
<classesOut>${project.build.directory}/classes-mojang</classesOut>
70-
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
71-
<mapsSpigot>
72-
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
73-
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
74-
</mapsSpigot>
7567
</configuration>
7668
</execution>
7769
</executions>

‎inventoryaccess/inventory-access-r11/src/main/java/xyz/xenondevs/inventoryaccess/r11/PlayerUtilsImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class PlayerUtilsImpl implements PlayerUtils {
3030
private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod(
3131
PlayerAdvancements.class,
3232
true,
33-
"SRM(net.minecraft.server.PlayerAdvancements registerListeners)",
33+
"ASRM(net/minecraft/server/PlayerAdvancements.registerListeners(Lnet/minecraft/server/ServerAdvancementManager;)V)",
3434
ServerAdvancementManager.class
3535
);
3636

‎inventoryaccess/inventory-access-r12/pom.xml‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
<build>
3737
<plugins>
3838
<plugin>
39-
<groupId>xyz.xenondevs</groupId>
39+
<groupId>xyz.xenondevs.string-remapper</groupId>
4040
<artifactId>string-remapper-maven-plugin</artifactId>
41-
<version>0.6</version>
41+
<version>1.2</version>
4242

4343
<executions>
4444
<execution>
@@ -47,14 +47,10 @@
4747
<goal>remap</goal>
4848
</goals>
4949
<configuration>
50-
<remapGoal>spigot</remapGoal>
50+
<spigotVersion>${spigot.version}</spigotVersion>
51+
<goal>spigot</goal>
5152
<classesIn>${project.build.directory}/classes</classesIn>
5253
<classesOut>${project.build.directory}/classes-spigot</classesOut>
53-
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
54-
<mapsSpigot>
55-
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
56-
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
57-
</mapsSpigot>
5854
</configuration>
5955
</execution>
6056

@@ -64,14 +60,10 @@
6460
<goal>remap</goal>
6561
</goals>
6662
<configuration>
67-
<remapGoal>mojang</remapGoal>
63+
<spigotVersion>${spigot.version}</spigotVersion>
64+
<goal>mojang</goal>
6865
<classesIn>${project.build.directory}/classes</classesIn>
6966
<classesOut>${project.build.directory}/classes-mojang</classesOut>
70-
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
71-
<mapsSpigot>
72-
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
73-
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
74-
</mapsSpigot>
7567
</configuration>
7668
</execution>
7769
</executions>

‎inventoryaccess/inventory-access-r12/src/main/java/xyz/xenondevs/inventoryaccess/r12/PlayerUtilsImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class PlayerUtilsImpl implements PlayerUtils {
3030
private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod(
3131
PlayerAdvancements.class,
3232
true,
33-
"SRM(net.minecraft.server.PlayerAdvancements registerListeners)",
33+
"ASRM(net/minecraft/server/PlayerAdvancements.registerListeners(Lnet/minecraft/server/ServerAdvancementManager;)V)",
3434
ServerAdvancementManager.class
3535
);
3636

‎inventoryaccess/inventory-access-r13/pom.xml‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
<build>
3737
<plugins>
3838
<plugin>
39-
<groupId>xyz.xenondevs</groupId>
39+
<groupId>xyz.xenondevs.string-remapper</groupId>
4040
<artifactId>string-remapper-maven-plugin</artifactId>
41-
<version>0.6</version>
41+
<version>1.2</version>
4242

4343
<executions>
4444
<execution>
@@ -47,14 +47,10 @@
4747
<goal>remap</goal>
4848
</goals>
4949
<configuration>
50-
<remapGoal>spigot</remapGoal>
50+
<spigotVersion>${spigot.version}</spigotVersion>
51+
<goal>spigot</goal>
5152
<classesIn>${project.build.directory}/classes</classesIn>
5253
<classesOut>${project.build.directory}/classes-spigot</classesOut>
53-
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
54-
<mapsSpigot>
55-
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
56-
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
57-
</mapsSpigot>
5854
</configuration>
5955
</execution>
6056

@@ -64,14 +60,10 @@
6460
<goal>remap</goal>
6561
</goals>
6662
<configuration>
67-
<remapGoal>mojang</remapGoal>
63+
<spigotVersion>${spigot.version}</spigotVersion>
64+
<goal>mojang</goal>
6865
<classesIn>${project.build.directory}/classes</classesIn>
6966
<classesOut>${project.build.directory}/classes-mojang</classesOut>
70-
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
71-
<mapsSpigot>
72-
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
73-
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
74-
</mapsSpigot>
7567
</configuration>
7668
</execution>
7769
</executions>

‎inventoryaccess/inventory-access-r13/src/main/java/xyz/xenondevs/inventoryaccess/r13/PlayerUtilsImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class PlayerUtilsImpl implements PlayerUtils {
3030
private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod(
3131
PlayerAdvancements.class,
3232
true,
33-
"SRM(net.minecraft.server.PlayerAdvancements registerListeners)",
33+
"ASRM(net/minecraft/server/PlayerAdvancements.registerListeners(Lnet/minecraft/server/ServerAdvancementManager;)V)",
3434
ServerAdvancementManager.class
3535
);
3636

‎inventoryaccess/inventory-access-r8/pom.xml‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
<build>
3737
<plugins>
3838
<plugin>
39-
<groupId>xyz.xenondevs</groupId>
39+
<groupId>xyz.xenondevs.string-remapper</groupId>
4040
<artifactId>string-remapper-maven-plugin</artifactId>
41-
<version>0.6</version>
41+
<version>1.2</version>
4242

4343
<executions>
4444
<execution>
@@ -47,14 +47,10 @@
4747
<goal>remap</goal>
4848
</goals>
4949
<configuration>
50-
<remapGoal>spigot</remapGoal>
50+
<spigotVersion>${spigot.version}</spigotVersion>
51+
<goal>spigot</goal>
5152
<classesIn>${project.build.directory}/classes</classesIn>
5253
<classesOut>${project.build.directory}/classes-spigot</classesOut>
53-
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
54-
<mapsSpigot>
55-
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
56-
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
57-
</mapsSpigot>
5854
</configuration>
5955
</execution>
6056

@@ -64,14 +60,10 @@
6460
<goal>remap</goal>
6561
</goals>
6662
<configuration>
67-
<remapGoal>mojang</remapGoal>
63+
<spigotVersion>${spigot.version}</spigotVersion>
64+
<goal>mojang</goal>
6865
<classesIn>${project.build.directory}/classes</classesIn>
6966
<classesOut>${project.build.directory}/classes-mojang</classesOut>
70-
<mapsMojang>org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version}</mapsMojang>
71-
<mapsSpigot>
72-
<classes>org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version}</classes>
73-
<members>org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version}</members>
74-
</mapsSpigot>
7567
</configuration>
7668
</execution>
7769
</executions>

‎inventoryaccess/inventory-access-r8/src/main/java/xyz/xenondevs/inventoryaccess/r8/PlayerUtilsImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class PlayerUtilsImpl implements PlayerUtils {
3030
private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod(
3131
PlayerAdvancements.class,
3232
true,
33-
"SRM(net.minecraft.server.PlayerAdvancements registerListeners)",
33+
"ASRM(net/minecraft/server/PlayerAdvancements.registerListeners(Lnet/minecraft/server/ServerAdvancementManager;)V)",
3434
ServerAdvancementManager.class
3535
);
3636

0 commit comments

Comments
 (0)