Merge branch 'master' of https://github.com/jaredlll08/ModTweaker
This commit is contained in:
commit
a033c03538
2 changed files with 5 additions and 3 deletions
|
@ -21,6 +21,8 @@ public class TConstructHelper {
|
|||
public static List<ICastingRecipe> basinCasting = null;
|
||||
public static List<ICastingRecipe> tableCasting = null;
|
||||
public static List<MeltingRecipe> smeltingList = null;
|
||||
public static List<DryingRecipe> dryingList = null;
|
||||
|
||||
// public static Map<ItemMetaWrapper, Integer> temperatureList = null;
|
||||
public static List<FluidStack> fuelList = new ArrayList<FluidStack>();
|
||||
public static Map<String, IModifier> modifiers = new THashMap<String, IModifier>();
|
||||
|
@ -30,12 +32,12 @@ public class TConstructHelper {
|
|||
try {
|
||||
alloys = ReflectionHelper.getStaticObject(TinkerRegistry.class, "alloyRegistry");
|
||||
smeltingList = ReflectionHelper.getStaticObject(TinkerRegistry.class, "meltingRegistry");
|
||||
dryingList = ReflectionHelper.getStaticObject(TinkerRegistry.class, "dryingRegistry");
|
||||
basinCasting = ReflectionHelper.getStaticObject(TinkerRegistry.class, "basinCastRegistry");
|
||||
tableCasting = ReflectionHelper.getStaticObject(TinkerRegistry.class, "tableCastRegistry");
|
||||
modifiers = ReflectionHelper.getStaticObject(TinkerRegistry.class, "modifiers");
|
||||
modifiers_clone = new THashMap<String, IModifier>(modifiers);
|
||||
fuelList = new ArrayList<>(TinkerRegistry.getSmelteryFuels());
|
||||
|
||||
} catch (Exception e) {
|
||||
}
|
||||
}
|
||||
|
|
|
@ -39,7 +39,7 @@ public class Drying {
|
|||
//Passes the list to the base list implementation, and adds the recipe
|
||||
private static class Add extends BaseListAddition<DryingRecipe> {
|
||||
public Add(DryingRecipe recipe) {
|
||||
super(Drying.name, TinkerRegistry.getAllDryingRecipes());
|
||||
super(Drying.name, TConstructHelper.dryingList);
|
||||
this.recipes.add(recipe);
|
||||
}
|
||||
|
||||
|
@ -72,7 +72,7 @@ public class Drying {
|
|||
//Removes a recipe, apply is never the same for anything, so will always need to override it
|
||||
private static class Remove extends BaseListRemoval<DryingRecipe> {
|
||||
public Remove(List<DryingRecipe> list) {
|
||||
super(Drying.name, TinkerRegistry.getAllDryingRecipes(), list);
|
||||
super(Drying.name, TConstructHelper.dryingList, list);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Loading…
Reference in a new issue