Fix methods injection

RakambdaOrg · Oct 23, 2024 · 1c8d5a4 · 1c8d5a4
1 parent 9c83adc
commit 1c8d5a4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/fabric/src/main/java/fr/rakambda/fallingtree/fabric/mixin/AbstractBlockMixin.java b/fabric/src/main/java/fr/rakambda/fallingtree/fabric/mixin/AbstractBlockMixin.java
@@ -16,9 +16,9 @@
 @Mixin(BlockBehaviour.class)
 public abstract class AbstractBlockMixin{
 	@Inject(method = "getDestroyProgress", at = @At(value = "TAIL"), cancellable = true)
-	public void calcBlockBreakingDelta(BlockState state, Player player, BlockGetter level, BlockPos pos, CallbackInfoReturnable<Float> callbackInfoReturnable){
+	public void calcBlockBreakingDelta(BlockState blockState, Player player, BlockGetter blockGetter, BlockPos blockPos, CallbackInfoReturnable<Float> callbackInfoReturnable){
 		var wrappedPlayer = new PlayerWrapper(player);
-		var wrappedPos = new BlockPosWrapper(pos);
+		var wrappedPos = new BlockPosWrapper(blockPos);
 
 		var result = FallingTree.getMod().getTreeHandler().getBreakSpeed(wrappedPlayer, wrappedPos, callbackInfoReturnable.getReturnValue());
 		if(result.isEmpty()){

diff --git a/fabric/src/main/java/fr/rakambda/fallingtree/fabric/mixin/LevelMixin.java b/fabric/src/main/java/fr/rakambda/fallingtree/fabric/mixin/LevelMixin.java
@@ -9,6 +9,8 @@
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.redstone.Orientation;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -30,16 +32,16 @@ public void updateNeighborsAlways(BlockPos pos, Block block, CallbackInfo callba
 	}
 
 	@Inject(method = "updateNeighborsAtExceptFromFacing", at = @At(value = "TAIL"))
-	public void updateNeighborsExcept(BlockPos pos, Block sourceBlock, Direction direction, CallbackInfo callbackInfo){
+	public void updateNeighborsExcept(BlockPos blockPos, Block block, Direction direction, @Nullable Orientation orientation, CallbackInfo callbackInfo){
 		//noinspection ConstantConditions
 		var serverLevel = (ServerLevel) (Object) this;
 		var directions = EnumSet.allOf(Direction.class);
 		directions.remove(direction);
 
 		FallingTree.getMod().getLeafBreakingHandler().onBlockUpdate(
 				new ServerLevelWrapper(serverLevel),
-				new BlockPosWrapper(pos),
-				new BlockStateWrapper(serverLevel.getBlockState(pos)),
+				new BlockPosWrapper(blockPos),
+				new BlockStateWrapper(serverLevel.getBlockState(blockPos)),
 				directions.stream().map(FallingTree.getMod()::asDirectionCompat).collect(Collectors.toSet()));
 	}
 }