From 109a65e5af40e56b017f8db1bda6282a8ded20e8 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 13 Sep 2023 17:22:35 +0100 Subject: [PATCH 1/2] 1.20.2-pre4 --- .../fabricmc/fabric/mixin/transfer/DropperBlockMixin.java | 3 ++- gradle.properties | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/DropperBlockMixin.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/DropperBlockMixin.java index e04780c2da..881c327905 100644 --- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/DropperBlockMixin.java +++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/DropperBlockMixin.java @@ -21,6 +21,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import net.minecraft.block.BlockState; import net.minecraft.block.DispenserBlock; import net.minecraft.block.DropperBlock; import net.minecraft.block.entity.DispenserBlockEntity; @@ -49,7 +50,7 @@ public class DropperBlockMixin { cancellable = true, allow = 1 ) - public void hookDispense(ServerWorld world, BlockPos pos, CallbackInfo ci) { + public void hookDispense(ServerWorld world, BlockState blockState, BlockPos pos, CallbackInfo ci) { DispenserBlockEntity dispenser = (DispenserBlockEntity) world.getBlockEntity(pos); Direction direction = dispenser.getCachedState().get(DispenserBlock.FACING); diff --git a/gradle.properties b/gradle.properties index 36e27cf82c..923dacc2a7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx2560M org.gradle.parallel=true fabric.loom.multiProjectOptimisation=true -version=0.88.3 -minecraft_version=1.20.2-pre2 +version=0.88.4 +minecraft_version=1.20.2-pre4 yarn_version=+build.1 loader_version=0.14.22 installer_version=0.11.1 @@ -58,7 +58,7 @@ fabric-resource-loader-v0-version=0.11.10 fabric-screen-api-v1-version=2.0.10 fabric-screen-handler-api-v1-version=1.3.35 fabric-sound-api-v1-version=1.0.13 -fabric-transfer-api-v1-version=3.3.6 +fabric-transfer-api-v1-version=3.3.7 fabric-transitive-access-wideners-v1-version=5.0.2 fabric-convention-tags-v1-version=1.5.6 fabric-client-tags-api-v1-version=1.1.3 From daef22a2cb79bde0c9569df2143e45b84f08b9f3 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 15 Sep 2023 15:27:05 +0100 Subject: [PATCH 2/2] 1.20.2-rc1 --- .../event/interaction/BeehiveBlockMixin.java | 50 ------------------- .../fabric-events-interaction-v0.mixins.json | 1 - gradle.properties | 6 +-- 3 files changed, 3 insertions(+), 54 deletions(-) delete mode 100644 fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/BeehiveBlockMixin.java diff --git a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/BeehiveBlockMixin.java b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/BeehiveBlockMixin.java deleted file mode 100644 index e8ed4be49f..0000000000 --- a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/BeehiveBlockMixin.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2016, 2017, 2018, 2019 FabricMC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package net.fabricmc.fabric.mixin.event.interaction; - -import java.util.List; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.LocalCapture; - -import net.minecraft.block.BeehiveBlock; -import net.minecraft.entity.passive.BeeEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -@Mixin(BeehiveBlock.class) -class BeehiveBlockMixin { - @Inject( - method = "angerNearbyBees", - cancellable = true, - at = @At( - value = "INVOKE_ASSIGN", - target = "Lnet/minecraft/world/World;getNonSpectatingEntities(Ljava/lang/Class;Lnet/minecraft/util/math/Box;)Ljava/util/List;", - ordinal = 1 // Only capture the PlayerEntity call. - ), - locals = LocalCapture.CAPTURE_FAILHARD - ) - private void afterNearbyBeesPlayers(World world, BlockPos pos, CallbackInfo ci, List bees, List players) { - // If a fake player broke the beehive, there will be no nearby players. This causes a crash later on as we try - // to pick a random player - we early return to avoid this. - if (players.isEmpty()) ci.cancel(); - } -} diff --git a/fabric-events-interaction-v0/src/main/resources/fabric-events-interaction-v0.mixins.json b/fabric-events-interaction-v0/src/main/resources/fabric-events-interaction-v0.mixins.json index 806c5161dc..9156d082b0 100644 --- a/fabric-events-interaction-v0/src/main/resources/fabric-events-interaction-v0.mixins.json +++ b/fabric-events-interaction-v0/src/main/resources/fabric-events-interaction-v0.mixins.json @@ -3,7 +3,6 @@ "package": "net.fabricmc.fabric.mixin.event.interaction", "compatibilityLevel": "JAVA_16", "mixins": [ - "BeehiveBlockMixin", "PlayerAdvancementTrackerMixin", "ServerPlayerEntityMixin", "ServerPlayerInteractionManagerMixin", diff --git a/gradle.properties b/gradle.properties index 923dacc2a7..ed832ad08b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx2560M org.gradle.parallel=true fabric.loom.multiProjectOptimisation=true -version=0.88.4 -minecraft_version=1.20.2-pre4 +version=0.88.5 +minecraft_version=1.20.2-rc1 yarn_version=+build.1 loader_version=0.14.22 installer_version=0.11.1 @@ -27,7 +27,7 @@ fabric-crash-report-info-v1-version=0.2.19 fabric-data-generation-api-v1-version=13.0.2 fabric-dimensions-v1-version=2.1.55 fabric-entity-events-v1-version=1.5.24 -fabric-events-interaction-v0-version=0.6.7 +fabric-events-interaction-v0-version=0.6.8 fabric-events-lifecycle-v0-version=0.2.67 fabric-game-rule-api-v1-version=1.0.39 fabric-gametest-api-v1-version=1.2.14