Fix Soul Shard combining

Fixed Soul Shards not being able to be combined in an anvil.

README.md

@@ -2,8 +2,3 @@
 
 A fork of the 1.15 fabric version to run with 1.16.5. 
 
-# Currently broken: 
-
-- Fusing SoulShards
-- Texture not rendering purple
-- probably something else as well 

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     //id "com.matthewprenger.cursegradle" version "1.4.0"
-    id 'fabric-loom' version '0.6-SNAPSHOT'
-    //id "maven-publish"
+    id 'fabric-loom' version '0.7-SNAPSHOT'
+    id "maven-publish"
 }
 
 sourceCompatibility = 1.8

src/main/java/info/tehnut/soulshards/core/mixin/MixinAnvilContainer.java → src/main/java/info/tehnut/soulshards/core/mixin/MixinAnvilScreenHandler.java

@@ -6,7 +6,6 @@
 import info.tehnut.soulshards.item.ItemSoulShard;
 import net.minecraft.screen.AnvilScreenHandler;
 import net.minecraft.screen.Property;
-import net.minecraft.inventory.CraftingResultInventory;
 import net.minecraft.inventory.Inventory;
 import net.minecraft.item.ItemStack;
 import org.spongepowered.asm.mixin.Final;
@@ -17,25 +16,19 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(AnvilScreenHandler.class)
-public class MixinAnvilContainer {
+public class MixinAnvilScreenHandler extends MixinForgingScreenHandler{
 
-    @Shadow
-    @Final
-    private Inventory inventory;
     @Shadow
     @Final
     private Property levelCost;
-    @Shadow
-    @Final
-    private CraftingResultInventory result;
-
+
     @Inject(method = "updateResult", at = @At("HEAD"), cancellable = true)
     public void soulshards$updateResult(CallbackInfo callbackInfo) {
         if (!SoulShards.CONFIG.getBalance().allowShardCombination())
             return;
 
-        ItemStack leftStack = inventory.getStack(0);
-        ItemStack rightStack = inventory.getStack(1);
+        ItemStack leftStack = this.input.getStack(0);
+        ItemStack rightStack = this.input.getStack(1);
 
         if (leftStack.getItem() instanceof ItemSoulShard && rightStack.getItem() instanceof ItemSoulShard) {
             Binding left = ((ItemSoulShard) leftStack.getItem()).getBinding(leftStack);
@@ -47,7 +40,7 @@ public class MixinAnvilContainer {
             if (left.getBoundEntity() != null && left.getBoundEntity().equals(right.getBoundEntity())) {
                 ItemStack output = new ItemStack(RegistrarSoulShards.SOUL_SHARD);
                 ((ItemSoulShard) output.getItem()).updateBinding(output, left.addKills(right.getKills()));
-                result.setStack(0, output);
+                this.output.setStack(0, output);
                 levelCost.set(left.getTier().getIndex() * 6);
                 callbackInfo.cancel();
             }

src/main/java/info/tehnut/soulshards/core/mixin/MixinForgingScreenHandler.java

@@ -0,0 +1,21 @@
+package info.tehnut.soulshards.core.mixin;
+
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import net.minecraft.inventory.CraftingResultInventory;
+import net.minecraft.inventory.Inventory;
+import net.minecraft.screen.ForgingScreenHandler;
+
+@Mixin(ForgingScreenHandler.class)
+public class MixinForgingScreenHandler {
+
+    @Shadow
+    @Final
+    protected CraftingResultInventory output;
+
+    @Shadow
+    @Final
+    protected Inventory input;
+}

src/main/resources/soulshards.mixins.json

@@ -5,7 +5,9 @@
   "refmap": "soulshards-refmap.json",
   "mixins": [
     "MixinEntityLiving",
-    "MobSpawnerLogicEntityId"
+    "MobSpawnerLogicEntityId",
+    "MixinAnvilScreenHandler",
+    "MixinForgingScreenHandler"
   ],
   "client": [
     "client.MixinItemRenderer"