Add extra srg file for workaround with SpongePowered/Mixin#438

Signed-off-by: Gabriel Harris-Rouquette <[email protected]>

build.gradle.kts

@@ -257,9 +257,11 @@ dependencies {
     add(mixins.get().implementationConfigurationName, mixinsConfig)
     add(mixins.get().implementationConfigurationName, project(":SpongeAPI"))
 }
+val extraSrgs = file("extra.srgs")
 mixin {
     add("mixins", "spongecommon.mixins.refmap.json")
     add("accessors", "spongecommon.accessors.refmap.json")
+    extraMappings(extraSrgs)
 }
 fun debug(logger: Logger, messsage: String) {
     println(message = messsage)

extra.srgs

@@ -0,0 +1 @@
+MD: net/minecraft/world/World/isPlayerWithin(DDDD)Z net/minecraft/world/World/func_217358_a(DDDD)Z

src/mixins/java/org/spongepowered/common/mixin/core/world/spawner/AbstractSpawnerMixin.java

@@ -94,8 +94,8 @@ public abstract class AbstractSpawnerMixin implements AbstractSpawnerBridge {
 
     @Redirect(method = "isActivated()Z",
         at = @At(value = "INVOKE",
-            target = "Lnet/minecraft/world/IEntityReader;isPlayerWithin(DDDD)Z"))
-    public boolean onIsPlayerWithin(final IEntityReader world, final double x, final double y, final double z, final double distance) {
+            target = "Lnet/minecraft/world/World;isPlayerWithin(DDDD)Z"))
+    public boolean onIsPlayerWithin(final World world, final double x, final double y, final double z, final double distance) {
         // Like vanilla but filter out players with !bridge$affectsSpawning
         for (final PlayerEntity playerentity : world.getPlayers()) {
             if (EntityPredicates.NOT_SPECTATING.test(playerentity)

vanilla/src/installer/java/org/spongepowered/vanilla/installer/InstallerMain.java

@@ -95,9 +95,9 @@ public void run(final String[] args) throws Exception {
         final String javaHome = System.getProperty("java.home");
         final String javaBin = javaHome + File.separator + "bin" + File.separator + "java";
         final String jvmArgs = String.join(" ", ManagementFactory.getRuntimeMXBean().getInputArguments());
-        final String depsClasspath = dependencies.stream().map(p -> p.toAbsolutePath().toString()).collect(Collectors.joining(File.pathSeparator));
+        final String depsClasspath = dependencies.stream().map(Path::toAbsolutePath).map(Path::toString).collect(Collectors.joining(File.pathSeparator));
         final String classpath = System.getProperty("java.class.path") + File.pathSeparator + depsClasspath + File.pathSeparator +
-            gameJar.toAbsolutePath().toString() + File.pathSeparator;
+            gameJar.toAbsolutePath().toString();
 
         this.logger.debug("Setting classpath to: " + classpath);