diff --git a/dependencies.gradle b/dependencies.gradle index 3b4449bf..c7553a67 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -46,7 +46,7 @@ dependencies { compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ForestryMC:4.9.10:dev') compileOnly('com.github.GTNewHorizons:EnderIO:2.8.17:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.52:dev') { + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.55:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' } diff --git a/src/main/java/com/glodblock/github/nei/recipes/DefaultExtractorLoader.java b/src/main/java/com/glodblock/github/nei/recipes/DefaultExtractorLoader.java index ee2bff4f..0c13e2bf 100644 --- a/src/main/java/com/glodblock/github/nei/recipes/DefaultExtractorLoader.java +++ b/src/main/java/com/glodblock/github/nei/recipes/DefaultExtractorLoader.java @@ -33,7 +33,7 @@ public class DefaultExtractorLoader implements Runnable { if (ModAndClassUtil.GT5) { try { - Class recipeMapClazz = Class.forName("gregtech.api.util.GT_Recipe$GT_Recipe_Map"); + Class recipeMapClazz = Class.forName("gregtech.api.util.GTRecipe$GT_Recipe_Map"); Collection sMappings = (Collection) recipeMapClazz.getDeclaredField("sMappings").get(null); for (Object tMap : sMappings) { String mNEIName = (String) recipeMapClazz.getDeclaredField("mNEIName").get(tMap); diff --git a/src/main/java/com/glodblock/github/nei/recipes/extractor/GregTech5RecipeExtractor.java b/src/main/java/com/glodblock/github/nei/recipes/extractor/GregTech5RecipeExtractor.java index 070a4d9b..41224abe 100644 --- a/src/main/java/com/glodblock/github/nei/recipes/extractor/GregTech5RecipeExtractor.java +++ b/src/main/java/com/glodblock/github/nei/recipes/extractor/GregTech5RecipeExtractor.java @@ -12,7 +12,7 @@ import com.glodblock.github.nei.object.OrderStack; import codechicken.nei.PositionedStack; import gregtech.api.enums.ItemList; -import gregtech.common.items.GT_FluidDisplayItem; +import gregtech.common.items.ItemFluidDisplay; public class GregTech5RecipeExtractor implements IRecipeExtractor { @@ -47,7 +47,7 @@ public class GregTech5RecipeExtractor implements IRecipeExtractor { public static Object getFluidFromDisplay(PositionedStack stack) { if (stack != null) { ItemStack item = stack.items[0].copy(); - if (item.getItem() instanceof GT_FluidDisplayItem) { + if (item.getItem() instanceof ItemFluidDisplay) { if (item.getTagCompound() != null) { Fluid fluid = FluidRegistry.getFluid(item.getItemDamage()); int amt = (int) item.getTagCompound().getLong("mFluidDisplayAmount");