Crafted Item Statistics Bugfix

Author: IcarussOne

README.md

@@ -27,6 +27,7 @@ All changes are toggleable via config files.
 * **Chunk Saving:** Fixes loading of outdated chunks to prevent duplications, deletions and data corruption
 * **Comparator Timing:** Fixes inconsistent delays of comparators to prevent redstone timing issues
 * **Concurrent Entity AI Tasks:** Replaces linked entity AI task sets with concurrent sets to avoid mod exception concerning entity AI
+* **Crafted Item Statistics:** Fixes crafted item statistics not increasing correctly when items are crafted with shift-click or drop methods
 * **Death Time:** Fixes corrupted entities exceeding the allowed death time
 * **Depth Mask:** Fixes entity and particle rendering issues by enabling depth buffer writing
 * **Destroy Entity Packets:** Fixes lag caused by dead entities by sending additional packets when the player is not alive

src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/crafteditemstatistics/mixin/UTSlotCraftingMixin.java

@@ -0,0 +1,40 @@
+package mod.acgaming.universaltweaks.bugfixes.misc.crafteditemstatistics.mixin;
+
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.inventory.SlotCrafting;
+import net.minecraft.item.ItemStack;
+import mod.acgaming.universaltweaks.config.UTConfigBugfixes;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+// MC-65198, MC-161869
+// https://bugs.mojang.com/browse/MC-65198
+// https://bugs.mojang.com/browse/MC-161869
+// Courtesy of mrgrim
+@Mixin(SlotCrafting.class)
+public abstract class UTSlotCraftingMixin extends Slot
+{
+    @Shadow
+    private int amountCrafted;
+
+    public UTSlotCraftingMixin(IInventory inventoryIn, int index, int xPosition, int yPosition)
+    {
+        super(inventoryIn, index, xPosition, yPosition);
+    }
+
+    @Inject(method = "decrStackSize", at = @At("HEAD"), cancellable = true)
+    private void utFixCraftingStats(int amount, CallbackInfoReturnable<ItemStack> cir)
+    {
+        if (UTConfigBugfixes.MISC.utCraftedItemStatisticsToggle)
+        {
+            ItemStack ret = super.decrStackSize(amount);
+            this.amountCrafted += ret.getCount();
+
+            cir.setReturnValue(ret);
+        }
+    }
+}

src/main/java/mod/acgaming/universaltweaks/bugfixes/misc/spectatormenu/mixin/UTPlayerMenuObjectMixin.java

@@ -24,7 +24,7 @@ public abstract class UTPlayerMenuObjectMixin
     private GameProfile profile;
 
     @Redirect(method = "renderIcon", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/texture/TextureManager;bindTexture(Lnet/minecraft/util/ResourceLocation;)V"))
-    private void redirectbindTexture(TextureManager textureManager, ResourceLocation resource)
+    private void utRedirectBindTexture(TextureManager textureManager, ResourceLocation resource)
     {
         if (UTConfigBugfixes.MISC.utSpectatorMenuToggle)
         {

src/main/java/mod/acgaming/universaltweaks/config/UTConfigBugfixes.java

@@ -303,6 +303,11 @@ public static class MiscCategory
         @Config.Name("Blast Protection Knockback")
         @Config.Comment("Fixes the blast protection enchantment not reducing knockback from explosions except at very high levels")
         public boolean utBlastProtectionKnockbackToggle = false;
+        
+        @Config.RequiresMcRestart
+        @Config.Name("Crafted Item Statistics")
+        @Config.Comment("Fixes crafted item statistics not increasing correctly when items are crafted with shift-click or drop methods")
+        public boolean utCraftedItemStatisticsToggle = true;
 
         @Config.RequiresMcRestart
         @Config.Name("Depth Mask")

src/main/java/mod/acgaming/universaltweaks/core/UTLoadingPlugin.java

@@ -179,6 +179,7 @@ public List<String> getMixinConfigs()
         configs.add("mixins.bugfixes.entities.skeletonaim.json");
         configs.add("mixins.bugfixes.entities.suffocation.json");
         configs.add("mixins.bugfixes.entities.tracker.json");
+        configs.add("mixins.bugfixes.misc.crafteditemstatistics.json");
         configs.add("mixins.bugfixes.misc.enchantment.json");
         configs.add("mixins.bugfixes.misc.packetsize.json");
         configs.add("mixins.bugfixes.misc.particlespawning.json");
@@ -355,6 +356,8 @@ public boolean shouldMixinConfigQueue(String mixinConfig)
                 return UTConfigBugfixes.BLOCKS.utPistonRetractionToggle;
             case "mixins.bugfixes.blocks.bed.json":
                 return UTConfigBugfixes.BLOCKS.utSleepResetsWeatherToggle;
+            case "mixins.bugfixes.misc.crafteditemstatistics.json":
+                return UTConfigBugfixes.MISC.utCraftedItemStatisticsToggle;
             case "mixins.bugfixes.misc.enchantment.json":
                 return UTConfigBugfixes.MISC.utBlastProtectionKnockbackToggle;
             case "mixins.bugfixes.misc.packetsize.json":

src/main/resources/mixins.bugfixes.misc.crafteditemstatistics.json

@@ -0,0 +1,7 @@
+{
+  "package": "mod.acgaming.universaltweaks.bugfixes.misc.crafteditemstatistics.mixin",
+  "refmap": "universaltweaks.refmap.json",
+  "minVersion": "0.8",
+  "compatibilityLevel": "JAVA_8",
+  "mixins": ["UTSlotCraftingMixin"]
+}