Merge pull request #17 from GTNewHorizons/fix_crash

fix crash
GTNewHorizons · Sep 10, 2022 · 1eceb6e · 1eceb6e
2 parents 18edf6d + 8e81621
commit 1eceb6e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 24 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -4,7 +4,7 @@ dependencies {
     compile("com.github.GTNewHorizons:CodeChickenCore:1.1.3:dev")
     compile("com.github.GTNewHorizons:NotEnoughItems:2.2.15-GTNH:dev")
     compile("com.github.GTNewHorizons:Baubles:1.0.1.14:dev")
-    compile("com.github.GTNewHorizons:WirelessCraftingTerminal:1.8.8.5:dev")
+    compile("com.github.GTNewHorizons:WirelessCraftingTerminal:1.8.8.8:dev")
 
     compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.5.3-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:BuildCraftCompat:7.1.11:dev") { transitive = false }

diff --git a/src/main/java/com/github/vfyjxf/nee/client/NEEContainerDrawHandler.java b/src/main/java/com/github/vfyjxf/nee/client/NEEContainerDrawHandler.java
@@ -83,7 +83,7 @@ public void onDrawScreen(GuiScreenEvent.DrawScreenEvent.Post event) {
             if (this.isCraftingTerm || this.isPatternTerm) {
                 GuiRecipe gui = (GuiRecipe) event.gui;
 
-                IRecipeHandler currentHandler = gui.currenthandlers.get(gui.recipetype);
+                IRecipeHandler currentHandler = (IRecipeHandler) gui.currenthandlers.get(gui.recipetype);
 
                 if (NEECraftingHandler.isCraftingTableRecipe(currentHandler)) {
 
@@ -189,7 +189,7 @@ private void initIngredientTracker(GuiRecipe gui) {
         for (int i = 0; i < overlayButtons.size(); i++) {
             GuiButton overlayButton = overlayButtons.get(i);
             if (overlayButton.visible) {
-                IRecipeHandler handler = gui.currenthandlers.get(gui.recipetype);
+                IRecipeHandler handler = (IRecipeHandler) gui.currenthandlers.get(gui.recipetype);
                 int recipeIndex = -1;
                 if (isGtnhNei) {
                     try {

diff --git a/src/main/java/com/github/vfyjxf/nee/container/WCTContainerCraftingConfirm.java b/src/main/java/com/github/vfyjxf/nee/container/WCTContainerCraftingConfirm.java
@@ -1,11 +1,11 @@
 package com.github.vfyjxf.nee.container;
 
 import appeng.api.storage.ITerminalHost;
+import appeng.container.implementations.ContainerCraftConfirm;
 import appeng.util.Platform;
 import com.github.vfyjxf.nee.block.tile.TilePatternInterface;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerCraftConfirm;
 
 public class WCTContainerCraftingConfirm extends ContainerCraftConfirm {
 

diff --git a/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHelper.java b/src/main/java/com/github/vfyjxf/nee/nei/NEECraftingHelper.java
@@ -214,10 +214,7 @@ private boolean isCraftingMatrixSlot(GuiContainer gui, Slot slot) {
         if (gui instanceof GuiCraftingTerm) {
             return slot instanceof SlotCraftingMatrix || slot instanceof SlotFakeCraftingMatrix;
         } else if (GuiUtils.isGuiWirelessCrafting(gui)) {
-            return slot instanceof net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotCraftingMatrix
-                    || slot
-                            instanceof
-                            net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotFakeCraftingMatrix;
+            return slot instanceof SlotCraftingMatrix || slot instanceof SlotFakeCraftingMatrix;
         }
         return false;
     }
@@ -274,7 +271,7 @@ public void onActionPerformedEventPre(GuiScreenEvent.ActionPerformedEvent.Pre ev
                             || GuiUtils.isGuiWirelessCrafting(guiRecipe.firstGui);
                     if (isCraftingTerm || isPatternTerm) {
                         int recipesPerPage = 2;
-                        IRecipeHandler handler = guiRecipe.currenthandlers.get(guiRecipe.recipetype);
+                        IRecipeHandler handler = (IRecipeHandler) guiRecipe.currenthandlers.get(guiRecipe.recipetype);
                         if (isGtnhNei) {
                             try {
                                 recipesPerPage = (int) ReflectionHelper.findMethod(
@@ -291,7 +288,7 @@ public void onActionPerformedEventPre(GuiScreenEvent.ActionPerformedEvent.Pre ev
                             Minecraft.getMinecraft().displayGuiScreen(guiRecipe.firstGui);
                             overlayHandler.overlayRecipe(
                                     guiRecipe.firstGui,
-                                    guiRecipe.currenthandlers.get(guiRecipe.recipetype),
+                                    (IRecipeHandler) guiRecipe.currenthandlers.get(guiRecipe.recipetype),
                                     recipe,
                                     NEIClientUtils.shiftKey());
                             event.setCanceled(true);

diff --git a/src/main/java/com/github/vfyjxf/nee/utils/IngredientTracker.java b/src/main/java/com/github/vfyjxf/nee/utils/IngredientTracker.java
@@ -88,13 +88,10 @@ private List<IAEItemStack> getCraftableStacks() {
                             ReflectionHelper.findField(ItemRepo.class, "list").get(repo);
                 } else {
                     // wireless crafting terminal support
-                    net.p455w0rd.wirelesscraftingterminal.client.me.ItemRepo repo =
-                            (net.p455w0rd.wirelesscraftingterminal.client.me.ItemRepo)
-                                    ReflectionHelper.findField(GuiWirelessCraftingTerminal.class, "repo")
-                                            .get(termGui);
-                    list = (IItemList<IAEItemStack>) ReflectionHelper.findField(
-                                    net.p455w0rd.wirelesscraftingterminal.client.me.ItemRepo.class, "list")
-                            .get(repo);
+                    ItemRepo repo = (ItemRepo) ReflectionHelper.findField(GuiWirelessCraftingTerminal.class, "repo")
+                            .get(termGui);
+                    list = (IItemList<IAEItemStack>)
+                            ReflectionHelper.findField(ItemRepo.class, "list").get(repo);
                 }
             } catch (IllegalAccessException e) {
                 e.printStackTrace();
@@ -124,13 +121,10 @@ private List<IAEItemStack> getStorageStacks() {
                     }
                 } else {
                     // wireless crafting terminal support
-                    net.p455w0rd.wirelesscraftingterminal.client.me.ItemRepo repo =
-                            (net.p455w0rd.wirelesscraftingterminal.client.me.ItemRepo)
-                                    ReflectionHelper.findField(GuiWirelessCraftingTerminal.class, "repo")
-                                            .get(termGui);
-                    for (IAEItemStack stack : (IItemList<IAEItemStack>) ReflectionHelper.findField(
-                                    net.p455w0rd.wirelesscraftingterminal.client.me.ItemRepo.class, "list")
-                            .get(repo)) {
+                    ItemRepo repo = (ItemRepo) ReflectionHelper.findField(GuiWirelessCraftingTerminal.class, "repo")
+                            .get(termGui);
+                    for (IAEItemStack stack : (IItemList<IAEItemStack>)
+                            ReflectionHelper.findField(ItemRepo.class, "list").get(repo)) {
                         list.add(stack.copy());
                     }
                 }