diff --git a/src/main/java/fox/spiteful/avaritia/Config.java b/src/main/java/fox/spiteful/avaritia/Config.java index 32f9911..83fac59 100644 --- a/src/main/java/fox/spiteful/avaritia/Config.java +++ b/src/main/java/fox/spiteful/avaritia/Config.java @@ -36,6 +36,7 @@ public class Config { public static boolean ee3 = true; public static boolean extracells = true; public static boolean witch = true; + public static boolean rotisserie = true; public static boolean copper = true; public static boolean tin = true; @@ -83,6 +84,7 @@ public class Config { ee3 = conf.get("compatibility", "Equivalent Exchange 3", true).getBoolean(true); extracells = conf.get("compatibility", "Extra Cells", true).getBoolean(true); witch = conf.get("compatibility", "Witchery", true).getBoolean(true); + rotisserie = conf.get("compatibility", "Rotarycraft", true).getBoolean(true); conf.addCustomCategoryComment("materials", "Disable to stop using that material in recipes. Useful if a mod adds unobtainable placeholder ores."); copper = conf.get("materials", "Copper", true).getBoolean(true); @@ -92,8 +94,8 @@ public class Config { nickel = conf.get("materials", "Nickel/Ferrous", true).getBoolean(true); steel = conf.get("materials", "Steel", true).getBoolean(true); - modifier = conf.get("balance!", "Cost Modifier", "Added to the existing modifier to make prices more expensive or cheaper. Can be negative.").getInt(0); - multiplier = conf.get("balance!", "Cost Multiplier", "Added to the existing multiplier to make prices more expensive or cheaper. Can be negative.").getInt(0); + modifier = conf.get("balance!", "Cost Modifier", 0, "Added to the existing modifier to make prices more expensive or cheaper. Can be negative.").getInt(0); + multiplier = conf.get("balance!", "Cost Multiplier", 0, "Added to the existing multiplier to make prices more expensive or cheaper. Can be negative.").getInt(0); } catch(Exception e){ Lumberjack.log(Level.ERROR, e, "Avaritia couldn't find its config!"); diff --git a/src/main/java/fox/spiteful/avaritia/compat/Compat.java b/src/main/java/fox/spiteful/avaritia/compat/Compat.java index 1d33dc2..7c8e9d0 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/Compat.java +++ b/src/main/java/fox/spiteful/avaritia/compat/Compat.java @@ -415,6 +415,16 @@ public class Compat { } } + if(Loader.isModLoaded("RotaryCraft") && Config.rotisserie){ + try { + Item stuff = getItem("RotaryCraft", "rotarycraft_item_compacts"); + Grinder.catalyst.getInput().add(new ItemStack(stuff, 1, 3)); + } + catch (Throwable e){ + Lumberjack.log(Level.INFO, e, "Avaritia couldn't figure out how torque works."); + } + } + } public static Block getBlock(String mod, String block) throws ItemNotFoundException {