From 0b874dcda2630f5f150ca8861245a22445a51381 Mon Sep 17 00:00:00 2001 From: Quantumlyy Date: Sun, 31 Dec 2023 16:03:46 +0100 Subject: [PATCH 1/6] modify drainer recipe --- .../dreammaster/scripts/ScriptMagicBees.java | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java b/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java index 43bb105bf..f7ca8917e 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java +++ b/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java @@ -1,15 +1,6 @@ package com.dreammaster.scripts; -import static gregtech.api.enums.Mods.AppliedEnergistics2; -import static gregtech.api.enums.Mods.Backpack; -import static gregtech.api.enums.Mods.Botania; -import static gregtech.api.enums.Mods.Forestry; -import static gregtech.api.enums.Mods.Genetics; -import static gregtech.api.enums.Mods.IndustrialCraft2; -import static gregtech.api.enums.Mods.MagicBees; -import static gregtech.api.enums.Mods.Minecraft; -import static gregtech.api.enums.Mods.PamsHarvestCraft; -import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.enums.Mods.*; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.extruderRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; @@ -408,6 +399,7 @@ public void loadRecipes() { TCHelper.removeInfusionRecipe(getModItem(MagicBees.ID, "miscResources", 3, 17, missing)); TCHelper.removeInfusionRecipe(getModItem(MagicBees.ID, "miscResources", 3, 17, missing)); + TCHelper.removeInfusionRecipe(getModItem(MagicBees.ID, "apiamancersDrainer", 1, 0, missing)); TCHelper.removeCrucibleRecipe(getModItem(MagicBees.ID, "miscResources", 1, 7, missing)); TCHelper.removeCrucibleRecipe(getModItem(MagicBees.ID, "miscResources", 1, 8, missing)); TCHelper.removeCrucibleRecipe(getModItem(MagicBees.ID, "miscResources", 1, 9, missing)); @@ -1117,6 +1109,24 @@ public void loadRecipes() { new ResearchPage( TCHelper.findArcaneRecipe( getModItem(MagicBees.ID, "magicbees.enchantedEarth", 1, 0, missing)))); + TCHelper.moveResearch("MB_ApiamancersDrainer", "MAGICBEES", -1, 7); + TCHelper.addResearchPrereq("MB_ApiamancersDrainer", "MB_DimensionalSingularity", false); + TCHelper.setResearchComplexity("MB_ApiamancersDrainer", 5); + ResearchCategories.getResearch("MB_ApiamancersDrainer").setConcealed(); + ThaumcraftApi.addWarpToResearch("MB_ApiamancersDrainer", 3); + ThaumcraftApi.addInfusionCraftingRecipe( + "MB_ApiamancersDrainer", + getModItem(MagicBees.ID, "apiamancersDrainer", 1, 0, missing), + 5, + new AspectList().add(Aspect.MAGIC, 100).add(Aspect.HARVEST, 75).add(Aspect.getAspect("tempus"), 50), + getModItem(Thaumcraft.ID, "blockEssentiaReservoir", 1, 0, missing), + new ItemStack[] { getModItem(Thaumcraft.ID, "blockTube", 1, 2, missing), + getModItem(MagicBees.ID, "pollen", 1, 0, missing), + getModItem(GoodGenerator.ID, "essentiaCell", 1, 1, missing), + getModItem(GoodGenerator.ID, "essentiaCell", 1, 1, missing), + getModItem(MagicBees.ID, "pollen", 1, 1, missing), + getModItem(GoodGenerator.ID, "essentiaCell", 1, 1, missing), + getModItem(GoodGenerator.ID, "essentiaCell", 1, 1, missing), }); TCHelper.refreshResearchPages("MB_VisAuraProvider"); TCHelper.refreshResearchPages("MB_EssenceLife"); TCHelper.refreshResearchPages("MB_EssenceDeath"); @@ -1127,5 +1137,6 @@ public void loadRecipes() { TCHelper.refreshResearchPages("MB_Scoop"); TCHelper.refreshResearchPages("MB_ScoopVoid"); TCHelper.refreshResearchPages("MB_GrafterVoid"); + TCHelper.refreshResearchPages("MB_ApiamancersDrainer"); } } From 607858db2f732ccb023c2583899fc82bd8029f19 Mon Sep 17 00:00:00 2001 From: Quantumlyy Date: Sun, 31 Dec 2023 16:12:14 +0100 Subject: [PATCH 2/6] sa --- .../com/dreammaster/scripts/ScriptMagicBees.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java b/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java index f7ca8917e..193090f95 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java +++ b/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java @@ -1,6 +1,16 @@ package com.dreammaster.scripts; -import static gregtech.api.enums.Mods.*; +import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.Backpack; +import static gregtech.api.enums.Mods.Botania; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.Genetics; +import static gregtech.api.enums.Mods.GoodGenerator; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.MagicBees; +import static gregtech.api.enums.Mods.Minecraft; +import static gregtech.api.enums.Mods.PamsHarvestCraft; +import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.extruderRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; From 4a69e06fbb58f1ebc76b2ecab145a0e4eb77d89d Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Mon, 1 Jan 2024 12:54:22 +0100 Subject: [PATCH 3/6] Update ScriptMagicBees.java change pollen to be at last position change tempus to be 25 vis add lucrum (because its greedy get vis out of bees ;) ) --- src/main/java/com/dreammaster/scripts/ScriptMagicBees.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java b/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java index 193090f95..f1865d6da 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java +++ b/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java @@ -1128,15 +1128,16 @@ public void loadRecipes() { "MB_ApiamancersDrainer", getModItem(MagicBees.ID, "apiamancersDrainer", 1, 0, missing), 5, - new AspectList().add(Aspect.MAGIC, 100).add(Aspect.HARVEST, 75).add(Aspect.getAspect("tempus"), 50), + new AspectList().add(Aspect.MAGIC, 100).add(Aspect.HARVEST, 75).add(Aspect.getAspect("lucrum"), 50) + .add(Aspect.getAspect("tempus"), 25), getModItem(Thaumcraft.ID, "blockEssentiaReservoir", 1, 0, missing), new ItemStack[] { getModItem(Thaumcraft.ID, "blockTube", 1, 2, missing), getModItem(MagicBees.ID, "pollen", 1, 0, missing), getModItem(GoodGenerator.ID, "essentiaCell", 1, 1, missing), getModItem(GoodGenerator.ID, "essentiaCell", 1, 1, missing), - getModItem(MagicBees.ID, "pollen", 1, 1, missing), getModItem(GoodGenerator.ID, "essentiaCell", 1, 1, missing), - getModItem(GoodGenerator.ID, "essentiaCell", 1, 1, missing), }); + getModItem(GoodGenerator.ID, "essentiaCell", 1, 1, missing), + getModItem(MagicBees.ID, "pollen", 1, 1, missing) }); TCHelper.refreshResearchPages("MB_VisAuraProvider"); TCHelper.refreshResearchPages("MB_EssenceLife"); TCHelper.refreshResearchPages("MB_EssenceDeath"); From 2173d0f1e197dc56950df8400485a349e46bed1d Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Mon, 1 Jan 2024 13:01:27 +0100 Subject: [PATCH 4/6] Update ScriptMagicBees.java add Lucrum aspect via Thaumcraft methode --- src/main/java/com/dreammaster/scripts/ScriptMagicBees.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java b/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java index f1865d6da..29ca4005d 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java +++ b/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java @@ -1128,7 +1128,7 @@ public void loadRecipes() { "MB_ApiamancersDrainer", getModItem(MagicBees.ID, "apiamancersDrainer", 1, 0, missing), 5, - new AspectList().add(Aspect.MAGIC, 100).add(Aspect.HARVEST, 75).add(Aspect.getAspect("lucrum"), 50) + new AspectList().add(Aspect.MAGIC, 100).add(Aspect.HARVEST, 75).add(Aspect.GREED, 50) .add(Aspect.getAspect("tempus"), 25), getModItem(Thaumcraft.ID, "blockEssentiaReservoir", 1, 0, missing), new ItemStack[] { getModItem(Thaumcraft.ID, "blockTube", 1, 2, missing), From c5a22c0ee57255a24e4839e187d74628ade3c639 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Tue, 2 Jan 2024 11:13:55 +0100 Subject: [PATCH 5/6] Update ScriptMagicBees.java change back research --- src/main/java/com/dreammaster/scripts/ScriptMagicBees.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java b/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java index 29ca4005d..03712244a 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java +++ b/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java @@ -1128,8 +1128,7 @@ public void loadRecipes() { "MB_ApiamancersDrainer", getModItem(MagicBees.ID, "apiamancersDrainer", 1, 0, missing), 5, - new AspectList().add(Aspect.MAGIC, 100).add(Aspect.HARVEST, 75).add(Aspect.GREED, 50) - .add(Aspect.getAspect("tempus"), 25), + new AspectList().add(Aspect.MAGIC, 100).add(Aspect.HARVEST, 75).add(Aspect.getAspect("tempus"), 50), getModItem(Thaumcraft.ID, "blockEssentiaReservoir", 1, 0, missing), new ItemStack[] { getModItem(Thaumcraft.ID, "blockTube", 1, 2, missing), getModItem(MagicBees.ID, "pollen", 1, 0, missing), From 44d33e2c46ff1ec606d557e46608b98207c7ef5a Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Mon, 22 Jan 2024 22:39:15 +0100 Subject: [PATCH 6/6] Update ScriptMagicBees.java --- .../com/dreammaster/scripts/ScriptMagicBees.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java b/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java index 03712244a..2187e9bfd 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java +++ b/src/main/java/com/dreammaster/scripts/ScriptMagicBees.java @@ -1119,13 +1119,13 @@ public void loadRecipes() { new ResearchPage( TCHelper.findArcaneRecipe( getModItem(MagicBees.ID, "magicbees.enchantedEarth", 1, 0, missing)))); - TCHelper.moveResearch("MB_ApiamancersDrainer", "MAGICBEES", -1, 7); - TCHelper.addResearchPrereq("MB_ApiamancersDrainer", "MB_DimensionalSingularity", false); - TCHelper.setResearchComplexity("MB_ApiamancersDrainer", 5); - ResearchCategories.getResearch("MB_ApiamancersDrainer").setConcealed(); - ThaumcraftApi.addWarpToResearch("MB_ApiamancersDrainer", 3); + TCHelper.moveResearch("MB_ApimancersDrainer", "MAGICBEES", -1, 7); + TCHelper.addResearchPrereq("MB_ApimancersDrainer", "MB_DimensionalSingularity", false); + TCHelper.setResearchComplexity("MB_ApimancersDrainer", 5); + ResearchCategories.getResearch("MB_ApimancersDrainer").setConcealed(); + ThaumcraftApi.addWarpToResearch("MB_ApimancersDrainer", 3); ThaumcraftApi.addInfusionCraftingRecipe( - "MB_ApiamancersDrainer", + "MB_ApimancersDrainer", getModItem(MagicBees.ID, "apiamancersDrainer", 1, 0, missing), 5, new AspectList().add(Aspect.MAGIC, 100).add(Aspect.HARVEST, 75).add(Aspect.getAspect("tempus"), 50), @@ -1147,6 +1147,6 @@ public void loadRecipes() { TCHelper.refreshResearchPages("MB_Scoop"); TCHelper.refreshResearchPages("MB_ScoopVoid"); TCHelper.refreshResearchPages("MB_GrafterVoid"); - TCHelper.refreshResearchPages("MB_ApiamancersDrainer"); + TCHelper.refreshResearchPages("MB_ApimancersDrainer"); } }