Anvilcraft/ModTweaker
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #184 from Zixxl/master

Browse source 
Factorization support 0.8.95+
This commit is contained in:
Zixxl 2015-07-14 15:31:39 +02:00
commit 922e17384c
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/modtweaker2/helpers/LogHelper.java
View file

@ -8,6 +8,7 @@ import minetweaker.MineTweakerAPI;
import minetweaker.MineTweakerImplementationAPI; import minetweaker.MineTweakerImplementationAPI;
import minetweaker.api.player.IPlayer; import minetweaker.api.player.IPlayer;
import minetweaker.mc1710.data.NBTConverter; import minetweaker.mc1710.data.NBTConverter;
import modtweaker2.utils.TweakerPlugin;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipe;
@ -60,7 +61,7 @@ public class LogHelper {
return getStackDescription((ItemStack)object); return getStackDescription((ItemStack)object);
} else if (object instanceof FluidStack) { } else if (object instanceof FluidStack) {
return getStackDescription((FluidStack)object); return getStackDescription((FluidStack)object);
} else if (object instanceof GasStack) { } else if (TweakerPlugin.isLoaded("Mekanism") && object instanceof GasStack) {
return getStackDescription((GasStack)object); return getStackDescription((GasStack)object);
} else if (object instanceof String) { } else if (object instanceof String) {
// Check if string specifies an oredict entry // Check if string specifies an oredict entry

1
src/main/java/modtweaker2/helpers/StackHelper.java
View file

@ -1,7 +1,6 @@
package modtweaker2.helpers; package modtweaker2.helpers;
import static modtweaker2.helpers.InputHelper.toStack; import static modtweaker2.helpers.InputHelper.toStack;
import mekanism.api.gas.GasStack;
import minetweaker.api.item.IIngredient; import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack; import minetweaker.api.item.IItemStack;
import minetweaker.api.item.IngredientAny; import minetweaker.api.item.IngredientAny;

8
src/main/java/modtweaker2/mods/factorization/FactorizationHelper.java
View file

@ -14,12 +14,12 @@ public class FactorizationHelper {
public static List slag = null; public static List slag = null;
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public static List crystallizer = null; public static List crystallizer = null;
static { static {
try { try {
lacerator = getStaticObject(Class.forName("factorization.oreprocessing.TileEntityGrinder"), "recipes"); lacerator = getStaticObject(Class.forName("factorization.oreprocessing.TileEntityGrinder"), "recipes");
slag = getStaticObject(Class.forName("factorization.oreprocessing.TileEntitySlagFurnace$SlagRecipes"), "smeltingResults"); slag = ReflectionHelper.getObject(getStaticObject(Class.forName("factorization.oreprocessing.TileEntitySlagFurnace"), "recipes"), "list");
crystallizer = getStaticObject(Class.forName("factorization.oreprocessing.TileEntityCrystallizer"), "recipes"); crystallizer = ReflectionHelper.getObject(getStaticObject(Class.forName("factorization.oreprocessing.TileEntityCrystallizer"), "recipes"), "list");
} catch (Exception e) {} } catch (Exception e) {}
} }