diff --git a/InventoryAccess/IA-R6/pom.xml b/InventoryAccess/IA-R6/pom.xml index 59153e4..aca6253 100644 --- a/InventoryAccess/IA-R6/pom.xml +++ b/InventoryAccess/IA-R6/pom.xml @@ -15,14 +15,14 @@ 17 17 - 1.17-R0.1-SNAPSHOT + 1.17-R0.1-SNAPSHOT org.spigotmc spigot - ${spigotVersion} + ${spigot.version} remapped-mojang provided @@ -35,6 +35,109 @@ + + xyz.xenondevs + string-remapper-maven-plugin + 0.1-SNAPSHOT + + + + remap-spigot + + remap + + + spigot_members + string-remapper-sources/spigot + org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version} + + org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version} + org.spigotmc:minecraft-server:csrg:maps-spigot-fields:${spigot.version} + + + + + + remap-mojang + + remap + + + mojang + string-remapper-sources/mojang + org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version} + + org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version} + org.spigotmc:minecraft-server:csrg:maps-spigot-fields:${spigot.version} + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + + default-compile + none + + + compile-spigot + + compile + + + ${project.build.directory}/string-remapper-sources/spigot + ${project.build.directory}/classes/spigot + + + + compile-mojang + + compile + + + ${project.build.directory}/string-remapper-sources/mojang + ${project.build.directory}/classes/mojang + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.2 + + + default-jar + none + + + spigot + + jar + + + ${project.build.directory}/classes/spigot + + + + mojang + + jar + + + ${project.build.directory}/classes/mojang + remapped-mojang + + + + + net.md-5 specialsource-maven-plugin @@ -47,12 +150,11 @@ remap-obf - org.spigotmc:minecraft-server:${spigotVersion}:txt:maps-mojang + org.spigotmc:minecraft-server:${spigot.version}:txt:maps-mojang true - org.spigotmc:spigot:${spigotVersion}:jar:remapped-mojang - - true - remapped-obf + org.spigotmc:spigot:${spigot.version}:jar:remapped-mojang + false + ${project.artifactId}-${project.version}-remapped-obf @@ -62,12 +164,9 @@ remap-spigot - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - - org.spigotmc:minecraft-server:${spigotVersion}:csrg:maps-spigot - org.spigotmc:spigot:${spigotVersion}:jar:remapped-obf - + ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar + org.spigotmc:minecraft-server:${spigot.version}:csrg:maps-spigot + org.spigotmc:spigot:${spigot.version}:jar:remapped-obf diff --git a/InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/inventory/CartographyInventoryImpl.java b/InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/inventory/CartographyInventoryImpl.java index 0c3b120..c7d47e6 100644 --- a/InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/inventory/CartographyInventoryImpl.java +++ b/InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/inventory/CartographyInventoryImpl.java @@ -27,7 +27,11 @@ import java.lang.reflect.Field; public class CartographyInventoryImpl extends CartographyTableMenu implements CartographyInventory { - private static final Field RESULT_CONTAINER_FIELD = ReflectionUtils.getField(CartographyTableMenu.class, true, "u"); + private static final Field RESULT_CONTAINER_FIELD = ReflectionUtils.getField( + CartographyTableMenu.class, + true, + "SRF(net.minecraft.world.inventory.CartographyTableMenu resultContainer)" + ); private final ResultContainer resultContainer = ReflectionUtils.getFieldValue(RESULT_CONTAINER_FIELD, this); private final Component title; diff --git a/InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/util/PlayerUtilsImpl.java b/InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/util/PlayerUtilsImpl.java index 556d3c7..1b4c199 100644 --- a/InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/util/PlayerUtilsImpl.java +++ b/InventoryAccess/IA-R6/src/main/java/de/studiocode/inventoryaccess/r6/util/PlayerUtilsImpl.java @@ -27,8 +27,12 @@ import java.util.stream.Collectors; public class PlayerUtilsImpl implements PlayerUtils { - private static final Method REGISTER_LISTENERS_METHOD = - ReflectionUtils.getMethod(PlayerAdvancements.class, true, "b", ServerAdvancementManager.class); + private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod( + PlayerAdvancements.class, + true, + "SRM(net.minecraft.server.PlayerAdvancements registerListeners)", + ServerAdvancementManager.class + ); @Override public void stopAdvancementListening(@NotNull Player player) { diff --git a/InventoryAccess/IA-R7/pom.xml b/InventoryAccess/IA-R7/pom.xml index ca107ef..56c430e 100644 --- a/InventoryAccess/IA-R7/pom.xml +++ b/InventoryAccess/IA-R7/pom.xml @@ -15,14 +15,14 @@ 17 17 - 1.17.1-R0.1-SNAPSHOT + 1.17.1-R0.1-SNAPSHOT org.spigotmc spigot - ${spigotVersion} + ${spigot.version} remapped-mojang provided @@ -35,6 +35,109 @@ + + xyz.xenondevs + string-remapper-maven-plugin + 0.1-SNAPSHOT + + + + remap-spigot + + remap + + + spigot_members + string-remapper-sources/spigot + org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version} + + org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version} + org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version} + + + + + + remap-mojang + + remap + + + mojang + string-remapper-sources/mojang + org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version} + + org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version} + org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version} + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + + default-compile + none + + + compile-spigot + + compile + + + ${project.build.directory}/string-remapper-sources/spigot + ${project.build.directory}/classes/spigot + + + + compile-mojang + + compile + + + ${project.build.directory}/string-remapper-sources/mojang + ${project.build.directory}/classes/mojang + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.2 + + + default-jar + none + + + spigot + + jar + + + ${project.build.directory}/classes/spigot + + + + mojang + + jar + + + ${project.build.directory}/classes/mojang + remapped-mojang + + + + + net.md-5 specialsource-maven-plugin @@ -47,12 +150,11 @@ remap-obf - org.spigotmc:minecraft-server:${spigotVersion}:txt:maps-mojang + org.spigotmc:minecraft-server:${spigot.version}:txt:maps-mojang true - org.spigotmc:spigot:${spigotVersion}:jar:remapped-mojang - - true - remapped-obf + org.spigotmc:spigot:${spigot.version}:jar:remapped-mojang + false + ${project.artifactId}-${project.version}-remapped-obf @@ -62,12 +164,9 @@ remap-spigot - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - - org.spigotmc:minecraft-server:${spigotVersion}:csrg:maps-spigot - org.spigotmc:spigot:${spigotVersion}:jar:remapped-obf - + ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar + org.spigotmc:minecraft-server:${spigot.version}:csrg:maps-spigot + org.spigotmc:spigot:${spigot.version}:jar:remapped-obf diff --git a/InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/inventory/CartographyInventoryImpl.java b/InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/inventory/CartographyInventoryImpl.java index d9410e1..17c5a4e 100644 --- a/InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/inventory/CartographyInventoryImpl.java +++ b/InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/inventory/CartographyInventoryImpl.java @@ -27,7 +27,11 @@ import java.lang.reflect.Field; public class CartographyInventoryImpl extends CartographyTableMenu implements CartographyInventory { - private static final Field RESULT_CONTAINER_FIELD = ReflectionUtils.getField(CartographyTableMenu.class, true, "u"); + private static final Field RESULT_CONTAINER_FIELD = ReflectionUtils.getField( + CartographyTableMenu.class, + true, + "SRF(net.minecraft.world.inventory.CartographyTableMenu resultContainer)" + ); private final ResultContainer resultContainer = ReflectionUtils.getFieldValue(RESULT_CONTAINER_FIELD, this); private final Component title; diff --git a/InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/util/PlayerUtilsImpl.java b/InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/util/PlayerUtilsImpl.java index ccfe73f..eb865d9 100644 --- a/InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/util/PlayerUtilsImpl.java +++ b/InventoryAccess/IA-R7/src/main/java/de/studiocode/inventoryaccess/r7/util/PlayerUtilsImpl.java @@ -27,8 +27,12 @@ import java.util.stream.Collectors; public class PlayerUtilsImpl implements PlayerUtils { - private static final Method REGISTER_LISTENERS_METHOD = - ReflectionUtils.getMethod(PlayerAdvancements.class, true, "b", ServerAdvancementManager.class); + private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod( + PlayerAdvancements.class, + true, + "SRM(net.minecraft.server.PlayerAdvancements registerListeners)", + ServerAdvancementManager.class + ); @Override public void stopAdvancementListening(@NotNull Player player) { diff --git a/InventoryAccess/IA-R8/pom.xml b/InventoryAccess/IA-R8/pom.xml index 708cac3..d0697c4 100644 --- a/InventoryAccess/IA-R8/pom.xml +++ b/InventoryAccess/IA-R8/pom.xml @@ -15,14 +15,14 @@ 17 17 - 1.18-R0.1-SNAPSHOT + 1.18-R0.1-SNAPSHOT org.spigotmc spigot - ${spigotVersion} + ${spigot.version} remapped-mojang provided @@ -35,6 +35,109 @@ + + xyz.xenondevs + string-remapper-maven-plugin + 0.1-SNAPSHOT + + + + remap-spigot + + remap + + + spigot + string-remapper-sources/spigot + org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version} + + org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version} + org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version} + + + + + + remap-mojang + + remap + + + mojang + string-remapper-sources/mojang + org.spigotmc:minecraft-server:txt:maps-mojang:${spigot.version} + + org.spigotmc:minecraft-server:csrg:maps-spigot:${spigot.version} + org.spigotmc:minecraft-server:csrg:maps-spigot-members:${spigot.version} + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + + default-compile + none + + + compile-spigot + + compile + + + ${project.build.directory}/string-remapper-sources/spigot + ${project.build.directory}/classes/spigot + + + + compile-mojang + + compile + + + ${project.build.directory}/string-remapper-sources/mojang + ${project.build.directory}/classes/mojang + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.2 + + + default-jar + none + + + spigot + + jar + + + ${project.build.directory}/classes/spigot + + + + mojang + + jar + + + ${project.build.directory}/classes/mojang + remapped-mojang + + + + + net.md-5 specialsource-maven-plugin @@ -47,12 +150,11 @@ remap-obf - org.spigotmc:minecraft-server:${spigotVersion}:txt:maps-mojang + org.spigotmc:minecraft-server:${spigot.version}:txt:maps-mojang true - org.spigotmc:spigot:${spigotVersion}:jar:remapped-mojang - - true - remapped-obf + org.spigotmc:spigot:${spigot.version}:jar:remapped-mojang + false + ${project.artifactId}-${project.version}-remapped-obf @@ -62,12 +164,9 @@ remap-spigot - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - - org.spigotmc:minecraft-server:${spigotVersion}:csrg:maps-spigot - org.spigotmc:spigot:${spigotVersion}:jar:remapped-obf - + ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar + org.spigotmc:minecraft-server:${spigot.version}:csrg:maps-spigot + org.spigotmc:spigot:${spigot.version}:jar:remapped-obf diff --git a/InventoryAccess/IA-R8/src/main/java/de/studiocode/inventoryaccess/r8/inventory/CartographyInventoryImpl.java b/InventoryAccess/IA-R8/src/main/java/de/studiocode/inventoryaccess/r8/inventory/CartographyInventoryImpl.java index 07f34ad..3cfb8ce 100644 --- a/InventoryAccess/IA-R8/src/main/java/de/studiocode/inventoryaccess/r8/inventory/CartographyInventoryImpl.java +++ b/InventoryAccess/IA-R8/src/main/java/de/studiocode/inventoryaccess/r8/inventory/CartographyInventoryImpl.java @@ -27,7 +27,11 @@ import java.lang.reflect.Field; public class CartographyInventoryImpl extends CartographyTableMenu implements CartographyInventory { - private static final Field RESULT_CONTAINER_FIELD = ReflectionUtils.getField(CartographyTableMenu.class, true, "u"); + private static final Field RESULT_CONTAINER_FIELD = ReflectionUtils.getField( + CartographyTableMenu.class, + true, + "SRF(net.minecraft.world.inventory.CartographyTableMenu resultContainer)" + ); private final ResultContainer resultContainer = ReflectionUtils.getFieldValue(RESULT_CONTAINER_FIELD, this); private final Component title; diff --git a/InventoryAccess/IA-R8/src/main/java/de/studiocode/inventoryaccess/r8/util/PlayerUtilsImpl.java b/InventoryAccess/IA-R8/src/main/java/de/studiocode/inventoryaccess/r8/util/PlayerUtilsImpl.java index c7ca223..ddfe799 100644 --- a/InventoryAccess/IA-R8/src/main/java/de/studiocode/inventoryaccess/r8/util/PlayerUtilsImpl.java +++ b/InventoryAccess/IA-R8/src/main/java/de/studiocode/inventoryaccess/r8/util/PlayerUtilsImpl.java @@ -27,8 +27,12 @@ import java.util.stream.Collectors; public class PlayerUtilsImpl implements PlayerUtils { - private static final Method REGISTER_LISTENERS_METHOD = - ReflectionUtils.getMethod(PlayerAdvancements.class, true, "b", ServerAdvancementManager.class); + private static final Method REGISTER_LISTENERS_METHOD = ReflectionUtils.getMethod( + PlayerAdvancements.class, + true, + "SRM(net.minecraft.server.PlayerAdvancements registerListeners)", + ServerAdvancementManager.class + ); @Override public void stopAdvancementListening(@NotNull Player player) {