1.16 compat: minor changes, no funcloss

7 files changed, 35 insertions, 22 deletions

diff --git a/src/main/java/re/jag/parquet/BucketDispenserBehavior.java b/src/main/java/re/jag/parquet/BucketDispenserBehavior.java
index 4de7495..e4bd88d 100644
--- a/src/main/java/re/jag/parquet/BucketDispenserBehavior.java
+++ b/src/main/java/re/jag/parquet/BucketDispenserBehavior.java
@@ -18,7 +18,7 @@ import net.minecraft.world.World;
 
 public class BucketDispenserBehavior extends FallibleItemDispenserBehavior {
 	public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) { 
-		this.success = false;
+		//this.success = false;
 		World world = pointer.getWorld();
 		Item item;
 		BlockPos block_pos = pointer.getBlockPos().offset((Direction)pointer.getBlockState().get(DispenserBlock.FACING));
@@ -27,7 +27,7 @@ public class BucketDispenserBehavior extends FallibleItemDispenserBehavior {
 		if (block instanceof FluidDrainable) {
 			Fluid fluid = ((FluidDrainable)block).tryDrainFluid(world, block_pos, state);
 		
-			if (!(fluid instanceof net.minecraft.fluid.BaseFluid)) {
+			if (!(fluid instanceof net.minecraft.fluid.FlowableFluid/*BaseFluid*/)) {
 				return super.dispenseSilently(pointer, stack);
 			}
 			
@@ -35,7 +35,8 @@ public class BucketDispenserBehavior extends FallibleItemDispenserBehavior {
 		} else if (block instanceof CauldronBlock) {
 			if(state.get(CauldronBlock.LEVEL) >= 3) {
 				((CauldronBlock)block).setLevel(world, block_pos, state, 0);
-				this.success = true;
+				//this.success = true;
+				this.setSuccess(true);
 				item = Items.WATER_BUCKET;
 			} else {
 				return stack;
diff --git a/src/main/java/re/jag/parquet/DyeItemDispenserBehavior.java b/src/main/java/re/jag/parquet/DyeItemDispenserBehavior.java
index c11db4a..8075914 100644
--- a/src/main/java/re/jag/parquet/DyeItemDispenserBehavior.java
+++ b/src/main/java/re/jag/parquet/DyeItemDispenserBehavior.java
@@ -23,7 +23,7 @@ import net.minecraft.world.World;
 
 public class DyeItemDispenserBehavior extends FallibleItemDispenserBehavior{
 	public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
-		this.success = false;
+		//this.success = false;
 		World world = pointer.getWorld();
 		BlockPos block_pos = pointer.getBlockPos().offset((Direction)pointer.getBlockState().get(DispenserBlock.FACING));
 		BlockState state = world.getBlockState(block_pos);
@@ -49,13 +49,15 @@ public class DyeItemDispenserBehavior extends FallibleItemDispenserBehavior{
 				
 				Direction direction = (Direction)pointer.getBlockState().get(DispenserBlock.FACING);
 				Direction direction2 = pointer.getWorld().isAir(block_pos.down()) ? direction : Direction.UP;
-				this.success = (((BlockItem)new_stack.getItem()).place(new AutomaticItemPlacementContext(pointer.getWorld(), block_pos, direction, new_stack, direction2)) == ActionResult.SUCCESS);
+				//this.success = (((BlockItem)new_stack.getItem()).place(new AutomaticItemPlacementContext(pointer.getWorld(), block_pos, direction, new_stack, direction2)) == ActionResult.SUCCESS);
+				this.setSuccess((((BlockItem)new_stack.getItem()).place(new AutomaticItemPlacementContext(pointer.getWorld(), block_pos, direction, new_stack, direction2)) == ActionResult.SUCCESS));
 				stack.decrement(1);
 			}
 			return stack;
 		}
 		
-		this.success = true;
+		//this.success = true;
+		this.setSuccess(true);
 		return super.dispenseSilently(pointer, stack);
 	}
 
diff --git a/src/main/java/re/jag/parquet/GlassBottleDispenserBehavior.java b/src/main/java/re/jag/parquet/GlassBottleDispenserBehavior.java
index 851a769..67f7097 100644
--- a/src/main/java/re/jag/parquet/GlassBottleDispenserBehavior.java
+++ b/src/main/java/re/jag/parquet/GlassBottleDispenserBehavior.java
@@ -34,27 +34,32 @@ public class GlassBottleDispenserBehavior extends FallibleItemDispenserBehavior
 	}
 	
 	public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
-		this.success = false;
+		//this.success = false;
 		World world = pointer.getWorld();
 		BlockPos block_pos = pointer.getBlockPos().offset((Direction)pointer.getBlockState().get(DispenserBlock.FACING));
 		BlockState state = world.getBlockState(block_pos);
 		Block block = state.getBlock();
-		if (block.matches(BlockTags.BEEHIVES) && ((Integer)state.get(BeehiveBlock.HONEY_LEVEL)).intValue() >= 5) {
+		//if (block.matches(BlockTags.BEEHIVES) && ...
+		if (state.method_27851(BlockTags.BEEHIVES, (abstractBlockState) -> { return abstractBlockState.contains(BeehiveBlock.HONEY_LEVEL); })
+				&& ((Integer)state.get(BeehiveBlock.HONEY_LEVEL)).intValue() >= 5) {
 			((BeehiveBlock)state.getBlock()).takeHoney(world, state, block_pos, null, BeehiveBlockEntity.BeeState.BEE_RELEASED);
-			this.success = true;
+			//this.success = true;
+			this.setSuccess(true);
 			return insert_first_free_or_drop(pointer, stack, new ItemStack(Items.HONEY_BOTTLE));
 		}
 		if (block instanceof CauldronBlock) {
 			int fill_level = state.get(CauldronBlock.LEVEL);
 			if(fill_level > 0) {
 				((CauldronBlock)block).setLevel(world, block_pos, state, fill_level - 1);
-				this.success = true;
+				//this.success = true;
+				this.setSuccess(true);
 				return insert_first_free_or_drop(pointer, stack, PotionUtil.setPotion( new ItemStack(Items.POTION), Potions.WATER ) );
 			}
 			return stack;
 		}
 		if (world.getFluidState(block_pos).matches(FluidTags.WATER)) {
-			this.success = true;
+			//this.success = true;
+			this.setSuccess(true);
 			return insert_first_free_or_drop(pointer, stack, PotionUtil.setPotion(new ItemStack(Items.POTION), Potions.WATER));
 		} 
 		return super.dispenseSilently(pointer, stack);
diff --git a/src/main/java/re/jag/parquet/PotionDispenserBehavior.java b/src/main/java/re/jag/parquet/PotionDispenserBehavior.java
index bdf6713..90c4c6b 100644
--- a/src/main/java/re/jag/parquet/PotionDispenserBehavior.java
+++ b/src/main/java/re/jag/parquet/PotionDispenserBehavior.java
@@ -16,7 +16,7 @@ import net.minecraft.world.World;
 
 public class PotionDispenserBehavior extends FallibleItemDispenserBehavior {
 	public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) { 
-		this.success = false;
+		//this.success = false;
 		World world = pointer.getWorld();
 		BlockPos block_pos = pointer.getBlockPos().offset((Direction)pointer.getBlockState().get(DispenserBlock.FACING));
 		BlockState state = world.getBlockState(block_pos);
@@ -28,7 +28,8 @@ public class PotionDispenserBehavior extends FallibleItemDispenserBehavior {
 				int fill_level = state.get(CauldronBlock.LEVEL);
 				if(fill_level < 3) {
 					((CauldronBlock)block).setLevel(world, block_pos, state, fill_level + 1);
-					this.success = true;
+					//this.success = true;
+					this.setSuccess(true);
 					return new ItemStack(Items.GLASS_BOTTLE, 1);
 				}
 				return stack;
diff --git a/src/main/java/re/jag/parquet/ShulkerPlacementDispenserBehavior.java b/src/main/java/re/jag/parquet/ShulkerPlacementDispenserBehavior.java
index 6efb849..dc048b3 100644
--- a/src/main/java/re/jag/parquet/ShulkerPlacementDispenserBehavior.java
+++ b/src/main/java/re/jag/parquet/ShulkerPlacementDispenserBehavior.java
@@ -16,7 +16,7 @@ import net.minecraft.util.math.Direction;
 
 public class ShulkerPlacementDispenserBehavior extends BlockPlacementDispenserBehavior{
 	protected ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
-		this.success = false;
+		//this.success = false;
 		
 		Item item = stack.getItem();
 		
@@ -36,7 +36,8 @@ public class ShulkerPlacementDispenserBehavior extends BlockPlacementDispenserBe
 						}
 						((CauldronBlock)state.getBlock()).setLevel(pointer.getWorld(), block_pos, state, fill_level - 1);
 						
-						this.success = true;
+						//this.success = true;
+						this.setSuccess(true);
 						return itemStack5;
 					}
 					
diff --git a/src/main/java/re/jag/parquet/WaterBucketDispenserBehavior.java b/src/main/java/re/jag/parquet/WaterBucketDispenserBehavior.java
index 8d38645..336ffda 100644
--- a/src/main/java/re/jag/parquet/WaterBucketDispenserBehavior.java
+++ b/src/main/java/re/jag/parquet/WaterBucketDispenserBehavior.java
@@ -16,15 +16,16 @@ import net.minecraft.world.World;
 public class WaterBucketDispenserBehavior extends FallibleItemDispenserBehavior{
 	
 	public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) { 
-		this.success = false;
+		//this.success = false;
 		
 		BucketItem bucket_item = (BucketItem)stack.getItem(); 
 		BlockPos block_pos = pointer.getBlockPos().offset((Direction)pointer.getBlockState().get(DispenserBlock.FACING)); 
 		World world = pointer.getWorld(); 
 		if (bucket_item.placeFluid(null, world, block_pos, null)) { 
 			bucket_item.onEmptied(world, stack, block_pos); 
-			this.success = true;
-			return new ItemStack(Items.BUCKET); 
+			//this.success = true;
+			this.setSuccess(true);
+			return new ItemStack(Items.BUCKET);
 		}
 		
 		BlockState state = pointer.getWorld().getBlockState(block_pos);
@@ -36,11 +37,12 @@ public class WaterBucketDispenserBehavior extends FallibleItemDispenserBehavior{
 			}
 			((CauldronBlock)facing_block).setLevel(world, block_pos, state, 3);
 			
-			this.success = true;
+			//this.success = true;
+			this.setSuccess(true);
 			return new ItemStack(Items.BUCKET, 1);
 		}
 
-		this.success = true;
+		this.setSuccess(true);
 		return this.dispense(pointer, stack); 
 	}
 }
diff --git a/src/main/java/re/jag/parquet/mixin/ServerPlayerEntityMixin.java b/src/main/java/re/jag/parquet/mixin/ServerPlayerEntityMixin.java
index aed4919..a46ba38 100644
--- a/src/main/java/re/jag/parquet/mixin/ServerPlayerEntityMixin.java
+++ b/src/main/java/re/jag/parquet/mixin/ServerPlayerEntityMixin.java
@@ -1,5 +1,6 @@
 package re.jag.parquet.mixin;
 
+import net.minecraft.util.math.BlockPos;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -22,8 +23,8 @@ import net.minecraft.nbt.Tag;
 @Mixin(ServerPlayerEntity.class)
 public abstract class ServerPlayerEntityMixin extends PlayerEntity implements CameraModeData{
 	
-	public ServerPlayerEntityMixin(World world, GameProfile profile) {
-		super(world, profile);
+	public ServerPlayerEntityMixin(World world, BlockPos pos, GameProfile profile) {
+		super(world, pos, profile);
 	}
 
 	private double saved_x, saved_y, saved_z;