Deduplicate code for shearing entities into Shearables#shearEntity

Author: coderbot16

patchwork-extensions-shearing/src/main/java/com/patchworkmc/impl/extensions/shearing/Shearables.java

@@ -0,0 +1,64 @@
+/*
+ * Minecraft Forge, Patchwork Project
+ * Copyright (c) 2016-2019, 2019
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation version 2.1
+ * of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package com.patchworkmc.impl.extensions.shearing;
+
+import java.util.List;
+import java.util.Random;
+
+import net.minecraftforge.common.IShearable;
+
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.enchantment.Enchantments;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.ItemEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IWorld;
+
+public class Shearables {
+	public static void shearEntity(ItemStack stack, IWorld world, BlockPos pos, IShearable target) {
+		if (!(target instanceof Entity)) {
+			throw new IllegalArgumentException("Tried to call shearEntity on something that was not an entity!");
+		}
+
+		Entity entity = (Entity) target;
+
+		List<ItemStack> drops = target.onSheared(stack, world, pos, EnchantmentHelper.getLevel(Enchantments.FORTUNE, stack));
+		Random rand = world.getRandom();
+
+		for (ItemStack drop : drops) {
+			ItemEntity item = entity.dropStack(drop, 1.0F);
+
+			if (item == null) {
+				continue;
+			}
+
+			float accelerationX = (rand.nextFloat() - rand.nextFloat()) * 0.1F;
+			float accelerationY = rand.nextFloat() * 0.05F;
+			float accelerationZ = (rand.nextFloat() - rand.nextFloat()) * 0.1F;
+
+			item.setVelocity(item.getVelocity().add(accelerationX, accelerationY, accelerationZ));
+		}
+
+		if (stack.damage(1, world.getRandom(), null)) {
+			stack.setCount(0);
+		}
+	}
+}

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

@@ -20,24 +20,22 @@
 package com.patchworkmc.mixin.extensions.shearing;
 
 import java.util.List;
-import java.util.Random;
 
 import net.minecraftforge.common.IShearable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
-import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.Shadow;
 
 import net.minecraft.block.DispenserBlock;
-import net.minecraft.enchantment.EnchantmentHelper;
-import net.minecraft.enchantment.Enchantments;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.ItemEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPointer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
 import net.minecraft.world.World;
 
+import com.patchworkmc.impl.extensions.shearing.Shearables;
+
 /**
  * Patches the inner class containing the logic for dispensers when using shears, to allow them to shear any
  * {@link IShearable} entity.
@@ -46,7 +44,7 @@
  */
 @Mixin(targets = "net/minecraft/block/dispenser/DispenserBehavior$13")
 public class MixinDispenserBehavior {
-	@Unique
+	@Shadow
 	protected boolean success;
 
 	/**
@@ -61,24 +59,20 @@ public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
 		if (!world.isClient()) {
 			this.success = false;
 			BlockPos pos = pointer.getBlockPos().offset(pointer.getBlockState().get(DispenserBlock.FACING));
-			List<Entity> entities = world.getEntities(Entity.class, new Box(pos));
+			List<Entity> entities = world.getEntities(Entity.class, new Box(pos),
+					entity -> !entity.isSpectator() && entity instanceof IShearable
+			);
 
 			for (Entity entity : entities) {
-				if (entity instanceof IShearable) {
-					IShearable target = (IShearable) entity;
+				IShearable target = (IShearable) entity;
 
-					if (target.isShearable(stack, world, pos)) {
-						List<ItemStack> drops = target.onSheared(stack, world, pos, EnchantmentHelper.getLevel(Enchantments.FORTUNE, stack));
-						Random rand = new Random();
+				if (!target.isShearable(stack, world, pos)) {
+					continue;
+				}
 
-						for (ItemStack drop : drops) {
-							ItemEntity ent = entity.dropStack(drop, 1.0F);
-							ent.setVelocity(ent.getVelocity().add((rand.nextFloat() - rand.nextFloat()) * 0.1F, rand.nextFloat() * 0.05F, (rand.nextFloat() - rand.nextFloat()) * 0.1F));
-						}
+				Shearables.shearEntity(stack, world, pos, target);
 
-						this.success = true;
-					}
-				}
+				this.success = true;
 			}
 		}
 

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

@@ -19,15 +19,9 @@
 
 package com.patchworkmc.mixin.extensions.shearing;
 
-import java.util.List;
-import java.util.Random;
-
 import net.minecraftforge.common.IShearable;
 import org.spongepowered.asm.mixin.Mixin;
 
-import net.minecraft.enchantment.EnchantmentHelper;
-import net.minecraft.enchantment.Enchantments;
-import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
@@ -36,6 +30,8 @@
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 
+import com.patchworkmc.impl.extensions.shearing.Shearables;
+
 /**
  * Patch {@link ShearsItem} to allow it to shear any {@link IShearable}.
  *
@@ -58,15 +54,7 @@ public boolean useOnEntity(ItemStack stack, PlayerEntity playerIn, LivingEntity
 			BlockPos pos = entity.getBlockPos();
 
 			if (target.isShearable(stack, entity.world, pos)) {
-				List<ItemStack> drops = target.onSheared(stack, entity.world, pos, EnchantmentHelper.getLevel(Enchantments.FORTUNE, stack));
-				Random rand = new Random();
-
-				for (ItemStack drop : drops) {
-					ItemEntity ent = entity.dropStack(drop, 1.0F);
-					ent.setVelocity(ent.getVelocity().add((rand.nextFloat() - rand.nextFloat()) * 0.1F, rand.nextFloat() * 0.05F, (rand.nextFloat() - rand.nextFloat()) * 0.1F));
-				}
-
-				stack.damage(1, entity, e -> e.sendToolBreakStatus(hand));
+				Shearables.shearEntity(stack, entity.world, pos, target);
 			}
 
 			return true;