diff --git a/src/main/java/modtweaker2/helpers/LogHelper.java b/src/main/java/modtweaker2/helpers/LogHelper.java index 6d4ad8d..d87b5b4 100644 --- a/src/main/java/modtweaker2/helpers/LogHelper.java +++ b/src/main/java/modtweaker2/helpers/LogHelper.java @@ -8,6 +8,7 @@ import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.mc1710.data.NBTConverter; +import modtweaker2.utils.TweakerPlugin; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -60,7 +61,7 @@ public class LogHelper { return getStackDescription((ItemStack)object); } else if (object instanceof FluidStack) { return getStackDescription((FluidStack)object); - } else if (object instanceof GasStack) { + } else if (TweakerPlugin.isLoaded("Mekanism") && object instanceof GasStack) { return getStackDescription((GasStack)object); } else if (object instanceof String) { // Check if string specifies an oredict entry diff --git a/src/main/java/modtweaker2/helpers/StackHelper.java b/src/main/java/modtweaker2/helpers/StackHelper.java index 6b98700..c558a91 100644 --- a/src/main/java/modtweaker2/helpers/StackHelper.java +++ b/src/main/java/modtweaker2/helpers/StackHelper.java @@ -1,7 +1,6 @@ package modtweaker2.helpers; import static modtweaker2.helpers.InputHelper.toStack; -import mekanism.api.gas.GasStack; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.item.IngredientAny; diff --git a/src/main/java/modtweaker2/mods/factorization/FactorizationHelper.java b/src/main/java/modtweaker2/mods/factorization/FactorizationHelper.java index 3410022..0a576bb 100644 --- a/src/main/java/modtweaker2/mods/factorization/FactorizationHelper.java +++ b/src/main/java/modtweaker2/mods/factorization/FactorizationHelper.java @@ -14,12 +14,12 @@ public class FactorizationHelper { public static List slag = null; @SuppressWarnings("rawtypes") public static List crystallizer = null; - + static { try { - lacerator = getStaticObject(Class.forName("factorization.oreprocessing.TileEntityGrinder"), "recipes"); - slag = getStaticObject(Class.forName("factorization.oreprocessing.TileEntitySlagFurnace$SlagRecipes"), "smeltingResults"); - crystallizer = getStaticObject(Class.forName("factorization.oreprocessing.TileEntityCrystallizer"), "recipes"); + lacerator = getStaticObject(Class.forName("factorization.oreprocessing.TileEntityGrinder"), "recipes"); + slag = ReflectionHelper.getObject(getStaticObject(Class.forName("factorization.oreprocessing.TileEntitySlagFurnace"), "recipes"), "list"); + crystallizer = ReflectionHelper.getObject(getStaticObject(Class.forName("factorization.oreprocessing.TileEntityCrystallizer"), "recipes"), "list"); } catch (Exception e) {} }