diff --git a/build.gradle b/build.gradle index bf93c9e7..e417f354 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ architectury { subprojects { apply plugin: "dev.architectury.loom" - apply plugin: "io.github.juuxel.loom-quiltflower" + apply plugin: "io.github.juuxel.loom-vineflower" loom { silentMojangMappingsLicense() diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinClientLevel.java b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinClientLevel.java index 669865b8..67baefae 100644 --- a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinClientLevel.java +++ b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinClientLevel.java @@ -45,7 +45,7 @@ private void construct(ClientPacketListener clientPacketListener, ClientLevel.Cl } @Inject(method = "addEntity", at = @At("HEAD"), cancellable = true) - private void addEntity(int i, Entity entity, CallbackInfo ci) { + private void addEntity(Entity entity, CallbackInfo ci) { if (EntityEvent.ADD.invoker().add(entity, (ClientLevel) (Object) this).isFalse()) { ci.cancel(); } diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinClientPacketListener.java b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinClientPacketListener.java index 361dfa45..e6151fc2 100644 --- a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinClientPacketListener.java +++ b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinClientPacketListener.java @@ -67,7 +67,7 @@ private void handleRespawnPre(ClientboundRespawnPacket packet, CallbackInfo ci) } @Inject(method = "handleRespawn", at = @At(value = "INVOKE", - target = "Lnet/minecraft/client/multiplayer/ClientLevel;addPlayer(ILnet/minecraft/client/player/AbstractClientPlayer;)V")) + target = "Lnet/minecraft/client/multiplayer/ClientLevel;addEntity(Lnet/minecraft/world/entity/Entity;)V")) private void handleRespawn(ClientboundRespawnPacket packet, CallbackInfo ci) { ClientPlayerEvent.CLIENT_PLAYER_RESPAWN.invoker().respawn(tmpPlayer, minecraft.player); this.tmpPlayer = null; diff --git a/fabric/src/main/java/dev/architectury/networking/fabric/SpawnEntityPacket.java b/fabric/src/main/java/dev/architectury/networking/fabric/SpawnEntityPacket.java index 409ee809..2d0435d0 100644 --- a/fabric/src/main/java/dev/architectury/networking/fabric/SpawnEntityPacket.java +++ b/fabric/src/main/java/dev/architectury/networking/fabric/SpawnEntityPacket.java @@ -111,7 +111,7 @@ public static void receive(FriendlyByteBuf buf, NetworkManager.PacketContext con ext.loadAdditionalSpawnData(buf); } buf.release(); - Minecraft.getInstance().level.putNonPlayerEntity(id, entity); + Minecraft.getInstance().level.addEntity(entity); entity.lerpMotion(deltaX, deltaY, deltaZ); }); } diff --git a/gradle.properties b/gradle.properties index 18b771e6..e7255f68 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ org.gradle.daemon=false platforms=fabric -minecraft_version=1.20.2-pre1 -supported_version=1.20.2-pre1 +minecraft_version=1.20.2-pre2 +supported_version=1.20.2-pre2 artifact_type=beta @@ -14,7 +14,7 @@ base_version=10.0 maven_group=dev.architectury fabric_loader_version=0.14.22 -fabric_api_version=0.88.2+1.20.2 +fabric_api_version=0.88.3+1.20.2 mod_menu_version=7.0.0 forge_version=46.0.1