From e18a4ef5e54cec63642494a89a6df0d50db4c087 Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Sun, 9 Apr 2023 12:05:35 +0100 Subject: [PATCH] Purge catalyst recipe (unused) --- .../java/fox/spiteful/avaritia/Avaritia.java | 1 - .../fox/spiteful/avaritia/compat/Compat.java | 163 ------------------ .../avaritia/compat/bloodmagic/Bloody.java | 3 - .../avaritia/compat/botania/Tsundere.java | 7 - .../avaritia/compat/forestry/Ranger.java | 2 - .../compat/minetweaker/ExtremeCrafting.java | 15 +- .../avaritia/compat/thaumcraft/Lucrum.java | 16 -- .../spiteful/avaritia/crafting/Grinder.java | 72 -------- 8 files changed, 2 insertions(+), 277 deletions(-) diff --git a/src/main/java/fox/spiteful/avaritia/Avaritia.java b/src/main/java/fox/spiteful/avaritia/Avaritia.java index 3d99d9c..5cfacb2 100644 --- a/src/main/java/fox/spiteful/avaritia/Avaritia.java +++ b/src/main/java/fox/spiteful/avaritia/Avaritia.java @@ -85,7 +85,6 @@ public class Avaritia { Gregorizer.balance(); if (Config.craftingOnly) return; Mincer.countThoseCalories(); - Grinder.lastMinuteChanges(); Achievements.achieve(); PotionHelper.healthInspection(); proxy.theAfterPretty(); diff --git a/src/main/java/fox/spiteful/avaritia/compat/Compat.java b/src/main/java/fox/spiteful/avaritia/compat/Compat.java index 6e2a905..fe7bccd 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/Compat.java +++ b/src/main/java/fox/spiteful/avaritia/compat/Compat.java @@ -92,27 +92,10 @@ public class Compat { } } - if (Loader.isModLoaded("StevesCarts") && Config.sc2) { - try { - Block resource = getBlock("StevesCarts", "BlockMetalStorage"); - ItemStack galg = new ItemStack(resource, 1, 2); - Grinder.catalyst.getInput().add(galg); - } catch (Throwable e) { - Lumberjack.log(Level.INFO, "Avaritia died of old age while trying to craft the Galgadorian Drill."); - e.printStackTrace(); - } - } - if (ae2) { try { Item resource = getItem("appliedenergistics2", "item.ItemMultiMaterial"); - // 16m cell - Grinder.catalyst.getInput().add(new ItemStack(resource, 1, 60)); - - // Singularity - Grinder.catalyst.getInput().add(new ItemStack(resource, 1, 47)); - Block creative = getBlock("appliedenergistics2", "tile.BlockCreativeEnergyCell"); Block dense = getBlock("appliedenergistics2", "tile.BlockDenseEnergyCell"); @@ -140,47 +123,6 @@ public class Compat { } } - if (exu) { - try { - Block bedrockium = getBlock("ExtraUtilities", "block_bedrockium"); - Block deco = getBlock("ExtraUtilities", "decorativeBlock1"); - ItemStack bed = new ItemStack(bedrockium, 1, 0); - ItemStack unstable = new ItemStack(deco, 1, 5); - Grinder.catalyst.getInput().add(bed); - Grinder.catalyst.getInput().add(unstable); - } catch (Throwable e) { - Lumberjack.log(Level.INFO, "Avaritia was unable to stop Lavos."); - e.printStackTrace(); - exu = false; - } - } - - if (ic2) { - try { - if (gt) { - try { - Item resource = getItem("gregtech", "gt.metaitem.01"); - ItemStack lolneutronium = new ItemStack(resource, 1, 9129); - Grinder.catalyst.getInput().add(lolneutronium); - } catch (Throwable e) { - Lumberjack.log(Level.INFO, "Avaritia got sick of only getting 2 planks per log."); - e.printStackTrace(); - gt = false; - } - } - - if (!gt) { - Item iridium = getItem("IC2", "itemPartIridium"); - ItemStack plate = new ItemStack(iridium, 1, 0); - Grinder.catalyst.getInput().add(plate); - } - } catch (Throwable e) { - Lumberjack.log(Level.INFO, "Avaritia blew up the macerator."); - e.printStackTrace(); - ic2 = false; - } - } - if (botan) { try { Tsundere.baka(); @@ -201,81 +143,10 @@ public class Compat { } } - 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, e, "Avaritia was distracted by a giant glowing sphere."); - } - } - - if (bigReactors) { - try { - Item ingot = getItem("BigReactors", "BRIngot"); - ItemStack ludicrite = new ItemStack(ingot, 1, 8); - Grinder.catalyst.getInput().add(ludicrite); - } catch (Throwable e) { - Lumberjack.log(Level.INFO, "Avaritia decided it just didn't need all that RF."); - e.printStackTrace(); - bigReactors = false; - } - } - - if (ticon) { - try { - Block metal = getBlock("TConstruct", "MetalBlock"); - ItemStack menomena = new ItemStack(metal, 1, 2); - Grinder.catalyst.getInput().add(menomena); - Tonkers.buildstruct(); - } catch (Throwable e) { - Lumberjack.log(Level.INFO, "Avaritia fell in the smeltery."); - e.printStackTrace(); - ticon = false; - } - } - - if (pe) { - try { - Item matter = getItem("ProjectE", "item.pe_matter"); - ItemStack red = new ItemStack(matter, 1, 1); - Grinder.catalyst.getInput().add(red); - } catch (Throwable e) { - Lumberjack.log(Level.INFO, "Avaritia got tired of abusing the blaze rod exploit."); - e.printStackTrace(); - pe = false; - } - } - - if (mfr) { - try { - Item ponk = getItem("MineFactoryReloaded", "pinkslime"); - ItemStack pank = new ItemStack(ponk, 1, 1); - Grinder.catalyst.getInput().add(pank); - } catch (Throwable e) { - Lumberjack.log(Level.INFO, "Avaritia walked into the laser drill."); - e.printStackTrace(); - mfr = false; - } - } - - if (Loader.isModLoaded("TwilightForest") && Config.twilight) { - try { - Item ironwood = getItem("TwilightForest", "item.ironwoodIngot"); - Grinder.catalyst.getInput().add(new ItemStack(ironwood, 1)); - } catch (Throwable e) { - Lumberjack.log(Level.INFO, e, "Avaritia was killed by a hydra."); - } - } - if (Loader.isModLoaded("magicalcrops") && Config.magicrops) { try { - Item essence = getItem("magicalcrops", "magicalcrops_MagicEssence"); Item meat = getItem("magicalcrops", "magicalcrops_RawMeat"); Item crop = getItem("magicalcrops", "magicalcrops_CropProduce"); - ItemStack extreme = new ItemStack(essence, 1, 4); - Grinder.catalyst.getInput().add(extreme); OreDictionary.registerOre("cropBlackberry", new ItemStack(crop, 1, 0)); OreDictionary.registerOre("cropBlueberry", new ItemStack(crop, 1, 1)); OreDictionary.registerOre("cropChilipepper", new ItemStack(crop, 1, 2)); @@ -324,19 +195,6 @@ public class Compat { } } - if (am2) { - try { - Item gem = getItem("arsmagica2", "itemOre"); - Item essence = getItem("arsmagica2", "essence"); - - Grinder.catalyst.getInput().add(new ItemStack(essence, 1, 10)); - Grinder.catalyst.getInput().add(new ItemStack(gem, 1, 6)); - } catch (Throwable e) { - Lumberjack.log(Level.INFO, e, "Avaritia got sick of the arcane guardian's healspam."); - am2 = false; - } - } - if (forestry) { try { Ranger.stopForestFires(); @@ -346,15 +204,6 @@ public class Compat { } } - if (Loader.isModLoaded("EE3") && Config.ee3) { - try { - Block fuel = getBlock("EE3", "alchemicalFuelBlock"); - Grinder.catalyst.getInput().add(new ItemStack(fuel, 1, 2)); - } catch (Throwable e) { - Lumberjack.log(Level.INFO, e, "Avaritia tried to do human transmutation."); - } - } - if (te) { try { Block cell = getBlock("ThermalExpansion", "Cell"); @@ -385,9 +234,6 @@ public class Compat { if (!Loader.isModLoaded("dreamcraft")) { if (Loader.isModLoaded("witchery") && Config.witch) { try { - Item ingredient = getItem("witchery", "ingredient"); - Grinder.catalyst.getInput().add(new ItemStack(ingredient, 1, 150)); - Block egg = getBlock("witchery", "infinityegg"); ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe( @@ -413,15 +259,6 @@ 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."); - } - } - if (Loader.isModLoaded("Tails")) { try { InfiniteFoxes.floof(); diff --git a/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/Bloody.java b/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/Bloody.java index a43aa78..6b4708e 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/Bloody.java +++ b/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/Bloody.java @@ -13,9 +13,6 @@ import fox.spiteful.avaritia.items.LudicrousItems; public class Bloody { public static void bloodlett() throws Compat.ItemNotFoundException { - Block crystal = Compat.getBlock("AWWayofTime", "blockCrystal"); - ItemStack cluster = new ItemStack(crystal, 1, 0); - Grinder.catalyst.getInput().add(cluster); LudicrousItems.armok_orb = new ItemOrbArmok(); GameRegistry.registerItem(LudicrousItems.armok_orb, "Orb_Armok"); diff --git a/src/main/java/fox/spiteful/avaritia/compat/botania/Tsundere.java b/src/main/java/fox/spiteful/avaritia/compat/botania/Tsundere.java index 4ab0e4a..e03c37d 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/botania/Tsundere.java +++ b/src/main/java/fox/spiteful/avaritia/compat/botania/Tsundere.java @@ -23,13 +23,6 @@ public class Tsundere { public static Item costumes; public static void baka() throws Compat.ItemNotFoundException { - Item resource = Compat.getItem("Botania", "manaResource"); - Block storage = Compat.getBlock("Botania", "storage"); - ItemStack terra = new ItemStack(storage, 1, 1); - ItemStack gaia = new ItemStack(resource, 1, 5); - - Grinder.catalyst.getInput().add(terra); - Grinder.catalyst.getInput().add(gaia); BotaniaAPI.registerSubTile("asgardandelion", SubTileCheaty.class); BotaniaAPI.registerSubTileSignature(SubTileCheaty.class, new Signature("asgardandelion")); diff --git a/src/main/java/fox/spiteful/avaritia/compat/forestry/Ranger.java b/src/main/java/fox/spiteful/avaritia/compat/forestry/Ranger.java index 3f4a367..5ee514f 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/forestry/Ranger.java +++ b/src/main/java/fox/spiteful/avaritia/compat/forestry/Ranger.java @@ -66,8 +66,6 @@ public class Ranger { new ItemStack(LudicrousItems.combs, 1, 0), Collections.singletonMap(new ItemStack(LudicrousItems.beesource, 1, 1), centrifugeChanceB)); - Grinder.catalyst.getInput().add(new ItemStack(panel, 1, 6)); - Grinder.catalyst.getInput().add(new ItemStack(LudicrousItems.beesource, 1, 0)); } } diff --git a/src/main/java/fox/spiteful/avaritia/compat/minetweaker/ExtremeCrafting.java b/src/main/java/fox/spiteful/avaritia/compat/minetweaker/ExtremeCrafting.java index 819b3d8..2e50d7f 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/minetweaker/ExtremeCrafting.java +++ b/src/main/java/fox/spiteful/avaritia/compat/minetweaker/ExtremeCrafting.java @@ -152,10 +152,7 @@ public class ExtremeCrafting { } @Override - public void apply() { - - Grinder.catalyst.getInput().add(ingredient); - } + public void apply() {} @Override public boolean canUndo() { @@ -163,9 +160,7 @@ public class ExtremeCrafting { } @Override - public void undo() { - Grinder.catalyst.getInput().remove(ingredient); - } + public void undo() {} @Override public String describe() { @@ -204,11 +199,6 @@ public class ExtremeCrafting { @Override public void apply() { - - Grinder.catalyst.getInput().add(ingredient); - for (Object ingredient : Grinder.catalyst.getInput()) { - - } } @Override @@ -218,7 +208,6 @@ public class ExtremeCrafting { @Override public void undo() { - Grinder.catalyst.getInput().remove(ingredient); } @Override diff --git a/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/Lucrum.java b/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/Lucrum.java index e2be27d..24cf37d 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/Lucrum.java +++ b/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/Lucrum.java @@ -45,8 +45,6 @@ public class Lucrum { LudicrousItems.bigPearl = new ItemBigPearl(); GameRegistry.registerItem(LudicrousItems.bigPearl, "big_pearl"); - Grinder.catalyst.getInput().add(new ItemStack(LudicrousItems.bigPearl)); - ThaumcraftApi.registerObjectTag( new ItemStack(LudicrousItems.resource, 1, 1), new AspectList().add(ULTRA_DEATH, 1).add(Aspect.ENERGY, 8).add(Aspect.CRYSTAL, 32)); @@ -186,20 +184,6 @@ public class Lucrum { new ResearchPage(akashic_recipe) }) .setParents(new String[] { "BIG_PEARL" }).setConcealed().setSecondary().registerResearchItem(); - if (Loader.isModLoaded("ThaumicTinkerer")) { - try { - boolean kami = Class.forName("thaumic.tinkerer.common.core.handler.ConfigHandler") - .getField("enableKami").getBoolean(null); - if (kami) { - // because ichorium get unificated from gt - Item kamiResource = Compat.getItem("gregtech", ":gt.metaitem.01"); - Grinder.catalyst.getInput().add(new ItemStack(kamiResource, 1, 11978)); - } - } catch (Exception e) { - Lumberjack.log(Level.INFO, e, "Avaritia couldn't find the last research it needs to unlock Ichor."); - } - } - } } diff --git a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java index 6491fac..49e3077 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java @@ -17,7 +17,6 @@ import fox.spiteful.avaritia.items.LudicrousItems; public class Grinder { - public static ShapelessOreRecipe catalyst; public static void artsAndCrafts() { @@ -193,18 +192,6 @@ public class Grinder { 'X', new ItemStack(LudicrousItems.resource, 1, 5)); - catalyst = ExtremeCraftingManager.getInstance().addShapelessOreRecipe( - new ItemStack(LudicrousItems.resource, 1, 5), - new ItemStack(Blocks.emerald_block, 1), - new ItemStack(LudicrousItems.singularity, 1, 0), - new ItemStack(LudicrousItems.singularity, 1, 1), - new ItemStack(LudicrousItems.singularity, 1, 2), - new ItemStack(LudicrousItems.singularity, 1, 3), - new ItemStack(LudicrousItems.singularity, 1, 4), - new ItemStack(LudicrousItems.ultimate_stew), - new ItemStack(LudicrousItems.cosmic_meatballs), - new ItemStack(LudicrousItems.endest_pearl)); - ItemStack result = new ItemStack(LudicrousItems.infinity_pickaxe, 1); result.addEnchantment(Enchantment.fortune, 10); ExtremeCraftingManager.getInstance().addRecipe( @@ -462,63 +449,4 @@ public class Grinder { new ItemStack(LudicrousBlocks.resource_block, 1, 0)); } - public static void lastMinuteChanges() { - if (Compat.mfr) { - catalyst.getInput().add(OreDictionary.getOres("record")); - } else { - catalyst.getInput().add(new ItemStack(LudicrousItems.resource, 1, 7)); - IRecipe smashysmashy; - // if (Compat.botan) { - // smashysmashy = new ShapelessOreRecipe(new ItemStack(LudicrousItems.resource, 4, 7), "record"); - // } else { - smashysmashy = new ShapelessOreRecipe(new ItemStack(LudicrousItems.resource, 8, 7), "record"); - // } - GameRegistry.addRecipe(smashysmashy); - } - - if (Config.copper && !OreDictionary.getOres("blockCopper").isEmpty()) { - CompressorManager.addOreRecipe(new ItemStack(LudicrousItems.singularity, 1, 5), 3648, "blockCopper"); - catalyst.getInput().add(new ItemStack(LudicrousItems.singularity, 1, 5)); - } - if (Config.tin && !OreDictionary.getOres("blockTin").isEmpty()) { - CompressorManager.addOreRecipe(new ItemStack(LudicrousItems.singularity, 1, 6), 3648, "blockTin"); - catalyst.getInput().add(new ItemStack(LudicrousItems.singularity, 1, 6)); - } - if (Config.lead && !OreDictionary.getOres("blockLead").isEmpty()) { - CompressorManager.addOreRecipe(new ItemStack(LudicrousItems.singularity, 1, 7), 3648, "blockLead"); - catalyst.getInput().add(new ItemStack(LudicrousItems.singularity, 1, 7)); - } - if (Config.silver && !OreDictionary.getOres("blockSilver").isEmpty()) { - CompressorManager.addOreRecipe(new ItemStack(LudicrousItems.singularity, 1, 8), 7296, "blockSilver"); - catalyst.getInput().add(new ItemStack(LudicrousItems.singularity, 1, 8)); - } - if (Config.nickel && !OreDictionary.getOres("blockNickel").isEmpty()) { - CompressorManager.addOreRecipe(new ItemStack(LudicrousItems.singularity, 1, 9), 3648, "blockNickel"); - catalyst.getInput().add(new ItemStack(LudicrousItems.singularity, 1, 9)); - } - if (Config.enderium && !OreDictionary.getOres("blockEnderium").isEmpty()) { - CompressorManager.addOreRecipe(new ItemStack(LudicrousItems.singularity, 1, 10), 608, "blockEnderium"); - catalyst.getInput().add(new ItemStack(LudicrousItems.singularity, 1, 10)); - } - if (Config.steel && !OreDictionary.getOres("blockSteel").isEmpty()) { - catalyst.getInput().add(OreDictionary.getOres("blockSteel")); - } - if (Config.metallurgy && !OreDictionary.getOres("ingotTartarite").isEmpty()) { - catalyst.getInput().add(OreDictionary.getOres("ingotTartarite")); - } - if (Config.numanuma && !OreDictionary.getOres("blockIronCompressed").isEmpty()) { - catalyst.getInput().add(OreDictionary.getOres("blockIronCompressed")); - } - if (Config.darksteel && !OreDictionary.getOres("blockDarkSteel").isEmpty()) { - catalyst.getInput().add(OreDictionary.getOres("blockDarkSteel")); - } - - if (Config.ultimateBalance && (Loader.isModLoaded("Botania") || Loader.isModLoaded("Mekanism"))) { - catalyst.getInput().add(new ItemStack(LudicrousItems.singularity, 1, 11)); - CompressorManager.addRecipe( - new ItemStack(LudicrousItems.singularity, 1, 11), - 150, - new ItemStack(Items.clay_ball, 1)); - } - } }