Merge branch '1.20.2' of https://github.com/FabricMC/fabric into obje…

…ct-builder/trade-experiment
apple502j · Sep 16, 2023 · 56d6ddf · 56d6ddf
2 parents 3c32eec + daef22a
commit 56d6ddf
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 56 deletions.
diff --git a/...ction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/BeehiveBlockMixin.java b/...ction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/BeehiveBlockMixin.java
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
@@ -3,7 +3,6 @@
   "package": "net.fabricmc.fabric.mixin.event.interaction",
   "compatibilityLevel": "JAVA_16",
   "mixins": [
-    "BeehiveBlockMixin",
     "PlayerAdvancementTrackerMixin",
     "ServerPlayerEntityMixin",
     "ServerPlayerInteractionManagerMixin",

diff --git a/...c-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/DropperBlockMixin.java b/...c-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
@@ -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.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
@@ -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