Skip to content

Commit

Permalink
Fix References to AE2FC Refactor (#29)
Browse files Browse the repository at this point in the history
Fixed References to classes in AE2FC that have been either renamed or refactored, as well as a reflection exception due to the refactor.
  • Loading branch information
bpwhelan authored Jan 25, 2023
1 parent 0113d3c commit a21d0cd
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ dependencies {
compile("com.github.GTNewHorizons:Baubles:1.0.1.14:dev")
compile("com.github.GTNewHorizons:WirelessCraftingTerminal:1.8.9.1:dev")

compileOnly("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.0.15-gtnh:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.0.58-gtnh:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.5.4-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BuildCraftCompat:7.1.12:dev") { transitive = false }
compileOnly('com.github.GTNewHorizons:EnderIO:2.3.1.47:dev') {transitive=false}
compileOnly("com.github.GTNewHorizons:ForestryMC:4.4.14:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.37:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTplusplus:1.7.90:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.239:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTplusplus:1.7.201:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ThaumicEnergistics:1.3.19-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Botania:1.9.11-GTNH:dev") { transitive = false }
compileOnly("com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev") { transitive = false }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.IRecipeHandler;
import com.github.vfyjxf.nee.utils.GuiUtils;
import com.glodblock.github.client.gui.GuiBaseFluidPatternTerminalEx;
import com.glodblock.github.client.gui.GuiFluidPatternTerminalEx;
import gregtech.api.enums.ItemList;
import gregtech.api.util.GT_Recipe;
import gregtech.nei.GT_NEI_DefaultHandler.FixedPositionedStack;
Expand Down Expand Up @@ -85,7 +85,7 @@ public List<PositionedStack> getRecipeInput(IRecipeHandler recipe, int recipeInd
if (gtDefaultClz.isInstance(recipe) || gtAssLineClz.isInstance(recipe)) {
if (GuiUtils.isFluidCraftPatternTermEx(Minecraft.getMinecraft().currentScreen)) {
boolean priority =
((GuiBaseFluidPatternTerminalEx) Minecraft.getMinecraft().currentScreen).container.prioritize;
((GuiFluidPatternTerminalEx) Minecraft.getMinecraft().currentScreen).container.prioritize;
if (priority) {
for (PositionedStack ps : recipe.getIngredientStacks(recipeIndex)) {
if (ps != null && getFluidFromDisplayStack(ps.item) != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import com.github.vfyjxf.nee.config.NEEConfig;
import com.github.vfyjxf.nee.network.NEENetworkHandler;
import com.github.vfyjxf.nee.network.packet.PacketCraftingRequest;
import com.glodblock.github.client.gui.GuiFCBaseMonitor;
import com.glodblock.github.client.gui.base.FCGuiMonitor;
import cpw.mods.fml.relauncher.ReflectionHelper;
import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -80,7 +80,7 @@ public IngredientTracker(GuiRecipe guiRecipe, IRecipeHandler recipe, int recipeI
private ItemRepo getRepo() throws IllegalAccessException {
if (isFluidCraftPatternTerm(termGui)) {
return (ItemRepo)
ReflectionHelper.findField(GuiFCBaseMonitor.class, "repo").get(termGui);
ReflectionHelper.findField(FCGuiMonitor.class, "repo").get(termGui);
} else {
return (ItemRepo)
ReflectionHelper.findField(GuiMEMonitorable.class, "repo").get(termGui);
Expand Down

0 comments on commit a21d0cd

Please sign in to comment.