Update forge to 34.1.25

README.md

@@ -6,7 +6,7 @@ A Bukkit server implementation utilizing Mixin.
 
 | Minecraft | Forge | Status | Build |
 | :----: | :----: | :---: | :---: |
-| 1.16.x | 34.1.7 | ACTIVE | [![1.16 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-16?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-16) |
+| 1.16.x | 34.1.25 | ACTIVE | [![1.16 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-16?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-16) |
 | 1.15.x | 31.2.45 | ACTIVE | [![1.15 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-15?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-15) |
 | 1.14.x | 28.2.0 | [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/1.0.6) | [![1.14 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight) |
 

arclight-common/build.gradle

@@ -21,7 +21,7 @@ apply plugin: 'io.izzel.arclight'
 
 ext {
     minecraftVersion = '1.16.3'
-    forgeVersion = '34.1.7'
+    forgeVersion = '34.1.25'
 }
 
 arclight {

arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftServerMixin.java

@@ -130,7 +130,7 @@ public abstract class CraftServerMixin implements CraftServerBridge {
         this.playerList = (DedicatedPlayerList) playerList;
     }
 
-    @Inject(method = "unloadWorld(Lorg/bukkit/World;Z)Z", require = 1, remap = false, at = @At(value = "INVOKE", target = "Lnet/minecraft/world/server/ServerChunkProvider;close()V"))
+    @Inject(method = "unloadWorld(Lorg/bukkit/World;Z)Z", require = 1, at = @At(value = "INVOKE", target = "Lnet/minecraft/world/server/ServerWorld;getChunkProvider()Lnet/minecraft/world/server/ServerChunkProvider;"))
     private void arclight$unloadForge(World world, boolean save, CallbackInfoReturnable<Boolean> cir) {
         MinecraftForge.EVENT_BUS.post(new WorldEvent.Unload(((CraftWorld) world).getHandle()));
     }

arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/EntityMixin.java

@@ -833,7 +833,7 @@ public abstract class EntityMixin implements InternalEntityBridge, EntityBridge,
                 return null;
             }
             this.world.getProfiler().startSection("reposition");
-            PortalInfo portalinfo = this.func_241829_a(server);
+            PortalInfo portalinfo = teleporter.getPortalInfo((Entity) (Object) this, server, this::func_241829_a);
             if (portalinfo == null) {
                 return null;
             } else {

arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/player/ServerPlayerEntityMixin.java

@@ -487,7 +487,7 @@ public abstract class ServerPlayerEntityMixin extends PlayerEntityMixin implemen
             serverworld.removeEntity((ServerPlayerEntity) (Object) this, true); //Forge: the player entity is moved to the new world, NOT cloned. So keep the data alive with no matching invalidate call.
             this.revive();
             */
-            PortalInfo portalinfo = this.func_241829_a(server);
+            PortalInfo portalinfo = teleporter.getPortalInfo((ServerPlayerEntity) (Object) this, server, this::func_241829_a);
             ServerWorld[] exitWorld = new ServerWorld[]{server};
             if (portalinfo != null) {
                 Entity e = teleporter.placeEntity((ServerPlayerEntity) (Object) this, serverworld, exitWorld[0], this.rotationYaw, spawnPortal -> {//Forge: Start vanilla logic

arclight-forge-1.16/build.gradle

@@ -18,10 +18,11 @@ apply plugin: 'org.spongepowered.mixin'
 apply plugin: 'java'
 apply plugin: 'idea'
 apply plugin: 'io.izzel.arclight'
+apply plugin: 'maven-publish'
 
 ext {
     minecraftVersion = '1.16.3'
-    forgeVersion = '34.1.7'
+    forgeVersion = '34.1.25'
 }
 
 arclight {
@@ -59,7 +60,7 @@ repositories {
     maven { url = 'https://jitpack.io/' }
 }
 
-def embedLibs = ['org.spongepowered:mixin:0.8.1', 'org.ow2.asm:asm-util:8.0.1',
+def embedLibs = [/*'org.spongepowered:mixin:0.8.1',*/ 'org.ow2.asm:asm-util:8.0.1',
                  'org.ow2.asm:asm-analysis:8.0.1', 'org.yaml:snakeyaml:1.26',
                  'org.xerial:sqlite-jdbc:3.32.3', 'mysql:mysql-connector-java:5.1.49',
                  'commons-lang:commons-lang:2.6', 'com.googlecode.json-simple:json-simple:1.1.1',
@@ -128,4 +129,61 @@ mixin {
 compileJava {
     options.compilerArgs << '-XDignore.symbol.file' << '-XDenableSunApiLintControl'
     options.encoding = 'UTF-8'
-}
+}
+
+task srgJar(type: Jar) {
+    from(tasks.jar.outputs.files.collect { it.isDirectory() ? it : zipTree(it) }) {
+        include 'io/izzel/**'
+        exclude 'io/izzel/arclight/common/mixin/**'
+    }
+    classifier = 'srg'
+}
+
+task spigotJar(type: Jar) {
+    with tasks.srgJar
+    doLast {
+        def task = tasks.create('renameSpigotJar', net.minecraftforge.gradle.userdev.tasks.RenameJarInPlace)
+        task.input = archivePath
+        task.hasLog = false
+        task.mappings = project(':arclight-common').file('build/arclight_cache/tmp_srg/bukkit_srg.srg')
+        def args = task.args.toList()
+        args.add('--reverse')
+        task.setArgs(args)
+        task.apply()
+    }
+    classifier = 'spigot'
+}
+
+task sourceJar(type: Jar) {
+    from(sourceSets.main.allSource)
+    for (def s in [':arclight-api', ':i18n-config', ':arclight-common', ':forge-installer']) {
+        from(project(s).sourceSets.main.allSource) {
+            exclude 'io/izzel/arclight/common/mixin/**'
+        }
+    }
+    classifier = 'sources'
+}
+
+publishing {
+    repositories {
+        maven {
+            name = "IzzelAliz Repo"
+            url = uri('https://maven.izzel.io/' + (project.version.toString().endsWith('SNAPSHOT') ? 'snapshots' : 'releases'))
+            credentials {
+                username = project.findProperty("mavenUser") ?: System.getenv("ARCLIGHT_USER")
+                password = project.findProperty("mavenToken") ?: System.getenv("ARCLIGHT_TOKEN")
+            }
+        }
+    }
+    publications {
+        mavenJava(MavenPublication) {
+            artifact srgJar
+            artifact spigotJar
+            artifact sourceJar
+        }
+    }
+}
+
+if ('true'.equalsIgnoreCase(System.getenv('APPVEYOR_REPO_TAG'))) {
+    tasks.build.dependsOn(tasks.publish)
+}