Update forge to 36.0.55, SS to 1.9.0

README.md

@@ -6,7 +6,7 @@ A Bukkit server implementation utilizing Mixin.
 
 | Minecraft | Forge | Status | Build |
 | :----: | :----: | :---: | :---: |
-| 1.16.x | 36.0.42 | 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 | 36.0.55 | 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.48 | 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

@@ -55,7 +55,7 @@ dependencies {
     annotationProcessor 'com.github.ArclightTeam:mixin-tools:1.0.0'
     
     implementation 'jline:jline:2.12.1'
-    implementation 'net.md-5:SpecialSource:1.8.6'
+    implementation 'net.md-5:SpecialSource:1.9.0'
     implementation 'org.apache.logging.log4j:log4j-jul:2.11.2'
     implementation 'net.md-5:bungeecord-chat:1.16-R0.4'
     implementation 'mysql:mysql-connector-java:5.1.49'

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

@@ -765,11 +765,11 @@ public abstract class ServerPlayerEntityMixin extends PlayerEntityMixin implemen
             PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(this.getBukkitEntity(), (this.getPrimaryHand() == HandSide.LEFT) ? MainHand.LEFT : MainHand.RIGHT);
             Bukkit.getPluginManager().callEvent(event);
         }
-        if (!this.language.equals(packetIn.getLanguage())) {
+        if (!this.language.equals(packetIn.getLang())) {
-            PlayerLocaleChangeEvent event2 = new PlayerLocaleChangeEvent(this.getBukkitEntity(), packetIn.getLanguage());
+            PlayerLocaleChangeEvent event2 = new PlayerLocaleChangeEvent(this.getBukkitEntity(), packetIn.getLang());
             Bukkit.getPluginManager().callEvent(event2);
         }
-        this.locale = packetIn.getLanguage();
+        this.locale = packetIn.getLang();
         this.clientViewDistance = packetIn.view;
     }
 

arclight-common/src/main/java/io/izzel/arclight/common/mixin/forge/ForgeInternalHandlerMixin.java

@@ -1,34 +0,0 @@
-package io.izzel.arclight.common.mixin.forge;
-
-import io.izzel.arclight.common.mod.util.ArclightCaptures;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.concurrent.TickDelayedTask;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.world.World;
-import net.minecraft.world.chunk.Chunk;
-import net.minecraft.world.chunk.ChunkStatus;
-import net.minecraft.world.chunk.IChunk;
-import net.minecraft.world.server.ServerWorld;
-import net.minecraftforge.common.ForgeInternalHandler;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-@Mixin(ForgeInternalHandler.class)
-public class ForgeInternalHandlerMixin {
-
-    // Workaround for MinecraftForge#7519
-    @Redirect(method = "*", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;addEntity(Lnet/minecraft/entity/Entity;)Z"))
-    private boolean arclight$addDuringWorldGen(World world, Entity entityIn) {
-        if (world instanceof ServerWorld && ArclightCaptures.isWorldGenAdd()) {
-            world.getServer().enqueue(new TickDelayedTask(world.getServer().getTickCounter(), () -> {
-                IChunk ichunk = world.getChunk(MathHelper.floor(entityIn.getPosX() / 16.0D), MathHelper.floor(entityIn.getPosZ() / 16.0D), ChunkStatus.FULL, entityIn.forceSpawn);
-                if (ichunk instanceof Chunk) {
-                    ichunk.addEntity(entityIn);
-                }
-            }));
-            return ((ServerWorld) world).addEntityIfNotDuplicate(entityIn);
-        }
-        return world.addEntity(entityIn);
-    }
-}

arclight-common/src/main/resources/mixins.arclight.forge.json

@@ -5,10 +5,12 @@
   "target": "@env(DEFAULT)",
   "refmap": "mixins.arclight.refmap.json",
   "setSourceFile": true,
+  "injectors": {
+    "defaultRequire": 1
+  },
   "mixins": [
     "ForgeEventFactoryMixin",
     "ForgeHooksMixin",
-    "ForgeInternalHandlerMixin",
     "NetworkHooksMixin",
     "PacketDistributorMixin"
   ]

arclight-forge-1.16/build.gradle

@@ -56,7 +56,7 @@ def embedLibs = [/*'org.spongepowered:mixin:0.8.1',*/ 'org.ow2.asm:asm-util:9.0'
                  'org.ow2.asm:asm-analysis:9.0', 'org.yaml:snakeyaml:1.27',
                  'org.xerial:sqlite-jdbc:3.34.0', 'mysql:mysql-connector-java:5.1.49',
                  'commons-lang:commons-lang:2.6', 'com.googlecode.json-simple:json-simple:1.1.1',
-                 'org.apache.logging.log4j:log4j-jul:2.11.2', 'net.md-5:SpecialSource:1.8.6',
+                 'org.apache.logging.log4j:log4j-jul:2.11.2', 'net.md-5:SpecialSource:1.9.0',
                  'org.jline:jline-terminal-jansi:3.12.1', 'org.fusesource.jansi:jansi:1.18',
                  'org.jline:jline-terminal:3.12.1', 'org.jline:jline-reader:3.12.1',
                  'jline:jline:2.12.1']

build.gradle

@@ -5,7 +5,7 @@ allprojects {
     ext {
         agpVersion = '1.14'
         minecraftVersion = '1.16.5'
-        forgeVersion = '36.0.42'
+        forgeVersion = '36.0.55'
     }
 
     task cleanBuild {