From fa10e888dcee283f363d61379371c8e234fa7a62 Mon Sep 17 00:00:00 2001
From: Alastors <78517796+Alastors@users.noreply.github.com>
Date: Sat, 29 Apr 2023 02:34:54 -0400
Subject: [PATCH] Revert "Add recipes and research nodes"
This reverts commit 1e0c7d3c5ee965f2d59ac61f8a03c9a39eb65ea2.
---
src/main/java/magicbees/main/Config.java | 8 +-
.../main/utils/compat/BloodHelper.java | 48 ++----
.../main/utils/compat/ModHelperManager.java | 1 -
.../main/utils/compat/ThaumcraftHelper.java | 54 +------
.../compat/bloodmagic/ItemBloodBaseFrame.java | 137 ------------------
.../compat/bloodmagic/ItemBloodFrame.java | 2 +
.../compat/bloodmagic/ItemFrenziedFrame.java | 2 +
.../assets/magicbees/lang/en_US.lang | 11 --
.../textures/items/bloodSoakedFrame.png | Bin 363 -> 0 bytes
9 files changed, 21 insertions(+), 242 deletions(-)
delete mode 100644 src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java
delete mode 100644 src/main/resources/assets/magicbees/textures/items/bloodSoakedFrame.png
diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java
index 5355a27..b75fccd 100644
--- a/src/main/java/magicbees/main/Config.java
+++ b/src/main/java/magicbees/main/Config.java
@@ -14,6 +14,7 @@ import net.minecraftforge.common.config.Property;
import net.minecraftforge.oredict.OreDictionary;
import cpw.mods.fml.client.event.ConfigChangedEvent;
+import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.registry.GameRegistry;
@@ -148,7 +149,6 @@ public class Config {
public static ItemMagicHiveFrame hiveFrameOblivion;
public static Item hiveFrameBlood;
public static Item hiveFrameFrenzy;
- public static Item hiveFrameBloodBase;
// ----- Backpacks ------------------------------------------
public static Item thaumaturgeBackpackT1;
@@ -209,6 +209,8 @@ public class Config {
magicCapsule = new ItemCapsule(CapsuleType.MAGIC, capsuleStackSizeMax);
voidCapsule = new ItemCapsule(CapsuleType.VOID, capsuleStackSizeMax);
+ bloodMagicActive = Loader.isModLoaded("AWWayofTime");
+
setupThaumcraftItems();
setupBotaniaItems();
@@ -250,7 +252,7 @@ public class Config {
p = configuration.get(CATEGORY_MODULES, "ArsMagica", true);
arsMagicaActive = p.getBoolean();
- p = configuration.get(CATEGORY_MODULES, "BloodMagic", true);
+ p = configuration.get(CATEGORY_MODULES, "AWWayofTime", true);
bloodMagicActive = p.getBoolean();
p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true);
@@ -486,7 +488,7 @@ public class Config {
voidGrafter = new ItemVoidGrafter();
GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN);
- if (BloodHelper.isActive()) {
+ if (Loader.isModLoaded("AWWayofTime")) {
BloodHelper.getItems();
}
diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java
index f430bc9..278f987 100644
--- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java
+++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java
@@ -5,7 +5,6 @@ import net.minecraft.util.IIcon;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
-import WayofTime.alchemicalWizardry.ModItems;
import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
@@ -13,13 +12,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import magicbees.main.CommonProxy;
import magicbees.main.Config;
-import magicbees.main.utils.compat.bloodmagic.ItemBloodBaseFrame;
import magicbees.main.utils.compat.bloodmagic.ItemBloodFrame;
import magicbees.main.utils.compat.bloodmagic.ItemFrenziedFrame;
-import thaumcraft.api.ThaumcraftApi;
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.aspects.AspectList;
-import thaumcraft.common.config.ConfigItems;
public class BloodHelper implements IModHelper {
@@ -34,15 +28,11 @@ public class BloodHelper implements IModHelper {
}
public void preInit() {
- if (Loader.isModLoaded(Name) && Config.thaumcraftActive) {
+ if (Loader.isModLoaded(Name)) {
isBloodMagicActive = true;
}
}
- public static void bloodMagicInstalled() {
- isBloodMagicActive = true;
- }
-
public void init() {}
public void postInit() {}
@@ -50,12 +40,6 @@ public class BloodHelper implements IModHelper {
public static void getBlocks() {}
public static void getItems() {
- Config.hiveFrameBloodBase = new ItemBloodBaseFrame();
- GameRegistry.registerItem(
- Config.hiveFrameBloodBase,
- Config.hiveFrameBloodBase.getUnlocalizedName(),
- CommonProxy.DOMAIN);
-
Config.hiveFrameBlood = new ItemBloodFrame();
GameRegistry
.registerItem(Config.hiveFrameBlood, Config.hiveFrameBlood.getUnlocalizedName(), CommonProxy.DOMAIN);
@@ -69,32 +53,22 @@ public class BloodHelper implements IModHelper {
public static void getRecipes() {
AltarRecipeRegistry.registerAltarRecipe(
- new ItemStack(Config.hiveFrameBloodBase),
+ new ItemStack(Config.hiveFrameBlood),
new ItemStack(Config.hiveFrameMagic),
- 1,
- 5000,
+ 3,
+ 30000,
20,
20,
false);
- }
- public static void thaumRecipes() {
- ThaumcraftHelper.bloodFrame = ThaumcraftApi.addArcaneCraftingRecipe(
- "MB_BloodFrame",
- new ItemStack(Config.hiveFrameBlood),
- new AspectList().add(Aspect.AIR, 50).add(Aspect.FIRE, 50).add(Aspect.WATER, 50).add(Aspect.EARTH, 50)
- .add(Aspect.ORDER, 50).add(Aspect.ENTROPY, 50),
- new Object[] { "sbs", "bFb", "sbs", 's', ModItems.imbuedSlate, 'b', ModItems.bucketLife, 'F',
- Config.hiveFrameBloodBase });
-
- ThaumcraftHelper.frenziedFrame = ThaumcraftApi.addArcaneCraftingRecipe(
- "MB_FrenziedFrame",
+ AltarRecipeRegistry.registerAltarRecipe(
new ItemStack(Config.hiveFrameFrenzy),
- new AspectList().add(Aspect.AIR, 50).add(Aspect.FIRE, 50).add(Aspect.WATER, 50).add(Aspect.EARTH, 50)
- .add(Aspect.ORDER, 50).add(Aspect.ENTROPY, 50),
- new Object[] { "sns", "nFn", "sns", 's', ModItems.imbuedSlate, 'n',
- new ItemStack(ConfigItems.itemResource, 1, 1), 'F', Config.hiveFrameBloodBase });
-
+ new ItemStack(Config.hiveFrameNecrotic),
+ 3,
+ 30000,
+ 20,
+ 20,
+ false);
}
public static void doBloodMagicModuleConfigs(Configuration configuration) {
diff --git a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java
index 5c9c7bf..c40d60b 100644
--- a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java
+++ b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java
@@ -39,6 +39,5 @@ public class ModHelperManager {
helpers.add(new RedstoneArsenalHelper());
helpers.add(new BotaniaHelper());
helpers.add(new AppliedEnergisticsHelper());
- helpers.add(new BloodHelper());
}
}
diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java
index 2043e2b..a32071f 100644
--- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java
+++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java
@@ -202,14 +202,6 @@ public class ThaumcraftHelper implements IModHelper {
public static Item nuggetPork;
public static Item zombieBrain;
- public static ResearchItem bloodFramePage;
- public static ResearchPage bloodFrame1;
- public static ResearchPage bloodFrame2;
-
- public static ResearchItem frenzyFramePage;
- public static ResearchPage frenzyFrame1;
- public static ResearchPage frenzyFrame2;
-
public static Class nodeClass;
public static final String Name = "Thaumcraft";
@@ -272,9 +264,6 @@ public class ThaumcraftHelper implements IModHelper {
private static Object essenceOblivion;
private static Object visAuraProvider;
- public static Object bloodFrame;
- public static Object frenziedFrame;
-
private static Object voidScoop;
private static Object voidGrafter;
@@ -442,10 +431,6 @@ public class ThaumcraftHelper implements IModHelper {
new AspectList().add(Aspect.ORDER, 5),
new Object[] { " T", " s ", "s ", 's', Items.stick, 'T',
new ItemStack(miscResource, 1, MiscResource.VOID_INGOT.ordinal()) });
-
- if (BloodHelper.isActive()) {
- BloodHelper.thaumRecipes();
- }
}
private static void setupResearch() {
@@ -534,6 +519,7 @@ public class ThaumcraftHelper implements IModHelper {
.setPages(getResearchPage("MB_GrafterVoid.1"), new ResearchPage((IArcaneRecipe) voidGrafter))
.setParents("MB_Grafter").setParentsHidden("VOIDMETAL").setSecondary().setConcealed()
.registerResearchItem();
+ //
new ResearchItem(
"MB_FrameMagic",
@@ -689,43 +675,6 @@ public class ThaumcraftHelper implements IModHelper {
getResearchPage("MB_VisAuraProvider.1"),
new ResearchPage((IArcaneRecipe) visAuraProvider))
.setParentsHidden("VISPOWER").registerResearchItem();
-
- if (BloodHelper.isActive()) {
- bloodFrame1 = new ResearchPage("bloodFrame.1");
- bloodFrame2 = new ResearchPage((IArcaneRecipe) bloodFrame);
-
- bloodFramePage = new ResearchItem(
- "MB_BloodFrame",
- category,
- new AspectList().add(Aspect.LIFE, 1).add(Aspect.ORDER, 1).add(Aspect.HEAL, 1)
- .add(Aspect.EXCHANGE, 1).add(Aspect.GREED, 1),
- -4,
- 3,
- 1,
- new ItemStack(Config.hiveFrameBlood));
-
- frenzyFrame1 = new ResearchPage("frenziedFrame.1");
- frenzyFrame2 = new ResearchPage((IArcaneRecipe) frenziedFrame);
-
- frenzyFramePage = new ResearchItem(
- "MB_FrenziedFrame",
- category,
- new AspectList().add(Aspect.LIFE, 1).add(Aspect.ORDER, 1).add(Aspect.HEAL, 1)
- .add(Aspect.EXCHANGE, 1).add(Aspect.GREED, 1),
- -5,
- 3,
- 1,
- new ItemStack(Config.hiveFrameFrenzy));
-
- bloodFramePage.setPages(bloodFrame1, bloodFrame2);
- bloodFramePage.setParents("MB_FrameMagic");
-
- frenzyFramePage.setPages(frenzyFrame1, frenzyFrame2);
- frenzyFramePage.setParents("MB_FrameMagic");
-
- ResearchCategories.addResearch(bloodFramePage);
- ResearchCategories.addResearch(frenzyFramePage);
- }
}
private static ResearchPage getResearchPage(String ident) {
@@ -921,6 +870,5 @@ public class ThaumcraftHelper implements IModHelper {
item,
new int[] { item.getItemDamage() },
new AspectList().add(Aspect.VOID, 6).add((Aspect) aspectTime, 8));
-
}
}
diff --git a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java
deleted file mode 100644
index d6b69b9..0000000
--- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package magicbees.main.utils.compat.bloodmagic;
-
-import java.util.List;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.StatCollector;
-import net.minecraft.world.World;
-
-import WayofTime.alchemicalWizardry.common.items.EnergyItems;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import forestry.api.apiculture.*;
-import magicbees.main.CommonProxy;
-import magicbees.main.utils.TabMagicBees;
-
-public class ItemBloodBaseFrame extends EnergyItems implements IHiveFrame {
-
- private final IBeeModifier beeModifier = new BloodFrameBeeModifier();
- private EntityPlayer owner = null;
-
- public ItemBloodBaseFrame() {
- super();
- this.maxStackSize = 1;
- this.setMaxDamage(1);
- setEnergyUsed(1000);
- setCreativeTab(TabMagicBees.tabMagicBees);
- this.setUnlocalizedName("bloodSoakedFrame");
- }
-
- private static class BloodFrameBeeModifier implements IBeeModifier {
-
- @Override
- public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
- return 1;
- }
-
- @Override
- public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
- return 1;
- }
-
- @Override
- public float getProductionModifier(IBeeGenome genome, float currentModifier) {
- return 2;
- }
-
- @Override
- public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
- return 1;
- }
-
- @Override
- public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
- return (float) 0.8;
- }
-
- @Override
- public boolean isSealed() {
- return false;
- }
-
- @Override
- public boolean isSelfLighted() {
- return false;
- }
-
- @Override
- public boolean isSunlightSimulated() {
- return false;
- }
-
- @Override
- public boolean isHellish() {
- return false;
- }
-
- @Override
- public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
- return 1;
- }
- }
-
- @Override
- public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
- par3List.add(StatCollector.translateToLocal("You feel gross touching this"));
-
- if (!(par1ItemStack.getTagCompound() == null)) {
- par3List.add(
- StatCollector.translateToLocal("tooltip.owner.currentowner") + " "
- + par1ItemStack.getTagCompound().getString("ownerName"));
- }
-
- }
-
- @Override
- @SideOnly(Side.CLIENT)
- public void registerIcons(IIconRegister iconRegister) {
- this.itemIcon = iconRegister.registerIcon(CommonProxy.DOMAIN + ":bloodSoakedFrame");
- }
-
- @Override
- public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
-
- if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) {
- owner = par3EntityPlayer;
- if (par1ItemStack.getItemDamage() > 0) {
- if (EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) {
- par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1);
- }
- }
- }
-
- return par1ItemStack;
- }
-
- @Override
- public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear) {
- if (EnergyItems.canSyphonInContainer(frame, getEnergyUsed() * wear)) {
- if (owner != null) {
- EnergyItems.drainPlayerNetwork(owner, getEnergyUsed() * wear);
- }
- } else {
- frame.setItemDamage(frame.getItemDamage() + wear);
- if (frame.getItemDamage() >= frame.getMaxDamage()) {
- return null;
- }
- }
- return frame;
- }
-
- @Override
- public IBeeModifier getBeeModifier() {
- return beeModifier;
- }
-}
diff --git a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java
index 0a6c162..c45a47e 100644
--- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java
+++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java
@@ -117,10 +117,12 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame {
@Override
public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear) {
+ // TODO Auto-generated method stub
if (EnergyItems.canSyphonInContainer(frame, getEnergyUsed() * wear)) {
if (owner != null) {
EnergyItems.drainPlayerNetwork(owner, getEnergyUsed() * wear);
}
+ // EnergyItems.syphonWhileInContainer(frame, getEnergyUsed() * wear);
} else {
frame.setItemDamage(frame.getItemDamage() + wear);
if (frame.getItemDamage() >= frame.getMaxDamage()) {
diff --git a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java
index f5590eb..66f96e3 100644
--- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java
+++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java
@@ -116,10 +116,12 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame {
@Override
public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear) {
+ // TODO Auto-generated method stub
if (EnergyItems.canSyphonInContainer(frame, getEnergyUsed() * wear)) {
if (owner != null) {
EnergyItems.drainPlayerNetwork(owner, getEnergyUsed() * wear);
}
+ // EnergyItems.syphonWhileInContainer(frame, getEnergyUsed() * wear);
} else {
frame.setItemDamage(frame.getItemDamage() + wear);
if (frame.getItemDamage() >= frame.getMaxDamage()) {
diff --git a/src/main/resources/assets/magicbees/lang/en_US.lang b/src/main/resources/assets/magicbees/lang/en_US.lang
index a1e93ca..bc95993 100644
--- a/src/main/resources/assets/magicbees/lang/en_US.lang
+++ b/src/main/resources/assets/magicbees/lang/en_US.lang
@@ -146,7 +146,6 @@ item.frameTemporal.name=Temporal Frame
item.frameOblivion.name=Oblivion Frame
item.bloodFrame.name=Sanguis Artus
item.frenziedFrame.name=Maddening Frame of Frenzy
-item.bloodSoakedFrame.name=Blood Frame
#Capsules
capsule.magic=%s Magic Capsule
@@ -229,16 +228,6 @@ research.node.dark=Dark
research.node.chaotic=Chaotic
research.block.crystals=Crystal Cluster
-
-#Blood Magic Compat
-tc.research_name.MB_BloodFrame=Sanguis Artus
-tc.research_text.MB_BloodFrame=Welcome, honored guest. To the birthplace of our Dynasty!
-tc.research_name.MB_FrenziedFrame=Maddening Frame of Frenzy
-tc.research_text.MB_FrenziedFrame=May chaos take the world! May chaos take the world!
-frenziedFrame.1=You don't know how it came to you... madness, is it not?
You remember yourself swearing to others that you heard some kind of voice in the back of your mind, almost silently... screaming? You can vaguely remember its ghastly call, screaming for you to burn the world in the purifying flames of chaos.
You took it into your hands, and you distinctly remember feeling the chaotic energies burning through your body, singeing your very mind in its fire.
But... surely you didn't, that would be madness after all...
-bloodFrame.1=Chosen Tarnished, and would-be Lord. Descend into the depths, far below the Erdtree Capital. Seek audience with the Three Fingers and the flame of frenzy. If you inherit the flame of frenzy, your flesh will serve as kindling and the girl can be spared ...setting you on the righteous path of lordship. The path of the Lord of Chaos. Burn the Erdtree to the ground, and incinerate all that divides and distinguishes.
THIS IS TEMPORARY, ACTUALLY SOLVE THIS AT SOME POINT TOMORROW!
-
-
#Species
magicbees.speciesMystical=Mystical
magicbees.speciesMystical.description=Common in many parts of the world, these bees have a little extra whimsy about them.|Apinomicon
diff --git a/src/main/resources/assets/magicbees/textures/items/bloodSoakedFrame.png b/src/main/resources/assets/magicbees/textures/items/bloodSoakedFrame.png
deleted file mode 100644
index 717f240c4efc899a8ecc9f42eb85401d91a6cf03..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 363
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE
z)7O>#9-|Z=1J6?)jj2E(+02lL66gHf+|;}hAeVu`xhOTUBsE2$JhLQ2!QIn0AVn{g
z9Vq_L)5S5w;`G%?hTex01ls1WKOzvc#EFZw@PyKi9W3pC8sGfW{y)pYLtLF*b`eLQ
zb5v%s-p_NoF5JEf-g{rZ+wr`$`u&6Z?VX1m7H__pus~z!+3A^$j2(v^+7Gqgt8oIQQbtboYWWPhQ
z?$OuWLDM>}FkD%;w6G;jYeMC3)_wPiSDh8>c3maqy3%jo#hFKIX8jYL^d+