No longer use IShearable for fully vanilla ShearsItem interactions, removing 2 of the 3 Overwrites.

Author: coderbot16

patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinMooshroomEntity.java

@@ -39,7 +39,7 @@
 import net.minecraft.world.World;
 
 /**
- * Patches MooshroomEntity to allow shearing when the mooshroom is an adult, dropping mushrooms. This patch cancels the vanilla shearing code.
+ * Patches {@link MooshroomEntity} to allow using {@link IShearable} for shearing the mooshroom when it is an adult, dropping mushrooms.
  *
  * @author SuperCoder79
  */

patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinShearsItem.java

@@ -22,10 +22,12 @@
 import net.minecraftforge.common.IShearable;
 import org.spongepowered.asm.mixin.Mixin;
 
+import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
 import net.minecraft.item.ShearsItem;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
@@ -49,6 +51,15 @@ public boolean useOnEntity(ItemStack stack, PlayerEntity playerIn, LivingEntity
 			return false;
 		}
 
+		// Avoid duplicating vanilla interactions
+		if (this == Items.SHEARS) {
+			EntityType<?> type = entity.getType();
+
+			if (type == EntityType.MOOSHROOM || type == EntityType.SHEEP || type == EntityType.SNOW_GOLEM) {
+				return false;
+			}
+		}
+
 		if (entity instanceof IShearable) {
 			IShearable target = (IShearable) entity;
 			BlockPos pos = entity.getBlockPos();

patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinSheepEntity.java

@@ -25,25 +25,22 @@
 import net.minecraftforge.common.IShearable;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
 
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.passive.AnimalEntity;
 import net.minecraft.entity.passive.SheepEntity;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemConvertible;
 import net.minecraft.item.ItemStack;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.DyeColor;
-import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IWorld;
 import net.minecraft.world.ViewableWorld;
 import net.minecraft.world.World;
 
 /**
- * Patches {@link SheepEntity} to use {@link IShearable} for dropping wool. This patch cancels the vanilla shearing code.
+ * Patches {@link SheepEntity} to allow using {@link IShearable} for dropping wool.
  *
  * @author SuperCoder79
  */
@@ -89,14 +86,4 @@ public List<ItemStack> onSheared(ItemStack item, IWorld world, BlockPos pos, int
 		this.playSound(SoundEvents.ENTITY_SHEEP_SHEAR, 1.0F, 1.0F);
 		return drops;
 	}
-
-	/**
-	 * @reason The original patch only required a cancellation at the HEAD, but @Overwrite was chosen to make
-	 * mod incompatibility easier to find.
-	 * @author SuperCoder79
-	 */
-	@Overwrite
-	public boolean interactMob(PlayerEntity player, Hand hand) {
-		return false;
-	}
 }

patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinSnowGolemEntity.java

@@ -24,19 +24,16 @@
 
 import net.minecraftforge.common.IShearable;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
 
 import net.minecraft.entity.passive.SnowGolemEntity;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IWorld;
 import net.minecraft.world.ViewableWorld;
 
 /**
- * Patches {@link SnowGolemEntity} to use {@link IShearable} for removing its pumpkin. The pumpkin will not be dropped as an item. This patch cancels the vanilla shearing code.
+ * Patches {@link SnowGolemEntity} to allow using {@link IShearable} for removing its pumpkin. The pumpkin will not be dropped as an item.
  *
  * @author SuperCoder79
  */
@@ -59,14 +56,4 @@ public List<ItemStack> onSheared(ItemStack item, IWorld world, BlockPos pos, int
 
 		return new ArrayList<>();
 	}
-
-	/**
-	 * @reason The original patch only required a cancellation at the HEAD, but @Overwrite was chosen to make
-	 * mod incompatibility easier to find.
-	 * @author SuperCoder79
-	 */
-	@Overwrite
-	public boolean interactMob(PlayerEntity player, Hand hand) {
-		return false;
-	}
 }