Merge pull request #21 from ModFest/mf-1.21

HamaIndustries · web-flow · commit 14f56058c350 · 2024-11-29T13:45:18.000-08:00
create tag blocking sneak click interacts
diff --git a/gradle.properties b/gradle.properties
@@ -17,7 +17,7 @@ authors=jaskarth, unascribed
 contributors=Patbox, IThundxr
 license=AGPL-3.0-or-later
 # Mod Version
-baseVersion=0.6.0
+baseVersion=0.6.1
 # Branch Metadata
 branch=1.21
 tagBranch=1.21
diff --git a/src/main/java/net/modfest/fireblanket/FireblanketConstants.java b/src/main/java/net/modfest/fireblanket/FireblanketConstants.java
@@ -13,8 +13,11 @@ public class FireblanketConstants {
 	public static final String MOD_ID = "fireblanket";
 
 	public static final TagKey<Block> BLOCK_INTERACTION_RESTRICTED = tag(RegistryKeys.BLOCK, "block_interaction_restricted");
+	public static final TagKey<Block> BLOCK_SNEAK_INTERACTION_RESTRICTED = tag(RegistryKeys.BLOCK, "block_sneak_interaction_restricted");
 	public static final TagKey<Item> ITEM_INTERACTION_RESTRICTED = tag(RegistryKeys.ITEM, "item_interaction_restricted");
+	public static final TagKey<Item> ITEM_SNEAK_INTERACTION_RESTRICTED = tag(RegistryKeys.ITEM, "item_sneak_interaction_restricted");
 	public static final TagKey<EntityType<?>> ENTITY_INTERACTION_RESTRICTED = tag(RegistryKeys.ENTITY_TYPE, "entity_interaction_restricted");
+	public static final TagKey<EntityType<?>> ENTITY_SNEAK_INTERACTION_RESTRICTED = tag(RegistryKeys.ENTITY_TYPE, "entity_sneak_interaction_restricted");
 
 	public static final TagKey<EntityType<?>> ENTITY_ATTACK_RESTRICTED = tag(RegistryKeys.ENTITY_TYPE, "entity_attack_restricted");
 
diff --git a/src/main/java/net/modfest/fireblanket/mixin/adventure_fix/MixinItemStack.java b/src/main/java/net/modfest/fireblanket/mixin/adventure_fix/MixinItemStack.java
@@ -10,6 +10,7 @@
 import net.minecraft.util.TypedActionResult;
 import net.minecraft.world.World;
 import net.modfest.fireblanket.FireblanketConstants;
+import net.modfest.fireblanket.mixinsupport.InteractionCheck;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -27,15 +28,15 @@ public abstract class MixinItemStack {
 	private void fireblanket$filterItemUseOnBlockByTag(ItemUsageContext context, CallbackInfoReturnable<ActionResult> ci) {
 		PlayerEntity player = context.getPlayer();
 		if (player == null) return;
-		if (!player.getAbilities().allowModifyWorld && this.isIn(FireblanketConstants.ITEM_INTERACTION_RESTRICTED)) {
+		if (!player.getAbilities().allowModifyWorld && InteractionCheck.preventUseItem(player, (ItemStack)(Object)this)) {
 			ci.setReturnValue(ActionResult.FAIL);
 			ci.cancel();
 		}
 	}
 
 	@Inject(method = "use", at = @At("HEAD"), cancellable = true)
 	private void fireblanket$filterItemUseByTag(World world, PlayerEntity user, Hand hand, CallbackInfoReturnable<TypedActionResult<ItemStack>> ci) {
-		if (!user.getAbilities().allowModifyWorld && this.isIn(FireblanketConstants.ITEM_INTERACTION_RESTRICTED)) {
+		if (!user.getAbilities().allowModifyWorld && InteractionCheck.preventUseItem(user, (ItemStack)(Object)this)) {
 			ci.setReturnValue(TypedActionResult.fail(user.getStackInHand(hand)));
 			ci.cancel();
 		}
diff --git a/src/main/java/net/modfest/fireblanket/mixin/adventure_fix/MixinPlayerInteractEntityC2SPacketHandler.java b/src/main/java/net/modfest/fireblanket/mixin/adventure_fix/MixinPlayerInteractEntityC2SPacketHandler.java
@@ -6,6 +6,7 @@
 import net.minecraft.server.network.ServerPlayNetworkHandler;
 import net.minecraft.util.Hand;
 import net.modfest.fireblanket.FireblanketConstants;
+import net.modfest.fireblanket.mixinsupport.InteractionCheck;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -34,9 +35,8 @@ public class MixinPlayerInteractEntityC2SPacketHandler {
 	private void fireblanket$filterEntityInteractByTag(Hand hand, ServerPlayNetworkHandler.Interaction action, CallbackInfo ci) {
 		PlayerEntity player = field_28963.player;
 		ItemStack stack = player.getStackInHand(hand);
-		if (!player.getAbilities().allowModifyWorld && (
-				stack.isIn(FireblanketConstants.ITEM_INTERACTION_RESTRICTED) ||
-				field_28962.getType().isIn(FireblanketConstants.ENTITY_INTERACTION_RESTRICTED))) {
+		if (!player.getAbilities().allowModifyWorld &&
+			(InteractionCheck.preventUseItem(player, stack) || InteractionCheck.preventUseEntity(player, field_28962.getType()))) {
 			ci.cancel();
 		}
 	}
@@ -48,7 +48,7 @@ public class MixinPlayerInteractEntityC2SPacketHandler {
 	)
 	private void fireblanket$filterAttackEntityByTag(CallbackInfo ci) {
 		PlayerEntity player = field_28963.player;
-		if (!player.getAbilities().allowModifyWorld && field_28962.getType().isIn(FireblanketConstants.ENTITY_ATTACK_RESTRICTED)) {
+		if (!player.getAbilities().allowModifyWorld && InteractionCheck.preventAttackEntity(player, field_28962.getType())) {
 			ci.cancel();
 		}
 	}
diff --git a/src/main/java/net/modfest/fireblanket/mixin/adventure_fix/MixinServerPlayerInteractionManager.java b/src/main/java/net/modfest/fireblanket/mixin/adventure_fix/MixinServerPlayerInteractionManager.java
@@ -12,6 +12,7 @@
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.world.World;
 import net.modfest.fireblanket.FireblanketConstants;
+import net.modfest.fireblanket.mixinsupport.InteractionCheck;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
@@ -23,10 +24,10 @@ public class MixinServerPlayerInteractionManager {
 	)
 	private ItemActionResult fireblanket$filterItemBlockInteractByTag(BlockState blockState, ItemStack stack, World world, PlayerEntity player, Hand hand, BlockHitResult hitResult, Operation<ItemActionResult> op) {
 		if (!player.getAbilities().allowModifyWorld) {
-			if (stack.isIn(FireblanketConstants.ITEM_INTERACTION_RESTRICTED)) {
+			if (InteractionCheck.preventUseItem(player, stack)) {
 				return ItemActionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
 			}
-			if (blockState.isIn(FireblanketConstants.BLOCK_INTERACTION_RESTRICTED)) {
+			if (InteractionCheck.preventUseBlock(player, blockState)) {
 				return ItemActionResult.FAIL;
 			}
 		}
@@ -38,7 +39,7 @@ public class MixinServerPlayerInteractionManager {
 		at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;onUse(Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/hit/BlockHitResult;)Lnet/minecraft/util/ActionResult;")
 	)
 	private ActionResult fireblanket$filterBlockInteractByTag(BlockState blockState, World world, PlayerEntity player, BlockHitResult hitResult, Operation<ActionResult> op) {
-		if (!player.getAbilities().allowModifyWorld && blockState.isIn(FireblanketConstants.BLOCK_INTERACTION_RESTRICTED)) {
+		if (!player.getAbilities().allowModifyWorld && InteractionCheck.preventUseBlock(player, blockState)) {
 			return ActionResult.FAIL;
 		}
 		return op.call(blockState, world, player, hitResult);
diff --git a/src/main/java/net/modfest/fireblanket/mixin/client/adventure_fix/MixinClientPlayerInteractionManager.java b/src/main/java/net/modfest/fireblanket/mixin/client/adventure_fix/MixinClientPlayerInteractionManager.java
@@ -14,6 +14,7 @@
 import net.minecraft.util.hit.EntityHitResult;
 import net.minecraft.world.World;
 import net.modfest.fireblanket.FireblanketConstants;
+import net.modfest.fireblanket.mixinsupport.InteractionCheck;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -28,8 +29,8 @@ public class MixinClientPlayerInteractionManager {
 		cancellable = true)
 	private void fireblanket$filterEntityInteractByTag(PlayerEntity player, Entity entity, Hand hand, CallbackInfoReturnable<ActionResult> ci) {
 		if (!player.getAbilities().allowModifyWorld && (
-				entity.getType().isIn(FireblanketConstants.ENTITY_INTERACTION_RESTRICTED) ||
-				player.getStackInHand(hand).isIn(FireblanketConstants.ITEM_INTERACTION_RESTRICTED))) {
+				InteractionCheck.preventUseEntity(player, entity.getType()) ||
+				InteractionCheck.preventUseItem(player, player.getStackInHand(hand)))) {
 			ci.setReturnValue(ActionResult.FAIL);
 			ci.cancel();
 		}
@@ -42,8 +43,8 @@ public class MixinClientPlayerInteractionManager {
 	)
 	private void fireblanket$filterEntityInteractAtLocationByTag(PlayerEntity player, Entity entity, EntityHitResult hitResult, Hand hand, CallbackInfoReturnable<ActionResult> ci) {
 		if (!player.getAbilities().allowModifyWorld && (
-				entity.getType().isIn(FireblanketConstants.ENTITY_INTERACTION_RESTRICTED) ||
-				player.getStackInHand(hand).isIn(FireblanketConstants.ITEM_INTERACTION_RESTRICTED))) {
+			InteractionCheck.preventUseEntity(player, entity.getType()) ||
+			InteractionCheck.preventUseItem(player, player.getStackInHand(hand)))) {
 			ci.setReturnValue(ActionResult.FAIL);
 			ci.cancel();
 		}
@@ -55,10 +56,10 @@ public class MixinClientPlayerInteractionManager {
 	)
 	private ItemActionResult fireblanket$filterItemBlockInteractByTag(BlockState blockState, ItemStack stack, World world, PlayerEntity player, Hand hand, BlockHitResult hitResult, Operation<ItemActionResult> op) {
  		if (!player.getAbilities().allowModifyWorld) {
-			if (stack.isIn(FireblanketConstants.ITEM_INTERACTION_RESTRICTED)) {
+			if (InteractionCheck.preventUseItem(player, stack)) {
 				return ItemActionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
 			}
-			if (blockState.isIn(FireblanketConstants.BLOCK_INTERACTION_RESTRICTED)) {
+			if (InteractionCheck.preventUseBlock(player, blockState)) {
 				return ItemActionResult.FAIL;
 			}
 		}
@@ -70,7 +71,7 @@ public class MixinClientPlayerInteractionManager {
 		at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;onUse(Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/hit/BlockHitResult;)Lnet/minecraft/util/ActionResult;")
 	)
 	private ActionResult fireblanket$filterBlockInteractByTag(BlockState blockState, World world, PlayerEntity player, BlockHitResult hitResult, Operation<ActionResult> op) {
-		if (!player.getAbilities().allowModifyWorld && blockState.isIn(FireblanketConstants.BLOCK_INTERACTION_RESTRICTED)) {
+		if (!player.getAbilities().allowModifyWorld && InteractionCheck.preventUseBlock(player, blockState)) {
 			return ActionResult.FAIL;
 		}
 		return op.call(blockState, world, player, hitResult);
@@ -82,7 +83,7 @@ public class MixinClientPlayerInteractionManager {
 		cancellable = true
 	)
 	private void fireblanket$filterAttackEntityByTag(PlayerEntity player, Entity target, CallbackInfo ci) {
-		if (!player.getAbilities().allowModifyWorld && target.getType().isIn(FireblanketConstants.ENTITY_ATTACK_RESTRICTED)) {
+		if (!player.getAbilities().allowModifyWorld && InteractionCheck.preventAttackEntity(player, target.getType())) {
 			ci.cancel();
 		}
 	}
diff --git a/src/main/java/net/modfest/fireblanket/mixinsupport/InteractionCheck.java b/src/main/java/net/modfest/fireblanket/mixinsupport/InteractionCheck.java
@@ -0,0 +1,29 @@
+package net.modfest.fireblanket.mixinsupport;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.modfest.fireblanket.FireblanketConstants;
+
+public class InteractionCheck {
+	public static boolean preventUseItem(PlayerEntity player, ItemStack stack) {
+		return stack.isIn(FireblanketConstants.ITEM_INTERACTION_RESTRICTED)
+			||  (player.isSneaking() && stack.isIn(FireblanketConstants.ITEM_SNEAK_INTERACTION_RESTRICTED));
+	}
+
+	public static boolean preventUseBlock(PlayerEntity player, BlockState blockState) {
+		return blockState.isIn(FireblanketConstants.BLOCK_INTERACTION_RESTRICTED)
+			|| (player.isSneaking() && blockState.isIn(FireblanketConstants.BLOCK_SNEAK_INTERACTION_RESTRICTED));
+	}
+
+	public static boolean preventUseEntity(PlayerEntity player, EntityType<?> entity) {
+		return entity.isIn(FireblanketConstants.ENTITY_INTERACTION_RESTRICTED)
+			|| (player.isSneaking() && entity.isIn(FireblanketConstants.ENTITY_SNEAK_INTERACTION_RESTRICTED));
+	}
+
+	public static boolean preventAttackEntity(PlayerEntity player, EntityType<?> entity) {
+		return entity.isIn(FireblanketConstants.ENTITY_ATTACK_RESTRICTED);
+	}
+}
diff --git a/src/main/resources/data/fireblanket/tags/block/block_interaction_restricted.json b/src/main/resources/data/fireblanket/tags/block/block_interaction_restricted.json
@@ -5,7 +5,6 @@
 		"#minecraft:fence_gates",
 		"minecraft:barrel",
 		"minecraft:chest",
-		"minecraft:trapped_chest",
 		"minecraft:chiseled_bookshelf",
 		"minecraft:repeater",
 		"minecraft:comparator",
diff --git a/src/main/resources/data/fireblanket/tags/block/block_sneak_interaction_restricted.json b/src/main/resources/data/fireblanket/tags/block/block_sneak_interaction_restricted.json
@@ -0,0 +1,5 @@
+{
+	"values": [
+		"minecraft:lectern"
+	]
+}

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`import net.minecraft.server.network.ServerPlayNetworkHandler;`
`7`	`7`	`import net.minecraft.util.Hand;`
`8`	`8`	`import net.modfest.fireblanket.FireblanketConstants;`
	`9`	`+import net.modfest.fireblanket.mixinsupport.InteractionCheck;`
`9`	`10`	`import org.spongepowered.asm.mixin.Final;`
`10`	`11`	`import org.spongepowered.asm.mixin.Mixin;`
`11`	`12`	`import org.spongepowered.asm.mixin.Shadow;`
`@@ -34,9 +35,8 @@ public class MixinPlayerInteractEntityC2SPacketHandler {`
`34`	`35`	`private void fireblanket$filterEntityInteractByTag(Hand hand, ServerPlayNetworkHandler.Interaction action, CallbackInfo ci) {`
`35`	`36`	`PlayerEntity player = field_28963.player;`
`36`	`37`	`ItemStack stack = player.getStackInHand(hand);`
`37`		`- if (!player.getAbilities().allowModifyWorld && (`
`38`		`- stack.isIn(FireblanketConstants.ITEM_INTERACTION_RESTRICTED) \|\|`
`39`		`- field_28962.getType().isIn(FireblanketConstants.ENTITY_INTERACTION_RESTRICTED))) {`
	`38`	`+ if (!player.getAbilities().allowModifyWorld &&`
	`39`	`+ (InteractionCheck.preventUseItem(player, stack) \|\| InteractionCheck.preventUseEntity(player, field_28962.getType()))) {`
`40`	`40`	`ci.cancel();`
`41`	`41`	`}`
`42`	`42`	`}`
`@@ -48,7 +48,7 @@ public class MixinPlayerInteractEntityC2SPacketHandler {`
`48`	`48`	`)`
`49`	`49`	`private void fireblanket$filterAttackEntityByTag(CallbackInfo ci) {`
`50`	`50`	`PlayerEntity player = field_28963.player;`
`51`		`- if (!player.getAbilities().allowModifyWorld && field_28962.getType().isIn(FireblanketConstants.ENTITY_ATTACK_RESTRICTED)) {`
	`51`	`+ if (!player.getAbilities().allowModifyWorld && InteractionCheck.preventAttackEntity(player, field_28962.getType())) {`
`52`	`52`	`ci.cancel();`
`53`	`53`	`}`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`import net.minecraft.util.hit.BlockHitResult;`
`13`	`13`	`import net.minecraft.world.World;`
`14`	`14`	`import net.modfest.fireblanket.FireblanketConstants;`
	`15`	`+import net.modfest.fireblanket.mixinsupport.InteractionCheck;`
`15`	`16`	`import org.spongepowered.asm.mixin.Mixin;`
`16`	`17`	`import org.spongepowered.asm.mixin.injection.At;`
`17`	`18`
`@@ -23,10 +24,10 @@ public class MixinServerPlayerInteractionManager {`
`23`	`24`	`)`
`24`	`25`	`private ItemActionResult fireblanket$filterItemBlockInteractByTag(BlockState blockState, ItemStack stack, World world, PlayerEntity player, Hand hand, BlockHitResult hitResult, Operation<ItemActionResult> op) {`
`25`	`26`	`if (!player.getAbilities().allowModifyWorld) {`
`26`		`- if (stack.isIn(FireblanketConstants.ITEM_INTERACTION_RESTRICTED)) {`
	`27`	`+ if (InteractionCheck.preventUseItem(player, stack)) {`
`27`	`28`	`return ItemActionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;`
`28`	`29`	`}`
`29`		`- if (blockState.isIn(FireblanketConstants.BLOCK_INTERACTION_RESTRICTED)) {`
	`30`	`+ if (InteractionCheck.preventUseBlock(player, blockState)) {`
`30`	`31`	`return ItemActionResult.FAIL;`
`31`	`32`	`}`
`32`	`33`	`}`
`@@ -38,7 +39,7 @@ public class MixinServerPlayerInteractionManager {`
`38`	`39`	`at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;onUse(Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/hit/BlockHitResult;)Lnet/minecraft/util/ActionResult;")`
`39`	`40`	`)`
`40`	`41`	`private ActionResult fireblanket$filterBlockInteractByTag(BlockState blockState, World world, PlayerEntity player, BlockHitResult hitResult, Operation<ActionResult> op) {`
`41`		`- if (!player.getAbilities().allowModifyWorld && blockState.isIn(FireblanketConstants.BLOCK_INTERACTION_RESTRICTED)) {`
	`42`	`+ if (!player.getAbilities().allowModifyWorld && InteractionCheck.preventUseBlock(player, blockState)) {`
`42`	`43`	`return ActionResult.FAIL;`
`43`	`44`	`}`
`44`	`45`	`return op.call(blockState, world, player, hitResult);`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`import net.minecraft.util.hit.EntityHitResult;`
`15`	`15`	`import net.minecraft.world.World;`
`16`	`16`	`import net.modfest.fireblanket.FireblanketConstants;`
	`17`	`+import net.modfest.fireblanket.mixinsupport.InteractionCheck;`
`17`	`18`	`import org.spongepowered.asm.mixin.Mixin;`
`18`	`19`	`import org.spongepowered.asm.mixin.injection.At;`
`19`	`20`	`import org.spongepowered.asm.mixin.injection.Inject;`
`@@ -28,8 +29,8 @@ public class MixinClientPlayerInteractionManager {`
`28`	`29`	`cancellable = true)`
`29`	`30`	`private void fireblanket$filterEntityInteractByTag(PlayerEntity player, Entity entity, Hand hand, CallbackInfoReturnable<ActionResult> ci) {`
`30`	`31`	`if (!player.getAbilities().allowModifyWorld && (`
`31`		`- entity.getType().isIn(FireblanketConstants.ENTITY_INTERACTION_RESTRICTED) \|\|`
`32`		`- player.getStackInHand(hand).isIn(FireblanketConstants.ITEM_INTERACTION_RESTRICTED))) {`
	`32`	`+ InteractionCheck.preventUseEntity(player, entity.getType()) \|\|`
	`33`	`+ InteractionCheck.preventUseItem(player, player.getStackInHand(hand)))) {`
`33`	`34`	`ci.setReturnValue(ActionResult.FAIL);`
`34`	`35`	`ci.cancel();`
`35`	`36`	`}`
`@@ -42,8 +43,8 @@ public class MixinClientPlayerInteractionManager {`
`42`	`43`	`)`
`43`	`44`	`private void fireblanket$filterEntityInteractAtLocationByTag(PlayerEntity player, Entity entity, EntityHitResult hitResult, Hand hand, CallbackInfoReturnable<ActionResult> ci) {`
`44`	`45`	`if (!player.getAbilities().allowModifyWorld && (`
`45`		`- entity.getType().isIn(FireblanketConstants.ENTITY_INTERACTION_RESTRICTED) \|\|`
`46`		`- player.getStackInHand(hand).isIn(FireblanketConstants.ITEM_INTERACTION_RESTRICTED))) {`
	`46`	`+ InteractionCheck.preventUseEntity(player, entity.getType()) \|\|`
	`47`	`+ InteractionCheck.preventUseItem(player, player.getStackInHand(hand)))) {`
`47`	`48`	`ci.setReturnValue(ActionResult.FAIL);`
`48`	`49`	`ci.cancel();`
`49`	`50`	`}`
`@@ -55,10 +56,10 @@ public class MixinClientPlayerInteractionManager {`
`55`	`56`	`)`
`56`	`57`	`private ItemActionResult fireblanket$filterItemBlockInteractByTag(BlockState blockState, ItemStack stack, World world, PlayerEntity player, Hand hand, BlockHitResult hitResult, Operation<ItemActionResult> op) {`
`57`	`58`	`if (!player.getAbilities().allowModifyWorld) {`
`58`		`- if (stack.isIn(FireblanketConstants.ITEM_INTERACTION_RESTRICTED)) {`
	`59`	`+ if (InteractionCheck.preventUseItem(player, stack)) {`
`59`	`60`	`return ItemActionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;`
`60`	`61`	`}`
`61`		`- if (blockState.isIn(FireblanketConstants.BLOCK_INTERACTION_RESTRICTED)) {`
	`62`	`+ if (InteractionCheck.preventUseBlock(player, blockState)) {`
`62`	`63`	`return ItemActionResult.FAIL;`
`63`	`64`	`}`
`64`	`65`	`}`
`@@ -70,7 +71,7 @@ public class MixinClientPlayerInteractionManager {`
`70`	`71`	`at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;onUse(Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/hit/BlockHitResult;)Lnet/minecraft/util/ActionResult;")`
`71`	`72`	`)`
`72`	`73`	`private ActionResult fireblanket$filterBlockInteractByTag(BlockState blockState, World world, PlayerEntity player, BlockHitResult hitResult, Operation<ActionResult> op) {`
`73`		`- if (!player.getAbilities().allowModifyWorld && blockState.isIn(FireblanketConstants.BLOCK_INTERACTION_RESTRICTED)) {`
	`74`	`+ if (!player.getAbilities().allowModifyWorld && InteractionCheck.preventUseBlock(player, blockState)) {`
`74`	`75`	`return ActionResult.FAIL;`
`75`	`76`	`}`
`76`	`77`	`return op.call(blockState, world, player, hitResult);`
`@@ -82,7 +83,7 @@ public class MixinClientPlayerInteractionManager {`
`82`	`83`	`cancellable = true`
`83`	`84`	`)`
`84`	`85`	`private void fireblanket$filterAttackEntityByTag(PlayerEntity player, Entity target, CallbackInfo ci) {`
`85`		`- if (!player.getAbilities().allowModifyWorld && target.getType().isIn(FireblanketConstants.ENTITY_ATTACK_RESTRICTED)) {`
	`86`	`+ if (!player.getAbilities().allowModifyWorld && InteractionCheck.preventAttackEntity(player, target.getType())) {`
`86`	`87`	`ci.cancel();`
`87`	`88`	`}`
`88`	`89`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +	"values": [
 +		"minecraft:lectern"
 +	]
 +}