Fix nitpicks with shearing code

Author: coderbot16

patchwork-dispatcher/src/main/java/com/patchworkmc/api/redirects/itemgroup/PatchworkItemGroup.java

@@ -37,11 +37,11 @@ private static int getNewArrayIndex() {
 		return GROUPS.length - 1;
 	}
 
-	/*// Note: uncomment this in dev
+	// Note: uncomment this in dev
 	public net.minecraft.item.ItemStack createIcon() {
 		return method_7750();
 	}
 
 	// TODO: Missing required classpath information in remapper!
-	public abstract net.minecraft.item.ItemStack method_7750();*/
+	public abstract net.minecraft.item.ItemStack method_7750();
 }

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

@@ -26,6 +26,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
+import net.minecraft.block.Block;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.passive.CowEntity;
 import net.minecraft.entity.passive.MooshroomEntity;
@@ -52,7 +53,7 @@ public MixinMooshroomEntity(EntityType<? extends CowEntity> entityType, World wo
 	}
 
 	@Override
-	public boolean isShearable(ItemStack item, ViewableWorld world, net.minecraft.util.math.BlockPos pos) {
+	public boolean isShearable(ItemStack item, ViewableWorld world, BlockPos pos) {
 		return this.getBreedingAge() >= 0;
 	}
 
@@ -74,9 +75,11 @@ public List<ItemStack> onSheared(ItemStack item, IWorld world, BlockPos pos, int
 			}
 
 			this.world.spawnEntity(cow);
+			Block mushroom = this.getMooshroomType().getMushroomState().getBlock();
 
-			for (int i = 0; i < 5; ++i) { //Fixes forge bug where shearing brown mooshrooms always drop red mushrooms
-				drops.add(new ItemStack(this.getMooshroomType().getMushroomState().getBlock()));
+			// TODO: Fixes forge bug where shearing brown mooshrooms always drop red mushrooms (Fixed in 1.15)
+			for (int i = 0; i < 5; ++i) {
+				drops.add(new ItemStack(mushroom));
 			}
 
 			this.playSound(SoundEvents.ENTITY_MOOSHROOM_SHEAR, 1.0F, 1.0F);

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

@@ -31,7 +31,7 @@
 import net.minecraft.block.VineBlock;
 
 /**
- * Patches blocks to extend {@link IShearable}.
+ * Patches blocks to implement {@link IShearable}.
  *
  * @author SuperCoder79
  */

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

@@ -38,6 +38,7 @@
 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;
 
@@ -71,15 +72,17 @@ public boolean isShearable(ItemStack item, ViewableWorld world, BlockPos pos) {
 	}
 
 	@Override
-	public List<ItemStack> onSheared(ItemStack item, net.minecraft.world.IWorld world, BlockPos pos, int fortune) {
+	public List<ItemStack> onSheared(ItemStack item, IWorld world, BlockPos pos, int fortune) {
 		List<ItemStack> drops = new java.util.ArrayList<>();
 
 		if (!this.world.isClient) {
 			this.setSheared(true);
+
 			int count = 1 + this.random.nextInt(3);
+			ItemConvertible wool = DROPS.get(this.getColor());
 
-			for (int i = 0; i < count; ++i) {
-				drops.add(new ItemStack(DROPS.get(this.getColor())));
+			for (int i = 0; i < count; i++) {
+				drops.add(new ItemStack(wool));
 			}
 		}
 

patchwork-extensions-shearing/src/main/java/net/minecraftforge/common/IShearable.java

@@ -31,31 +31,31 @@
  * This allows for mods to create their own Shear-like items
  * and have them interact with entities without extra work.
  * Also, if your block/entity supports shears, this allows you
- * to support mod-shears as well.
+ * to support modded shears as well.
  */
 @Deprecated
 public interface IShearable {
 	/**
 	 * Checks if the object is currently shearable.
-	 * Example: Sheep return false when they have no wool
+	 *
+	 * <p>Example: Sheep return false when they have no wool.</p>
 	 *
 	 * @param item  The {@link ItemStack} that is being used, may be empty.
 	 * @param world The current world.
 	 * @param pos   The current position in the world of the target block or entity.
-	 * @return If this block/entity is shearable, and if {@link #onSheared} should be called.
+	 * @return {@code true} if this block/entity is shearable, and if {@link #onSheared} should be called.
 	 */
 	default boolean isShearable(ItemStack item, ViewableWorld world, BlockPos pos) {
 		return true;
 	}
 
 	/**
 	 * Performs the shear function on this object.
-	 * This is called on both the client and the server.
+	 *
+	 * <p>This is called on both the client and the server.
 	 * The object should perform all actions related to being sheared,
 	 * except for dropping of the items, and removal of the block.
-	 * Those functions are handled by {@link net.minecraft.item.ShearsItem} itself.
-	 *
-	 * <p>Returns a list of items to be dropped as a result of the shearing process.</p>
+	 * Those functions are handled by {@link net.minecraft.item.ShearsItem} itself.</p>
 	 *
 	 * <p>For entities, they should trust their internal location information
 	 * over the values passed into this function.</p>
@@ -64,7 +64,7 @@ default boolean isShearable(ItemStack item, ViewableWorld world, BlockPos pos) {
 	 * @param world   The current world.
 	 * @param pos     If this is a block, the block's position in world.
 	 * @param fortune The fortune level of the shears being used.
-	 * @return A List containing all items from this shearing. May be empty.
+	 * @return a list of items to be dropped as a result of the shearing process.
 	 */
 	default List<ItemStack> onSheared(ItemStack item, IWorld world, BlockPos pos, int fortune) {
 		return DefaultedList.of();