Update to Minecraft 1.19.4

IzzelAliz · Apr 22, 2023 · e82ed29 · e82ed29
1 parent ae81c7b
commit e82ed29
Show file tree

Hide file tree

Showing 87 changed files with 845 additions and 440 deletions.
diff --git a/README.md b/README.md
@@ -4,22 +4,23 @@ A Bukkit server implementation utilizing Mixin.
 
 ![Downloads](https://img.shields.io/github/downloads/IzzelAliz/Arclight/total?style=flat-square)  ![GitHub](https://img.shields.io/github/license/IzzelAliz/Arclight?style=flat-square)
 
-|       Release       |  Forge  | Status |                                                                                              Build                                                                                              |
-|:-------------------:|:-------:|:------:|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
-| Great Horn (1.19.3) | 44.1.8  | ACTIVE | [![1.19 Status](https://img.shields.io/github/actions/workflow/status/IzzelAliz/Arclight/gradle.yml?branch=GreatHorn&style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-19) |
-|       1.18.x        | 40.1.80 |  LTS   |   [![1.18 Status](https://img.shields.io/github/actions/workflow/status/IzzelAliz/Arclight/gradle.yml?branch=1.18&style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-18)    |
-|       1.16.x        | 36.2.39 |  LTS   |                     [![1.16 Status](https://img.shields.io/github/actions/workflow/status/IzzelAliz/Arclight/gradle.yml?branch=1.16&style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-16)                      |
+|       Release       |  Forge  | Status |                                                                                                        Build                                                                                                         |
+|:-------------------:|:-------:|:------:|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
+| Executions (1.19.4) | 45.0.43 | ACTIVE | [![1.19.4 Status](https://img.shields.io/github/actions/workflow/status/IzzelAliz/Arclight/gradle.yml?branch=Executions&style=flat-square)](https://github.com/IzzelAliz/Arclight/actions?query=branch%3AExecutions) |
+|       1.18.x        | 40.1.80 |  LTS   |              [![1.18 Status](https://img.shields.io/github/actions/workflow/status/IzzelAliz/Arclight/gradle.yml?branch=1.18&style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-18)              |
+|       1.16.x        | 36.2.39 |  LTS   |              [![1.16 Status](https://img.shields.io/github/actions/workflow/status/IzzelAliz/Arclight/gradle.yml?branch=1.16&style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-16)              |
 
 **Legacy versions**:
 
 <details>
 
-| Release |  Forge  |                                  Status                                  |                                                                         Build                                                                          |
-|:-------:|:-------:|:------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------:|
-| Horn (1.19-1.19.2)  | 43.2.0  | [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/horn/1.0.1)  | [![Horn Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-19?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-19) |
-| 1.17.x  | 37.1.0  | [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/1.17/1.0.2)  | [![1.17 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-17?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-17) |
-| 1.15.x  | 31.2.48 | [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/1.15/1.0.19) | [![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)    |
+| Release |  Forge  |                                    Status                                    |                                                                         Build                                                                          |
+|:-------:|:-------:|:----------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------:|
+| Great Horn (1.19.3) | 44.1.22 | [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/GreatHorn/1.0.3) | [![1.19 Status](https://img.shields.io/github/actions/workflow/status/IzzelAliz/Arclight/gradle.yml?branch=GreatHorn&style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-19) |
+| Horn (1.19-1.19.2)  | 43.2.0  |   [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/horn/1.0.1)    | [![Horn Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-19?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-19) |
+| 1.17.x  | 37.1.0  |   [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/1.17/1.0.2)    | [![1.17 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-17?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-17) |
+| 1.15.x  | 31.2.48 |   [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/1.15/1.0.19)   | [![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)    |
 
 * Legacy version still accepts pull requests.
 

diff --git a/arclight-common/build.gradle b/arclight-common/build.gradle
@@ -24,7 +24,7 @@ apply plugin: 'io.izzel.arclight'
 arclight {
     mcVersion = minecraftVersion
     forgeVersion = project.ext.forgeVersion
-    bukkitVersion = 'v1_19_R2'
+    bukkitVersion = 'v1_19_R3'
     wipeVersion = true
     reobfVersion = true
     accessTransformer = project.file('bukkit.at')

diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/EntityBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/core/entity/EntityBridge.java
@@ -41,8 +41,6 @@ public interface EntityBridge extends ICommandSourceBridge {
 
     void bridge$postTick();
 
-    void bridge$burn(float amount);
-
     boolean bridge$removePassenger(Entity passenger);
 
     boolean bridge$addPassenger(Entity entity);

diff --git a/...mmon/src/main/java/io/izzel/arclight/common/bridge/core/network/NetworkManagerBridge.java b/...mmon/src/main/java/io/izzel/arclight/common/bridge/core/network/NetworkManagerBridge.java
@@ -15,8 +15,6 @@ public interface NetworkManagerBridge {
 
     void bridge$setSpoofedProfile(Property[] spoofedProfile);
 
-    SocketAddress bridge$getRawAddress();
-
     String bridge$getHostname();
 
     void bridge$setHostname(String hostname);

diff --git a/...ht-common/src/main/java/io/izzel/arclight/common/bridge/core/util/DamageSourceBridge.java b/...ht-common/src/main/java/io/izzel/arclight/common/bridge/core/util/DamageSourceBridge.java
@@ -7,4 +7,8 @@ public interface DamageSourceBridge {
     boolean bridge$isSweep();
 
     DamageSource bridge$sweep();
+
+    DamageSource bridge$poison();
+
+    DamageSource bridge$melting();
 }
diff --git a/...t-common/src/main/java/io/izzel/arclight/common/bridge/core/util/DamageSourcesBridge.java b/...t-common/src/main/java/io/izzel/arclight/common/bridge/core/util/DamageSourcesBridge.java
@@ -0,0 +1,10 @@
+package io.izzel.arclight.common.bridge.core.util;
+
+import net.minecraft.world.damagesource.DamageSource;
+
+public interface DamageSourcesBridge {
+
+    DamageSource bridge$poison();
+
+    DamageSource bridge$melting();
+}
diff --git a/...main/java/io/izzel/arclight/common/bridge/core/util/IndirectEntityDamageSourceBridge.java b/...main/java/io/izzel/arclight/common/bridge/core/util/IndirectEntityDamageSourceBridge.java
diff --git a/...ht-common/src/main/java/io/izzel/arclight/common/bridge/core/world/chunk/ChunkBridge.java b/...ht-common/src/main/java/io/izzel/arclight/common/bridge/core/world/chunk/ChunkBridge.java
@@ -9,8 +9,6 @@ public interface ChunkBridge {
 
     Chunk bridge$getBukkitChunk();
 
-    void bridge$setBukkitChunk(Chunk chunk);
-
     BlockState bridge$setType(BlockPos pos, BlockState state, boolean isMoving, boolean doPlace);
 
     boolean bridge$isMustNotSave();

diff --git a/...ht-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftEventFactoryMixin.java b/...ht-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftEventFactoryMixin.java
@@ -7,6 +7,7 @@
 import io.izzel.arclight.common.mod.util.DistValidate;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.damagesource.DamageSource;
+import net.minecraft.world.damagesource.DamageTypes;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.level.Level;
@@ -54,14 +55,14 @@ public class CraftEventFactoryMixin {
         Entity damageEventEntity = ArclightCaptures.getDamageEventEntity();
         BlockPos damageEventBlock = ArclightCaptures.getDamageEventBlock();
         if (damageEventEntity != null && entityDamage == null) {
-            if (source.msgId.equals(DamageSource.LIGHTNING_BOLT.msgId)) {
+            if (source.is(DamageTypes.LIGHTNING_BOLT)) {
                 entityDamage = damageEventEntity;
             }
         }
         if (damageEventBlock != null && blockDamage == null) {
-            if (source.msgId.equals(DamageSource.CACTUS.msgId)
-                || source.msgId.equals(DamageSource.SWEET_BERRY_BUSH.msgId)
-                || source.msgId.equals(DamageSource.HOT_FLOOR.msgId)) {
+            if (source.is(DamageTypes.CACTUS)
+                || source.is(DamageTypes.SWEET_BERRY_BUSH)
+                || source.is(DamageTypes.HOT_FLOOR)) {
                 blockDamage = CraftBlock.at(entity.getCommandSenderWorld(), damageEventBlock);
             }
         }

diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftWorldMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/bukkit/CraftWorldMixin.java
@@ -2,11 +2,14 @@
 
 import io.izzel.arclight.common.bridge.core.world.server.ServerWorldBridge;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.biome.Biome;
 import org.bukkit.craftbukkit.v.CraftWorld;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
 
 import java.io.File;
 
@@ -25,4 +28,9 @@ public abstract class CraftWorldMixin {
     public File getWorldFolder() {
         return ((ServerWorldBridge) this.world).bridge$getConvertable().getDimensionPath(this.world.dimension()).toFile();
     }
+
+    @Redirect(method = "getHumidity(III)D", at = @At(value = "FIELD", remap = true, target = "Lnet/minecraft/world/level/biome/Biome;climateSettings:Lnet/minecraft/world/level/biome/Biome$ClimateSettings;"))
+    private Biome.ClimateSettings arclight$useForgeSetting(Biome instance) {
+        return instance.getModifiedClimateSettings();
+    }
 }
diff --git a/...ght-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ConnectionMixin.java b/...ght-common/src/main/java/io/izzel/arclight/common/mixin/core/network/ConnectionMixin.java
@@ -7,7 +7,6 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
-import java.net.SocketAddress;
 import java.util.UUID;
 
 @Mixin(Connection.class)
@@ -38,15 +37,6 @@ public class ConnectionMixin implements NetworkManagerBridge {
         this.spoofedProfile = spoofedProfile;
     }
 
-    public SocketAddress getRawAddress() {
-        return this.channel.remoteAddress();
-    }
-
-    @Override
-    public SocketAddress bridge$getRawAddress() {
-        return getRawAddress();
-    }
-
     @Override
     public String bridge$getHostname() {
         return hostname;

diff --git a/...main/java/io/izzel/arclight/common/mixin/core/network/ServerHandshakeNetHandlerMixin.java b/...main/java/io/izzel/arclight/common/mixin/core/network/ServerHandshakeNetHandlerMixin.java
@@ -10,6 +10,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.handshake.ClientIntentionPacket;
 import net.minecraft.network.protocol.login.ClientboundLoginDisconnectPacket;
+import net.minecraft.network.protocol.status.ServerStatus;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerHandshakePacketListenerImpl;
 import net.minecraft.server.network.ServerLoginPacketListenerImpl;
@@ -112,9 +113,10 @@ public void handleIntention(ClientIntentionPacket packetIn) {
                 break;
             }
             case STATUS: {
-                if (this.server.repliesToStatus()) {
+                ServerStatus serverstatus = this.server.getStatus();
+                if (this.server.repliesToStatus() && serverstatus != null) {
                     this.connection.setProtocol(ConnectionProtocol.STATUS);
-                    this.connection.setListener(new ServerStatusPacketListenerImpl(this.server, this.connection));
+                    this.connection.setListener(new ServerStatusPacketListenerImpl(serverstatus, this.connection));
                 } else {
                     this.connection.disconnect(IGNORE_STATUS_REASON);
                 }