diff --git a/build.gradle b/build.gradle index c0a14a6..19a09e5 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "0.1" +version = "0.2" group= "fox.spiteful.avaritia" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Avaritia" diff --git a/src/main/java/fox/spiteful/avaritia/Avaritia.java b/src/main/java/fox/spiteful/avaritia/Avaritia.java index 74aef4b..dd96900 100644 --- a/src/main/java/fox/spiteful/avaritia/Avaritia.java +++ b/src/main/java/fox/spiteful/avaritia/Avaritia.java @@ -51,10 +51,12 @@ public class Avaritia { @EventHandler public void earlyGame(FMLPreInitializationEvent event){ instance = this; + Config.configurate(event.getSuggestedConfigurationFile()); LudicrousItems.grind(); LudicrousBlocks.voxelize(); - LudicrousEntities.letLooseTheDogsOfWar(); Compat.census(); + if(!Config.craftingOnly) + LudicrousEntities.letLooseTheDogsOfWar(); proxy.prepareForPretty(); } @@ -62,6 +64,8 @@ public class Avaritia { public void midGame(FMLInitializationEvent event){ Grinder.artsAndCrafts(); NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GooeyHandler()); + if(Config.craftingOnly) + return; proxy.makeThingsPretty(); MinecraftForge.EVENT_BUS.register(new LudicrousEvents()); ItemFracturedOre.brushUpUncomfortablyAgainstTheOreDictionary(); @@ -70,6 +74,8 @@ public class Avaritia { @EventHandler public void endGame(FMLPostInitializationEvent event){ Compat.compatify(); + if(Config.craftingOnly) + return; Mincer.countThoseCalories(); Grinder.lastMinuteChanges(); Achievements.achieve(); diff --git a/src/main/java/fox/spiteful/avaritia/Config.java b/src/main/java/fox/spiteful/avaritia/Config.java new file mode 100644 index 0000000..0dc6711 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/Config.java @@ -0,0 +1,91 @@ +package fox.spiteful.avaritia; + +import net.minecraftforge.common.config.Configuration; +import org.apache.logging.log4j.Level; + +import java.io.File; + +public class Config { + + public static boolean craftingOnly = false; + public static boolean endStone = true; + public static boolean bedrockBreaker = true; + public static boolean boringFood = false; + + public static boolean thaumic = true; + public static boolean sc2 = true; + public static boolean ae2 = true; + public static boolean exu = true; + public static boolean ic2 = true; + public static boolean gt = true; + public static boolean botan = true; + public static boolean blood = true; + public static boolean lolDargon = true; + public static boolean bigReactors = true; + public static boolean ticon = true; + public static boolean pe = true; + public static boolean mfr = true; + public static boolean twilight = true; + public static boolean magicrops = true; + public static boolean am2 = true; + public static boolean te = true; + public static boolean numanuma = true; + public static boolean metallurgy = true; + + public static boolean copper = true; + public static boolean tin = true; + public static boolean silver = true; + public static boolean lead = true; + public static boolean steel = true; + public static boolean nickel = true; + + + public static void configurate(File file){ + Configuration conf = new Configuration(file); + + try { + conf.load(); + + craftingOnly = conf.get("general", "Crafting Only", craftingOnly, "Enable to completely disable most of the mod except for the Dire Crafting table. For if you just want the mod for Minetweaking purposes.").getBoolean(false); + endStone = conf.get("general", "Use End Stone", endStone, "Disable to take end stone out of recipes").getBoolean(true); + bedrockBreaker = conf.get("general", "Break Bedrock", bedrockBreaker, "Disable if you don't want the World Breaker to break unbreakable blocks").getBoolean(true); + boringFood = conf.get("general", "Boring Food", boringFood, "Enable to keep the Ultimate Stew and Cosmic Meatballs from grabbing more ingredients").getBoolean(false); + + conf.addCustomCategoryComment("compatibility", "Disable to stop compatibility with that particular mod. Will not use the mod in recipes or add new items for that mod."); + thaumic = conf.get("compatibility", "Thaumcraft", true).getBoolean(true); + sc2 = conf.get("compatibility", "Steve's Carts 2", true).getBoolean(true); + ae2 = conf.get("compatibility", "Applied Energistics 2", true).getBoolean(true); + exu = conf.get("compatibility", "Extra Utilities", true).getBoolean(true); + ic2 = conf.get("compatibility", "Industrialcraft 2 Exp", true).getBoolean(true); + gt = conf.get("compatibility", "Gregtech 5", true).getBoolean(true); + botan = conf.get("compatibility", "Botania", true).getBoolean(true); + blood = conf.get("compatibility", "Blood Magic", true).getBoolean(true); + lolDargon = conf.get("compatibility", "Draconic Evolution", true).getBoolean(true); + bigReactors = conf.get("compatibility", "Big Reactors", true).getBoolean(true); + ticon = conf.get("compatibility", "Tinkers Construct", true).getBoolean(true); + pe = conf.get("compatibility", "Project E", true).getBoolean(true); + mfr = conf.get("compatibility", "MineFactory Reloaded", true).getBoolean(true); + twilight = conf.get("compatibility", "Twilight Forest", true).getBoolean(true); + magicrops = conf.get("compatibility", "Magical Crops", true).getBoolean(true); + am2 = conf.get("compatibility", "Ars Magica 2", true).getBoolean(true); + te = conf.get("compatibility", "Thermal Expansion", true).getBoolean(true); + numanuma = conf.get("compatibility", "Pneumaticraft", true).getBoolean(true); + metallurgy = conf.get("compatibility", "Metallurgy", true).getBoolean(true); + + conf.addCustomCategoryComment("metal", "Disable to stop using that metal in recipes. Useful if a mod adds unobtainable placeholder metal."); + copper = conf.get("metal", "Copper", true).getBoolean(true); + tin = conf.get("metal", "Tin", true).getBoolean(true); + silver = conf.get("metal", "Silver", true).getBoolean(true); + lead = conf.get("metal", "Lead", true).getBoolean(true); + nickel = conf.get("metal", "Nickel/Ferrous", true).getBoolean(true); + steel = conf.get("metal", "Steel", true).getBoolean(true); + } + catch(Exception e){ + Lumberjack.log(Level.ERROR, e, "Avaritia couldn't find its config!"); + } + finally { + conf.save(); + } + } + +} diff --git a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java index de12f46..e362246 100644 --- a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java +++ b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java @@ -47,7 +47,7 @@ public class LudicrousEvents { @SubscribeEvent public void onPlayerMine(PlayerInteractEvent event) { - if(event.face == -1 || event.world.isRemote || event.action != PlayerInteractEvent.Action.LEFT_CLICK_BLOCK || event.entityPlayer.getHeldItem() == null || event.entityPlayer.capabilities.isCreativeMode) + if(!Config.bedrockBreaker || event.face == -1 || event.world.isRemote || event.action != PlayerInteractEvent.Action.LEFT_CLICK_BLOCK || event.entityPlayer.getHeldItem() == null || event.entityPlayer.capabilities.isCreativeMode) return; Block block = event.world.getBlock(event.x, event.y, event.z); int meta = event.world.getBlockMetadata(event.x, event.y, event.z); diff --git a/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java b/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java index 8332856..9266d8d 100644 --- a/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java +++ b/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java @@ -1,6 +1,7 @@ package fox.spiteful.avaritia.blocks; import cpw.mods.fml.common.registry.GameRegistry; +import fox.spiteful.avaritia.Config; import fox.spiteful.avaritia.tile.TileEntityDireCrafting; import fox.spiteful.avaritia.tile.TileEntityNeutron; import net.minecraft.block.Block; @@ -19,10 +20,14 @@ public class LudicrousBlocks { public static void voxelize(){ double_craft = GameRegistry.registerBlock(new BlockDoubleCraft(), "Double_Craft"); triple_craft = GameRegistry.registerBlock(new BlockTripleCraft(), "Triple_Craft"); - crystal_matrix = GameRegistry.registerBlock(new BlockCrystalMatrix(), "Crystal_Matrix"); - resource_block = GameRegistry.registerBlock(new BlockResource(), ItemBlockResource.class, "Resource_Block"); dire_crafting = GameRegistry.registerBlock(new BlockDireCrafting(), "Dire_Crafting"); GameRegistry.registerTileEntity(TileEntityDireCrafting.class, "Avaritia_Dire_Craft"); + + if(Config.craftingOnly) + return; + + crystal_matrix = GameRegistry.registerBlock(new BlockCrystalMatrix(), "Crystal_Matrix"); + resource_block = GameRegistry.registerBlock(new BlockResource(), ItemBlockResource.class, "Resource_Block"); neutron_collector = GameRegistry.registerBlock(new BlockNeutronCollector(), "Neutron_Collector"); GameRegistry.registerTileEntity(TileEntityNeutron.class, "Avaritia_Neutron"); } diff --git a/src/main/java/fox/spiteful/avaritia/compat/Compat.java b/src/main/java/fox/spiteful/avaritia/compat/Compat.java index 1b7487d..2eca661 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/Compat.java +++ b/src/main/java/fox/spiteful/avaritia/compat/Compat.java @@ -2,6 +2,7 @@ package fox.spiteful.avaritia.compat; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; +import fox.spiteful.avaritia.Config; import fox.spiteful.avaritia.Lumberjack; import fox.spiteful.avaritia.compat.bloodmagic.Bloody; import fox.spiteful.avaritia.compat.botania.Tsundere; @@ -19,48 +20,34 @@ public class Compat { public static boolean nei = false; public static boolean thaumic = false; - public static boolean sc2 = false; public static boolean ae2 = false; public static boolean exu = false; public static boolean ic2 = false; public static boolean gt = false; public static boolean botan = false; public static boolean blood = false; - public static boolean lolDargon = false; public static boolean bigReactors = false; public static boolean ticon = false; public static boolean pe = false; public static boolean tweak = false; public static boolean mfr = false; - public static boolean twilight = false; - public static boolean natura = false; - public static boolean magicrops = false; - public static boolean ganyland = false; - public static boolean pams = false; public static boolean am2 = false; public static void census(){ nei = Loader.isModLoaded("NotEnoughItems"); - thaumic = Loader.isModLoaded("Thaumcraft"); - sc2 = Loader.isModLoaded("StevesCarts"); - ae2 = Loader.isModLoaded("appliedenergistics2"); - exu = Loader.isModLoaded("ExtraUtilities"); - ic2 = Loader.isModLoaded("IC2"); - gt = Loader.isModLoaded("gregtech"); - botan = Loader.isModLoaded("Botania"); - blood = Loader.isModLoaded("AWWayofTime"); - lolDargon = Loader.isModLoaded("DraconicEvolution"); - bigReactors = Loader.isModLoaded("BigReactors"); - ticon = Loader.isModLoaded("TConstruct"); - pe = Loader.isModLoaded("ProjectE"); tweak = Loader.isModLoaded("MineTweaker3"); - mfr = Loader.isModLoaded("MineFactoryReloaded"); - twilight = Loader.isModLoaded("TwilightForest"); - natura = Loader.isModLoaded("Natura"); - magicrops = Loader.isModLoaded("magicalcrops"); - ganyland = Loader.isModLoaded("ganyssurface"); - pams = Loader.isModLoaded("harvestcraft"); - am2 = Loader.isModLoaded("arsmagica2"); + thaumic = Loader.isModLoaded("Thaumcraft") && Config.thaumic; + ae2 = Loader.isModLoaded("appliedenergistics2") && Config.ae2; + exu = Loader.isModLoaded("ExtraUtilities") && Config.exu; + ic2 = Loader.isModLoaded("IC2") && Config.ic2; + gt = Loader.isModLoaded("gregtech") && Config.gt; + botan = Loader.isModLoaded("Botania") && Config.botan; + blood = Loader.isModLoaded("AWWayofTime") && Config.blood; + bigReactors = Loader.isModLoaded("BigReactors") && Config.bigReactors; + ticon = Loader.isModLoaded("TConstruct") && Config.ticon; + pe = Loader.isModLoaded("ProjectE") && Config.pe; + mfr = Loader.isModLoaded("MineFactoryReloaded") && Config.mfr; + am2 = Loader.isModLoaded("arsmagica2") && Config.am2; } public static void compatify(){ @@ -92,6 +79,9 @@ public class Compat { } } + if(Config.craftingOnly) + return; + if(thaumic){ try { @@ -104,7 +94,7 @@ public class Compat { } } - if(sc2){ + if(Loader.isModLoaded("StevesCarts") && Config.sc2){ try { Block resource = getBlock("StevesCarts", "BlockMetalStorage"); ItemStack galg = new ItemStack(resource, 1, 2); @@ -113,7 +103,6 @@ public class Compat { catch(Throwable e){ Lumberjack.log(Level.INFO, "Avaritia died of old age while trying to craft the Galgadorian Drill."); e.printStackTrace(); - sc2 = false; } } @@ -198,16 +187,14 @@ public class Compat { } } - if(lolDargon){ + if(Loader.isModLoaded("DraconicEvolution") && Config.lolDargon){ try { Block dargon = getBlock("DraconicEvolution", "draconicBlock"); ItemStack lol = new ItemStack(dargon, 1, 0); Grinder.catalyst.getInput().add(lol); } catch (Throwable e){ - Lumberjack.log(Level.INFO, "Avaritia was distracted by a giant glowing sphere."); - e.printStackTrace(); - lolDargon = false; + Lumberjack.log(Level.INFO, e, "Avaritia was distracted by a giant glowing sphere."); } } @@ -264,7 +251,7 @@ public class Compat { } } - if(twilight){ + if(Loader.isModLoaded("TwilightForest") && Config.twilight){ try { Item ironwood = getItem("TwilightForest", "item.ironwoodIngot"); ItemStack wood = new ItemStack(ironwood, 1); @@ -273,11 +260,10 @@ public class Compat { catch (Throwable e){ Lumberjack.log(Level.INFO, "Avaritia was killed by a hydra."); e.printStackTrace(); - twilight = false; } } - if(magicrops){ + if(Loader.isModLoaded("magicalcrops") && Config.magicrops){ try { Item essence = getItem("magicalcrops", "magicalcrops_MagicEssence"); Item meat = getItem("magicalcrops", "magicalcrops_RawMeat"); @@ -297,25 +283,21 @@ public class Compat { OreDictionary.registerOre("rawCalamari", new ItemStack(meat, 1, 1)); } catch (Throwable e){ - Lumberjack.log(Level.INFO, "Avaritia got bored of waiting for magical crops to grow."); - e.printStackTrace(); - magicrops = false; + Lumberjack.log(Level.INFO, e, "Avaritia got bored of waiting for magical crops to grow."); } } - if(ganyland){ + if(Loader.isModLoaded("ganyssurface")){ try { Item mutton = getItem("ganyssurface", "mutton_raw"); OreDictionary.registerOre("rawMutton", new ItemStack(mutton, 1, 0)); } catch (Throwable e){ - Lumberjack.log(Level.INFO, "Avaritia forgot which Gany's mod it was dealing with."); - e.printStackTrace(); - ganyland = false; + Lumberjack.log(Level.INFO, e, "Avaritia forgot which Gany's mod it was dealing with."); } } - if(pams){ + if(Loader.isModLoaded("harvestcraft")){ try { Item mutton = getItem("harvestcraft", "muttonrawItem"); Item beet = getItem("harvestcraft", "beetItem"); @@ -327,19 +309,16 @@ public class Compat { catch (Throwable e){ Lumberjack.log(Level.INFO, "Avaritia got overwhelmed by all the food choices. D:"); e.printStackTrace(); - pams = false; } } - if(natura){ + if(Loader.isModLoaded("Natura")){ try { Item barley = getItem("Natura", "barleyFood"); OreDictionary.registerOre("cropBarley", new ItemStack(barley, 1, 0)); } catch (Throwable e){ - Lumberjack.log(Level.INFO, "Avaritia got overwhelmed by all the food choices. D:"); - e.printStackTrace(); - natura = false; + Lumberjack.log(Level.INFO, e, "Avaritia got overwhelmed by all the food choices. D:"); } } diff --git a/src/main/java/fox/spiteful/avaritia/compat/ticon/TonkersEvents.java b/src/main/java/fox/spiteful/avaritia/compat/ticon/TonkersEvents.java index 46a71c3..e4f6a51 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/ticon/TonkersEvents.java +++ b/src/main/java/fox/spiteful/avaritia/compat/ticon/TonkersEvents.java @@ -2,6 +2,7 @@ package fox.spiteful.avaritia.compat.ticon; import java.util.Random; +import fox.spiteful.avaritia.Config; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; @@ -156,7 +157,7 @@ public class TonkersEvents { // bedrock SMASH! @SubscribeEvent public void onPlayerMine(PlayerInteractEvent event) { - if(event.face == -1 || event.world.isRemote || event.action != PlayerInteractEvent.Action.LEFT_CLICK_BLOCK || event.entityPlayer.getHeldItem() == null || event.entityPlayer.capabilities.isCreativeMode) + if(!Config.bedrockBreaker || event.face == -1 || event.world.isRemote || event.action != PlayerInteractEvent.Action.LEFT_CLICK_BLOCK || event.entityPlayer.getHeldItem() == null || event.entityPlayer.capabilities.isCreativeMode) return; Block block = event.world.getBlock(event.x, event.y, event.z); int meta = event.world.getBlockMetadata(event.x, event.y, event.z); diff --git a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java index e211aa9..b7f8772 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java @@ -1,6 +1,7 @@ package fox.spiteful.avaritia.crafting; import cpw.mods.fml.common.registry.GameRegistry; +import fox.spiteful.avaritia.Config; import fox.spiteful.avaritia.blocks.LudicrousBlocks; import fox.spiteful.avaritia.compat.Compat; import fox.spiteful.avaritia.items.LudicrousItems; @@ -25,9 +26,13 @@ public class Grinder { GameRegistry.addShapedRecipe(new ItemStack(LudicrousBlocks.triple_craft, 1), "CCC", "CCC", "CCC", 'C', new ItemStack(LudicrousBlocks.double_craft)); GameRegistry.addShapedRecipe(new ItemStack(Blocks.crafting_table, 9), "C", 'C', new ItemStack(LudicrousBlocks.double_craft)); GameRegistry.addShapedRecipe(new ItemStack(LudicrousBlocks.double_craft, 9), "C", 'C', new ItemStack(LudicrousBlocks.triple_craft)); + GameRegistry.addShapedRecipe(new ItemStack(LudicrousBlocks.dire_crafting, 1), "CCC", "CXC", "CCC", 'C', new ItemStack(LudicrousItems.resource, 1, 1), 'X', new ItemStack(LudicrousBlocks.triple_craft)); + + if(Config.craftingOnly) + return; + GameRegistry.addShapedRecipe(new ItemStack(LudicrousBlocks.crystal_matrix, 1, 0), "CCC", "CCC", "CCC", 'C', new ItemStack(LudicrousItems.resource, 1, 1)); GameRegistry.addShapedRecipe(new ItemStack(LudicrousItems.resource, 9, 1), "C", 'C', new ItemStack(LudicrousBlocks.crystal_matrix, 1, 0)); - GameRegistry.addShapedRecipe(new ItemStack(LudicrousBlocks.dire_crafting, 1), "CCC", "CXC", "CCC", 'C', new ItemStack(LudicrousItems.resource, 1, 1), 'X', new ItemStack(LudicrousBlocks.triple_craft)); GameRegistry.addShapedRecipe(new ItemStack(LudicrousItems.resource, 1, 3), "CCC", "CCC", "CCC", 'C', new ItemStack(LudicrousItems.resource, 1, 2)); GameRegistry.addShapedRecipe(new ItemStack(LudicrousItems.resource, 1, 4), "CCC", "CCC", "CCC", 'C', new ItemStack(LudicrousItems.resource, 1, 3)); GameRegistry.addShapedRecipe(new ItemStack(LudicrousItems.resource, 9, 3), "C", 'C', new ItemStack(LudicrousItems.resource, 1, 4)); @@ -194,36 +199,36 @@ public class Grinder { ExtremeCraftingManager.getInstance().addSingularityRecipe(new ItemStack(LudicrousItems.singularity, 1, 3), new ItemStack(Blocks.redstone_block, 1)); ExtremeCraftingManager.getInstance().addSingularityRecipe(new ItemStack(LudicrousItems.singularity, 1, 4), new ItemStack(Blocks.quartz_block, 1)); - if(!OreDictionary.getOres("blockCopper").isEmpty()){ + if(Config.copper && !OreDictionary.getOres("blockCopper").isEmpty()){ ExtremeCraftingManager.getInstance().addOreSingularityRecipe(new ItemStack(LudicrousItems.singularity, 1, 5), "blockCopper"); catalyst.getInput().add(new ItemStack(LudicrousItems.singularity, 1, 5)); } - if(!OreDictionary.getOres("blockTin").isEmpty()){ + if(Config.tin && !OreDictionary.getOres("blockTin").isEmpty()){ ExtremeCraftingManager.getInstance().addOreSingularityRecipe(new ItemStack(LudicrousItems.singularity, 1, 6), "blockTin"); catalyst.getInput().add(new ItemStack(LudicrousItems.singularity, 1, 6)); } - if(!OreDictionary.getOres("blockLead").isEmpty()){ + if(Config.lead && !OreDictionary.getOres("blockLead").isEmpty()){ ExtremeCraftingManager.getInstance().addOreSingularityRecipe(new ItemStack(LudicrousItems.singularity, 1, 7), "blockLead"); catalyst.getInput().add(new ItemStack(LudicrousItems.singularity, 1, 7)); } - if(!OreDictionary.getOres("blockSilver").isEmpty()){ + if(Config.silver && !OreDictionary.getOres("blockSilver").isEmpty()){ ExtremeCraftingManager.getInstance().addOreSingularityRecipe(new ItemStack(LudicrousItems.singularity, 1, 8), "blockSilver"); catalyst.getInput().add(new ItemStack(LudicrousItems.singularity, 1, 8)); } - if(!OreDictionary.getOres("blockNickel").isEmpty()){ + if(Config.nickel && !OreDictionary.getOres("blockNickel").isEmpty()){ ExtremeCraftingManager.getInstance().addOreSingularityRecipe(new ItemStack(LudicrousItems.singularity, 1, 9), "blockNickel"); catalyst.getInput().add(new ItemStack(LudicrousItems.singularity, 1, 9)); } - if(!OreDictionary.getOres("blockEnderium").isEmpty()){ + if(Config.te && !OreDictionary.getOres("blockEnderium").isEmpty()){ catalyst.getInput().add(OreDictionary.getOres("blockEnderium")); } - if(!OreDictionary.getOres("blockSteel").isEmpty()){ + if(Config.steel &&!OreDictionary.getOres("blockSteel").isEmpty()){ catalyst.getInput().add(OreDictionary.getOres("blockSteel")); } - if(!OreDictionary.getOres("ingotTartarite").isEmpty()){ + if(Config.metallurgy && !OreDictionary.getOres("ingotTartarite").isEmpty()){ catalyst.getInput().add(OreDictionary.getOres("ingotTartarite")); } - if(!OreDictionary.getOres("blockIronCompressed").isEmpty()){ + if(Config.numanuma && !OreDictionary.getOres("blockIronCompressed").isEmpty()){ catalyst.getInput().add(OreDictionary.getOres("blockIronCompressed")); } diff --git a/src/main/java/fox/spiteful/avaritia/crafting/Mincer.java b/src/main/java/fox/spiteful/avaritia/crafting/Mincer.java index 398cdce..09013cb 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/Mincer.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/Mincer.java @@ -2,6 +2,8 @@ package fox.spiteful.avaritia.crafting; import java.util.*; +import cpw.mods.fml.common.Loader; +import fox.spiteful.avaritia.Config; import fox.spiteful.avaritia.Lumberjack; import fox.spiteful.avaritia.compat.Compat; import fox.spiteful.avaritia.items.LudicrousItems; @@ -14,6 +16,7 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import org.apache.logging.log4j.Level; public class Mincer { + public static ShapelessOreRecipe stewRecipe; public static ShapelessOreRecipe meatballRecipe; // here's where all the food magic goes on @@ -39,6 +42,12 @@ public class Mincer { public static void countThoseCalories() { + if(Config.boringFood){ + stewRecipe = ExtremeCraftingManager.getInstance().addShapelessOreRecipe(new ItemStack(LudicrousItems.ultimate_stew, 1), "cropWheat", "cropCarrot", "cropPotato", "cropApple", "cropMelon", "cropPumpkin", "cropCactus", "cropMushroomRed", "cropMushroomBrown"); + meatballRecipe = ExtremeCraftingManager.getInstance().addShapelessOreRecipe(new ItemStack(LudicrousItems.cosmic_meatballs, 1), new ItemStack(Items.beef), new ItemStack(Items.beef), new ItemStack(Items.chicken), new ItemStack(Items.chicken), new ItemStack(Items.porkchop), new ItemStack(Items.porkchop), new ItemStack(Items.fish), new ItemStack(Items.fish)); + return; + } + String[] orenames = OreDictionary.getOreNames(); List rawCrops = new ArrayList(); @@ -118,7 +127,7 @@ public class Mincer { if (a.count != b.count) { return b.count > a.count ? 1 : -1; } - + return 0; } }); @@ -150,7 +159,7 @@ public class Mincer { // time to actually MAKE the damn thing... - ShapelessOreRecipe stewRecipe = ExtremeCraftingManager.getInstance().addShapelessOreRecipe(new ItemStack(LudicrousItems.ultimate_stew, makesstew), new ItemStack(LudicrousItems.resource, 1, 2)); + stewRecipe = ExtremeCraftingManager.getInstance().addShapelessOreRecipe(new ItemStack(LudicrousItems.ultimate_stew, makesstew), new ItemStack(LudicrousItems.resource, 1, 2)); List stewInputs = stewRecipe.getInput(); for (int i=0; i