From e12eda73fc8d6bf0e5aa23fbd4e8c7925ebf9f4d Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Thu, 27 Apr 2023 22:01:03 -0400 Subject: [PATCH 01/70] Addition of Blood Magic Frames Adds the replacement for the Blood Frame from BM, which is soon to be deleted from BM because of glitches, likewise this adds a new frame, The Maddening Frame of Frenzy, both use LP, both need a recipe to be decided on a later date, both need their lp tweaked, the updated LP is currently proposed to be switched to 25k --- dependencies.gradle | 5 +- .../magicbees/item/types/HiveFrameType.java | 3 +- src/main/java/magicbees/main/Config.java | 12 ++ .../compat/bloodmagic/ItemBloodFrame.java | 140 ++++++++++++++++++ .../compat/bloodmagic/ItemFrenziedFrame.java | 137 +++++++++++++++++ .../assets/magicbees/lang/en_US.lang | 2 + .../magicbees/textures/items/bloodFrame.png | Bin 0 -> 401 bytes .../textures/items/frenziedFrame.png | Bin 0 -> 498 bytes 8 files changed, 296 insertions(+), 3 deletions(-) create mode 100644 src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java create mode 100644 src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java create mode 100644 src/main/resources/assets/magicbees/textures/items/bloodFrame.png create mode 100644 src/main/resources/assets/magicbees/textures/items/frenziedFrame.png diff --git a/dependencies.gradle b/dependencies.gradle index 14f4243..3dd097f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,9 +1,10 @@ // Add your dependencies here dependencies { - compile('com.github.GTNewHorizons:ForestryMC:4.5.2:dev') + compile('com.github.GTNewHorizons:ForestryMC:4.6.6:dev') compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:Botania:1.9.2-GTNH:api') {transitive = false} + compileOnly('com.github.GTNewHorizons:Botania:1.9.17-GTNH:api') {transitive = false} compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:BloodMagic:1.3.22:dev') {transitive = false} } diff --git a/src/main/java/magicbees/item/types/HiveFrameType.java b/src/main/java/magicbees/item/types/HiveFrameType.java index f822993..aa71438 100644 --- a/src/main/java/magicbees/item/types/HiveFrameType.java +++ b/src/main/java/magicbees/item/types/HiveFrameType.java @@ -12,7 +12,8 @@ public enum HiveFrameType implements IBeeModifier { METABOLIC("Metabolic", 130, 1f, 1.8f, 1f, 1.2f, 1f), NECROTIC("Necrotic", 280, 1f, 1f, 0.3f, 0.75f, 1.2f), TEMPORAL("Temporal", 300, 1f, 1f, 2.5f, 1f, 0.8f), - OBLIVION("Oblivion", 50, 1f, 1f, 0.0001f, 0f, 1f),; + OBLIVION("Oblivion", 50, 1f, 1f, 0.0001f, 0f, 1f); + private final String frameName; public final int maxDamage; diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 88fa5c3..e5d620f 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -38,6 +38,8 @@ import magicbees.main.utils.LogHelper; import magicbees.main.utils.VersionInfo; import magicbees.main.utils.compat.BotaniaHelper; import magicbees.main.utils.compat.ThaumcraftHelper; +import magicbees.main.utils.compat.bloodmagic.ItemBloodFrame; +import magicbees.main.utils.compat.bloodmagic.ItemFrenziedFrame; import magicbees.storage.BackpackDefinition; import magicbees.tileentity.TileEntityEffectJar; import magicbees.tileentity.TileEntityMagicApiary; @@ -146,6 +148,8 @@ public class Config { public static ItemMagicHiveFrame hiveFrameNecrotic; public static ItemMagicHiveFrame hiveFrameTemporal; public static ItemMagicHiveFrame hiveFrameOblivion; + public static ItemBloodFrame hiveFrameBlood; + public static ItemFrenziedFrame hiveFrameFrenzy; // ----- Backpacks ------------------------------------------ public static Item thaumaturgeBackpackT1; @@ -482,6 +486,14 @@ public class Config { voidGrafter = new ItemVoidGrafter(); GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); + if (bloodMagicActive) { + hiveFrameBlood = new ItemBloodFrame(); + GameRegistry.registerItem(hiveFrameBlood, hiveFrameBlood.getUnlocalizedName(), CommonProxy.DOMAIN); + + hiveFrameFrenzy = new ItemFrenziedFrame(); + GameRegistry.registerItem(hiveFrameFrenzy, hiveFrameFrenzy.getUnlocalizedName(), CommonProxy.DOMAIN); + } + } } diff --git a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java new file mode 100644 index 0000000..5b11b0b --- /dev/null +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java @@ -0,0 +1,140 @@ +package magicbees.main.utils.compat.bloodmagic; + +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +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; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; + +import java.util.List; + +public class ItemBloodFrame extends EnergyItems implements IHiveFrame { + + private final IBeeModifier beeModifier = new BloodFrameBeeModifier(); + private EntityPlayer owner = null; + + public ItemBloodFrame() { + super(); + this.maxStackSize = 1; + this.setMaxDamage(1); + setEnergyUsed(1000); + setCreativeTab(TabMagicBees.tabMagicBees); + this.setUnlocalizedName("bloodFrame"); + } + + 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 0.0001f; + } + + @Override + public float getProductionModifier(IBeeGenome genome, float currentModifier) { + return 0; + } + + @Override + public float getFloweringModifier(IBeeGenome genome, float currentModifier) { + return 1; + } + + @Override + public float getGeneticDecay(IBeeGenome genome, float currentModifier) { + return 1; + } + + @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("tooltip.bloodframe.desc")); + + 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 + ":bloodFrame"); + } + + @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) { + // 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()) { + return null; + } + } + return frame; + } + + @Override + public IBeeModifier getBeeModifier() { + return beeModifier; + } +} diff --git a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java new file mode 100644 index 0000000..c7043f1 --- /dev/null +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java @@ -0,0 +1,137 @@ +package magicbees.main.utils.compat.bloodmagic; + +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; +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 java.util.List; + +public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame { + + private final IBeeModifier beeModifier = new FrenziedFrameBeeModifier(); + private EntityPlayer owner = null; + + public ItemFrenziedFrame() { + super(); + this.maxStackSize = 1; + this.setMaxDamage(1); + setEnergyUsed(1000); + setCreativeTab(TabMagicBees.tabMagicBees); + this.setUnlocalizedName("frenziedFrame"); + } + + private static class FrenziedFrameBeeModifier implements IBeeModifier { + + @Override + public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { + return 10; + } + + @Override + public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { + return 0.0001f; + } + + @Override + public float getProductionModifier(IBeeGenome genome, float currentModifier) { + return 0; + } + + @Override + public float getFloweringModifier(IBeeGenome genome, float currentModifier) { + return 0; + } + + @Override + public float getGeneticDecay(IBeeGenome genome, float currentModifier) { + return 10; + } + + @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("MAY CHAOS TAKE THE WORLD")); + + 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 + ":frenziedFrame"); + } + + @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) { + // 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()) { + return null; + } + } + return frame; + } + + @Override + public IBeeModifier getBeeModifier() { + return beeModifier; + } +} diff --git a/src/main/resources/assets/magicbees/lang/en_US.lang b/src/main/resources/assets/magicbees/lang/en_US.lang index 3bd43ee..bc95993 100644 --- a/src/main/resources/assets/magicbees/lang/en_US.lang +++ b/src/main/resources/assets/magicbees/lang/en_US.lang @@ -144,6 +144,8 @@ item.frameMetabolic.name=Metabolic Frame item.frameNecrotic.name=Necrotic Frame item.frameTemporal.name=Temporal Frame item.frameOblivion.name=Oblivion Frame +item.bloodFrame.name=Sanguis Artus +item.frenziedFrame.name=Maddening Frame of Frenzy #Capsules capsule.magic=%s Magic Capsule diff --git a/src/main/resources/assets/magicbees/textures/items/bloodFrame.png b/src/main/resources/assets/magicbees/textures/items/bloodFrame.png new file mode 100644 index 0000000000000000000000000000000000000000..f41865897d64710b72f2e334cdd5deb5fa62ca39 GIT binary patch literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D%z4Lw~PLo9l) zPBipB>>$xLfA_MEUPX&71xejOf21S-F!HT?760Phvq$sxKX~_O-r4#KkCeh(41?N* zmMqYb z?f7O9@7hzIoC$BE!^fEeYDb6bnC8^8}jQJ-ZoG8d)-ZQ$)dP#X-OYPx$l1W5CR5*>jlDkSnK@f(&jTbDuM1v>MDms)?j$3!lZ-UQzAENk=duYTo1mG`TcWf` z;b<1@8Vk8Q<5D=9Wnuoz#IN-R0L9{5^TMwATgoPo%5K!xZZOVR9mX9Xq!Zftwp6FG z8#O{Y_AS7!p_Xox5%4Z9z5lFkOLgO(-hWoHc$m-QX~S9Bd^B1iaZDev

Date: Thu, 27 Apr 2023 22:11:12 -0400 Subject: [PATCH 02/70] fer fecks sake spotless --- .../magicbees/item/types/HiveFrameType.java | 1 - .../compat/bloodmagic/ItemBloodFrame.java | 32 +++++++++---------- .../compat/bloodmagic/ItemFrenziedFrame.java | 30 +++++++++-------- 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/src/main/java/magicbees/item/types/HiveFrameType.java b/src/main/java/magicbees/item/types/HiveFrameType.java index aa71438..ad9c2d1 100644 --- a/src/main/java/magicbees/item/types/HiveFrameType.java +++ b/src/main/java/magicbees/item/types/HiveFrameType.java @@ -14,7 +14,6 @@ public enum HiveFrameType implements IBeeModifier { TEMPORAL("Temporal", 300, 1f, 1f, 2.5f, 1f, 0.8f), OBLIVION("Oblivion", 50, 1f, 1f, 0.0001f, 0f, 1f); - private final String frameName; public final int maxDamage; 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 5b11b0b..def220d 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java @@ -1,20 +1,20 @@ package magicbees.main.utils.compat.bloodmagic; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.apiculture.*; +import java.util.List; + import magicbees.main.CommonProxy; import magicbees.main.utils.TabMagicBees; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import java.util.List; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.apiculture.*; public class ItemBloodFrame extends EnergyItems implements IHiveFrame { @@ -104,14 +104,14 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame { @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); - } - } - } + if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) { + owner = par3EntityPlayer; + if (par1ItemStack.getItemDamage() > 0) { + if (EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { + par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); + } + } + } return par1ItemStack; } @@ -123,7 +123,7 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame { if (owner != null) { EnergyItems.drainPlayerNetwork(owner, getEnergyUsed() * wear); } - // EnergyItems.syphonWhileInContainer(frame, 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 c7043f1..464c23c 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java @@ -1,18 +1,20 @@ package magicbees.main.utils.compat.bloodmagic; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.apiculture.*; +import java.util.List; + import magicbees.main.CommonProxy; import magicbees.main.utils.TabMagicBees; + 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 java.util.List; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.apiculture.*; public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame { @@ -101,14 +103,14 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame { @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); - } - } - } + if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) { + owner = par3EntityPlayer; + if (par1ItemStack.getItemDamage() > 0) { + if (EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { + par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); + } + } + } return par1ItemStack; } @@ -120,7 +122,7 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame { if (owner != null) { EnergyItems.drainPlayerNetwork(owner, getEnergyUsed() * wear); } - // EnergyItems.syphonWhileInContainer(frame, getEnergyUsed() * wear); + // EnergyItems.syphonWhileInContainer(frame, getEnergyUsed() * wear); } else { frame.setItemDamage(frame.getItemDamage() + wear); if (frame.getItemDamage() >= frame.getMaxDamage()) { From 1d4a52c3af5d0d00fce8402c510817b5f8050ca7 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Thu, 27 Apr 2023 22:17:38 -0400 Subject: [PATCH 03/70] You gonna work this time? --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 3dd097f..a5d9fbc 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -6,5 +6,5 @@ dependencies { compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:Botania:1.9.17-GTNH:api') {transitive = false} compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:BloodMagic:1.3.22:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:BloodMagic:1.3.22:dev') } From 77936b6dab7e7a083067d2faaed38bca48449fc0 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Thu, 27 Apr 2023 23:35:19 -0400 Subject: [PATCH 04/70] Finally fixed the optional dependency --- dependencies.gradle | 2 +- src/main/java/magicbees/main/Config.java | 11 ++--- .../main/utils/compat/BloodHelper.java | 42 +++++++++++++++++++ 3 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 src/main/java/magicbees/main/utils/compat/BloodHelper.java diff --git a/dependencies.gradle b/dependencies.gradle index a5d9fbc..3dd097f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -6,5 +6,5 @@ dependencies { compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:Botania:1.9.17-GTNH:api') {transitive = false} compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:BloodMagic:1.3.22:dev') + compileOnly('com.github.GTNewHorizons:BloodMagic:1.3.22:dev') {transitive = false} } diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index e5d620f..6e2d9d7 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -36,6 +36,7 @@ import magicbees.item.types.WaxType; import magicbees.main.utils.LocalizationManager; import magicbees.main.utils.LogHelper; import magicbees.main.utils.VersionInfo; +import magicbees.main.utils.compat.BloodHelper; import magicbees.main.utils.compat.BotaniaHelper; import magicbees.main.utils.compat.ThaumcraftHelper; import magicbees.main.utils.compat.bloodmagic.ItemBloodFrame; @@ -94,7 +95,7 @@ public class Config { public static int thaumcraftNodeMaxSize; public static boolean arsMagicaActive; - public static boolean bloodMagicActive; + public static boolean bloodMagicActive = true; public static boolean equivalentExchangeActive; public static boolean extraBeesActive; public static boolean redstoneArsenalActive; @@ -251,8 +252,8 @@ public class Config { p = configuration.get(CATEGORY_MODULES, "ArsMagica", true); arsMagicaActive = p.getBoolean(); - p = configuration.get(CATEGORY_MODULES, "BloodMagic", true); - bloodMagicActive = p.getBoolean(); + p = configuration.get(CATEGORY_MODULES, "bloodmagic", true); + // bloodMagicActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true); equivalentExchangeActive = p.getBoolean(); @@ -486,13 +487,13 @@ public class Config { voidGrafter = new ItemVoidGrafter(); GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); - if (bloodMagicActive) { + try { hiveFrameBlood = new ItemBloodFrame(); GameRegistry.registerItem(hiveFrameBlood, hiveFrameBlood.getUnlocalizedName(), CommonProxy.DOMAIN); hiveFrameFrenzy = new ItemFrenziedFrame(); GameRegistry.registerItem(hiveFrameFrenzy, hiveFrameFrenzy.getUnlocalizedName(), CommonProxy.DOMAIN); - } + } catch (Exception ignored) {} } } diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java new file mode 100644 index 0000000..c3315c7 --- /dev/null +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -0,0 +1,42 @@ +package magicbees.main.utils.compat; + +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import magicbees.main.Config; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.common.config.Property; + +public class BloodHelper implements IModHelper { + + @SideOnly(Side.CLIENT) + public static IIcon subtileIcons[]; + + private static boolean isBloodMagicActive = false; + public static final String Name = "bloodmagic"; + + + public static boolean isActive() { + return isBloodMagicActive; + } + + public void preInit() { + if (Loader.isModLoaded(Name) && Config.bloodMagicActive) { + isBloodMagicActive = true; + } + } + + public void init() { } + + public void postInit() {} + + public static void getBlocks() {} + + public static void getItems() {} + + public static void doBloodMagicModuleConfigs(Configuration configuration) { + Property p; + } + +} From b9292af3d94a700621dd0f4f7c4339bca59e43e2 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Thu, 27 Apr 2023 23:40:46 -0400 Subject: [PATCH 05/70] SpOtLeSsChEcK fAiLEd --- src/main/java/magicbees/main/Config.java | 3 +-- .../magicbees/main/utils/compat/BloodHelper.java | 13 +++++++------ .../utils/compat/bloodmagic/ItemFrenziedFrame.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 6e2d9d7..b553edf 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -36,7 +36,6 @@ import magicbees.item.types.WaxType; import magicbees.main.utils.LocalizationManager; import magicbees.main.utils.LogHelper; import magicbees.main.utils.VersionInfo; -import magicbees.main.utils.compat.BloodHelper; import magicbees.main.utils.compat.BotaniaHelper; import magicbees.main.utils.compat.ThaumcraftHelper; import magicbees.main.utils.compat.bloodmagic.ItemBloodFrame; @@ -253,7 +252,7 @@ public class Config { arsMagicaActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "bloodmagic", true); - // bloodMagicActive = p.getBoolean(); + // bloodMagicActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true); equivalentExchangeActive = p.getBoolean(); diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index c3315c7..7152dcf 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -1,12 +1,14 @@ package magicbees.main.utils.compat; +import magicbees.main.Config; + +import net.minecraft.util.IIcon; +import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.common.config.Property; + import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import magicbees.main.Config; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.common.config.Property; public class BloodHelper implements IModHelper { @@ -16,7 +18,6 @@ public class BloodHelper implements IModHelper { private static boolean isBloodMagicActive = false; public static final String Name = "bloodmagic"; - public static boolean isActive() { return isBloodMagicActive; } @@ -27,7 +28,7 @@ public class BloodHelper implements IModHelper { } } - public void init() { } + public void init() {} public void postInit() {} 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 464c23c..ab478c9 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java @@ -64,7 +64,7 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame { @Override public boolean isSelfLighted() { - return false; + return true; } @Override From ef4359835ae083dfcfd695521b625d322a04c826 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Fri, 28 Apr 2023 01:13:14 -0400 Subject: [PATCH 06/70] Should work this time --- src/main/java/magicbees/main/Config.java | 12 +++++++----- .../magicbees/main/utils/compat/BloodHelper.java | 6 ++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index b553edf..6b7969f 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -57,6 +57,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; @@ -94,7 +95,7 @@ public class Config { public static int thaumcraftNodeMaxSize; public static boolean arsMagicaActive; - public static boolean bloodMagicActive = true; + public static boolean bloodMagicActive; public static boolean equivalentExchangeActive; public static boolean extraBeesActive; public static boolean redstoneArsenalActive; @@ -251,8 +252,8 @@ public class Config { p = configuration.get(CATEGORY_MODULES, "ArsMagica", true); arsMagicaActive = p.getBoolean(); - p = configuration.get(CATEGORY_MODULES, "bloodmagic", true); - // bloodMagicActive = p.getBoolean(); + p = configuration.get(CATEGORY_MODULES, "AWWayofTime", true); + bloodMagicActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true); equivalentExchangeActive = p.getBoolean(); @@ -486,13 +487,14 @@ public class Config { voidGrafter = new ItemVoidGrafter(); GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); - try { + + if (Loader.isModLoaded("AWWayofTime")) { hiveFrameBlood = new ItemBloodFrame(); GameRegistry.registerItem(hiveFrameBlood, hiveFrameBlood.getUnlocalizedName(), CommonProxy.DOMAIN); hiveFrameFrenzy = new ItemFrenziedFrame(); GameRegistry.registerItem(hiveFrameFrenzy, hiveFrameFrenzy.getUnlocalizedName(), CommonProxy.DOMAIN); - } catch (Exception ignored) {} + } } } diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index 7152dcf..ad7ed96 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -1,7 +1,5 @@ package magicbees.main.utils.compat; -import magicbees.main.Config; - import net.minecraft.util.IIcon; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; @@ -16,14 +14,14 @@ public class BloodHelper implements IModHelper { public static IIcon subtileIcons[]; private static boolean isBloodMagicActive = false; - public static final String Name = "bloodmagic"; + public static final String Name = "AWWayofTime"; public static boolean isActive() { return isBloodMagicActive; } public void preInit() { - if (Loader.isModLoaded(Name) && Config.bloodMagicActive) { + if (Loader.isModLoaded(Name)) { isBloodMagicActive = true; } } From 87ec6c63ebd0ee277cd9840e4c75214e4369aac2 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Fri, 28 Apr 2023 01:19:22 -0400 Subject: [PATCH 07/70] I swear to god if this fixes it --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 3dd097f..3317910 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -6,5 +6,5 @@ dependencies { compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:Botania:1.9.17-GTNH:api') {transitive = false} compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:BloodMagic:1.3.22:dev') {transitive = false} + compile('com.github.GTNewHorizons:BloodMagic:1.3.22:dev') {transitive = false} } From 726831399da645da438904913b62e6f76f7dee90 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Fri, 28 Apr 2023 01:30:54 -0400 Subject: [PATCH 08/70] Update dependencies.gradle --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 3317910..a5d9fbc 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -6,5 +6,5 @@ dependencies { compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:Botania:1.9.17-GTNH:api') {transitive = false} compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false} - compile('com.github.GTNewHorizons:BloodMagic:1.3.22:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:BloodMagic:1.3.22:dev') } From 6c6b690d57e0febdb6e6fa245da88d57c685c529 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Fri, 28 Apr 2023 01:36:51 -0400 Subject: [PATCH 09/70] Update dependencies.gradle --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index a5d9fbc..2a3b2e6 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -6,5 +6,5 @@ dependencies { compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:Botania:1.9.17-GTNH:api') {transitive = false} compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:BloodMagic:1.3.22:dev') + compile('com.github.GTNewHorizons:BloodMagic:1.3.22:dev') } From 138e8d9c4069c76664fbeaa086a914d8c50a1e89 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Fri, 28 Apr 2023 01:51:07 -0400 Subject: [PATCH 10/70] Please work --- dependencies.gradle | 3 ++- src/main/java/magicbees/main/Config.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 2a3b2e6..f1755d0 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -3,8 +3,9 @@ dependencies { compile('com.github.GTNewHorizons:ForestryMC:4.6.6:dev') + compileOnly('com.github.GTNewHorizons:BloodMagic:1.3.22:dev') compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:Botania:1.9.17-GTNH:api') {transitive = false} compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false} - compile('com.github.GTNewHorizons:BloodMagic:1.3.22:dev') + } diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 6b7969f..55fb3e1 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -211,6 +211,8 @@ public class Config { magicCapsule = new ItemCapsule(CapsuleType.MAGIC, capsuleStackSizeMax); voidCapsule = new ItemCapsule(CapsuleType.VOID, capsuleStackSizeMax); + bloodMagicActive = Loader.isModLoaded("AWWayofTime"); + setupThaumcraftItems(); setupBotaniaItems(); @@ -488,7 +490,7 @@ public class Config { voidGrafter = new ItemVoidGrafter(); GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); - if (Loader.isModLoaded("AWWayofTime")) { + if (bloodMagicActive) { hiveFrameBlood = new ItemBloodFrame(); GameRegistry.registerItem(hiveFrameBlood, hiveFrameBlood.getUnlocalizedName(), CommonProxy.DOMAIN); From 32ffe03aa30f4f4fd364b3a1435c2509d7c6838c Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Fri, 28 Apr 2023 10:55:02 -0400 Subject: [PATCH 11/70] Update Config.java --- src/main/java/magicbees/main/Config.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 55fb3e1..9e3ddd7 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -149,8 +149,8 @@ public class Config { public static ItemMagicHiveFrame hiveFrameNecrotic; public static ItemMagicHiveFrame hiveFrameTemporal; public static ItemMagicHiveFrame hiveFrameOblivion; - public static ItemBloodFrame hiveFrameBlood; - public static ItemFrenziedFrame hiveFrameFrenzy; + public static Item hiveFrameBlood; + public static Item hiveFrameFrenzy; // ----- Backpacks ------------------------------------------ public static Item thaumaturgeBackpackT1; From 75db1329eafc75e759e77eacdd8b84b2b56f3edf Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Fri, 28 Apr 2023 11:03:33 -0400 Subject: [PATCH 12/70] Update Config.java --- src/main/java/magicbees/main/Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 9e3ddd7..accb03b 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -490,7 +490,7 @@ public class Config { voidGrafter = new ItemVoidGrafter(); GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); - if (bloodMagicActive) { + if (Loader.isModLoaded("AWWayofTime")) { hiveFrameBlood = new ItemBloodFrame(); GameRegistry.registerItem(hiveFrameBlood, hiveFrameBlood.getUnlocalizedName(), CommonProxy.DOMAIN); From e1d289bc482b5620a3a02d4e697ff00118a893c5 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Fri, 28 Apr 2023 17:50:21 +0200 Subject: [PATCH 13/70] update bs+sa --- build.gradle | 461 +++++++++++++----- gradle/wrapper/gradle-wrapper.jar | Bin 61608 -> 61574 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 4 +- src/main/java/magicbees/bees/Allele.java | 25 +- .../magicbees/bees/BeeClassification.java | 2 +- .../java/magicbees/bees/BeeGenomeManager.java | 5 +- .../java/magicbees/bees/BeeIconProvider.java | 3 +- src/main/java/magicbees/bees/BeeManager.java | 11 +- src/main/java/magicbees/bees/BeeMutation.java | 17 +- .../java/magicbees/bees/BeeProductHelper.java | 10 +- src/main/java/magicbees/bees/BeeSpecies.java | 15 +- .../java/magicbees/bees/HiveDescription.java | 17 +- .../bees/MoonPhaseMutationBonus.java | 5 +- .../bees/MoonPhaseMutationRestriction.java | 5 +- .../allele/effect/AlleleEffectCrumbling.java | 5 +- .../bees/allele/effect/AlleleEffectCure.java | 3 +- .../allele/effect/AlleleEffectEmpowering.java | 17 +- .../effect/AlleleEffectNodeConversion.java | 11 +- .../allele/effect/AlleleEffectNodeRepair.java | 9 +- .../effect/AlleleEffectPlaceholder.java | 2 +- .../allele/effect/AlleleEffectPotion.java | 3 +- .../allele/effect/AlleleEffectRecharge.java | 15 +- .../allele/effect/AlleleEffectSpawnMob.java | 5 +- .../effect/AlleleEffectSpawnMobWeighted.java | 5 +- .../allele/effect/AlleleEffectSpawnWisp.java | 3 +- .../effect/AlleleEffectTransmuting.java | 5 +- .../effect/TransmutationEffectController.java | 8 +- .../TransmutationEffectLBotaniaLiving.java | 6 +- .../effect/TransmutationEffectRailcraft.java | 3 +- .../effect/TransmutationEffectVanilla.java | 4 +- .../FlowerProviderArsMagicaFlower.java | 5 +- .../FlowerProviderAuraNode.java | 5 +- .../FlowerProviderBookshelf.java | 3 +- .../flowerProvider/FlowerProviderBotania.java | 5 +- .../FlowerProviderThaumcraftFlower.java | 5 +- .../java/magicbees/block/BlockEffectJar.java | 11 +- .../magicbees/block/BlockEnchantedEarth.java | 5 +- src/main/java/magicbees/block/BlockHive.java | 5 +- .../magicbees/block/BlockMagicApiary.java | 11 +- .../block/BlockManaAuraProvider.java | 7 +- .../magicbees/block/BlockVisAuraProvider.java | 7 +- .../java/magicbees/block/types/HiveType.java | 15 +- .../client/gui/ContainerEffectJar.java | 3 +- .../client/gui/ContainerMagicApiary.java | 7 +- .../magicbees/client/gui/GUIEffectJar.java | 6 +- .../java/magicbees/client/gui/GUIHandler.java | 5 +- .../magicbees/client/gui/GuiMagicApiary.java | 5 +- .../magicbees/client/gui/ModGuiConfig.java | 5 +- .../client/model/ModelEffectJar.java | 3 +- .../client/model/ModelVisAuraProvider.java | 3 +- .../client/render/RendererEffectJar.java | 5 +- .../render/RendererVisAuraProvider.java | 5 +- src/main/java/magicbees/item/ItemCapsule.java | 9 +- src/main/java/magicbees/item/ItemComb.java | 7 +- src/main/java/magicbees/item/ItemDrop.java | 5 +- src/main/java/magicbees/item/ItemGrafter.java | 5 +- .../java/magicbees/item/ItemMagicHive.java | 3 +- .../magicbees/item/ItemMagicHiveFrame.java | 7 +- .../magicbees/item/ItemManasteelGrafter.java | 7 +- .../magicbees/item/ItemManasteelScoop.java | 7 +- .../magicbees/item/ItemMiscResources.java | 7 +- .../java/magicbees/item/ItemMoonDial.java | 9 +- .../magicbees/item/ItemMysteriousMagnet.java | 9 +- src/main/java/magicbees/item/ItemNugget.java | 5 +- src/main/java/magicbees/item/ItemPollen.java | 5 +- .../java/magicbees/item/ItemPropolis.java | 5 +- .../magicbees/item/ItemThaumiumGrafter.java | 9 +- .../magicbees/item/ItemThaumiumScoop.java | 9 +- .../java/magicbees/item/ItemVoidGrafter.java | 11 +- .../java/magicbees/item/ItemVoidScoop.java | 11 +- src/main/java/magicbees/item/ItemWax.java | 5 +- .../java/magicbees/item/types/FluidType.java | 4 +- .../magicbees/item/types/HiveFrameType.java | 2 +- .../java/magicbees/item/types/NuggetType.java | 4 +- src/main/java/magicbees/main/ClientProxy.java | 9 +- src/main/java/magicbees/main/Config.java | 37 +- src/main/java/magicbees/main/MagicBees.java | 16 +- .../magicbees/main/utils/CraftingManager.java | 23 +- .../java/magicbees/main/utils/IMCManager.java | 3 +- .../magicbees/main/utils/TabMagicBees.java | 6 +- .../compat/AppliedEnergisticsHelper.java | 3 +- .../main/utils/compat/ArsMagicaHelper.java | 7 +- .../main/utils/compat/BotaniaHelper.java | 15 +- .../compat/EquivalentExchangeHelper.java | 5 +- .../main/utils/compat/ExtraBeesHelper.java | 5 +- .../main/utils/compat/ForestryHelper.java | 13 +- .../utils/compat/RedstoneArsenalHelper.java | 5 +- .../main/utils/compat/ThaumcraftHelper.java | 25 +- .../main/utils/compat/ThermalModsHelper.java | 5 +- .../compat/bloodmagic/ItemBloodFrame.java | 5 +- .../compat/bloodmagic/ItemFrenziedFrame.java | 5 +- .../botania/BotaniaAPIDistanceHelper.java | 7 +- .../botania/SpeciesRecipeElvenTrade.java | 7 +- .../botania/SpeciesRecipeManaInfusion.java | 9 +- .../utils/compat/botania/SubTileBeegonia.java | 9 +- .../compat/botania/SubTileHibeescus.java | 9 +- .../compat/botania/SubTileHiveacynth.java | 9 +- .../utils/compat/thaumcraft/NodeHelper.java | 3 +- .../main/utils/net/EventAuraChargeUpdate.java | 9 +- .../magicbees/main/utils/net/EventBase.java | 3 +- .../main/utils/net/EventFlagsUpdate.java | 9 +- .../main/utils/net/EventInventoryUpdate.java | 5 +- .../main/utils/net/NetworkEventHandler.java | 15 +- .../magicbees/tileentity/AuraCharges.java | 4 +- .../tileentity/EffectJarHousing.java | 3 +- .../tileentity/TileEntityEffectJar.java | 3 +- .../tileentity/TileEntityMagicApiary.java | 17 +- .../TileEntityManaAuraProvider.java | 13 +- .../tileentity/TileEntityVisAuraProvider.java | 7 +- .../world/feature/FeatureOreVein.java | 4 +- .../world/feature/HiveGenOblivion.java | 3 +- .../world/feature/HiveGenUnderground.java | 3 +- 113 files changed, 710 insertions(+), 590 deletions(-) diff --git a/build.gradle b/build.gradle index fe8a2e7..17e7501 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1675110695 +//version: 1682616243 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -6,27 +6,28 @@ */ -import com.diffplug.blowdryer.Blowdryer -import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import com.gtnewhorizons.retrofuturagradle.ObfuscationAttribute import com.gtnewhorizons.retrofuturagradle.mcp.ReobfuscatedJar +import com.gtnewhorizons.retrofuturagradle.minecraft.RunMinecraftTask +import com.gtnewhorizons.retrofuturagradle.util.Distribution import com.matthewprenger.cursegradle.CurseArtifact import com.matthewprenger.cursegradle.CurseRelation import com.modrinth.minotaur.dependencies.ModDependency import com.modrinth.minotaur.dependencies.VersionDependency import org.gradle.internal.logging.text.StyledTextOutput.Style import org.gradle.internal.logging.text.StyledTextOutputFactory -import org.jetbrains.gradle.ext.* +import org.gradle.internal.xml.XmlTransformer +import org.jetbrains.gradle.ext.Application +import org.jetbrains.gradle.ext.Gradle +import javax.inject.Inject import java.nio.file.Files import java.nio.file.Paths import java.util.concurrent.TimeUnit -import java.util.zip.ZipEntry -import java.util.zip.ZipOutputStream buildscript { repositories { - mavenLocal() mavenCentral() maven { @@ -47,6 +48,8 @@ buildscript { name 'Scala CI dependencies' url 'https://repo1.maven.org/maven2/' } + + mavenLocal() } } plugins { @@ -58,22 +61,23 @@ plugins { id 'org.jetbrains.kotlin.jvm' version '1.8.0' apply false id 'org.jetbrains.kotlin.kapt' version '1.8.0' apply false id 'com.google.devtools.ksp' version '1.8.0-1.0.9' apply false - id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version ,unused, available for addon.gradle - id 'com.github.johnrengelman.shadow' version '7.1.2' apply false - id 'com.palantir.git-version' version '0.13.0' apply false // 0.13.0 is the last jvm8 supporting version - id 'de.undercouch.download' version '5.3.0' + id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle + id 'com.github.johnrengelman.shadow' version '8.1.1' apply false + id 'com.palantir.git-version' version '3.0.0' apply false + id 'de.undercouch.download' version '5.4.0' id 'com.github.gmazzo.buildconfig' version '3.1.0' apply false // Unused, available for addon.gradle - id 'com.diffplug.spotless' version '6.7.2' apply false + id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version id 'com.modrinth.minotaur' version '2.+' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false - id 'com.gtnewhorizons.retrofuturagradle' version '1.1.2' + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.7' } boolean settingsupdated = verifySettingsGradle() settingsupdated = verifyGitAttributes() || settingsupdated if (settingsupdated) throw new GradleException("Settings has been updated, please re-run task.") -if (project.file('.git/HEAD').isFile()) { +// In submodules, .git is a file pointing to the real git dir +if (project.file('.git/HEAD').isFile() || project.file('.git').isFile()) { apply plugin: 'com.palantir.git-version' } @@ -122,7 +126,10 @@ propertyDefaultIfUnset("gradleTokenGroupName", "") propertyDefaultIfUnset("enableModernJavaSyntax", false) // On by default for new projects only propertyDefaultIfUnset("enableGenericInjection", false) // On by default for new projects only -project.extensions.add(Blowdryer, "Blowdryer", Blowdryer) // Make blowdryer available in "apply from:" scripts +// this is meant to be set using the user wide property file. by default we do nothing. +propertyDefaultIfUnset("ideaOverrideBuildType", "") // Can be nothing, "gradle" or "idea" + +project.extensions.add(com.diffplug.blowdryer.Blowdryer, "Blowdryer", com.diffplug.blowdryer.Blowdryer) // Make blowdryer available in "apply from:" scripts if (!disableSpotless) { apply plugin: 'com.diffplug.spotless' apply from: Blowdryer.file('spotless.gradle') @@ -143,13 +150,21 @@ java { } else { languageVersion.set(projectJavaVersion) } - vendor.set(JvmVendorSpec.ADOPTIUM) + vendor.set(JvmVendorSpec.AZUL) } if (!noPublishedSources) { withSourcesJar() } } +tasks.withType(JavaCompile).configureEach { + options.encoding = "UTF-8" +} + +tasks.withType(ScalaCompile).configureEach { + options.encoding = "UTF-8" +} + pluginManager.withPlugin('org.jetbrains.kotlin.jvm') { // If Kotlin is enabled in the project kotlin { @@ -183,14 +198,32 @@ configurations { canBeConsumed = false canBeResolved = false } + + create("devOnlyNonPublishable") { + description = "Runtime and compiletime dependencies that are not published alongside the jar (compileOnly + runtimeOnlyNonPublishable)" + canBeConsumed = false + canBeResolved = false + } + compileOnly.extendsFrom(devOnlyNonPublishable) + runtimeOnlyNonPublishable.extendsFrom(devOnlyNonPublishable) } if (enableModernJavaSyntax.toBoolean()) { + repositories { + mavenCentral { + mavenContent { + includeGroup("me.eigenraven.java8unsupported") + } + } + } + dependencies { annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:1.0.0' compileOnly('com.github.bsideup.jabel:jabel-javac-plugin:1.0.0') { transitive = false // We only care about the 1 annotation class } + // Allow using jdk.unsupported classes like sun.misc.Unsafe in the compiled code, working around JDK-8206937. + patchedMinecraft('me.eigenraven.java8unsupported:java-8-unsupported-shim:1.0.0') } tasks.withType(JavaCompile).configureEach { @@ -202,7 +235,7 @@ if (enableModernJavaSyntax.toBoolean()) { javaCompiler.set(javaToolchains.compilerFor { languageVersion.set(JavaLanguageVersion.of(17)) - vendor.set(JvmVendorSpec.ADOPTIUM) + vendor.set(JvmVendorSpec.AZUL) }) } } @@ -234,12 +267,14 @@ if (apiPackage) { } if (accessTransformersFile) { - String targetFile = "src/main/resources/META-INF/" + accessTransformersFile - if (!getFile(targetFile).exists()) { - throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile) + for (atFile in accessTransformersFile.split(",")) { + String targetFile = "src/main/resources/META-INF/" + atFile.trim() + if (!getFile(targetFile).exists()) { + throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile) + } + tasks.deobfuscateMergedJarToSrg.accessTransformerFiles.from(targetFile) + tasks.srgifyBinpatchedJar.accessTransformerFiles.from(targetFile) } - tasks.deobfuscateMergedJarToSrg.accessTransformerFiles.from(targetFile) - tasks.srgifyBinpatchedJar.accessTransformerFiles.from(targetFile) } else { boolean atsFound = false for (File at : sourceSets.getByName("main").resources.files) { @@ -367,12 +402,14 @@ minecraft { injectMissingGenerics.set(true) } + username = developmentEnvironmentUserName.toString() + + lwjgl3Version = "3.3.2" + // Enable assertions in the current mod extraRunJvmArguments.add("-ea:${modGroup}") if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - extraTweakClasses.add("org.spongepowered.asm.launch.MixinTweaker") - if (usesMixinDebug.toBoolean()) { extraRunJvmArguments.addAll([ "-Dmixin.debug.countInjections=true", @@ -401,6 +438,16 @@ configurations.configureEach { } } } + def obfuscationAttr = it.attributes.getAttribute(ObfuscationAttribute.OBFUSCATION_ATTRIBUTE) + if (obfuscationAttr != null && obfuscationAttr.name == ObfuscationAttribute.SRG) { + resolutionStrategy.eachDependency { DependencyResolveDetails details -> + // Remap CoFH core cursemaven dev jar to the obfuscated version for runObfClient/Server + if (details.requested.group == 'curse.maven' && details.requested.name.endsWith('-69162') && details.requested.version == '2388751') { + details.useVersion '2388750' + details.because 'Pick obfuscated jar' + } + } + } } // Ensure tests have access to minecraft classes @@ -430,8 +477,9 @@ repositories.configureEach { repo -> apply from: 'repositories.gradle' configurations { + runtimeClasspath.extendsFrom(runtimeOnlyNonPublishable) + testRuntimeClasspath.extendsFrom(runtimeOnlyNonPublishable) for (config in [compileClasspath, runtimeClasspath, testCompileClasspath, testRuntimeClasspath]) { - config.extendsFrom(runtimeOnlyNonPublishable) if (usesShadowedDependencies.toBoolean()) { config.extendsFrom(shadowImplementation) // TODO: remove Compile after all uses are refactored to Implementation @@ -476,12 +524,11 @@ repositories { url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" allowInsecureProtocol = true } - if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - if (usesMixinDebug.toBoolean()) { - maven { - name = "Fabric Maven" - url = "https://maven.fabricmc.net/" - } + maven { + name 'sonatype' + url 'https://oss.sonatype.org/content/repositories/snapshots/' + content { + includeGroup "org.lwjgl" } } if (includeWellKnownRepositories.toBoolean()) { @@ -515,29 +562,49 @@ repositories { } } +def mixinProviderGroup = "io.github.legacymoddingmc" +def mixinProviderModule = "unimixins" +def mixinProviderVersion = "0.1.6" +def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}" +def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev" + dependencies { if (usesMixins.toBoolean()) { annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3') annotationProcessor('com.google.guava:guava:24.1.1-jre') annotationProcessor('com.google.code.gson:gson:2.8.6') - annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.10:processor') + annotationProcessor(mixinProviderSpec) if (usesMixinDebug.toBoolean()) { runtimeOnlyNonPublishable('org.jetbrains:intellij-fernflower:1.2.1.16') } } - if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - implementation('com.gtnewhorizon:gtnhmixins:2.1.10') + if (usesMixins.toBoolean()) { + implementation(mixinProviderSpec) + } else if (forceEnableMixins.toBoolean()) { + runtimeOnlyNonPublishable(mixinProviderSpec) } } pluginManager.withPlugin('org.jetbrains.kotlin.kapt') { if (usesMixins.toBoolean()) { dependencies { - kapt('com.gtnewhorizon:gtnhmixins:2.1.10:processor') + kapt(mixinProviderSpec) } } } +// Replace old mixin mods with unimixins +// https://docs.gradle.org/8.0.2/userguide/resolution_rules.html#sec:substitution_with_classifier +configurations.all { + resolutionStrategy.dependencySubstitution { + substitute module('com.gtnewhorizon:gtnhmixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('com.github.GTNewHorizons:Mixingasm') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier") + } +} + apply from: 'dependencies.gradle' def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json' @@ -633,9 +700,146 @@ tasks.named("processResources", ProcessResources).configure { if (usesMixins.toBoolean()) { from refMap + dependsOn("compileJava", "compileScala") } } +ext.java17Toolchain = (JavaToolchainSpec spec) -> { + spec.languageVersion.set(JavaLanguageVersion.of(17)) + spec.vendor.set(JvmVendorSpec.matching("jetbrains")) +} + +ext.java17DependenciesCfg = configurations.create("java17Dependencies") { + extendsFrom(configurations.getByName("runtimeClasspath")) // Ensure consistent transitive dependency resolution + canBeConsumed = false +} +ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies") { + canBeConsumed = false +} + +dependencies { + def lwjgl3ifyVersion = '1.3.5' + def asmVersion = '9.4' + if (modId != 'lwjgl3ify') { + java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") + } + if (modId != 'hodgepodge') { + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.8') + } + + java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false} + java17PatchDependencies("org.ow2.asm:asm:${asmVersion}") + java17PatchDependencies("org.ow2.asm:asm-commons:${asmVersion}") + java17PatchDependencies("org.ow2.asm:asm-tree:${asmVersion}") + java17PatchDependencies("org.ow2.asm:asm-analysis:${asmVersion}") + java17PatchDependencies("org.ow2.asm:asm-util:${asmVersion}") + java17PatchDependencies('org.ow2.asm:asm-deprecated:7.1') + java17PatchDependencies("org.apache.commons:commons-lang3:3.12.0") + java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false} +} + +ext.java17JvmArgs = [ + // Java 9+ support + "--illegal-access=warn", + "-Djava.security.manager=allow", + "-Dfile.encoding=UTF-8", + "--add-opens", "java.base/jdk.internal.loader=ALL-UNNAMED", + "--add-opens", "java.base/java.net=ALL-UNNAMED", + "--add-opens", "java.base/java.nio=ALL-UNNAMED", + "--add-opens", "java.base/java.io=ALL-UNNAMED", + "--add-opens", "java.base/java.lang=ALL-UNNAMED", + "--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED", + "--add-opens", "java.base/java.text=ALL-UNNAMED", + "--add-opens", "java.base/java.util=ALL-UNNAMED", + "--add-opens", "java.base/jdk.internal.reflect=ALL-UNNAMED", + "--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED", + "--add-opens", "jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED,java.naming", + "--add-opens", "java.desktop/sun.awt.image=ALL-UNNAMED", + "--add-modules", "jdk.dynalink", + "--add-opens", "jdk.dynalink/jdk.dynalink.beans=ALL-UNNAMED", + "--add-modules", "java.sql.rowset", + "--add-opens", "java.sql.rowset/javax.sql.rowset.serial=ALL-UNNAMED" +] + +ext.hotswapJvmArgs = [ + // DCEVM advanced hot reload + "-XX:+AllowEnhancedClassRedefinition", + "-XX:HotswapAgent=fatjar" +] + +ext.setupHotswapAgentTask = tasks.register("setupHotswapAgent") { + group = "GTNH Buildscript" + description = "Installs a recent version of HotSwapAgent into the Java 17 JetBrains runtime directory" + def hsaUrl = 'https://github.com/HotswapProjects/HotswapAgent/releases/download/1.4.2-SNAPSHOT/hotswap-agent-1.4.2-SNAPSHOT.jar' + def targetFolderProvider = javaToolchains.launcherFor(java17Toolchain).map {it.metadata.installationPath.dir("lib/hotswap")} + def targetFilename = "hotswap-agent.jar" + onlyIf { + !targetFolderProvider.get().file(targetFilename).asFile.exists() + } + doLast { + def targetFolder = targetFolderProvider.get() + targetFolder.asFile.mkdirs() + download.run { + src hsaUrl + dest targetFolder.file(targetFilename).asFile + overwrite false + tempAndMove true + } + } +} + +public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { + // IntelliJ doesn't seem to allow commandline arguments so we also support an env variable + private boolean enableHotswap = Boolean.valueOf(System.getenv("HOTSWAP")); + + @Input + public boolean getEnableHotswap() { return enableHotswap } + @Option(option = "hotswap", description = "Enables HotSwapAgent for enhanced class reloading under a debugger") + public boolean setEnableHotswap(boolean enable) { enableHotswap = enable } + + @Inject + public RunHotswappableMinecraftTask(Distribution side, String superTask, org.gradle.api.invocation.Gradle gradle) { + super(side, gradle) + + this.lwjglVersion = 3 + this.javaLauncher = project.javaToolchains.launcherFor(project.java17Toolchain) + this.extraJvmArgs.addAll(project.java17JvmArgs) + this.extraJvmArgs.addAll(project.provider(() -> enableHotswap ? project.hotswapJvmArgs : [])) + + this.classpath(project.java17PatchDependenciesCfg) + if (side == Distribution.CLIENT) { + this.classpath(project.minecraftTasks.lwjgl3Configuration) + } + // Use a raw provider instead of map to not create a dependency on the task + this.classpath(project.provider(() -> project.tasks.named(superTask, RunMinecraftTask).get().classpath)) + this.classpath.filter { file -> + !file.path.contains("2.9.4-nightly-20150209") // Remove lwjgl2 + } + this.classpath(project.java17DependenciesCfg) + } +} + +def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Distribution.CLIENT, "runClient") +runClient17Task.configure { + setup(project) + group = "Modded Minecraft" + description = "Runs the modded client using Java 17, lwjgl3ify and Hodgepodge" + dependsOn(setupHotswapAgentTask, mcpTasks.launcherSources.classesTaskName, minecraftTasks.taskDownloadVanillaAssets, mcpTasks.taskPackagePatchedMc, 'jar') + mainClass = "GradleStart" + username = minecraft.username + userUUID = minecraft.userUUID +} + +def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Distribution.DEDICATED_SERVER, "runServer") +runServer17Task.configure { + setup(project) + group = "Modded Minecraft" + description = "Runs the modded server using Java 17, lwjgl3ify and Hodgepodge" + dependsOn(setupHotswapAgentTask, mcpTasks.launcherSources.classesTaskName, minecraftTasks.taskDownloadVanillaAssets, mcpTasks.taskPackagePatchedMc, 'jar') + mainClass = "GradleStartServer" + extraArgs.add("nogui") +} + def getManifestAttributes() { def manifestAttributes = [:] if (!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) { @@ -667,11 +871,6 @@ tasks.named("jar", Jar).configure { } if (usesShadowedDependencies.toBoolean()) { - tasks.register('relocateShadowJar', ConfigureShadowRelocation) { - target = tasks.shadowJar - prefix = modGroup + ".shadow" - enabled = minimizeShadowedDependencies.toBoolean() - } tasks.named("shadowJar", ShadowJar).configure { manifest { attributes(getManifestAttributes()) @@ -686,8 +885,9 @@ if (usesShadowedDependencies.toBoolean()) { project.configurations.shadeCompile ] archiveClassifier.set('dev') - if (minimizeShadowedDependencies.toBoolean()) { - dependsOn(relocateShadowJar) + if (relocateShadowedDependencies.toBoolean()) { + relocationPrefix = modGroup + ".shadow" + enableRelocation = true } } configurations.runtimeElements.outgoing.artifacts.clear() @@ -705,7 +905,7 @@ if (usesShadowedDependencies.toBoolean()) { javaComponent.withVariantsFromConfiguration(configurations.shadowRuntimeElements) { skip() } - for (runTask in ["runClient", "runServer"]) { + for (runTask in ["runClient", "runServer", "runClient17", "runServer17"]) { tasks.named(runTask).configure { dependsOn("shadowJar") } @@ -743,9 +943,23 @@ idea { module { downloadJavadoc = true downloadSources = true + inheritOutputDirs = true } project { settings { + if (ideaOverrideBuildType != "") { + delegateActions { + if ("gradle".equalsIgnoreCase(ideaOverrideBuildType)) { + delegateBuildRunToGradle = true + testRunner = org.jetbrains.gradle.ext.ActionDelegationConfig.TestRunner.GRADLE + } else if ("idea".equalsIgnoreCase(ideaOverrideBuildType)) { + delegateBuildRunToGradle = false + testRunner = org.jetbrains.gradle.ext.ActionDelegationConfig.TestRunner.PLATFORM + } else { + throw GradleScriptException('Accepted value for ideaOverrideBuildType is one of gradle or idea.') + } + } + } runConfigurations { "1. Run Client"(Gradle) { taskNames = ["runClient"] @@ -753,6 +967,20 @@ idea { "2. Run Server"(Gradle) { taskNames = ["runServer"] } + "1a. Run Client (Java 17)"(Gradle) { + taskNames = ["runClient17"] + } + "2a. Run Server (Java 17)"(Gradle) { + taskNames = ["runServer17"] + } + "1b. Run Client (Java 17, Hotswap)"(Gradle) { + taskNames = ["runClient17"] + envs = ["HOTSWAP": "true"] + } + "2b. Run Server (Java 17, Hotswap)"(Gradle) { + taskNames = ["runServer17"] + envs = ["HOTSWAP": "true"] + } "3. Run Obfuscated Client"(Gradle) { taskNames = ["runObfClient"] } @@ -770,7 +998,7 @@ idea { } "Run Client (IJ Native)"(Application) { mainClass = "GradleStart" - moduleName = project.name + ".main" + moduleName = project.name + ".ideVirtualMain" afterEvaluate { workingDirectory = tasks.runClient.workingDir.absolutePath programParameters = tasks.runClient.calculateArgs(project).collect { '"' + it + '"' }.join(' ') @@ -781,7 +1009,7 @@ idea { } "Run Server (IJ Native)"(Application) { mainClass = "GradleStartServer" - moduleName = project.name + ".main" + moduleName = project.name + ".ideVirtualMain" afterEvaluate { workingDirectory = tasks.runServer.workingDir.absolutePath programParameters = tasks.runServer.calculateArgs(project).collect { '"' + it + '"' }.join(' ') @@ -793,11 +1021,57 @@ idea { } compiler.javac { afterEvaluate { + javacAdditionalOptions = "-encoding utf8" moduleJavacAdditionalOptions = [ (project.name + ".main"): tasks.compileJava.options.compilerArgs.collect { '"' + it + '"' }.join(' ') ] } } + withIDEADir { File ideaDir -> + if (!ideaDir.path.contains(".idea")) { + // If an .ipr file exists, the project root directory is passed here instead of the .idea subdirectory + ideaDir = new File(ideaDir, ".idea") + } + if (ideaDir.isDirectory()) { + def miscFile = new File(ideaDir, "misc.xml") + if (miscFile.isFile()) { + boolean dirty = false + def miscTransformer = new XmlTransformer() + miscTransformer.addAction { root -> + Node rootNode = root.asNode() + def rootManager = rootNode + .component.find { it.@name == 'ProjectRootManager' } + if (!rootManager) { + rootManager = rootNode.appendNode('component', ['name': 'ProjectRootManager', 'version': '2']) + dirty = true + } + def output = rootManager.output + if (!output) { + output = rootManager.appendNode('output') + dirty = true + } + if (!output.@url) { + // Only modify the output url if it doesn't yet have one, or if the existing one is blank somehow. + // This is a sensible default for most setups + output.@url = 'file://$PROJECT_DIR$/build/ideaBuild' + dirty = true + } + } + def result = miscTransformer.transform(miscFile.text) + if (dirty) { + miscFile.write(result) + } + } else { + miscFile.text = """ + + + + + +""" + } + } + } } } } @@ -867,7 +1141,7 @@ if (modrinthProjectId.size() != 0 && System.getenv("MODRINTH_TOKEN") != null) { } } if (usesMixins.toBoolean()) { - addModrinthDep("required", "project", "gtnhmixins") + addModrinthDep("required", "project", "unimixins") } tasks.modrinth.dependsOn(build) tasks.publish.dependsOn(tasks.modrinth) @@ -911,7 +1185,7 @@ if (curseForgeProjectId.size() != 0 && System.getenv("CURSEFORGE_TOKEN") != null } } if (usesMixins.toBoolean()) { - addCurseForgeRelation("requiredDependency", "gtnhmixins") + addCurseForgeRelation("requiredDependency", "unimixins") } tasks.curseforge.dependsOn(build) tasks.publish.dependsOn(tasks.curseforge) @@ -945,10 +1219,21 @@ def addCurseForgeRelation(String type, String name) { } // Updating + +def buildscriptGradleVersion = "8.1.1" + +tasks.named('wrapper', Wrapper).configure { + gradleVersion = buildscriptGradleVersion +} + tasks.register('updateBuildScript') { group = 'GTNH Buildscript' description = 'Updates the build script to the latest version' + if (gradle.gradleVersion != buildscriptGradleVersion && !Boolean.getBoolean('DISABLE_BUILDSCRIPT_GRADLE_UPDATE')) { + dependsOn('wrapper') + } + doLast { if (performBuildScriptUpdate()) return @@ -961,6 +1246,9 @@ if (!project.getGradle().startParameter.isOffline() && !Boolean.getBoolean('DISA performBuildScriptUpdate() } else { out.style(Style.SuccessHeader).println("Build script update available! Run 'gradle updateBuildScript'") + if (gradle.gradleVersion != buildscriptGradleVersion) { + out.style(Style.SuccessHeader).println("updateBuildScript can update gradle from ${gradle.gradleVersion} to ${buildscriptGradleVersion}\n") + } } } @@ -1101,7 +1389,7 @@ static int replaceParams(File file, Map params) { return 0 } -// Dependency Deobfuscation +// Dependency Deobfuscation (Deprecated, use the new RFG API documented in dependencies.gradle) def deobf(String sourceURL) { try { @@ -1143,11 +1431,7 @@ def deobfMaven(String repoURL, String mavenDep) { } def deobfCurse(String curseDep) { - try { - return deobfMaven("https://www.cursemaven.com/", "curse.maven:$curseDep") - } catch (Exception ignored) { - out.style(Style.Failure).println("Failed to get $curseDep from cursemaven.") - } + return dependencies.rfg.deobf("curse.maven:$curseDep") } // The method above is to be preferred. Use this method if the filename is not at the end of the URL. @@ -1155,34 +1439,7 @@ def deobf(String sourceURL, String rawFileName) { String bon2Version = "2.5.1" String fileName = URLDecoder.decode(rawFileName, "UTF-8") String cacheDir = "$project.gradle.gradleUserHomeDir/caches" - String bon2Dir = "$cacheDir/forge_gradle/deobf" - String bon2File = "$bon2Dir/BON2-${bon2Version}.jar" String obfFile = "$cacheDir/modules-2/files-2.1/${fileName}.jar" - String deobfFile = "$cacheDir/modules-2/files-2.1/${fileName}-deobf.jar" - - if (file(deobfFile).exists()) { - return files(deobfFile) - } - - String mappingsVer - String remoteMappings = project.hasProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/' - if (remoteMappings) { - String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion" - String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip" - - zipMappings(mappingsZIP, remoteMappings, bon2Dir) - - mappingsVer = "snapshot_$id" - } else { - mappingsVer = "${channel}_$mappingsVersion" - } - - download.run { - src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar" - dest bon2File - quiet true - overwrite false - } download.run { src sourceURL @@ -1190,50 +1447,8 @@ def deobf(String sourceURL, String rawFileName) { quiet true overwrite false } - - exec { - commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch' - workingDir bon2Dir - standardOutput = new FileOutputStream("${deobfFile}.log") - } - - return files(deobfFile) + return dependencies.rfg.deobf(files(obfFile)) } - -def zipMappings(String zipPath, String url, String bon2Dir) { - File zipFile = new File(zipPath) - if (zipFile.exists()) { - return - } - - String fieldsCache = "$bon2Dir/data/fields.csv" - String methodsCache = "$bon2Dir/data/methods.csv" - - download.run { - src "${url}fields.csv" - dest fieldsCache - quiet true - } - download.run { - src "${url}methods.csv" - dest methodsCache - quiet true - } - - zipFile.getParentFile().mkdirs() - ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile)) - - zos.putNextEntry(new ZipEntry("fields.csv")) - Files.copy(Paths.get(fieldsCache), zos) - zos.closeEntry() - - zos.putNextEntry(new ZipEntry("methods.csv")) - Files.copy(Paths.get(methodsCache), zos) - zos.closeEntry() - - zos.close() -} - // Helper methods def checkPropertyExists(String propertyName) { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba7710deaf9f98673a68957ea02138b60d0a..943f0cbfa754578e88a3dae77fce6e3dea56edbf 100644 GIT binary patch delta 5107 zcmY*d1zc0@|J{HQlai7V5+f#EN-H%&UP4MFm6QgFfuJK4DG4u#ARsbQL4i>MB1q|w zmWd#pqd~BR-yN@ieE-|$^W1aKIZtf&-p_fyw{(Uwc7_sWYDh^12cY!qXvcPQ!qF;q@b0nYU7 zP&ht}K7j%}P%%|ffm;4F0^i3P0R`a!2wm89L5P3Kfu;tTZJre<{N5}AzsH+E3DS`Q zJLIl`LRMf`JOTBLf(;IV(9(h{(}dXK!cPoSLm(o@fz8vRz}6fOw%3}3VYOsCczLF` za2RTsCWa2sS-uw(6|HLJg)Xf@S8#|+(Z5Y)ER+v+8;btfB3&9sWH6<=U}0)o-jIts zsi?Nko;No&JyZI%@1G&zsG5kKo^Zd7rk_9VIUao9;fC~nv(T0F&Af0&Rp`?x94EIS zUBPyBe5R5#okNiB1Xe--q4|hPyGzhJ?Lurt#Ci09BQ+}rlHpBhm;EmfLw{EbCz)sg zgseAE#f$met1jo;`Z6ihk?O1be3aa$IGV69{nzagziA!M*~E5lMc(Sp+NGm2IUjmn zql((DU9QP~Tn1pt6L`}|$Na-v(P+Zg&?6bAN@2u%KiB*Gmf}Z)R zMENRJgjKMqVbMpzPO{`!J~2Jyu7&xXnTDW?V?IJgy+-35q1)-J8T**?@_-2H`%X+6f5 zIRv`uLp&*?g7L~6+3O*saXT~gWsmhF*FNKw4X$29ePKi02G*)ysenhHv{u9-y?_do ztT(Cu04pk>51n}zu~=wgToY5Cx|MTlNw}GR>+`|6CAhQn=bh@S<7N)`w};;KTywDU z=QWO@RBj$WKOXSgCWg{BD`xl&DS!G}`Mm3$)=%3jzO_C+s+mfTFH5JL>}*(JKs@MqX|o2b#ZBX5P;p7;c)$F1y4HwvJ?KA938$rd)gn_U^CcUtmdaBW57 zlPph>Fz&L`cSScFjcj+7Jif3vxb20Ag~FPstm?9#OrD$e?Y~#1osDB0CFZ9Mu&%iE zSj~wZpFqu6!k%BT)}$F@Z%(d-Pqy07`N8ch2F7z^=S-!r-@j{#&{SM@a8O$P#SySx zZLD_z=I300OCA1YmKV0^lo@>^)THfZvW}s<$^w^#^Ce=kO5ymAnk>H7pK!+NJ-+F7 z1Bb6Y=r)0nZ+hRXUyD+BKAyecZxb+$JTHK5k(nWv*5%2a+u*GDt|rpReYQ}vft zXrIt#!kGO85o^~|9Oc-M5A!S@9Q)O$$&g8u>1=ew?T35h8B{-Z_S78oe=E(-YZhBPe@Y1sUt63A-Cdv>D1nIT~=Rub6$?8g>meFb7Ic@w^%@RN2z72oPZ#Ta%b(P1|&6I z61iO<8hT*)p19Bgd0JgXP{^c{P2~K@^DIXv=dF(u|DFfqD^dMIl8-x)xKIpJRZru@ zDxicyYJG}mh}=1Dfg%B$#H`CiAxPTj^;f4KRMZHUz-_x6)lEq!^mu%72*PI=t$6{Uql#dqm4 zClgaN63!&?v*enz4k1sbaM+yCqUf+i9rw$(YrY%ir1+%cWRB<;r}$8si!6QcNAk~J zk3?dejBaC`>=T<=y=>QVt*4kL>SwYwn$(4ES793qaH)>n(axyV3R5jdXDh#e-N0K- zuUgk|N^|3*D1!Wlz-!M*b}Zc5=;K6I+>1N$&Q%)&8LWUiTYi&aQIj(luA< zN5R<8Y8L#*i0xBio$jWcaiZ4S2w3#R@CGemesy~akKP)2GojQF6!$}!_RdUJPBevX zG#~uz%Yirb0@1wgQ;ayb=qD}6{=QXxjuZQ@@kxbN!QWhtEvuhS2yAZe8fZy6*4Inr zdSyR9Dec4HrE|I=z-U;IlH;_h#7e^Hq}gaJ<-z^}{*s!m^66wu2=(*EM0UaV*&u1q zJrq!K23TO8a(ecSQFdD$y+`xu)Xk36Z*;1i{hS=H2E<8<5yHuHG~22-S+Jq|3HMAw z%qBz3auT=M!=5F|Wqke|I^E8pmJ-}>_DwX5w%d3MSdC>xW%$ocm8w8HRdZ|^#cEt1 zM*I7S6sLQq;;Mecet(Q()+?s+&MeVLOvx}(MkvytkvLHl7h*N0AT1#AqC&(he(^%przH`KqA$z_dAvJJb409@F)fYwD$JW_{_Oie8!@VdJE zU>D$@B?LawAf5$;`AZ1E!krn=aAC%4+YQrzL!59yl1;|T2)u=RBYA8lk0Ek&gS!Rb zt0&hVuyhSa0}rpZGjTA>Gz}>Uv*4)F zf7S%D2nfA7x?gPEXZWk8DZimQs#xi0?So_k`2zb!UVQEAcbvjPLK9v>J~!awnxGpq zEh$EPOc4q&jywmglnC&D)1-P0DH!@)x;uJwMHdhPh>ZLWDw+p1pf52{X2dk{_|UOmakJa4MHu?CY`6Hhv!!d7=aNwiB5z zb*Wlq1zf^3iDlPf)b_SzI*{JCx2jN;*s~ra8NeB!PghqP!0po-ZL?0Jk;2~*~sCQ<%wU`mRImd)~!23RS?XJu|{u( ztFPy3*F=ZhJmBugTv48WX)4U*pNmm~4oD4}$*-92&<)n=R)5lT z-VpbEDk>(C1hoo#-H_u0`#%L6L$ zln(}h2*Cl(5(JtVM{YZ26@Fwmp;?Qt}9$_F%`?+-JHbC;bPZj8PLq9 zWo-KFw!i&r8WuA-!3F_m9!24Z(RhalAUR~_H#Ln=$%b5GY z)oB)zO%J5TY}&BXq^7#M>euVL%01Tzj4$6^ZOjT*7@zr~q@6GEjGi)nbwzSL`TiLN z{DVG~I$w@%^#tD{>1Ap@%=XogG_^Hvy_xiRn4yy?LKsC+ zU!S79X8orh&D%>1S`x2iyi&(iG&r#YT{}~iy(FIOo8?MZU#eo*c*(RjAGj@uDi zARJur)-*{n0PgW~&mFeg`MJ?(Kr;NUom)jh?ozZtyywN9bea6ikQlh}953Oul~N%4 z@Sx!@>?l1e7V*@HZMJx!gMo0TeXdU~#W6^n?YVQJ$)nuFRkvKbfwv_s*2g(!wPO|@ zvuXF=2MiPIX)A7x!|BthSa$GB%ECnuZe_Scx&AlnC z!~6C_SF24#@^VMIw)a-7{00}}Cr5NImPbW8OTIHoo6@NcxLVTna8<<;uy~YaaeMnd z;k_ynYc_8jQn9vW_W8QLkgaHtmwGC}wRcgZ^I^GPbz{lW)p#YYoinez1MjkY%6LBd z+Vr>j&^!?b-*Vk>8I!28o`r3w&^Lal8@=50zV4&9V9oXI{^r8;JmVeos&wf?O!;_o zk))^k*1fvYw9?WrS!sG2TcX`hH@Y3mF&@{i05;_AV{>Umi8{uZP_0W5_1V2yHU<)E z+qviK*7SJtnL;76{WK!?Pv$-!w$08<%8Qy|sB|P%GiV1<+dHw*sj!C~SjsB6+1L@so+Q~n# z+Uc5+Uz+mGmkR@>H7D*c?mm8WQz;3VOpktU_DeBi>3#@z zmLe;3gP<7KPy>~k47nEeT?G?7e2g6316Xdb_y+ja5C9Ayg6QTNr~&Kbs(1>7zp|f@le;9B z1e(+Ga%jPWR7oc}=XcB4$z?YD)l;%#U;}~gZzGViI=fwu9OAPCCK!0w>Ay^#$b49k zT&|M?JaIyRT<;@*t_jp1ifWPvL;{maf6o0T#X!#9YX;0Q;LTQ0}0tg^_Ru4pkSr4#P zmnW|D0`A#Ie6pEfBDv39=jN2;kiUoT6I&kChsbI!jMuY6zuZql5!&i%5!c zjsHlXtjT;NV?jAb`%vy)JOK_j1rponLqc>(2qgYlLPEs>|0QV<=Pw~C`fLFKJJitt zyC6003{rxCsmtGKjhB%W2W~*%vKH8l$pZoOFT*K@uL9%CD^3rh=ZtuTU1 zJpf4|%n^yjh#dKSSCJI8;YU*CD!8Wv20*e5`-fya^75@ADLU^RdHDg3Bk3k6)dGi7 z!!z;|O1h$8q!vO*w6 I6Xdi10eY*&F8}}l delta 5094 zcmZu#c|6qH|DG9RA4`noBZNWrC2N)tSqjO%%aX0^O4dPAB*iC6_9R<`apl^#h-_oY z)(k_0v8Fxp{fyi9-uwN%e)GpU&v~BrS>~KG^PF=MNmQjIDr&QHR7f-kM{%U_u*1=5 zGC}ae5(^Rrg9QY8$x^}oiJ0d2O9YW{J~$dD1ovlvh&0B4L)!4S=z;Hac>K{#9q9cKq;>>BtKo1!+gw`yqE zSK8x^jC|B!qmSW#uyb@T^CkB9qRd{N3V-rEi}AEgoU_J27lw_0X`}c0&m9JhxM;RK z54_gdZ(u?R5`B3}NeVal2NTHqlktM`2eTF28%6BZCWW$-shf0l-BOVSm)hU58MTPy zDcY-5777j;ccU!Yba8wH=X6OdPJ8O5Kp^3gUNo>!b=xb6T2F&LiC2eBJj8KuLPW!4 zw3V^NnAKZm^D?tmliCvzi>UtoDH%V#%SM0d*NS+m%4}qO<)M1E{OpQ(v&ZNc`vdi| zEGlVi$Dgxy1p6+k0qGLQt(JwxZxLCZ4>wJ=sb0v%Ki?*+!ic_2exumn{%Co|| z-axdK#RUC;P|vqbe?L`K!j;sUo=uuR_#ZkRvBf%Txo6{OL&I(?dz?47Z(DcX3KTw> zGY%A=kX;fBkq$F^sX|-)1Qkg##+n-Ci{qJVPj@P?l_1Y`nD^v>fZ3HMX%(4p-TlD(>yWwJij!6Jw}l7h>CIm@Ou5B@$Wy`Ky*814%Mdi1GfG1zDG9NogaoVHHr4gannv4?w6g&10!j=lKM zFW;@=Z0}vAPAxA=R4)|`J??*$|Fh`5=ks*V7TapX`+=4n*{aXxRhh-EGX_Xrzjb4r zn0vO7Cc~wtyeM_8{**~9y7>+}1JV8Buhg%*hy|PUc#!vw#W(HFTL|BpM)U0>JxG6S zLnqn1!0++RyyJ>5VU<4mDv8>Q#{EtgS3mj7Hx}Zkr0tz1}h8Kn6q`MiwC z{Y#;D!-ndlImST(C@(*i5f0U(jD29G7g#nkiPX zki6M$QYX_fNH=E4_eg9*FFZ3wF9YAKC}CP89Kl(GNS(Ag994)0$OL4-fj_1EdR}ARB#-vP_$bWF`Qk58+ z4Jq*-YkcmCuo9U%oxGeYe7Be=?n}pX+x>ob(8oPLDUPiIryT8v*N4@0{s_VYALi;lzj19ivLJKaXt7~UfU|mu9zjbhPnIhG2`uI34urWWA9IO{ z_1zJ)lwSs{qt3*UnD}3qB^kcRZ?``>IDn>qp8L96bRaZH)Zl`!neewt(wjSk1i#zf zb8_{x_{WRBm9+0CF4+nE)NRe6K8d|wOWN)&-3jCDiK5mj>77=s+TonlH5j`nb@rB5 z5NX?Z1dk`E#$BF{`(D>zISrMo4&}^wmUIyYL-$PWmEEfEn-U0tx_vy$H6|+ zi{ytv2@JXBsot|%I5s74>W1K{-cvj0BYdNiRJz*&jrV9>ZXYZhEMULcM=fCmxkN&l zEoi=)b)Vazc5TQC&Q$oEZETy@!`Gnj`qoXl7mcwdY@3a-!SpS2Mau|uK#++@>H8QC zr2ld8;<_8We%@E?S=E?=e9c$BL^9X?bj*4W;<+B&OOe+3{<`6~*fC(=`TO>o^A(Y! zA`Qc1ky?*6xjVfR?ugE~oY`Gtzhw^{Z@E6vZ`mMRAp>Odpa!m zzWmtjT|Lj^qiZMfj%%un-o$Eu>*v12qF{$kCKai^?DF=$^tfyV%m9;W@pm-BZn_6b z{jsXY3!U`%9hzk6n7YyHY%48NhjI6jjuUn?Xfxe0`ARD_Q+T_QBZ{ zUK@!63_Wr`%9q_rh`N4=J=m;v>T{Y=ZLKN^m?(KZQ2J%|3`hV0iogMHJ} zY6&-nXirq$Yhh*CHY&Qf*b@@>LPTMf z(cMorwW?M11RN{H#~ApKT)F!;R#fBHahZGhmy>Sox`rk>>q&Y)RG$-QwH$_TWk^hS zTq2TC+D-cB21|$g4D=@T`-ATtJ?C=aXS4Q}^`~XjiIRszCB^cvW0OHe5;e~9D%D10 zl4yP4O=s-~HbL7*4>#W52eiG7*^Hi)?@-#*7C^X5@kGwK+paI>_a2qxtW zU=xV7>QQROWQqVfPcJ$4GSx`Y23Z&qnS?N;%mjHL*EVg3pBT{V7bQUI60jtBTS?i~ zycZ4xqJ<*3FSC6_^*6f)N|sgB5Bep(^%)$=0cczl>j&n~KR!7WC|3;Zoh_^GuOzRP zo2Hxf50w9?_4Qe368fZ0=J|fR*jO_EwFB1I^g~i)roB|KWKf49-)!N%Ggb%w=kB8)(+_%kE~G!(73aF=yCmM3Cfb9lV$G!b zoDIxqY{dH>`SILGHEJwq%rwh46_i`wkZS-NY95qdNE)O*y^+k#JlTEij8NT(Y_J!W zFd+YFoZB|auOz~A@A{V*c)o7E(a=wHvb@8g5PnVJ&7D+Fp8ABV z5`&LD-<$jPy{-y*V^SqM)9!#_Pj2-x{m$z+9Z*o|JTBGgXYYVM;g|VbitDUfnVn$o zO)6?CZcDklDoODzj+ti@i#WcqPoZ!|IPB98LW!$-p+a4xBVM@%GEGZKmNjQMhh)zv z7D){Gpe-Dv=~>c9f|1vANF&boD=Nb1Dv>4~eD636Lldh?#zD5{6JlcR_b*C_Enw&~ z5l2(w(`{+01xb1FCRfD2ap$u(h1U1B6e&8tQrnC}Cy0GR=i^Uue26Rc6Dx}!4#K*0 zaxt`a+px7-Z!^(U1WN2#kdN#OeR|2z+C@b@w+L67VEi&ZpAdg+8`HJT=wIMJqibhT ztb3PFzsq&7jzQuod3xp7uL?h-7rYao&0MiT_Bux;U*N#ebGv92o(jM2?`1!N2W_M* zeo9$%hEtIy;=`8z1c|kL&ZPn0y`N)i$Y1R9>K!el{moiy)014448YC#9=K zwO3weN|8!`5bU_#f(+ZrVd*9`7Uw?!q?yo&7sk&DJ;#-^tcCtqt5*A(V;&LdHq7Hg zI6sC@!ly9p$^@v&XDsgIuv;9#w^!C1n5+10-tEw~ZdO1kqMDYyDl!5__o}f3hYe2M zCeO)~m&&=JZn%cVH3HzPlcE`9^@``2u+!Y}Remn)DLMHc-h5A9ATgs;7F7=u2=vBlDRbjeYvyNby=TvpI{5nb2@J_YTEEEj4q<@zaGSC_i&xxD!6)d zG{1??({Ma<=Wd4JL%bnEXoBOU_0bbNy3p%mFrMW>#c zzPEvryBevZVUvT^2P&Zobk#9j>vSIW_t?AHy>(^x-Bx~(mvNYb_%$ZFg(s5~oka+Kp(GU68I$h(Vq|fZ zC_u1FM|S)=ldt#5q>&p4r%%p)*7|Rf0}B#-FwHDTo*|P6HB_rz%R;{==hpl#xTt@VLdSrrf~g^ z`IA8ZV1b`UazYpnkn28h&U)$(gdZ*f{n`&kH%Oy54&Z;ebjlh4x?JmnjFAALu}EG} zfGmQ$5vEMJMH`a=+*src#dWK&N1^LFxK9Sa#q_rja$JWra09we<2oL9Q9Sx)?kZFW z$jhOFGE~VcihYlkaZv8?uA7v$*}?2h6i%Qmgc4n~3E(O_`YCRGy~}`NFaj@(?Wz;GS_?T+RqU{S)eD1j$1Gr;C^m z7zDK=xaJ^6``=#Y-2ssNfdRqh0ntJrutGV5Nv&WI%3k1wmD5n+0aRe{0k^!>LFReN zx1g*E>nbyx03KU~UT6->+rG%(owLF=beJxK&a0F;ie1GZ^eKg-VEZb&=s&ajKS#6w zjvC6J#?b|U_(%@uq$c#Q@V_me0S1%)pKz9--{EKwyM}_gOj*Og-NEWLDF_oFtPjG; zXCZ7%#=s}RKr&_5RFN@=H(015AGl4XRN9Bc51`;WWt%vzQvzexDI2BZ@xP~^2$I&7 zA(ndsgLsmA*su8p-~IS q+ZJUZM}`4#Zi@l2F-#HCw*??ha2ta#9s8?H3%YId(*zJG6aF78h1yF1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f398c33..37aef8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 79a61d4..65dcd68 100755 --- a/gradlew +++ b/gradlew @@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/src/main/java/magicbees/bees/Allele.java b/src/main/java/magicbees/bees/Allele.java index ea33ad1..2bfc752 100644 --- a/src/main/java/magicbees/bees/Allele.java +++ b/src/main/java/magicbees/bees/Allele.java @@ -1,5 +1,17 @@ package magicbees.bees; +import net.minecraft.potion.Potion; + +import forestry.api.apiculture.EnumBeeChromosome; +import forestry.api.apiculture.IAlleleBeeEffect; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleEffect; +import forestry.api.genetics.IAlleleFlowers; +import forestry.api.genetics.IAlleleRegistry; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IFlowerProvider; import magicbees.api.MagicBeesAPI; import magicbees.bees.allele.effect.AlleleEffectCrumbling; import magicbees.bees.allele.effect.AlleleEffectCure; @@ -27,20 +39,7 @@ import magicbees.main.utils.compat.ArsMagicaHelper; import magicbees.main.utils.compat.BotaniaHelper; import magicbees.main.utils.compat.ThaumcraftHelper; import magicbees.main.utils.compat.ThermalModsHelper; - -import net.minecraft.potion.Potion; - import thaumcraft.api.nodes.NodeType; -import forestry.api.apiculture.EnumBeeChromosome; -import forestry.api.apiculture.IAlleleBeeEffect; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleEffect; -import forestry.api.genetics.IAlleleFlowers; -import forestry.api.genetics.IAlleleRegistry; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IFlowerProvider; public class Allele implements IAllele { diff --git a/src/main/java/magicbees/bees/BeeClassification.java b/src/main/java/magicbees/bees/BeeClassification.java index a715c42..d22e5dc 100644 --- a/src/main/java/magicbees/bees/BeeClassification.java +++ b/src/main/java/magicbees/bees/BeeClassification.java @@ -2,10 +2,10 @@ package magicbees.bees; import java.util.ArrayList; -import magicbees.main.utils.LocalizationManager; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; +import magicbees.main.utils.LocalizationManager; public enum BeeClassification implements IClassification { diff --git a/src/main/java/magicbees/bees/BeeGenomeManager.java b/src/main/java/magicbees/bees/BeeGenomeManager.java index d0fb2fa..7ce2f7e 100644 --- a/src/main/java/magicbees/bees/BeeGenomeManager.java +++ b/src/main/java/magicbees/bees/BeeGenomeManager.java @@ -1,8 +1,5 @@ package magicbees.bees; -import magicbees.main.utils.ItemInterface; -import magicbees.main.utils.compat.ExtraBeesHelper; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -10,6 +7,8 @@ import net.minecraft.nbt.NBTTagList; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; import forestry.api.genetics.IAllele; +import magicbees.main.utils.ItemInterface; +import magicbees.main.utils.compat.ExtraBeesHelper; /** * Simply a class to hold all the functions to manage species' default genomes. diff --git a/src/main/java/magicbees/bees/BeeIconProvider.java b/src/main/java/magicbees/bees/BeeIconProvider.java index 0d6ddd6..f599cde 100644 --- a/src/main/java/magicbees/bees/BeeIconProvider.java +++ b/src/main/java/magicbees/bees/BeeIconProvider.java @@ -2,8 +2,6 @@ package magicbees.bees; import java.util.Locale; -import magicbees.main.CommonProxy; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; @@ -11,6 +9,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBeeIconProvider; +import magicbees.main.CommonProxy; public enum BeeIconProvider implements IBeeIconProvider { diff --git a/src/main/java/magicbees/bees/BeeManager.java b/src/main/java/magicbees/bees/BeeManager.java index f762f7f..d8ccff5 100644 --- a/src/main/java/magicbees/bees/BeeManager.java +++ b/src/main/java/magicbees/bees/BeeManager.java @@ -5,12 +5,6 @@ import java.util.Collections; import java.util.List; import java.util.Random; -import magicbees.block.types.HiveType; -import magicbees.item.types.DropType; -import magicbees.main.Config; -import magicbees.main.utils.Tuple; -import magicbees.main.utils.compat.ExtraBeesHelper; - import net.minecraft.item.ItemStack; import forestry.api.apiculture.EnumBeeType; @@ -20,6 +14,11 @@ import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeRoot; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; +import magicbees.block.types.HiveType; +import magicbees.item.types.DropType; +import magicbees.main.Config; +import magicbees.main.utils.Tuple; +import magicbees.main.utils.compat.ExtraBeesHelper; public class BeeManager { diff --git a/src/main/java/magicbees/bees/BeeMutation.java b/src/main/java/magicbees/bees/BeeMutation.java index 1bc9df7..57fc68a 100644 --- a/src/main/java/magicbees/bees/BeeMutation.java +++ b/src/main/java/magicbees/bees/BeeMutation.java @@ -1,5 +1,13 @@ package magicbees.bees; +import net.minecraft.init.Blocks; +import net.minecraftforge.common.BiomeDictionary; +import net.minecraftforge.common.BiomeDictionary.Type; +import net.minecraftforge.oredict.OreDictionary; + +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IBeeMutationCustom; +import forestry.api.apiculture.IBeeMutationFactory; import magicbees.main.utils.LogHelper; import magicbees.main.utils.MoonPhase; import magicbees.main.utils.compat.AppliedEnergisticsHelper; @@ -12,15 +20,6 @@ import magicbees.main.utils.compat.RedstoneArsenalHelper; import magicbees.main.utils.compat.ThaumcraftHelper; import magicbees.main.utils.compat.ThermalModsHelper; -import net.minecraft.init.Blocks; -import net.minecraftforge.common.BiomeDictionary; -import net.minecraftforge.common.BiomeDictionary.Type; -import net.minecraftforge.oredict.OreDictionary; - -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.apiculture.IBeeMutationCustom; -import forestry.api.apiculture.IBeeMutationFactory; - public class BeeMutation { private static IBeeMutationFactory beeMutationFactory = forestry.api.apiculture.BeeManager.beeMutationFactory; diff --git a/src/main/java/magicbees/bees/BeeProductHelper.java b/src/main/java/magicbees/bees/BeeProductHelper.java index eadb997..a559a14 100644 --- a/src/main/java/magicbees/bees/BeeProductHelper.java +++ b/src/main/java/magicbees/bees/BeeProductHelper.java @@ -2,6 +2,11 @@ package magicbees.bees; import static magicbees.bees.BeeSpecies.*; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import magicbees.item.types.CombType; import magicbees.item.types.DropType; import magicbees.item.types.NuggetType; @@ -20,11 +25,6 @@ import magicbees.main.utils.compat.RedstoneArsenalHelper; import magicbees.main.utils.compat.ThaumcraftHelper; import magicbees.main.utils.compat.ThermalModsHelper; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - public class BeeProductHelper { public static void initBaseProducts() { diff --git a/src/main/java/magicbees/bees/BeeSpecies.java b/src/main/java/magicbees/bees/BeeSpecies.java index 76f4083..1fa0be9 100644 --- a/src/main/java/magicbees/bees/BeeSpecies.java +++ b/src/main/java/magicbees/bees/BeeSpecies.java @@ -1,13 +1,5 @@ package magicbees.bees; -import magicbees.main.utils.compat.AppliedEnergisticsHelper; -import magicbees.main.utils.compat.ArsMagicaHelper; -import magicbees.main.utils.compat.BotaniaHelper; -import magicbees.main.utils.compat.EquivalentExchangeHelper; -import magicbees.main.utils.compat.RedstoneArsenalHelper; -import magicbees.main.utils.compat.ThaumcraftHelper; -import magicbees.main.utils.compat.ThermalModsHelper; - import net.minecraft.item.ItemStack; import forestry.api.apiculture.EnumBeeChromosome; @@ -24,6 +16,13 @@ import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleTolerance; import forestry.api.genetics.IClassification; +import magicbees.main.utils.compat.AppliedEnergisticsHelper; +import magicbees.main.utils.compat.ArsMagicaHelper; +import magicbees.main.utils.compat.BotaniaHelper; +import magicbees.main.utils.compat.EquivalentExchangeHelper; +import magicbees.main.utils.compat.RedstoneArsenalHelper; +import magicbees.main.utils.compat.ThaumcraftHelper; +import magicbees.main.utils.compat.ThermalModsHelper; public enum BeeSpecies { diff --git a/src/main/java/magicbees/bees/HiveDescription.java b/src/main/java/magicbees/bees/HiveDescription.java index a36f7b2..781e980 100644 --- a/src/main/java/magicbees/bees/HiveDescription.java +++ b/src/main/java/magicbees/bees/HiveDescription.java @@ -5,15 +5,6 @@ import java.util.List; import java.util.Locale; import java.util.Random; -import magicbees.block.types.HiveType; -import magicbees.main.Config; -import magicbees.main.utils.BlockUtil; -import magicbees.main.utils.LogHelper; -import magicbees.world.feature.FeatureOreVein; -import magicbees.world.feature.HiveGenNether; -import magicbees.world.feature.HiveGenOblivion; -import magicbees.world.feature.HiveGenUnderground; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; @@ -25,6 +16,14 @@ import forestry.api.apiculture.hives.IHiveDescription; import forestry.api.apiculture.hives.IHiveGen; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; +import magicbees.block.types.HiveType; +import magicbees.main.Config; +import magicbees.main.utils.BlockUtil; +import magicbees.main.utils.LogHelper; +import magicbees.world.feature.FeatureOreVein; +import magicbees.world.feature.HiveGenNether; +import magicbees.world.feature.HiveGenOblivion; +import magicbees.world.feature.HiveGenUnderground; public enum HiveDescription implements IHiveDescription { diff --git a/src/main/java/magicbees/bees/MoonPhaseMutationBonus.java b/src/main/java/magicbees/bees/MoonPhaseMutationBonus.java index 4de2258..eeea1ac 100644 --- a/src/main/java/magicbees/bees/MoonPhaseMutationBonus.java +++ b/src/main/java/magicbees/bees/MoonPhaseMutationBonus.java @@ -1,14 +1,13 @@ package magicbees.bees; -import magicbees.main.utils.LocalizationManager; -import magicbees.main.utils.MoonPhase; - import net.minecraft.world.World; import forestry.api.core.IClimateProvider; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; +import magicbees.main.utils.LocalizationManager; +import magicbees.main.utils.MoonPhase; // There is a bonus to this mutation during moon phases... public class MoonPhaseMutationBonus implements IMutationCondition { diff --git a/src/main/java/magicbees/bees/MoonPhaseMutationRestriction.java b/src/main/java/magicbees/bees/MoonPhaseMutationRestriction.java index 2a812ff..50f1955 100644 --- a/src/main/java/magicbees/bees/MoonPhaseMutationRestriction.java +++ b/src/main/java/magicbees/bees/MoonPhaseMutationRestriction.java @@ -1,14 +1,13 @@ package magicbees.bees; -import magicbees.main.utils.LocalizationManager; -import magicbees.main.utils.MoonPhase; - import net.minecraft.world.World; import forestry.api.core.IClimateProvider; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; +import magicbees.main.utils.LocalizationManager; +import magicbees.main.utils.MoonPhase; public class MoonPhaseMutationRestriction implements IMutationCondition { diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectCrumbling.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectCrumbling.java index b65bd22..518b330 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectCrumbling.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectCrumbling.java @@ -2,9 +2,6 @@ package magicbees.bees.allele.effect; import java.util.HashMap; -import magicbees.bees.AlleleEffect; -import magicbees.bees.BeeManager; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -16,6 +13,8 @@ import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.genetics.IEffectData; +import magicbees.bees.AlleleEffect; +import magicbees.bees.BeeManager; public class AlleleEffectCrumbling extends AlleleEffect { diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectCure.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectCure.java index dd3c28f..0fbf0b6 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectCure.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectCure.java @@ -2,8 +2,6 @@ package magicbees.bees.allele.effect; import java.util.List; -import magicbees.bees.AlleleEffect; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -11,6 +9,7 @@ import net.minecraft.item.ItemStack; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; +import magicbees.bees.AlleleEffect; public class AlleleEffectCure extends AlleleEffect { diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java index c062107..ec87323 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectEmpowering.java @@ -7,24 +7,23 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import magicbees.bees.AlleleEffect; -import magicbees.bees.BeeManager; -import magicbees.main.Config; -import magicbees.main.utils.BlockUtil; -import magicbees.main.utils.compat.thaumcraft.NodeHelper; - import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.nodes.INode; import forestry.api.apiculture.IAlleleBeeAcceleratableEffect; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.genetics.IEffectData; +import magicbees.bees.AlleleEffect; +import magicbees.bees.BeeManager; +import magicbees.main.Config; +import magicbees.main.utils.BlockUtil; +import magicbees.main.utils.compat.thaumcraft.NodeHelper; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.nodes.INode; public class AlleleEffectEmpowering extends AlleleEffect implements IAlleleBeeAcceleratableEffect { diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectNodeConversion.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectNodeConversion.java index 22f3996..a397cd9 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectNodeConversion.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectNodeConversion.java @@ -2,20 +2,19 @@ package magicbees.bees.allele.effect; import java.util.List; -import magicbees.bees.AlleleEffect; -import magicbees.bees.BeeManager; -import magicbees.main.utils.BlockUtil; -import magicbees.main.utils.compat.thaumcraft.NodeHelper; - import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; -import thaumcraft.api.nodes.NodeType; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.genetics.IEffectData; +import magicbees.bees.AlleleEffect; +import magicbees.bees.BeeManager; +import magicbees.main.utils.BlockUtil; +import magicbees.main.utils.compat.thaumcraft.NodeHelper; +import thaumcraft.api.nodes.NodeType; public class AlleleEffectNodeConversion extends AlleleEffect { diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectNodeRepair.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectNodeRepair.java index 55dd3f3..67e658e 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectNodeRepair.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectNodeRepair.java @@ -2,11 +2,6 @@ package magicbees.bees.allele.effect; import java.util.List; -import magicbees.bees.AlleleEffect; -import magicbees.bees.BeeManager; -import magicbees.main.utils.BlockUtil; -import magicbees.main.utils.compat.thaumcraft.NodeHelper; - import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; @@ -15,6 +10,10 @@ import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.genetics.IEffectData; +import magicbees.bees.AlleleEffect; +import magicbees.bees.BeeManager; +import magicbees.main.utils.BlockUtil; +import magicbees.main.utils.compat.thaumcraft.NodeHelper; public class AlleleEffectNodeRepair extends AlleleEffect { diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectPlaceholder.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectPlaceholder.java index 271b3f9..64a9637 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectPlaceholder.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectPlaceholder.java @@ -1,9 +1,9 @@ package magicbees.bees.allele.effect; -import magicbees.bees.AlleleEffect; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; +import magicbees.bees.AlleleEffect; public class AlleleEffectPlaceholder extends AlleleEffect { diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectPotion.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectPotion.java index 80190c8..9857d46 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectPotion.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectPotion.java @@ -2,8 +2,6 @@ package magicbees.bees.allele.effect; import java.util.List; -import magicbees.bees.AlleleEffect; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; @@ -13,6 +11,7 @@ import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.genetics.IEffectData; +import magicbees.bees.AlleleEffect; public class AlleleEffectPotion extends AlleleEffect { diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectRecharge.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectRecharge.java index e5aefb6..e9377e3 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectRecharge.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectRecharge.java @@ -4,23 +4,22 @@ import static magicbees.main.utils.compat.thaumcraft.NodeHelper.updateNode; import java.util.*; -import magicbees.bees.AlleleEffect; -import magicbees.bees.BeeManager; -import magicbees.main.utils.BlockUtil; -import magicbees.main.utils.compat.thaumcraft.NodeHelper; - import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.nodes.INode; import forestry.api.apiculture.IAlleleBeeAcceleratableEffect; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.genetics.IEffectData; +import magicbees.bees.AlleleEffect; +import magicbees.bees.BeeManager; +import magicbees.main.utils.BlockUtil; +import magicbees.main.utils.compat.thaumcraft.NodeHelper; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.nodes.INode; public class AlleleEffectRecharge extends AlleleEffect implements IAlleleBeeAcceleratableEffect { diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMob.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMob.java index d0ef58d..e1b80fc 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMob.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMob.java @@ -2,9 +2,6 @@ package magicbees.bees.allele.effect; import java.util.List; -import magicbees.bees.AlleleEffect; -import magicbees.bees.BeeManager; - import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; @@ -17,6 +14,8 @@ import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.genetics.IEffectData; +import magicbees.bees.AlleleEffect; +import magicbees.bees.BeeManager; public class AlleleEffectSpawnMob extends AlleleEffect { diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMobWeighted.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMobWeighted.java index 4447f9d..d1b87dd 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMobWeighted.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnMobWeighted.java @@ -1,8 +1,5 @@ package magicbees.bees.allele.effect; -import magicbees.bees.AlleleEffect; -import magicbees.bees.BeeManager; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; @@ -13,6 +10,8 @@ import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.genetics.IEffectData; +import magicbees.bees.AlleleEffect; +import magicbees.bees.BeeManager; public class AlleleEffectSpawnMobWeighted extends AlleleEffect { diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnWisp.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnWisp.java index 30594f5..a90cd8c 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnWisp.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectSpawnWisp.java @@ -2,8 +2,6 @@ package magicbees.bees.allele.effect; import java.lang.reflect.Field; -import magicbees.main.utils.compat.ThaumcraftHelper; - import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; @@ -14,6 +12,7 @@ import net.minecraft.world.World; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; +import magicbees.main.utils.compat.ThaumcraftHelper; public class AlleleEffectSpawnWisp extends AlleleEffectSpawnMob { diff --git a/src/main/java/magicbees/bees/allele/effect/AlleleEffectTransmuting.java b/src/main/java/magicbees/bees/allele/effect/AlleleEffectTransmuting.java index 1dd013f..5e4b93d 100644 --- a/src/main/java/magicbees/bees/allele/effect/AlleleEffectTransmuting.java +++ b/src/main/java/magicbees/bees/allele/effect/AlleleEffectTransmuting.java @@ -1,8 +1,5 @@ package magicbees.bees.allele.effect; -import magicbees.bees.AlleleEffect; -import magicbees.bees.BeeManager; - import net.minecraft.item.ItemStack; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; @@ -12,6 +9,8 @@ import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.genetics.IEffectData; +import magicbees.bees.AlleleEffect; +import magicbees.bees.BeeManager; public class AlleleEffectTransmuting extends AlleleEffect { diff --git a/src/main/java/magicbees/bees/allele/effect/TransmutationEffectController.java b/src/main/java/magicbees/bees/allele/effect/TransmutationEffectController.java index d943bbd..3016b2e 100644 --- a/src/main/java/magicbees/bees/allele/effect/TransmutationEffectController.java +++ b/src/main/java/magicbees/bees/allele/effect/TransmutationEffectController.java @@ -4,14 +4,14 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import magicbees.api.bees.ITransmutationEffectController; -import magicbees.api.bees.ITransmutationEffectLogic; -import magicbees.main.utils.LogHelper; - import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; +import magicbees.api.bees.ITransmutationEffectController; +import magicbees.api.bees.ITransmutationEffectLogic; +import magicbees.main.utils.LogHelper; + public class TransmutationEffectController implements ITransmutationEffectController { private List logicObjects; diff --git a/src/main/java/magicbees/bees/allele/effect/TransmutationEffectLBotaniaLiving.java b/src/main/java/magicbees/bees/allele/effect/TransmutationEffectLBotaniaLiving.java index 70911d2..81b1c7f 100644 --- a/src/main/java/magicbees/bees/allele/effect/TransmutationEffectLBotaniaLiving.java +++ b/src/main/java/magicbees/bees/allele/effect/TransmutationEffectLBotaniaLiving.java @@ -1,13 +1,13 @@ package magicbees.bees.allele.effect; -import magicbees.api.bees.ITransmutationEffectLogic; -import magicbees.main.utils.compat.BotaniaHelper; - import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.oredict.OreDictionary; +import magicbees.api.bees.ITransmutationEffectLogic; +import magicbees.main.utils.compat.BotaniaHelper; + public class TransmutationEffectLBotaniaLiving implements ITransmutationEffectLogic { @Override diff --git a/src/main/java/magicbees/bees/allele/effect/TransmutationEffectRailcraft.java b/src/main/java/magicbees/bees/allele/effect/TransmutationEffectRailcraft.java index 30942fc..c5a6b23 100644 --- a/src/main/java/magicbees/bees/allele/effect/TransmutationEffectRailcraft.java +++ b/src/main/java/magicbees/bees/allele/effect/TransmutationEffectRailcraft.java @@ -2,8 +2,6 @@ package magicbees.bees.allele.effect; import java.util.Locale; -import magicbees.api.bees.ITransmutationEffectLogic; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -13,6 +11,7 @@ import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.registry.GameRegistry; +import magicbees.api.bees.ITransmutationEffectLogic; public class TransmutationEffectRailcraft implements ITransmutationEffectLogic { diff --git a/src/main/java/magicbees/bees/allele/effect/TransmutationEffectVanilla.java b/src/main/java/magicbees/bees/allele/effect/TransmutationEffectVanilla.java index 03eb784..f98f186 100644 --- a/src/main/java/magicbees/bees/allele/effect/TransmutationEffectVanilla.java +++ b/src/main/java/magicbees/bees/allele/effect/TransmutationEffectVanilla.java @@ -1,7 +1,5 @@ package magicbees.bees.allele.effect; -import magicbees.api.bees.ITransmutationEffectLogic; - import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -9,6 +7,8 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.oredict.OreDictionary; +import magicbees.api.bees.ITransmutationEffectLogic; + public class TransmutationEffectVanilla implements ITransmutationEffectLogic { @Override diff --git a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderArsMagicaFlower.java b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderArsMagicaFlower.java index b6754db..e38cb99 100644 --- a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderArsMagicaFlower.java +++ b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderArsMagicaFlower.java @@ -1,8 +1,5 @@ package magicbees.bees.allele.flowerProvider; -import magicbees.main.utils.LocalizationManager; -import magicbees.main.utils.compat.ArsMagicaHelper; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -13,6 +10,8 @@ import forestry.api.genetics.IFlowerGrowthRule; import forestry.api.genetics.IFlowerRegistry; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; +import magicbees.main.utils.LocalizationManager; +import magicbees.main.utils.compat.ArsMagicaHelper; public class FlowerProviderArsMagicaFlower extends FlowerProvider implements IFlowerGrowthRule { diff --git a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderAuraNode.java b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderAuraNode.java index 5ca2fe5..e36718b 100644 --- a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderAuraNode.java +++ b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderAuraNode.java @@ -1,13 +1,12 @@ package magicbees.bees.allele.flowerProvider; -import magicbees.main.utils.LocalizationManager; -import magicbees.main.utils.compat.ThaumcraftHelper; - import net.minecraft.item.ItemStack; import net.minecraft.world.World; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; +import magicbees.main.utils.LocalizationManager; +import magicbees.main.utils.compat.ThaumcraftHelper; public class FlowerProviderAuraNode extends FlowerProvider { diff --git a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBookshelf.java b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBookshelf.java index 7e66986..e08f070 100644 --- a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBookshelf.java +++ b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBookshelf.java @@ -2,8 +2,6 @@ package magicbees.bees.allele.flowerProvider; import java.util.EnumSet; -import magicbees.main.utils.LocalizationManager; - import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -12,6 +10,7 @@ import net.minecraftforge.oredict.OreDictionary; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; +import magicbees.main.utils.LocalizationManager; public class FlowerProviderBookshelf extends FlowerProvider { diff --git a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBotania.java b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBotania.java index 2db787a..344d44d 100644 --- a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBotania.java +++ b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBotania.java @@ -1,8 +1,5 @@ package magicbees.bees.allele.flowerProvider; -import magicbees.main.utils.LocalizationManager; -import magicbees.main.utils.compat.BotaniaHelper; - import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; @@ -12,6 +9,8 @@ import forestry.api.genetics.IFlowerGrowthRule; import forestry.api.genetics.IFlowerRegistry; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; +import magicbees.main.utils.LocalizationManager; +import magicbees.main.utils.compat.BotaniaHelper; public class FlowerProviderBotania extends FlowerProvider implements IFlowerGrowthRule { diff --git a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderThaumcraftFlower.java b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderThaumcraftFlower.java index 326d451..d25dcdc 100644 --- a/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderThaumcraftFlower.java +++ b/src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderThaumcraftFlower.java @@ -1,8 +1,5 @@ package magicbees.bees.allele.flowerProvider; -import magicbees.main.utils.LocalizationManager; -import magicbees.main.utils.compat.ThaumcraftHelper; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -13,6 +10,8 @@ import forestry.api.genetics.IFlowerGrowthRule; import forestry.api.genetics.IFlowerRegistry; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; +import magicbees.main.utils.LocalizationManager; +import magicbees.main.utils.compat.ThaumcraftHelper; public class FlowerProviderThaumcraftFlower extends FlowerProvider implements IFlowerGrowthRule { diff --git a/src/main/java/magicbees/block/BlockEffectJar.java b/src/main/java/magicbees/block/BlockEffectJar.java index cfe46c2..52381f1 100644 --- a/src/main/java/magicbees/block/BlockEffectJar.java +++ b/src/main/java/magicbees/block/BlockEffectJar.java @@ -1,11 +1,5 @@ package magicbees.block; -import magicbees.client.gui.UIScreens; -import magicbees.main.CommonProxy; -import magicbees.main.MagicBees; -import magicbees.main.utils.TabMagicBees; -import magicbees.tileentity.TileEntityEffectJar; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -19,6 +13,11 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import magicbees.client.gui.UIScreens; +import magicbees.main.CommonProxy; +import magicbees.main.MagicBees; +import magicbees.main.utils.TabMagicBees; +import magicbees.tileentity.TileEntityEffectJar; public class BlockEffectJar extends BlockContainer { diff --git a/src/main/java/magicbees/block/BlockEnchantedEarth.java b/src/main/java/magicbees/block/BlockEnchantedEarth.java index 8b26cd0..60bdc2d 100644 --- a/src/main/java/magicbees/block/BlockEnchantedEarth.java +++ b/src/main/java/magicbees/block/BlockEnchantedEarth.java @@ -2,9 +2,6 @@ package magicbees.block; import java.util.Random; -import magicbees.main.CommonProxy; -import magicbees.main.utils.TabMagicBees; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,6 +13,8 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import magicbees.main.CommonProxy; +import magicbees.main.utils.TabMagicBees; public class BlockEnchantedEarth extends Block { diff --git a/src/main/java/magicbees/block/BlockHive.java b/src/main/java/magicbees/block/BlockHive.java index 1f4a687..d06a2df 100644 --- a/src/main/java/magicbees/block/BlockHive.java +++ b/src/main/java/magicbees/block/BlockHive.java @@ -3,9 +3,6 @@ package magicbees.block; import java.util.ArrayList; import java.util.List; -import magicbees.block.types.HiveType; -import magicbees.main.Config; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -20,6 +17,8 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; +import magicbees.block.types.HiveType; +import magicbees.main.Config; public class BlockHive extends Block { diff --git a/src/main/java/magicbees/block/BlockMagicApiary.java b/src/main/java/magicbees/block/BlockMagicApiary.java index 184e9fc..816de93 100644 --- a/src/main/java/magicbees/block/BlockMagicApiary.java +++ b/src/main/java/magicbees/block/BlockMagicApiary.java @@ -1,11 +1,5 @@ package magicbees.block; -import magicbees.client.gui.UIScreens; -import magicbees.main.CommonProxy; -import magicbees.main.MagicBees; -import magicbees.main.utils.TabMagicBees; -import magicbees.tileentity.TileEntityMagicApiary; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -20,6 +14,11 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import magicbees.client.gui.UIScreens; +import magicbees.main.CommonProxy; +import magicbees.main.MagicBees; +import magicbees.main.utils.TabMagicBees; +import magicbees.tileentity.TileEntityMagicApiary; public class BlockMagicApiary extends BlockContainer { diff --git a/src/main/java/magicbees/block/BlockManaAuraProvider.java b/src/main/java/magicbees/block/BlockManaAuraProvider.java index f32a831..db65857 100644 --- a/src/main/java/magicbees/block/BlockManaAuraProvider.java +++ b/src/main/java/magicbees/block/BlockManaAuraProvider.java @@ -1,9 +1,5 @@ package magicbees.block; -import magicbees.main.CommonProxy; -import magicbees.main.utils.TabMagicBees; -import magicbees.tileentity.TileEntityManaAuraProvider; - import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; @@ -14,6 +10,9 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import magicbees.main.CommonProxy; +import magicbees.main.utils.TabMagicBees; +import magicbees.tileentity.TileEntityManaAuraProvider; public class BlockManaAuraProvider extends Block implements ITileEntityProvider { diff --git a/src/main/java/magicbees/block/BlockVisAuraProvider.java b/src/main/java/magicbees/block/BlockVisAuraProvider.java index aad48db..b864b2c 100644 --- a/src/main/java/magicbees/block/BlockVisAuraProvider.java +++ b/src/main/java/magicbees/block/BlockVisAuraProvider.java @@ -1,9 +1,5 @@ package magicbees.block; -import magicbees.main.CommonProxy; -import magicbees.main.utils.TabMagicBees; -import magicbees.tileentity.TileEntityVisAuraProvider; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,6 +9,9 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import magicbees.main.CommonProxy; +import magicbees.main.utils.TabMagicBees; +import magicbees.tileentity.TileEntityVisAuraProvider; public class BlockVisAuraProvider extends BlockContainer { diff --git a/src/main/java/magicbees/block/types/HiveType.java b/src/main/java/magicbees/block/types/HiveType.java index 05291f1..386c6ab 100644 --- a/src/main/java/magicbees/block/types/HiveType.java +++ b/src/main/java/magicbees/block/types/HiveType.java @@ -3,14 +3,6 @@ package magicbees.block.types; import java.util.ArrayList; import java.util.Collections; -import magicbees.bees.BeeGenomeManager; -import magicbees.bees.BeeSpecies; -import magicbees.bees.HiveDrop; -import magicbees.item.types.CombType; -import magicbees.main.CommonProxy; -import magicbees.main.Config; -import magicbees.main.utils.compat.ForestryHelper; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -20,6 +12,13 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.apiculture.IHiveDrop; +import magicbees.bees.BeeGenomeManager; +import magicbees.bees.BeeSpecies; +import magicbees.bees.HiveDrop; +import magicbees.item.types.CombType; +import magicbees.main.CommonProxy; +import magicbees.main.Config; +import magicbees.main.utils.compat.ForestryHelper; public enum HiveType { diff --git a/src/main/java/magicbees/client/gui/ContainerEffectJar.java b/src/main/java/magicbees/client/gui/ContainerEffectJar.java index d504f10..ce6de3a 100644 --- a/src/main/java/magicbees/client/gui/ContainerEffectJar.java +++ b/src/main/java/magicbees/client/gui/ContainerEffectJar.java @@ -1,7 +1,5 @@ package magicbees.client.gui; -import magicbees.tileentity.TileEntityEffectJar; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; @@ -11,6 +9,7 @@ import net.minecraft.item.ItemStack; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import magicbees.tileentity.TileEntityEffectJar; public class ContainerEffectJar extends Container { diff --git a/src/main/java/magicbees/client/gui/ContainerMagicApiary.java b/src/main/java/magicbees/client/gui/ContainerMagicApiary.java index d86c8e5..dceb545 100644 --- a/src/main/java/magicbees/client/gui/ContainerMagicApiary.java +++ b/src/main/java/magicbees/client/gui/ContainerMagicApiary.java @@ -1,9 +1,5 @@ package magicbees.client.gui; -import magicbees.bees.BeeManager; -import magicbees.main.utils.ItemInterface; -import magicbees.tileentity.TileEntityMagicApiary; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; @@ -11,6 +7,9 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import forestry.api.apiculture.IHiveFrame; +import magicbees.bees.BeeManager; +import magicbees.main.utils.ItemInterface; +import magicbees.tileentity.TileEntityMagicApiary; public class ContainerMagicApiary extends ContainerMB { diff --git a/src/main/java/magicbees/client/gui/GUIEffectJar.java b/src/main/java/magicbees/client/gui/GUIEffectJar.java index ae8659c..22cc24f 100644 --- a/src/main/java/magicbees/client/gui/GUIEffectJar.java +++ b/src/main/java/magicbees/client/gui/GUIEffectJar.java @@ -1,14 +1,14 @@ package magicbees.client.gui; -import magicbees.main.CommonProxy; -import magicbees.tileentity.TileEntityEffectJar; - import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import magicbees.main.CommonProxy; +import magicbees.tileentity.TileEntityEffectJar; + public class GUIEffectJar extends GuiContainer { public static final String BACKGROUND_FILE = "jarScreen.png"; diff --git a/src/main/java/magicbees/client/gui/GUIHandler.java b/src/main/java/magicbees/client/gui/GUIHandler.java index a388c87..6bc9277 100644 --- a/src/main/java/magicbees/client/gui/GUIHandler.java +++ b/src/main/java/magicbees/client/gui/GUIHandler.java @@ -1,12 +1,11 @@ package magicbees.client.gui; -import magicbees.tileentity.TileEntityEffectJar; -import magicbees.tileentity.TileEntityMagicApiary; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import cpw.mods.fml.common.network.IGuiHandler; +import magicbees.tileentity.TileEntityEffectJar; +import magicbees.tileentity.TileEntityMagicApiary; public class GUIHandler implements IGuiHandler { diff --git a/src/main/java/magicbees/client/gui/GuiMagicApiary.java b/src/main/java/magicbees/client/gui/GuiMagicApiary.java index e58f933..ae8cfa1 100644 --- a/src/main/java/magicbees/client/gui/GuiMagicApiary.java +++ b/src/main/java/magicbees/client/gui/GuiMagicApiary.java @@ -1,8 +1,5 @@ package magicbees.client.gui; -import magicbees.main.CommonProxy; -import magicbees.tileentity.TileEntityMagicApiary; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -12,6 +9,8 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import magicbees.main.CommonProxy; +import magicbees.tileentity.TileEntityMagicApiary; @SideOnly(Side.CLIENT) public class GuiMagicApiary extends GuiContainer { diff --git a/src/main/java/magicbees/client/gui/ModGuiConfig.java b/src/main/java/magicbees/client/gui/ModGuiConfig.java index f76dc47..65fb05a 100644 --- a/src/main/java/magicbees/client/gui/ModGuiConfig.java +++ b/src/main/java/magicbees/client/gui/ModGuiConfig.java @@ -3,15 +3,14 @@ package magicbees.client.gui; import java.util.ArrayList; import java.util.List; -import magicbees.main.Config; -import magicbees.main.utils.VersionInfo; - import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; import cpw.mods.fml.client.config.DummyConfigElement; import cpw.mods.fml.client.config.GuiConfig; import cpw.mods.fml.client.config.IConfigElement; +import magicbees.main.Config; +import magicbees.main.utils.VersionInfo; public class ModGuiConfig extends GuiConfig { diff --git a/src/main/java/magicbees/client/model/ModelEffectJar.java b/src/main/java/magicbees/client/model/ModelEffectJar.java index ad4ded1..093f852 100644 --- a/src/main/java/magicbees/client/model/ModelEffectJar.java +++ b/src/main/java/magicbees/client/model/ModelEffectJar.java @@ -1,7 +1,5 @@ package magicbees.client.model; -import magicbees.main.CommonProxy; - import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; @@ -10,6 +8,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import magicbees.main.CommonProxy; @SideOnly(Side.CLIENT) public class ModelEffectJar { diff --git a/src/main/java/magicbees/client/model/ModelVisAuraProvider.java b/src/main/java/magicbees/client/model/ModelVisAuraProvider.java index 456a368..95b6232 100644 --- a/src/main/java/magicbees/client/model/ModelVisAuraProvider.java +++ b/src/main/java/magicbees/client/model/ModelVisAuraProvider.java @@ -1,7 +1,5 @@ package magicbees.client.model; -import magicbees.main.CommonProxy; - import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; @@ -10,6 +8,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import magicbees.main.CommonProxy; @SideOnly(Side.CLIENT) public class ModelVisAuraProvider { diff --git a/src/main/java/magicbees/client/render/RendererEffectJar.java b/src/main/java/magicbees/client/render/RendererEffectJar.java index ea78952..b7bd591 100644 --- a/src/main/java/magicbees/client/render/RendererEffectJar.java +++ b/src/main/java/magicbees/client/render/RendererEffectJar.java @@ -1,8 +1,5 @@ package magicbees.client.render; -import magicbees.client.model.ModelEffectJar; -import magicbees.tileentity.TileEntityEffectJar; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -11,6 +8,8 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; import cpw.mods.fml.client.FMLClientHandler; +import magicbees.client.model.ModelEffectJar; +import magicbees.tileentity.TileEntityEffectJar; public class RendererEffectJar extends TileEntitySpecialRenderer implements IItemRenderer { diff --git a/src/main/java/magicbees/client/render/RendererVisAuraProvider.java b/src/main/java/magicbees/client/render/RendererVisAuraProvider.java index 25f0869..3e8b991 100644 --- a/src/main/java/magicbees/client/render/RendererVisAuraProvider.java +++ b/src/main/java/magicbees/client/render/RendererVisAuraProvider.java @@ -1,8 +1,5 @@ package magicbees.client.render; -import magicbees.client.model.ModelVisAuraProvider; -import magicbees.tileentity.TileEntityVisAuraProvider; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -11,6 +8,8 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; import cpw.mods.fml.client.FMLClientHandler; +import magicbees.client.model.ModelVisAuraProvider; +import magicbees.tileentity.TileEntityVisAuraProvider; public class RendererVisAuraProvider extends TileEntitySpecialRenderer implements IItemRenderer { diff --git a/src/main/java/magicbees/item/ItemCapsule.java b/src/main/java/magicbees/item/ItemCapsule.java index 8d77629..32cb1c2 100644 --- a/src/main/java/magicbees/item/ItemCapsule.java +++ b/src/main/java/magicbees/item/ItemCapsule.java @@ -2,11 +2,6 @@ package magicbees.item; import java.util.List; -import magicbees.item.types.CapsuleType; -import magicbees.item.types.FluidType; -import magicbees.main.CommonProxy; -import magicbees.main.utils.TabMagicBees; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -16,6 +11,10 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import magicbees.item.types.CapsuleType; +import magicbees.item.types.FluidType; +import magicbees.main.CommonProxy; +import magicbees.main.utils.TabMagicBees; public class ItemCapsule extends Item { diff --git a/src/main/java/magicbees/item/ItemComb.java b/src/main/java/magicbees/item/ItemComb.java index 428c45f..04b68e4 100644 --- a/src/main/java/magicbees/item/ItemComb.java +++ b/src/main/java/magicbees/item/ItemComb.java @@ -2,10 +2,6 @@ package magicbees.item; import java.util.List; -import magicbees.item.types.CombType; -import magicbees.main.Config; -import magicbees.main.utils.compat.ForestryHelper; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -16,6 +12,9 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; +import magicbees.item.types.CombType; +import magicbees.main.Config; +import magicbees.main.utils.compat.ForestryHelper; public class ItemComb extends Item { diff --git a/src/main/java/magicbees/item/ItemDrop.java b/src/main/java/magicbees/item/ItemDrop.java index caa3c9b..6db3125 100644 --- a/src/main/java/magicbees/item/ItemDrop.java +++ b/src/main/java/magicbees/item/ItemDrop.java @@ -2,9 +2,6 @@ package magicbees.item; import java.util.List; -import magicbees.item.types.DropType; -import magicbees.main.utils.compat.ForestryHelper; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -15,6 +12,8 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; +import magicbees.item.types.DropType; +import magicbees.main.utils.compat.ForestryHelper; public class ItemDrop extends Item { diff --git a/src/main/java/magicbees/item/ItemGrafter.java b/src/main/java/magicbees/item/ItemGrafter.java index c33753b..996e61a 100644 --- a/src/main/java/magicbees/item/ItemGrafter.java +++ b/src/main/java/magicbees/item/ItemGrafter.java @@ -1,8 +1,5 @@ package magicbees.item; -import magicbees.main.Config; -import magicbees.main.utils.compat.ThaumcraftHelper; - import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -12,6 +9,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import forestry.api.arboriculture.IToolGrafter; +import magicbees.main.Config; +import magicbees.main.utils.compat.ThaumcraftHelper; public class ItemGrafter extends Item implements IToolGrafter { diff --git a/src/main/java/magicbees/item/ItemMagicHive.java b/src/main/java/magicbees/item/ItemMagicHive.java index 2a04933..47a0481 100644 --- a/src/main/java/magicbees/item/ItemMagicHive.java +++ b/src/main/java/magicbees/item/ItemMagicHive.java @@ -1,7 +1,5 @@ package magicbees.item; -import magicbees.block.types.HiveType; - import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -9,6 +7,7 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import magicbees.block.types.HiveType; /** * Created by Allen on 7/29/2014. diff --git a/src/main/java/magicbees/item/ItemMagicHiveFrame.java b/src/main/java/magicbees/item/ItemMagicHiveFrame.java index e75b838..ff9d4ae 100644 --- a/src/main/java/magicbees/item/ItemMagicHiveFrame.java +++ b/src/main/java/magicbees/item/ItemMagicHiveFrame.java @@ -1,9 +1,5 @@ package magicbees.item; -import magicbees.item.types.HiveFrameType; -import magicbees.main.CommonProxy; -import magicbees.main.utils.TabMagicBees; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -15,6 +11,9 @@ import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IHiveFrame; +import magicbees.item.types.HiveFrameType; +import magicbees.main.CommonProxy; +import magicbees.main.utils.TabMagicBees; public class ItemMagicHiveFrame extends Item implements IHiveFrame { diff --git a/src/main/java/magicbees/item/ItemManasteelGrafter.java b/src/main/java/magicbees/item/ItemManasteelGrafter.java index f80b8d3..eadc2bf 100644 --- a/src/main/java/magicbees/item/ItemManasteelGrafter.java +++ b/src/main/java/magicbees/item/ItemManasteelGrafter.java @@ -1,18 +1,17 @@ package magicbees.item; -import magicbees.main.CommonProxy; -import magicbees.main.utils.compat.BotaniaHelper; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import vazkii.botania.api.mana.IManaUsingItem; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import magicbees.main.CommonProxy; +import magicbees.main.utils.compat.BotaniaHelper; +import vazkii.botania.api.mana.IManaUsingItem; @Optional.InterfaceList({ @Optional.Interface( iface = "vazkii.botania.api.mana.IManaUsingItem", diff --git a/src/main/java/magicbees/item/ItemManasteelScoop.java b/src/main/java/magicbees/item/ItemManasteelScoop.java index f302a28..7cd9211 100644 --- a/src/main/java/magicbees/item/ItemManasteelScoop.java +++ b/src/main/java/magicbees/item/ItemManasteelScoop.java @@ -1,8 +1,5 @@ package magicbees.item; -import magicbees.main.CommonProxy; -import magicbees.main.utils.compat.BotaniaHelper; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -12,11 +9,13 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import vazkii.botania.api.mana.IManaUsingItem; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.IToolScoop; +import magicbees.main.CommonProxy; +import magicbees.main.utils.compat.BotaniaHelper; +import vazkii.botania.api.mana.IManaUsingItem; @Optional.InterfaceList({ @Optional.Interface( iface = "vazkii.botania.api.mana.IManaUsingItem", diff --git a/src/main/java/magicbees/item/ItemMiscResources.java b/src/main/java/magicbees/item/ItemMiscResources.java index 1bfa1ae..7028b38 100644 --- a/src/main/java/magicbees/item/ItemMiscResources.java +++ b/src/main/java/magicbees/item/ItemMiscResources.java @@ -2,10 +2,6 @@ package magicbees.item; import java.util.List; -import magicbees.item.types.ResourceType; -import magicbees.main.CommonProxy; -import magicbees.main.utils.TabMagicBees; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -15,6 +11,9 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import magicbees.item.types.ResourceType; +import magicbees.main.CommonProxy; +import magicbees.main.utils.TabMagicBees; public class ItemMiscResources extends Item { diff --git a/src/main/java/magicbees/item/ItemMoonDial.java b/src/main/java/magicbees/item/ItemMoonDial.java index 7f2997e..689b4d2 100644 --- a/src/main/java/magicbees/item/ItemMoonDial.java +++ b/src/main/java/magicbees/item/ItemMoonDial.java @@ -2,11 +2,6 @@ package magicbees.item; import java.util.List; -import magicbees.main.CommonProxy; -import magicbees.main.Config; -import magicbees.main.utils.MoonPhase; -import magicbees.main.utils.TabMagicBees; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -16,6 +11,10 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import magicbees.main.CommonProxy; +import magicbees.main.Config; +import magicbees.main.utils.MoonPhase; +import magicbees.main.utils.TabMagicBees; public class ItemMoonDial extends Item { diff --git a/src/main/java/magicbees/item/ItemMysteriousMagnet.java b/src/main/java/magicbees/item/ItemMysteriousMagnet.java index e3242e0..e7f0482 100644 --- a/src/main/java/magicbees/item/ItemMysteriousMagnet.java +++ b/src/main/java/magicbees/item/ItemMysteriousMagnet.java @@ -2,11 +2,6 @@ package magicbees.item; import java.util.List; -import magicbees.main.CommonProxy; -import magicbees.main.Config; -import magicbees.main.utils.LocalizationManager; -import magicbees.main.utils.TabMagicBees; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -27,6 +22,10 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import magicbees.main.CommonProxy; +import magicbees.main.Config; +import magicbees.main.utils.LocalizationManager; +import magicbees.main.utils.TabMagicBees; @Optional.Interface(modid = "Baubles", iface = "baubles.api.IBauble") public class ItemMysteriousMagnet extends Item implements IBauble { diff --git a/src/main/java/magicbees/item/ItemNugget.java b/src/main/java/magicbees/item/ItemNugget.java index 34b6d46..80bcd9b 100644 --- a/src/main/java/magicbees/item/ItemNugget.java +++ b/src/main/java/magicbees/item/ItemNugget.java @@ -2,9 +2,6 @@ package magicbees.item; import java.util.List; -import magicbees.item.types.NuggetType; -import magicbees.main.CommonProxy; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -13,6 +10,8 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import magicbees.item.types.NuggetType; +import magicbees.main.CommonProxy; public class ItemNugget extends Item { diff --git a/src/main/java/magicbees/item/ItemPollen.java b/src/main/java/magicbees/item/ItemPollen.java index 8d4c89a..d5b3c73 100644 --- a/src/main/java/magicbees/item/ItemPollen.java +++ b/src/main/java/magicbees/item/ItemPollen.java @@ -2,9 +2,6 @@ package magicbees.item; import java.util.List; -import magicbees.item.types.PollenType; -import magicbees.main.utils.compat.ForestryHelper; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -15,6 +12,8 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; +import magicbees.item.types.PollenType; +import magicbees.main.utils.compat.ForestryHelper; public class ItemPollen extends Item { diff --git a/src/main/java/magicbees/item/ItemPropolis.java b/src/main/java/magicbees/item/ItemPropolis.java index 548d8f1..7d81a1a 100644 --- a/src/main/java/magicbees/item/ItemPropolis.java +++ b/src/main/java/magicbees/item/ItemPropolis.java @@ -2,9 +2,6 @@ package magicbees.item; import java.util.List; -import magicbees.item.types.PropolisType; -import magicbees.main.utils.compat.ForestryHelper; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -14,6 +11,8 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; +import magicbees.item.types.PropolisType; +import magicbees.main.utils.compat.ForestryHelper; public class ItemPropolis extends Item { diff --git a/src/main/java/magicbees/item/ItemThaumiumGrafter.java b/src/main/java/magicbees/item/ItemThaumiumGrafter.java index c4daebf..fe0e416 100644 --- a/src/main/java/magicbees/item/ItemThaumiumGrafter.java +++ b/src/main/java/magicbees/item/ItemThaumiumGrafter.java @@ -1,8 +1,5 @@ package magicbees.item; -import magicbees.main.CommonProxy; -import magicbees.main.utils.compat.ThaumcraftHelper; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -11,11 +8,13 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.IRepairableExtended; -import thaumcraft.api.ThaumcraftApi; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import magicbees.main.CommonProxy; +import magicbees.main.utils.compat.ThaumcraftHelper; +import thaumcraft.api.IRepairableExtended; +import thaumcraft.api.ThaumcraftApi; @Optional.InterfaceList({ @Optional.Interface( iface = "thaumcraft.api.IRepairableExtended", diff --git a/src/main/java/magicbees/item/ItemThaumiumScoop.java b/src/main/java/magicbees/item/ItemThaumiumScoop.java index 1c1be3f..138f9d8 100644 --- a/src/main/java/magicbees/item/ItemThaumiumScoop.java +++ b/src/main/java/magicbees/item/ItemThaumiumScoop.java @@ -1,8 +1,5 @@ package magicbees.item; -import magicbees.main.CommonProxy; -import magicbees.main.utils.compat.ThaumcraftHelper; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; @@ -13,12 +10,14 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.IRepairable; -import thaumcraft.api.ThaumcraftApi; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.IToolScoop; +import magicbees.main.CommonProxy; +import magicbees.main.utils.compat.ThaumcraftHelper; +import thaumcraft.api.IRepairable; +import thaumcraft.api.ThaumcraftApi; @Optional.InterfaceList({ @Optional.Interface(iface = "thaumcraft.api.IRepairable", modid = ThaumcraftHelper.Name, striprefs = true) }) diff --git a/src/main/java/magicbees/item/ItemVoidGrafter.java b/src/main/java/magicbees/item/ItemVoidGrafter.java index bd3c87a..72df25e 100644 --- a/src/main/java/magicbees/item/ItemVoidGrafter.java +++ b/src/main/java/magicbees/item/ItemVoidGrafter.java @@ -1,8 +1,5 @@ package magicbees.item; -import magicbees.main.CommonProxy; -import magicbees.main.utils.compat.ThaumcraftHelper; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -17,12 +14,14 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.IRepairableExtended; -import thaumcraft.api.IWarpingGear; -import thaumcraft.api.ThaumcraftApi; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import magicbees.main.CommonProxy; +import magicbees.main.utils.compat.ThaumcraftHelper; +import thaumcraft.api.IRepairableExtended; +import thaumcraft.api.IWarpingGear; +import thaumcraft.api.ThaumcraftApi; @Optional.InterfaceList({ @Optional.Interface( diff --git a/src/main/java/magicbees/item/ItemVoidScoop.java b/src/main/java/magicbees/item/ItemVoidScoop.java index 25aa93b..9a8e60b 100644 --- a/src/main/java/magicbees/item/ItemVoidScoop.java +++ b/src/main/java/magicbees/item/ItemVoidScoop.java @@ -1,8 +1,5 @@ package magicbees.item; -import magicbees.main.CommonProxy; -import magicbees.main.utils.compat.ThaumcraftHelper; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -18,13 +15,15 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.IRepairable; -import thaumcraft.api.IWarpingGear; -import thaumcraft.api.ThaumcraftApi; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.IToolScoop; +import magicbees.main.CommonProxy; +import magicbees.main.utils.compat.ThaumcraftHelper; +import thaumcraft.api.IRepairable; +import thaumcraft.api.IWarpingGear; +import thaumcraft.api.ThaumcraftApi; @Optional.InterfaceList({ @Optional.Interface(iface = "thaumcraft.api.IRepairable", modid = ThaumcraftHelper.Name, striprefs = true), diff --git a/src/main/java/magicbees/item/ItemWax.java b/src/main/java/magicbees/item/ItemWax.java index 723a1b9..3887262 100644 --- a/src/main/java/magicbees/item/ItemWax.java +++ b/src/main/java/magicbees/item/ItemWax.java @@ -2,9 +2,6 @@ package magicbees.item; import java.util.List; -import magicbees.item.types.WaxType; -import magicbees.main.CommonProxy; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -15,6 +12,8 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; +import magicbees.item.types.WaxType; +import magicbees.main.CommonProxy; public class ItemWax extends Item { diff --git a/src/main/java/magicbees/item/types/FluidType.java b/src/main/java/magicbees/item/types/FluidType.java index 64f2bbd..bc97210 100644 --- a/src/main/java/magicbees/item/types/FluidType.java +++ b/src/main/java/magicbees/item/types/FluidType.java @@ -1,9 +1,9 @@ package magicbees.item.types; -import magicbees.main.utils.LocalizationManager; - import net.minecraft.util.IIcon; +import magicbees.main.utils.LocalizationManager; + public enum FluidType { // Incidentally, Item meta is the liquid ID. diff --git a/src/main/java/magicbees/item/types/HiveFrameType.java b/src/main/java/magicbees/item/types/HiveFrameType.java index ad9c2d1..247ac53 100644 --- a/src/main/java/magicbees/item/types/HiveFrameType.java +++ b/src/main/java/magicbees/item/types/HiveFrameType.java @@ -1,8 +1,8 @@ package magicbees.item.types; -import magicbees.main.utils.LocalizationManager; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeModifier; +import magicbees.main.utils.LocalizationManager; public enum HiveFrameType implements IBeeModifier { diff --git a/src/main/java/magicbees/item/types/NuggetType.java b/src/main/java/magicbees/item/types/NuggetType.java index c8053fb..01a2755 100644 --- a/src/main/java/magicbees/item/types/NuggetType.java +++ b/src/main/java/magicbees/item/types/NuggetType.java @@ -1,9 +1,9 @@ package magicbees.item.types; -import magicbees.main.utils.LocalizationManager; - import net.minecraft.item.Item; +import magicbees.main.utils.LocalizationManager; + public enum NuggetType { IRON, diff --git a/src/main/java/magicbees/main/ClientProxy.java b/src/main/java/magicbees/main/ClientProxy.java index 74e32ad..6d16fa0 100644 --- a/src/main/java/magicbees/main/ClientProxy.java +++ b/src/main/java/magicbees/main/ClientProxy.java @@ -1,10 +1,5 @@ package magicbees.main; -import magicbees.client.render.RendererEffectJar; -import magicbees.client.render.RendererVisAuraProvider; -import magicbees.tileentity.TileEntityEffectJar; -import magicbees.tileentity.TileEntityVisAuraProvider; - import net.minecraft.item.Item; import net.minecraftforge.client.MinecraftForgeClient; @@ -12,6 +7,10 @@ import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import magicbees.client.render.RendererEffectJar; +import magicbees.client.render.RendererVisAuraProvider; +import magicbees.tileentity.TileEntityEffectJar; +import magicbees.tileentity.TileEntityVisAuraProvider; @SideOnly(Side.CLIENT) public class ClientProxy extends CommonProxy { diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index accb03b..a37e7bc 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -3,6 +3,24 @@ package magicbees.main; import java.io.File; import java.lang.reflect.Field; +import net.minecraft.item.Item; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.util.WeightedRandomChestContent; +import net.minecraftforge.common.ChestGenHooks; +import net.minecraftforge.common.config.Configuration; +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; +import forestry.api.apiculture.BeeManager; +import forestry.api.storage.BackpackManager; +import forestry.api.storage.EnumBackpackType; import magicbees.block.BlockEffectJar; import magicbees.block.BlockEnchantedEarth; import magicbees.block.BlockHive; @@ -46,25 +64,6 @@ import magicbees.tileentity.TileEntityMagicApiary; import magicbees.tileentity.TileEntityManaAuraProvider; import magicbees.tileentity.TileEntityVisAuraProvider; -import net.minecraft.item.Item; -import net.minecraft.item.ItemFood; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.util.WeightedRandomChestContent; -import net.minecraftforge.common.ChestGenHooks; -import net.minecraftforge.common.config.Configuration; -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; -import forestry.api.apiculture.BeeManager; -import forestry.api.storage.BackpackManager; -import forestry.api.storage.EnumBackpackType; - /** * A class to hold some data related to mod state & functions. * diff --git a/src/main/java/magicbees/main/MagicBees.java b/src/main/java/magicbees/main/MagicBees.java index 0f5770c..c1e3af8 100644 --- a/src/main/java/magicbees/main/MagicBees.java +++ b/src/main/java/magicbees/main/MagicBees.java @@ -1,13 +1,5 @@ package magicbees.main; -import magicbees.bees.BeeManager; -import magicbees.client.gui.GUIHandler; -import magicbees.main.utils.CraftingManager; -import magicbees.main.utils.IMCManager; -import magicbees.main.utils.LogHelper; -import magicbees.main.utils.VersionInfo; -import magicbees.main.utils.compat.ModHelperManager; -import magicbees.main.utils.net.NetworkEventHandler; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; @@ -18,6 +10,14 @@ import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; +import magicbees.bees.BeeManager; +import magicbees.client.gui.GUIHandler; +import magicbees.main.utils.CraftingManager; +import magicbees.main.utils.IMCManager; +import magicbees.main.utils.LogHelper; +import magicbees.main.utils.VersionInfo; +import magicbees.main.utils.compat.ModHelperManager; +import magicbees.main.utils.net.NetworkEventHandler; @Mod( modid = VersionInfo.ModName, diff --git a/src/main/java/magicbees/main/utils/CraftingManager.java b/src/main/java/magicbees/main/utils/CraftingManager.java index 21effaf..d4d42e0 100644 --- a/src/main/java/magicbees/main/utils/CraftingManager.java +++ b/src/main/java/magicbees/main/utils/CraftingManager.java @@ -3,6 +3,17 @@ package magicbees.main.utils; import java.util.Hashtable; import java.util.Map; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; + +import cpw.mods.fml.common.registry.GameRegistry; +import forestry.api.recipes.RecipeManagers; import magicbees.item.ItemCapsule; import magicbees.item.types.CombType; import magicbees.item.types.DropType; @@ -18,18 +29,6 @@ import magicbees.main.utils.compat.ForestryHelper; import magicbees.main.utils.compat.ThaumcraftHelper; import magicbees.main.utils.compat.ThermalModsHelper; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; - -import cpw.mods.fml.common.registry.GameRegistry; -import forestry.api.recipes.RecipeManagers; - public class CraftingManager { public static void registerLiquidContainers() { diff --git a/src/main/java/magicbees/main/utils/IMCManager.java b/src/main/java/magicbees/main/utils/IMCManager.java index 47d3731..5ad007b 100644 --- a/src/main/java/magicbees/main/utils/IMCManager.java +++ b/src/main/java/magicbees/main/utils/IMCManager.java @@ -1,7 +1,5 @@ package magicbees.main.utils; -import magicbees.bees.allele.effect.AlleleEffectCrumbling; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; @@ -9,6 +7,7 @@ import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; +import magicbees.bees.allele.effect.AlleleEffectCrumbling; public class IMCManager { diff --git a/src/main/java/magicbees/main/utils/TabMagicBees.java b/src/main/java/magicbees/main/utils/TabMagicBees.java index 1f1b262..a379664 100644 --- a/src/main/java/magicbees/main/utils/TabMagicBees.java +++ b/src/main/java/magicbees/main/utils/TabMagicBees.java @@ -1,11 +1,11 @@ package magicbees.main.utils; -import magicbees.item.types.ResourceType; -import magicbees.main.Config; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; +import magicbees.item.types.ResourceType; +import magicbees.main.Config; + public class TabMagicBees extends CreativeTabs { public static TabMagicBees tabMagicBees = new TabMagicBees(); diff --git a/src/main/java/magicbees/main/utils/compat/AppliedEnergisticsHelper.java b/src/main/java/magicbees/main/utils/compat/AppliedEnergisticsHelper.java index dec3b65..9bdf0cc 100644 --- a/src/main/java/magicbees/main/utils/compat/AppliedEnergisticsHelper.java +++ b/src/main/java/magicbees/main/utils/compat/AppliedEnergisticsHelper.java @@ -1,11 +1,10 @@ package magicbees.main.utils.compat; -import magicbees.main.Config; - import net.minecraft.block.Block; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; +import magicbees.main.Config; public class AppliedEnergisticsHelper implements IModHelper { diff --git a/src/main/java/magicbees/main/utils/compat/ArsMagicaHelper.java b/src/main/java/magicbees/main/utils/compat/ArsMagicaHelper.java index b62bc14..b86b3d2 100644 --- a/src/main/java/magicbees/main/utils/compat/ArsMagicaHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ArsMagicaHelper.java @@ -1,13 +1,12 @@ package magicbees.main.utils.compat; -import magicbees.main.Config; -import magicbees.main.utils.BlockInterface; -import magicbees.main.utils.ItemInterface; - import net.minecraft.block.Block; import net.minecraft.item.Item; import cpw.mods.fml.common.Loader; +import magicbees.main.Config; +import magicbees.main.utils.BlockInterface; +import magicbees.main.utils.ItemInterface; public class ArsMagicaHelper implements IModHelper { diff --git a/src/main/java/magicbees/main/utils/compat/BotaniaHelper.java b/src/main/java/magicbees/main/utils/compat/BotaniaHelper.java index d018b5e..7a67042 100644 --- a/src/main/java/magicbees/main/utils/compat/BotaniaHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BotaniaHelper.java @@ -1,12 +1,5 @@ package magicbees.main.utils.compat; -import magicbees.bees.BeeManager; -import magicbees.item.types.PollenType; -import magicbees.main.Config; -import magicbees.main.utils.BlockInterface; -import magicbees.main.utils.ItemInterface; -import magicbees.main.utils.compat.botania.BotaniaAPIDistanceHelper; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -19,11 +12,17 @@ import net.minecraft.util.IIcon; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; -import vazkii.botania.api.mana.ManaItemHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import magicbees.bees.BeeManager; +import magicbees.item.types.PollenType; +import magicbees.main.Config; +import magicbees.main.utils.BlockInterface; +import magicbees.main.utils.ItemInterface; +import magicbees.main.utils.compat.botania.BotaniaAPIDistanceHelper; +import vazkii.botania.api.mana.ManaItemHandler; public class BotaniaHelper implements IModHelper { diff --git a/src/main/java/magicbees/main/utils/compat/EquivalentExchangeHelper.java b/src/main/java/magicbees/main/utils/compat/EquivalentExchangeHelper.java index 1971097..9b25f8f 100644 --- a/src/main/java/magicbees/main/utils/compat/EquivalentExchangeHelper.java +++ b/src/main/java/magicbees/main/utils/compat/EquivalentExchangeHelper.java @@ -1,11 +1,10 @@ package magicbees.main.utils.compat; -import magicbees.main.Config; -import magicbees.main.utils.ItemInterface; - import net.minecraft.item.Item; import cpw.mods.fml.common.Loader; +import magicbees.main.Config; +import magicbees.main.utils.ItemInterface; public class EquivalentExchangeHelper implements IModHelper { diff --git a/src/main/java/magicbees/main/utils/compat/ExtraBeesHelper.java b/src/main/java/magicbees/main/utils/compat/ExtraBeesHelper.java index bc2af47..4207f18 100644 --- a/src/main/java/magicbees/main/utils/compat/ExtraBeesHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ExtraBeesHelper.java @@ -1,11 +1,10 @@ package magicbees.main.utils.compat; -import magicbees.main.Config; -import magicbees.main.utils.BlockInterface; - import net.minecraft.block.Block; import cpw.mods.fml.common.Loader; +import magicbees.main.Config; +import magicbees.main.utils.BlockInterface; public class ExtraBeesHelper implements IModHelper { diff --git a/src/main/java/magicbees/main/utils/compat/ForestryHelper.java b/src/main/java/magicbees/main/utils/compat/ForestryHelper.java index 173fee9..ca108a8 100644 --- a/src/main/java/magicbees/main/utils/compat/ForestryHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ForestryHelper.java @@ -2,13 +2,6 @@ package magicbees.main.utils.compat; import java.util.Locale; -import magicbees.bees.BeeManager; -import magicbees.bees.HiveDescription; -import magicbees.main.Config; -import magicbees.main.utils.BlockInterface; -import magicbees.main.utils.ItemInterface; -import magicbees.main.utils.VersionInfo; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -21,6 +14,12 @@ import forestry.api.apiculture.hives.IHiveRegistry; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.IAllele; +import magicbees.bees.BeeManager; +import magicbees.bees.HiveDescription; +import magicbees.main.Config; +import magicbees.main.utils.BlockInterface; +import magicbees.main.utils.ItemInterface; +import magicbees.main.utils.VersionInfo; public class ForestryHelper implements IModHelper { diff --git a/src/main/java/magicbees/main/utils/compat/RedstoneArsenalHelper.java b/src/main/java/magicbees/main/utils/compat/RedstoneArsenalHelper.java index 754dfea..fe1e9b0 100644 --- a/src/main/java/magicbees/main/utils/compat/RedstoneArsenalHelper.java +++ b/src/main/java/magicbees/main/utils/compat/RedstoneArsenalHelper.java @@ -1,11 +1,10 @@ package magicbees.main.utils.compat; -import magicbees.main.Config; -import magicbees.main.utils.ItemInterface; - import net.minecraft.item.ItemStack; import cpw.mods.fml.common.Loader; +import magicbees.main.Config; +import magicbees.main.utils.ItemInterface; public class RedstoneArsenalHelper implements IModHelper { diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java index 9560364..a32071f 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -2,17 +2,6 @@ package magicbees.main.utils.compat; import java.util.ArrayList; -import magicbees.api.MagicBeesAPI; -import magicbees.item.types.PollenType; -import magicbees.item.types.PropolisType; -import magicbees.item.types.ResourceType; -import magicbees.item.types.WaxType; -import magicbees.main.CommonProxy; -import magicbees.main.Config; -import magicbees.main.utils.BlockInterface; -import magicbees.main.utils.ItemInterface; -import magicbees.main.utils.LocalizationManager; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -23,6 +12,18 @@ import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; +import magicbees.api.MagicBeesAPI; +import magicbees.item.types.PollenType; +import magicbees.item.types.PropolisType; +import magicbees.item.types.ResourceType; +import magicbees.item.types.WaxType; +import magicbees.main.CommonProxy; +import magicbees.main.Config; +import magicbees.main.utils.BlockInterface; +import magicbees.main.utils.ItemInterface; +import magicbees.main.utils.LocalizationManager; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -32,8 +33,6 @@ import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; public class ThaumcraftHelper implements IModHelper { diff --git a/src/main/java/magicbees/main/utils/compat/ThermalModsHelper.java b/src/main/java/magicbees/main/utils/compat/ThermalModsHelper.java index 7ba8b31..9bbd60d 100644 --- a/src/main/java/magicbees/main/utils/compat/ThermalModsHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThermalModsHelper.java @@ -1,8 +1,5 @@ package magicbees.main.utils.compat; -import magicbees.item.types.DropType; -import magicbees.main.Config; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidRegistry; @@ -11,6 +8,8 @@ import net.minecraftforge.fluids.FluidStack; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.registry.GameRegistry; +import magicbees.item.types.DropType; +import magicbees.main.Config; public class ThermalModsHelper implements IModHelper { 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 def220d..c45a47e 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java @@ -2,9 +2,6 @@ package magicbees.main.utils.compat.bloodmagic; import java.util.List; -import magicbees.main.CommonProxy; -import magicbees.main.utils.TabMagicBees; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -15,6 +12,8 @@ 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 ItemBloodFrame extends EnergyItems implements IHiveFrame { 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 ab478c9..66f96e3 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java @@ -2,9 +2,6 @@ package magicbees.main.utils.compat.bloodmagic; import java.util.List; -import magicbees.main.CommonProxy; -import magicbees.main.utils.TabMagicBees; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -15,6 +12,8 @@ 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 ItemFrenziedFrame extends EnergyItems implements IHiveFrame { diff --git a/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java b/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java index b842626..b8447a8 100644 --- a/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java +++ b/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java @@ -1,19 +1,18 @@ package magicbees.main.utils.compat.botania; +import net.minecraft.item.ItemStack; + +import forestry.api.apiculture.EnumBeeType; import magicbees.bees.BeeSpecies; import magicbees.main.Config; import magicbees.main.utils.compat.BotaniaHelper; import magicbees.main.utils.compat.BotaniaHelper.ManaResource; import magicbees.main.utils.compat.BotaniaHelper.Rune; - -import net.minecraft.item.ItemStack; - import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; -import forestry.api.apiculture.EnumBeeType; /** * Subordinate helper to the Botania Helper that has references to Botania API stuff that will cause diff --git a/src/main/java/magicbees/main/utils/compat/botania/SpeciesRecipeElvenTrade.java b/src/main/java/magicbees/main/utils/compat/botania/SpeciesRecipeElvenTrade.java index a0ec201..e9a5187 100644 --- a/src/main/java/magicbees/main/utils/compat/botania/SpeciesRecipeElvenTrade.java +++ b/src/main/java/magicbees/main/utils/compat/botania/SpeciesRecipeElvenTrade.java @@ -3,15 +3,14 @@ package magicbees.main.utils.compat.botania; import java.util.LinkedList; import java.util.List; -import magicbees.bees.BeeManager; -import magicbees.bees.BeeSpecies; - import net.minecraft.item.ItemStack; -import vazkii.botania.api.recipe.RecipeElvenTrade; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBee; +import magicbees.bees.BeeManager; +import magicbees.bees.BeeSpecies; +import vazkii.botania.api.recipe.RecipeElvenTrade; public class SpeciesRecipeElvenTrade extends RecipeElvenTrade { diff --git a/src/main/java/magicbees/main/utils/compat/botania/SpeciesRecipeManaInfusion.java b/src/main/java/magicbees/main/utils/compat/botania/SpeciesRecipeManaInfusion.java index 14b4d6b..267df33 100644 --- a/src/main/java/magicbees/main/utils/compat/botania/SpeciesRecipeManaInfusion.java +++ b/src/main/java/magicbees/main/utils/compat/botania/SpeciesRecipeManaInfusion.java @@ -1,15 +1,14 @@ package magicbees.main.utils.compat.botania; -import magicbees.bees.BeeManager; -import magicbees.bees.BeeSpecies; -import magicbees.main.utils.compat.ForestryHelper; - import net.minecraft.item.ItemStack; -import vazkii.botania.api.recipe.RecipeManaInfusion; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBee; +import magicbees.bees.BeeManager; +import magicbees.bees.BeeSpecies; +import magicbees.main.utils.compat.ForestryHelper; +import vazkii.botania.api.recipe.RecipeManaInfusion; public class SpeciesRecipeManaInfusion extends RecipeManaInfusion { diff --git a/src/main/java/magicbees/main/utils/compat/botania/SubTileBeegonia.java b/src/main/java/magicbees/main/utils/compat/botania/SubTileBeegonia.java index f735b0d..120841b 100644 --- a/src/main/java/magicbees/main/utils/compat/botania/SubTileBeegonia.java +++ b/src/main/java/magicbees/main/utils/compat/botania/SubTileBeegonia.java @@ -2,21 +2,20 @@ package magicbees.main.utils.compat.botania; import java.util.List; -import magicbees.bees.BeeManager; -import magicbees.main.utils.compat.BotaniaHelper; - import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.subtile.SubTileGenerating; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBee; +import magicbees.bees.BeeManager; +import magicbees.main.utils.compat.BotaniaHelper; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.subtile.SubTileGenerating; public class SubTileBeegonia extends SubTileGenerating { diff --git a/src/main/java/magicbees/main/utils/compat/botania/SubTileHibeescus.java b/src/main/java/magicbees/main/utils/compat/botania/SubTileHibeescus.java index a30a805..23a35f8 100644 --- a/src/main/java/magicbees/main/utils/compat/botania/SubTileHibeescus.java +++ b/src/main/java/magicbees/main/utils/compat/botania/SubTileHibeescus.java @@ -4,21 +4,20 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import magicbees.bees.BeeManager; -import magicbees.main.utils.compat.BotaniaHelper; - import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.subtile.SubTileFunctional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBee; +import magicbees.bees.BeeManager; +import magicbees.main.utils.compat.BotaniaHelper; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.subtile.SubTileFunctional; public class SubTileHibeescus extends SubTileFunctional { diff --git a/src/main/java/magicbees/main/utils/compat/botania/SubTileHiveacynth.java b/src/main/java/magicbees/main/utils/compat/botania/SubTileHiveacynth.java index 9c448be..9c86098 100644 --- a/src/main/java/magicbees/main/utils/compat/botania/SubTileHiveacynth.java +++ b/src/main/java/magicbees/main/utils/compat/botania/SubTileHiveacynth.java @@ -2,19 +2,18 @@ package magicbees.main.utils.compat.botania; import java.util.Random; -import magicbees.bees.BeeManager; -import magicbees.main.utils.compat.BotaniaHelper; - import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.subtile.SubTileFunctional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBee; +import magicbees.bees.BeeManager; +import magicbees.main.utils.compat.BotaniaHelper; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.subtile.SubTileFunctional; public class SubTileHiveacynth extends SubTileFunctional { diff --git a/src/main/java/magicbees/main/utils/compat/thaumcraft/NodeHelper.java b/src/main/java/magicbees/main/utils/compat/thaumcraft/NodeHelper.java index 94bf226..c782531 100644 --- a/src/main/java/magicbees/main/utils/compat/thaumcraft/NodeHelper.java +++ b/src/main/java/magicbees/main/utils/compat/thaumcraft/NodeHelper.java @@ -7,14 +7,13 @@ import java.util.List; import java.util.Map; import java.util.Random; -import magicbees.main.Config; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Vec3; import net.minecraft.world.ChunkPosition; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; +import magicbees.main.Config; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.nodes.INode; diff --git a/src/main/java/magicbees/main/utils/net/EventAuraChargeUpdate.java b/src/main/java/magicbees/main/utils/net/EventAuraChargeUpdate.java index 2564fdf..111e9cf 100644 --- a/src/main/java/magicbees/main/utils/net/EventAuraChargeUpdate.java +++ b/src/main/java/magicbees/main/utils/net/EventAuraChargeUpdate.java @@ -4,17 +4,16 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.tileentity.TileEntity; + +import cpw.mods.fml.client.FMLClientHandler; import magicbees.main.utils.ChunkCoords; import magicbees.main.utils.LogHelper; import magicbees.main.utils.net.NetworkEventHandler.EventType; import magicbees.tileentity.AuraCharges; import magicbees.tileentity.ITileEntityAuraCharged; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.tileentity.TileEntity; - -import cpw.mods.fml.client.FMLClientHandler; - public class EventAuraChargeUpdate extends EventCoords { private int flags; diff --git a/src/main/java/magicbees/main/utils/net/EventBase.java b/src/main/java/magicbees/main/utils/net/EventBase.java index 1afa085..3c97b86 100644 --- a/src/main/java/magicbees/main/utils/net/EventBase.java +++ b/src/main/java/magicbees/main/utils/net/EventBase.java @@ -6,8 +6,6 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import magicbees.main.utils.LogHelper; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -17,6 +15,7 @@ import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.network.internal.FMLProxyPacket; import cpw.mods.fml.common.registry.GameData; import io.netty.buffer.Unpooled; +import magicbees.main.utils.LogHelper; public class EventBase { diff --git a/src/main/java/magicbees/main/utils/net/EventFlagsUpdate.java b/src/main/java/magicbees/main/utils/net/EventFlagsUpdate.java index 2c63a7a..43dcf0c 100644 --- a/src/main/java/magicbees/main/utils/net/EventFlagsUpdate.java +++ b/src/main/java/magicbees/main/utils/net/EventFlagsUpdate.java @@ -4,15 +4,14 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import magicbees.main.utils.ChunkCoords; -import magicbees.main.utils.LogHelper; -import magicbees.main.utils.net.NetworkEventHandler.EventType; -import magicbees.tileentity.ITileEntityFlags; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.client.FMLClientHandler; +import magicbees.main.utils.ChunkCoords; +import magicbees.main.utils.LogHelper; +import magicbees.main.utils.net.NetworkEventHandler.EventType; +import magicbees.tileentity.ITileEntityFlags; public class EventFlagsUpdate extends EventCoords { diff --git a/src/main/java/magicbees/main/utils/net/EventInventoryUpdate.java b/src/main/java/magicbees/main/utils/net/EventInventoryUpdate.java index 1284ed3..e0b025b 100644 --- a/src/main/java/magicbees/main/utils/net/EventInventoryUpdate.java +++ b/src/main/java/magicbees/main/utils/net/EventInventoryUpdate.java @@ -4,15 +4,14 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import magicbees.main.utils.ChunkCoords; -import magicbees.main.utils.LogHelper; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.client.FMLClientHandler; +import magicbees.main.utils.ChunkCoords; +import magicbees.main.utils.LogHelper; public class EventInventoryUpdate extends EventCoords { diff --git a/src/main/java/magicbees/main/utils/net/NetworkEventHandler.java b/src/main/java/magicbees/main/utils/net/NetworkEventHandler.java index 0954eb8..fdaf308 100644 --- a/src/main/java/magicbees/main/utils/net/NetworkEventHandler.java +++ b/src/main/java/magicbees/main/utils/net/NetworkEventHandler.java @@ -3,14 +3,6 @@ package magicbees.main.utils.net; import java.io.DataInputStream; import java.io.IOException; -import magicbees.main.MagicBees; -import magicbees.main.utils.ChunkCoords; -import magicbees.main.utils.LogHelper; -import magicbees.main.utils.VersionInfo; -import magicbees.main.utils.error.InvalidEventTypeIndexException; -import magicbees.tileentity.AuraCharges; -import magicbees.tileentity.ITileEntityAuraCharged; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.network.NetHandlerPlayServer; @@ -25,6 +17,13 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.internal.FMLProxyPacket; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufInputStream; +import magicbees.main.MagicBees; +import magicbees.main.utils.ChunkCoords; +import magicbees.main.utils.LogHelper; +import magicbees.main.utils.VersionInfo; +import magicbees.main.utils.error.InvalidEventTypeIndexException; +import magicbees.tileentity.AuraCharges; +import magicbees.tileentity.ITileEntityAuraCharged; public class NetworkEventHandler { diff --git a/src/main/java/magicbees/tileentity/AuraCharges.java b/src/main/java/magicbees/tileentity/AuraCharges.java index b2b1d15..36e25e1 100644 --- a/src/main/java/magicbees/tileentity/AuraCharges.java +++ b/src/main/java/magicbees/tileentity/AuraCharges.java @@ -3,11 +3,11 @@ package magicbees.tileentity; import java.util.HashMap; import java.util.Map; -import magicbees.bees.AuraCharge; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import magicbees.bees.AuraCharge; + public class AuraCharges { private static final String auraChargesTagName = "AuraCharges"; diff --git a/src/main/java/magicbees/tileentity/EffectJarHousing.java b/src/main/java/magicbees/tileentity/EffectJarHousing.java index dfe0aff..ebe7995 100644 --- a/src/main/java/magicbees/tileentity/EffectJarHousing.java +++ b/src/main/java/magicbees/tileentity/EffectJarHousing.java @@ -4,8 +4,6 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import magicbees.bees.BeeManager; - import net.minecraft.item.ItemStack; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.Vec3; @@ -26,6 +24,7 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.IErrorLogic; import forestry.api.core.IErrorState; +import magicbees.bees.BeeManager; /** * Simulates enough of a bee house to fire the bee effects. =D diff --git a/src/main/java/magicbees/tileentity/TileEntityEffectJar.java b/src/main/java/magicbees/tileentity/TileEntityEffectJar.java index be69667..e2e0e40 100644 --- a/src/main/java/magicbees/tileentity/TileEntityEffectJar.java +++ b/src/main/java/magicbees/tileentity/TileEntityEffectJar.java @@ -1,7 +1,5 @@ package magicbees.tileentity; -import magicbees.main.CommonProxy; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -14,6 +12,7 @@ import com.mojang.authlib.GameProfile; import forestry.api.apiculture.IBee; import forestry.api.genetics.IEffectData; +import magicbees.main.CommonProxy; public class TileEntityEffectJar extends TileEntity implements IInventory { diff --git a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java index 8def485..4dad701 100644 --- a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java @@ -6,15 +6,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import magicbees.api.bees.IMagicApiaryAuraProvider; -import magicbees.bees.AuraCharge; -import magicbees.bees.BeeManager; -import magicbees.main.CommonProxy; -import magicbees.main.utils.ChunkCoords; -import magicbees.main.utils.ItemStackUtils; -import magicbees.main.utils.net.EventAuraChargeUpdate; -import magicbees.main.utils.net.NetworkEventHandler; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; @@ -50,6 +41,14 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorLogic; +import magicbees.api.bees.IMagicApiaryAuraProvider; +import magicbees.bees.AuraCharge; +import magicbees.bees.BeeManager; +import magicbees.main.CommonProxy; +import magicbees.main.utils.ChunkCoords; +import magicbees.main.utils.ItemStackUtils; +import magicbees.main.utils.net.EventAuraChargeUpdate; +import magicbees.main.utils.net.NetworkEventHandler; public class TileEntityMagicApiary extends TileEntity implements ISidedInventory, IBeeHousing, ITileEntityAuraCharged { diff --git a/src/main/java/magicbees/tileentity/TileEntityManaAuraProvider.java b/src/main/java/magicbees/tileentity/TileEntityManaAuraProvider.java index f2a782a..5819881 100644 --- a/src/main/java/magicbees/tileentity/TileEntityManaAuraProvider.java +++ b/src/main/java/magicbees/tileentity/TileEntityManaAuraProvider.java @@ -3,19 +3,18 @@ package magicbees.tileentity; import java.util.HashMap; import java.util.Map; -import magicbees.api.bees.AuraChargeType; -import magicbees.api.bees.IMagicApiaryAuraProvider; -import magicbees.bees.AuraCharge; -import magicbees.main.CommonProxy; -import magicbees.main.utils.compat.BotaniaHelper; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import vazkii.botania.api.mana.IManaReceiver; import cpw.mods.fml.common.Optional; +import magicbees.api.bees.AuraChargeType; +import magicbees.api.bees.IMagicApiaryAuraProvider; +import magicbees.bees.AuraCharge; +import magicbees.main.CommonProxy; +import magicbees.main.utils.compat.BotaniaHelper; +import vazkii.botania.api.mana.IManaReceiver; @Optional.InterfaceList({ @Optional.Interface(iface = "vazkii.botania.api.mana.IManaReceiver", modid = BotaniaHelper.Name) }) diff --git a/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java b/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java index a1290cf..5bc0f27 100644 --- a/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java +++ b/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java @@ -3,14 +3,13 @@ package magicbees.tileentity; import java.util.HashMap; import java.util.Map; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; + import magicbees.api.bees.AuraChargeType; import magicbees.api.bees.IMagicApiaryAuraProvider; import magicbees.bees.AuraCharge; import magicbees.main.CommonProxy; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; - import thaumcraft.api.aspects.Aspect; import thaumcraft.api.visnet.VisNetHandler; diff --git a/src/main/java/magicbees/world/feature/FeatureOreVein.java b/src/main/java/magicbees/world/feature/FeatureOreVein.java index 9a4fcd8..19326d1 100644 --- a/src/main/java/magicbees/world/feature/FeatureOreVein.java +++ b/src/main/java/magicbees/world/feature/FeatureOreVein.java @@ -2,12 +2,12 @@ package magicbees.world.feature; import java.util.Random; -import magicbees.main.utils.BlockUtil; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import magicbees.main.utils.BlockUtil; + public class FeatureOreVein { public static final FeatureOreVein redstoneGen; diff --git a/src/main/java/magicbees/world/feature/HiveGenOblivion.java b/src/main/java/magicbees/world/feature/HiveGenOblivion.java index b1f0ead..4891671 100644 --- a/src/main/java/magicbees/world/feature/HiveGenOblivion.java +++ b/src/main/java/magicbees/world/feature/HiveGenOblivion.java @@ -1,12 +1,11 @@ package magicbees.world.feature; -import magicbees.main.utils.BlockUtil; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import forestry.api.apiculture.hives.IHiveGen; +import magicbees.main.utils.BlockUtil; public class HiveGenOblivion implements IHiveGen { diff --git a/src/main/java/magicbees/world/feature/HiveGenUnderground.java b/src/main/java/magicbees/world/feature/HiveGenUnderground.java index de33ef5..d70638d 100644 --- a/src/main/java/magicbees/world/feature/HiveGenUnderground.java +++ b/src/main/java/magicbees/world/feature/HiveGenUnderground.java @@ -1,12 +1,11 @@ package magicbees.world.feature; -import magicbees.main.utils.BlockUtil; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import forestry.api.apiculture.hives.IHiveGen; +import magicbees.main.utils.BlockUtil; public class HiveGenUnderground implements IHiveGen { From 61398d31391b8c9cd9336f6b31fe8850c00b5805 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Fri, 28 Apr 2023 17:52:05 +0200 Subject: [PATCH 14/70] update dep file --- dependencies.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index f1755d0..e7ac141 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -3,9 +3,9 @@ dependencies { compile('com.github.GTNewHorizons:ForestryMC:4.6.6:dev') - compileOnly('com.github.GTNewHorizons:BloodMagic:1.3.22:dev') - compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:Botania:1.9.17-GTNH:api') {transitive = false} + compileOnly('com.github.GTNewHorizons:BloodMagic:1.4.0:dev') + compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:Botania:1.9.18-GTNH:api') {transitive = false} compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false} } From e90b40159c16618c0d9ebcc4ef6c973041afd937 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Fri, 28 Apr 2023 17:56:14 +0200 Subject: [PATCH 15/70] derp --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index e7ac141..9d7ff0d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -5,7 +5,7 @@ dependencies { compileOnly('com.github.GTNewHorizons:BloodMagic:1.4.0:dev') compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:Botania:1.9.18-GTNH:api') {transitive = false} + compileOnly('com.github.GTNewHorizons:Botania:1.9.17-GTNH:api') {transitive = false} compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false} } From 108a11c119333aa995f3d907774d8670d2aa3763 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Fri, 28 Apr 2023 12:04:41 -0400 Subject: [PATCH 16/70] Fix? --- src/main/java/magicbees/main/Config.java | 9 ++------- .../magicbees/main/utils/compat/BloodHelper.java | 12 +++++++++++- .../main/utils/compat/ThaumcraftHelper.java | 2 ++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index a37e7bc..e82bcf1 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -3,6 +3,7 @@ package magicbees.main; import java.io.File; import java.lang.reflect.Field; +import magicbees.main.utils.compat.BloodHelper; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -56,8 +57,6 @@ import magicbees.main.utils.LogHelper; import magicbees.main.utils.VersionInfo; import magicbees.main.utils.compat.BotaniaHelper; import magicbees.main.utils.compat.ThaumcraftHelper; -import magicbees.main.utils.compat.bloodmagic.ItemBloodFrame; -import magicbees.main.utils.compat.bloodmagic.ItemFrenziedFrame; import magicbees.storage.BackpackDefinition; import magicbees.tileentity.TileEntityEffectJar; import magicbees.tileentity.TileEntityMagicApiary; @@ -490,11 +489,7 @@ public class Config { GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); if (Loader.isModLoaded("AWWayofTime")) { - hiveFrameBlood = new ItemBloodFrame(); - GameRegistry.registerItem(hiveFrameBlood, hiveFrameBlood.getUnlocalizedName(), CommonProxy.DOMAIN); - - hiveFrameFrenzy = new ItemFrenziedFrame(); - GameRegistry.registerItem(hiveFrameFrenzy, hiveFrameFrenzy.getUnlocalizedName(), CommonProxy.DOMAIN); + 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 ad7ed96..1d76015 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -1,5 +1,10 @@ package magicbees.main.utils.compat; +import cpw.mods.fml.common.registry.GameRegistry; +import magicbees.main.CommonProxy; +import magicbees.main.Config; +import magicbees.main.utils.compat.bloodmagic.ItemBloodFrame; +import magicbees.main.utils.compat.bloodmagic.ItemFrenziedFrame; import net.minecraft.util.IIcon; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; @@ -32,7 +37,12 @@ public class BloodHelper implements IModHelper { public static void getBlocks() {} - public static void getItems() {} + public static void getItems() { + Config.hiveFrameBlood = new ItemBloodFrame(); + GameRegistry.registerItem(Config.hiveFrameBlood, Config.hiveFrameBlood.getUnlocalizedName(), CommonProxy.DOMAIN); + + Config.hiveFrameFrenzy = new ItemFrenziedFrame(); + GameRegistry.registerItem(Config.hiveFrameFrenzy, Config.hiveFrameFrenzy.getUnlocalizedName(), CommonProxy.DOMAIN);} public static void doBloodMagicModuleConfigs(Configuration configuration) { Property p; diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java index a32071f..a1b0310 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -33,6 +33,8 @@ import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; +import magicbees.main.utils.compat.bloodmagic.ItemBloodFrame; +import magicbees.main.utils.compat.bloodmagic.ItemFrenziedFrame; public class ThaumcraftHelper implements IModHelper { From 3a0d9352b1f1ff5536c8bf17d193ea2eb52e3cc7 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Fri, 28 Apr 2023 12:10:59 -0400 Subject: [PATCH 17/70] I fucking forgot spotless again --- src/main/java/magicbees/main/Config.java | 2 +- .../main/utils/compat/BloodHelper.java | 17 ++++++++++------- .../main/utils/compat/ThaumcraftHelper.java | 2 -- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index e82bcf1..b75fccd 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -3,7 +3,6 @@ package magicbees.main; import java.io.File; import java.lang.reflect.Field; -import magicbees.main.utils.compat.BloodHelper; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -55,6 +54,7 @@ import magicbees.item.types.WaxType; import magicbees.main.utils.LocalizationManager; import magicbees.main.utils.LogHelper; import magicbees.main.utils.VersionInfo; +import magicbees.main.utils.compat.BloodHelper; import magicbees.main.utils.compat.BotaniaHelper; import magicbees.main.utils.compat.ThaumcraftHelper; import magicbees.storage.BackpackDefinition; diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index 1d76015..1d6ba4f 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -1,17 +1,17 @@ package magicbees.main.utils.compat; -import cpw.mods.fml.common.registry.GameRegistry; -import magicbees.main.CommonProxy; -import magicbees.main.Config; -import magicbees.main.utils.compat.bloodmagic.ItemBloodFrame; -import magicbees.main.utils.compat.bloodmagic.ItemFrenziedFrame; import net.minecraft.util.IIcon; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; 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.ItemBloodFrame; +import magicbees.main.utils.compat.bloodmagic.ItemFrenziedFrame; public class BloodHelper implements IModHelper { @@ -39,10 +39,13 @@ public class BloodHelper implements IModHelper { public static void getItems() { Config.hiveFrameBlood = new ItemBloodFrame(); - GameRegistry.registerItem(Config.hiveFrameBlood, Config.hiveFrameBlood.getUnlocalizedName(), CommonProxy.DOMAIN); + GameRegistry + .registerItem(Config.hiveFrameBlood, Config.hiveFrameBlood.getUnlocalizedName(), CommonProxy.DOMAIN); Config.hiveFrameFrenzy = new ItemFrenziedFrame(); - GameRegistry.registerItem(Config.hiveFrameFrenzy, Config.hiveFrameFrenzy.getUnlocalizedName(), CommonProxy.DOMAIN);} + GameRegistry + .registerItem(Config.hiveFrameFrenzy, Config.hiveFrameFrenzy.getUnlocalizedName(), CommonProxy.DOMAIN); + } public static void doBloodMagicModuleConfigs(Configuration configuration) { Property p; diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java index a1b0310..a32071f 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -33,8 +33,6 @@ import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; -import magicbees.main.utils.compat.bloodmagic.ItemBloodFrame; -import magicbees.main.utils.compat.bloodmagic.ItemFrenziedFrame; public class ThaumcraftHelper implements IModHelper { From 9b21be0eb5f0fd3885e212d142a33555cc30df06 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Fri, 28 Apr 2023 13:19:31 -0400 Subject: [PATCH 18/70] Added Recipes --- .../main/utils/compat/BloodHelper.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index 1d6ba4f..278f987 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -1,9 +1,11 @@ package magicbees.main.utils.compat; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; +import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -45,6 +47,28 @@ public class BloodHelper implements IModHelper { Config.hiveFrameFrenzy = new ItemFrenziedFrame(); GameRegistry .registerItem(Config.hiveFrameFrenzy, Config.hiveFrameFrenzy.getUnlocalizedName(), CommonProxy.DOMAIN); + + getRecipes(); + } + + public static void getRecipes() { + AltarRecipeRegistry.registerAltarRecipe( + new ItemStack(Config.hiveFrameBlood), + new ItemStack(Config.hiveFrameMagic), + 3, + 30000, + 20, + 20, + false); + + AltarRecipeRegistry.registerAltarRecipe( + new ItemStack(Config.hiveFrameFrenzy), + new ItemStack(Config.hiveFrameNecrotic), + 3, + 30000, + 20, + 20, + false); } public static void doBloodMagicModuleConfigs(Configuration configuration) { From 1e0c7d3c5ee965f2d59ac61f8a03c9a39eb65ea2 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 00:07:09 -0400 Subject: [PATCH 19/70] Add recipes and research nodes --- 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 0 -> 363 bytes 9 files changed, 242 insertions(+), 21 deletions(-) create mode 100644 src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java create 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 b75fccd..5355a27 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -14,7 +14,6 @@ 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; @@ -149,6 +148,7 @@ 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,8 +209,6 @@ public class Config { magicCapsule = new ItemCapsule(CapsuleType.MAGIC, capsuleStackSizeMax); voidCapsule = new ItemCapsule(CapsuleType.VOID, capsuleStackSizeMax); - bloodMagicActive = Loader.isModLoaded("AWWayofTime"); - setupThaumcraftItems(); setupBotaniaItems(); @@ -252,7 +250,7 @@ public class Config { p = configuration.get(CATEGORY_MODULES, "ArsMagica", true); arsMagicaActive = p.getBoolean(); - p = configuration.get(CATEGORY_MODULES, "AWWayofTime", true); + p = configuration.get(CATEGORY_MODULES, "BloodMagic", true); bloodMagicActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true); @@ -488,7 +486,7 @@ public class Config { voidGrafter = new ItemVoidGrafter(); GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); - if (Loader.isModLoaded("AWWayofTime")) { + if (BloodHelper.isActive()) { 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 278f987..f430bc9 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -5,6 +5,7 @@ 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; @@ -12,8 +13,13 @@ 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 { @@ -28,11 +34,15 @@ public class BloodHelper implements IModHelper { } public void preInit() { - if (Loader.isModLoaded(Name)) { + if (Loader.isModLoaded(Name) && Config.thaumcraftActive) { isBloodMagicActive = true; } } + public static void bloodMagicInstalled() { + isBloodMagicActive = true; + } + public void init() {} public void postInit() {} @@ -40,6 +50,12 @@ 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); @@ -53,22 +69,32 @@ public class BloodHelper implements IModHelper { public static void getRecipes() { AltarRecipeRegistry.registerAltarRecipe( - new ItemStack(Config.hiveFrameBlood), + new ItemStack(Config.hiveFrameBloodBase), new ItemStack(Config.hiveFrameMagic), - 3, - 30000, + 1, + 5000, 20, 20, false); + } - AltarRecipeRegistry.registerAltarRecipe( + 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", new ItemStack(Config.hiveFrameFrenzy), - new ItemStack(Config.hiveFrameNecrotic), - 3, - 30000, - 20, - 20, - false); + 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 }); + } 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 c40d60b..5c9c7bf 100644 --- a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java +++ b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java @@ -39,5 +39,6 @@ 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 a32071f..2043e2b 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -202,6 +202,14 @@ 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"; @@ -264,6 +272,9 @@ 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; @@ -431,6 +442,10 @@ 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() { @@ -519,7 +534,6 @@ 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", @@ -675,6 +689,43 @@ 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) { @@ -870,5 +921,6 @@ 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 new file mode 100644 index 0000000..d6b69b9 --- /dev/null +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java @@ -0,0 +1,137 @@ +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 c45a47e..0a6c162 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java @@ -117,12 +117,10 @@ 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 66f96e3..f5590eb 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java @@ -116,12 +116,10 @@ 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 bc95993..a1e93ca 100644 --- a/src/main/resources/assets/magicbees/lang/en_US.lang +++ b/src/main/resources/assets/magicbees/lang/en_US.lang @@ -146,6 +146,7 @@ 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 @@ -228,6 +229,16 @@ 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 new file mode 100644 index 0000000000000000000000000000000000000000..717f240c4efc899a8ecc9f42eb85401d91a6cf03 GIT binary patch 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+ Date: Sat, 29 Apr 2023 00:13:15 -0400 Subject: [PATCH 20/70] fix the glitch --- src/main/java/magicbees/main/utils/compat/BloodHelper.java | 2 -- src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index f430bc9..f99c7d3 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -63,8 +63,6 @@ public class BloodHelper implements IModHelper { Config.hiveFrameFrenzy = new ItemFrenziedFrame(); GameRegistry .registerItem(Config.hiveFrameFrenzy, Config.hiveFrameFrenzy.getUnlocalizedName(), CommonProxy.DOMAIN); - - getRecipes(); } public static void getRecipes() { diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java index 2043e2b..d9b92a1 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -445,6 +445,7 @@ public class ThaumcraftHelper implements IModHelper { if (BloodHelper.isActive()) { BloodHelper.thaumRecipes(); + BloodHelper.getRecipes(); } } From 80c1c4d5da123724899c8ab890166568cebddded Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 00:18:36 -0400 Subject: [PATCH 21/70] fix? --- src/main/java/magicbees/main/Config.java | 1 + src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 5355a27..22faf86 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -488,6 +488,7 @@ public class Config { if (BloodHelper.isActive()) { BloodHelper.getItems(); + BloodHelper.getRecipes(); } } diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java index d9b92a1..2043e2b 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -445,7 +445,6 @@ public class ThaumcraftHelper implements IModHelper { if (BloodHelper.isActive()) { BloodHelper.thaumRecipes(); - BloodHelper.getRecipes(); } } From bc963b0d7eb8d8c48b3031bee740c89c5460d774 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 00:22:10 -0400 Subject: [PATCH 22/70] Gonna be annoyed if this works --- src/main/java/magicbees/main/Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 22faf86..b9051ae 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -488,7 +488,7 @@ public class Config { if (BloodHelper.isActive()) { BloodHelper.getItems(); - BloodHelper.getRecipes(); + // BloodHelper.getRecipes(); } } From c3fcb6fc28e7d5a316202145f27e20a9ab0618a6 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 00:26:53 -0400 Subject: [PATCH 23/70] work? --- src/main/java/magicbees/main/Config.java | 2 +- src/main/java/magicbees/main/utils/compat/ModHelperManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index b9051ae..22faf86 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -488,7 +488,7 @@ public class Config { if (BloodHelper.isActive()) { BloodHelper.getItems(); - // BloodHelper.getRecipes(); + BloodHelper.getRecipes(); } } diff --git a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java index 5c9c7bf..52194c2 100644 --- a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java +++ b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java @@ -39,6 +39,6 @@ public class ModHelperManager { helpers.add(new RedstoneArsenalHelper()); helpers.add(new BotaniaHelper()); helpers.add(new AppliedEnergisticsHelper()); - helpers.add(new BloodHelper()); + // helpers.add(new BloodHelper()); } } From 9f1642fd5b2b9721cdeace72faba955acd8cdb20 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 00:49:28 -0400 Subject: [PATCH 24/70] please fix --- .../java/magicbees/main/utils/compat/ModHelperManager.java | 2 +- .../main/utils/compat/bloodmagic/ItemBloodBaseFrame.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java index 52194c2..5c9c7bf 100644 --- a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java +++ b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java @@ -39,6 +39,6 @@ public class ModHelperManager { helpers.add(new RedstoneArsenalHelper()); helpers.add(new BotaniaHelper()); helpers.add(new AppliedEnergisticsHelper()); - // helpers.add(new BloodHelper()); + helpers.add(new BloodHelper()); } } diff --git a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java index d6b69b9..a830d47 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java @@ -17,7 +17,7 @@ import magicbees.main.utils.TabMagicBees; public class ItemBloodBaseFrame extends EnergyItems implements IHiveFrame { - private final IBeeModifier beeModifier = new BloodFrameBeeModifier(); + private final IBeeModifier beeModifier = new BloodBaseFrameBeeModifier(); private EntityPlayer owner = null; public ItemBloodBaseFrame() { @@ -29,7 +29,7 @@ public class ItemBloodBaseFrame extends EnergyItems implements IHiveFrame { this.setUnlocalizedName("bloodSoakedFrame"); } - private static class BloodFrameBeeModifier implements IBeeModifier { + private static class BloodBaseFrameBeeModifier implements IBeeModifier { @Override public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { From 17768a13000497e24b17c5bf362573df429c651e Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 01:20:13 -0400 Subject: [PATCH 25/70] Update Config.java --- src/main/java/magicbees/main/Config.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 22faf86..5355a27 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -488,7 +488,6 @@ public class Config { if (BloodHelper.isActive()) { BloodHelper.getItems(); - BloodHelper.getRecipes(); } } From 5b4aaf50f44f2bff344695562d39e4da7c904d6f Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 01:23:41 -0400 Subject: [PATCH 26/70] Update BloodHelper.java --- src/main/java/magicbees/main/utils/compat/BloodHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index f99c7d3..378a8e5 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -34,7 +34,7 @@ public class BloodHelper implements IModHelper { } public void preInit() { - if (Loader.isModLoaded(Name) && Config.thaumcraftActive) { + if (Loader.isModLoaded(Name) && Config.bloodMagicActive) { isBloodMagicActive = true; } } From 98fd7c1e19cad1ed420c8dd064fa2c6900dbf072 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 01:29:49 -0400 Subject: [PATCH 27/70] Update Config.java --- src/main/java/magicbees/main/Config.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 5355a27..9a6fd5d 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -3,6 +3,7 @@ package magicbees.main; import java.io.File; import java.lang.reflect.Field; +import cpw.mods.fml.common.Loader; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -251,7 +252,8 @@ public class Config { arsMagicaActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "BloodMagic", true); - bloodMagicActive = p.getBoolean(); + //bloodMagicActive = p.getBoolean(); + bloodMagicActive = Loader.isModLoaded("AWWayofTime"); p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true); equivalentExchangeActive = p.getBoolean(); @@ -486,10 +488,9 @@ public class Config { voidGrafter = new ItemVoidGrafter(); GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); - if (BloodHelper.isActive()) { + if (bloodMagicActive) { BloodHelper.getItems(); } - } } From c209ef59fbba224789eda22caf0d642cc92f000a Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 01:40:29 -0400 Subject: [PATCH 28/70] Update Config.java --- src/main/java/magicbees/main/Config.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 9a6fd5d..06d33cd 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -3,7 +3,6 @@ package magicbees.main; import java.io.File; import java.lang.reflect.Field; -import cpw.mods.fml.common.Loader; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -15,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; @@ -252,7 +252,7 @@ public class Config { arsMagicaActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "BloodMagic", true); - //bloodMagicActive = p.getBoolean(); + // bloodMagicActive = p.getBoolean(); bloodMagicActive = Loader.isModLoaded("AWWayofTime"); p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true); From c31726001baa6533f27b127cf62435b6fe9265b3 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 01:48:41 -0400 Subject: [PATCH 29/70] Update Config.java --- src/main/java/magicbees/main/Config.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 06d33cd..71b2bd0 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -14,7 +14,6 @@ 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; @@ -147,9 +146,9 @@ public class Config { public static ItemMagicHiveFrame hiveFrameNecrotic; public static ItemMagicHiveFrame hiveFrameTemporal; public static ItemMagicHiveFrame hiveFrameOblivion; + public static Item hiveFrameBloodBase; public static Item hiveFrameBlood; public static Item hiveFrameFrenzy; - public static Item hiveFrameBloodBase; // ----- Backpacks ------------------------------------------ public static Item thaumaturgeBackpackT1; @@ -252,8 +251,7 @@ public class Config { arsMagicaActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "BloodMagic", true); - // bloodMagicActive = p.getBoolean(); - bloodMagicActive = Loader.isModLoaded("AWWayofTime"); + bloodMagicActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true); equivalentExchangeActive = p.getBoolean(); @@ -488,7 +486,7 @@ public class Config { voidGrafter = new ItemVoidGrafter(); GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); - if (bloodMagicActive) { + if (BloodHelper.isActive()) { BloodHelper.getItems(); } } From 806c326b6217bdb8439b6820a93bf43b2eabcab5 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 01:53:15 -0400 Subject: [PATCH 30/70] Update Config.java --- src/main/java/magicbees/main/Config.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 71b2bd0..534b9ba 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -3,6 +3,7 @@ package magicbees.main; import java.io.File; import java.lang.reflect.Field; +import cpw.mods.fml.common.Loader; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -209,6 +210,8 @@ public class Config { magicCapsule = new ItemCapsule(CapsuleType.MAGIC, capsuleStackSizeMax); voidCapsule = new ItemCapsule(CapsuleType.VOID, capsuleStackSizeMax); + bloodMagicActive = Loader.isModLoaded("AWWayofTime"); + setupThaumcraftItems(); setupBotaniaItems(); @@ -251,7 +254,7 @@ public class Config { arsMagicaActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "BloodMagic", true); - bloodMagicActive = p.getBoolean(); + // bloodMagicActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true); equivalentExchangeActive = p.getBoolean(); From d612f8c5206a2dc26f6adc28865c80a078d1518b Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 01:55:44 -0400 Subject: [PATCH 31/70] Update Config.java --- src/main/java/magicbees/main/Config.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 534b9ba..9a0f9b7 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -3,7 +3,6 @@ package magicbees.main; import java.io.File; import java.lang.reflect.Field; -import cpw.mods.fml.common.Loader; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -15,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; @@ -254,7 +254,7 @@ public class Config { arsMagicaActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "BloodMagic", true); - // bloodMagicActive = p.getBoolean(); + // bloodMagicActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true); equivalentExchangeActive = p.getBoolean(); From a64ae868534c23c6c8a5508cae262405f449be7c Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:10:01 -0400 Subject: [PATCH 32/70] Update BloodHelper.java --- src/main/java/magicbees/main/utils/compat/BloodHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index 378a8e5..1fd2d96 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -34,7 +34,7 @@ public class BloodHelper implements IModHelper { } public void preInit() { - if (Loader.isModLoaded(Name) && Config.bloodMagicActive) { + if (Loader.isModLoaded(Name)) { isBloodMagicActive = true; } } From 66c5bdf2ca56b4b8b4a850b8b4083ab62cbc4981 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:13:36 -0400 Subject: [PATCH 33/70] please fucking work --- .../main/utils/compat/BloodHelper.java | 10 ++-- .../main/utils/compat/ThaumcraftHelper.java | 49 ++++++------------- 2 files changed, 18 insertions(+), 41 deletions(-) diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index 1fd2d96..9e7e518 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -13,7 +13,6 @@ 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; @@ -50,11 +49,10 @@ 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.hiveFrameBloodBase = new ItemBloodBaseFrame(); GameRegistry.registerItem( Config.hiveFrameBloodBase, + * Config.hiveFrameBloodBase.getUnlocalizedName(), CommonProxy.DOMAIN); + */ Config.hiveFrameBlood = new ItemBloodFrame(); GameRegistry diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java index 2043e2b..f6d0352 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -444,7 +444,7 @@ public class ThaumcraftHelper implements IModHelper { new ItemStack(miscResource, 1, MiscResource.VOID_INGOT.ordinal()) }); if (BloodHelper.isActive()) { - BloodHelper.thaumRecipes(); + // BloodHelper.thaumRecipes(); } } @@ -691,40 +691,19 @@ public class ThaumcraftHelper implements IModHelper { .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); + /* + * 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); + */ } } From 5e5a80fb5cf516d658a4ee81df410f32ac7f0235 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:17:33 -0400 Subject: [PATCH 34/70] a --- src/main/java/magicbees/main/Config.java | 2 +- .../main/utils/compat/BloodHelper.java | 32 +++++++------------ 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 9a0f9b7..751294a 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -490,7 +490,7 @@ public class Config { GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); if (BloodHelper.isActive()) { - BloodHelper.getItems(); + // 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 9e7e518..8fbd72b 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; @@ -15,10 +14,6 @@ import magicbees.main.CommonProxy; import magicbees.main.Config; 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 { @@ -75,22 +70,17 @@ public class BloodHelper implements IModHelper { } 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", - 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 }); - + /* + * 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", 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 }); + */ } public static void doBloodMagicModuleConfigs(Configuration configuration) { From b76b77d4a39ed0db073364c3bf0e0d89b5d2e1cd Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:20:36 -0400 Subject: [PATCH 35/70] b --- src/main/java/magicbees/main/Config.java | 2 +- .../magicbees/main/utils/compat/BloodHelper.java | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 751294a..5823e28 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -147,7 +147,7 @@ public class Config { public static ItemMagicHiveFrame hiveFrameNecrotic; public static ItemMagicHiveFrame hiveFrameTemporal; public static ItemMagicHiveFrame hiveFrameOblivion; - public static Item hiveFrameBloodBase; + // public static Item hiveFrameBloodBase; public static Item hiveFrameBlood; public static Item hiveFrameFrenzy; diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index 8fbd72b..303b68a 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -1,11 +1,9 @@ package magicbees.main.utils.compat; -import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; -import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -59,14 +57,10 @@ public class BloodHelper implements IModHelper { } public static void getRecipes() { - AltarRecipeRegistry.registerAltarRecipe( - new ItemStack(Config.hiveFrameBloodBase), - new ItemStack(Config.hiveFrameMagic), - 1, - 5000, - 20, - 20, - false); + /* + * AltarRecipeRegistry.registerAltarRecipe( new ItemStack(Config.hiveFrameBloodBase), new + * ItemStack(Config.hiveFrameMagic), 1, 5000, 20, 20, false); + */ } public static void thaumRecipes() { From 840771f5f4dbc5a86e63fcd839a2c098c49b3a59 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:26:03 -0400 Subject: [PATCH 36/70] Revert "b" This reverts commit b76b77d4a39ed0db073364c3bf0e0d89b5d2e1cd. --- src/main/java/magicbees/main/Config.java | 2 +- .../magicbees/main/utils/compat/BloodHelper.java | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 5823e28..751294a 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -147,7 +147,7 @@ public class Config { public static ItemMagicHiveFrame hiveFrameNecrotic; public static ItemMagicHiveFrame hiveFrameTemporal; public static ItemMagicHiveFrame hiveFrameOblivion; - // public static Item hiveFrameBloodBase; + public static Item hiveFrameBloodBase; public static Item hiveFrameBlood; public static Item hiveFrameFrenzy; diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index 303b68a..8fbd72b 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -1,9 +1,11 @@ package magicbees.main.utils.compat; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; +import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -57,10 +59,14 @@ public class BloodHelper implements IModHelper { } public static void getRecipes() { - /* - * AltarRecipeRegistry.registerAltarRecipe( new ItemStack(Config.hiveFrameBloodBase), new - * ItemStack(Config.hiveFrameMagic), 1, 5000, 20, 20, false); - */ + AltarRecipeRegistry.registerAltarRecipe( + new ItemStack(Config.hiveFrameBloodBase), + new ItemStack(Config.hiveFrameMagic), + 1, + 5000, + 20, + 20, + false); } public static void thaumRecipes() { From fddc31a8f59cf8f12c6f8013c8aaacc220ea37d7 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:26:06 -0400 Subject: [PATCH 37/70] Revert "a" This reverts commit 5e5a80fb5cf516d658a4ee81df410f32ac7f0235. --- src/main/java/magicbees/main/Config.java | 2 +- .../main/utils/compat/BloodHelper.java | 32 ++++++++++++------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 751294a..9a0f9b7 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -490,7 +490,7 @@ public class Config { GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); if (BloodHelper.isActive()) { - // BloodHelper.getItems(); + 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 8fbd72b..9e7e518 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -5,6 +5,7 @@ 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; @@ -14,6 +15,10 @@ import magicbees.main.CommonProxy; import magicbees.main.Config; 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 { @@ -70,17 +75,22 @@ public class BloodHelper implements IModHelper { } 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", 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 }); - */ + 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", + 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 }); + } public static void doBloodMagicModuleConfigs(Configuration configuration) { From cf6536c17fbc8efe4b08128e47c826c5013f7cd8 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:26:08 -0400 Subject: [PATCH 38/70] Revert "please fucking work" This reverts commit 66c5bdf2ca56b4b8b4a850b8b4083ab62cbc4981. --- .../main/utils/compat/BloodHelper.java | 10 ++-- .../main/utils/compat/ThaumcraftHelper.java | 49 +++++++++++++------ 2 files changed, 41 insertions(+), 18 deletions(-) diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index 9e7e518..1fd2d96 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -13,6 +13,7 @@ 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; @@ -49,10 +50,11 @@ 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.hiveFrameBloodBase = new ItemBloodBaseFrame(); + GameRegistry.registerItem( + Config.hiveFrameBloodBase, + Config.hiveFrameBloodBase.getUnlocalizedName(), + CommonProxy.DOMAIN); Config.hiveFrameBlood = new ItemBloodFrame(); GameRegistry diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java index f6d0352..2043e2b 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -444,7 +444,7 @@ public class ThaumcraftHelper implements IModHelper { new ItemStack(miscResource, 1, MiscResource.VOID_INGOT.ordinal()) }); if (BloodHelper.isActive()) { - // BloodHelper.thaumRecipes(); + BloodHelper.thaumRecipes(); } } @@ -691,19 +691,40 @@ public class ThaumcraftHelper implements IModHelper { .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); - */ + 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); } } From 1391dd3ed657677e265ff9d3f090f5c794a94ea4 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:26:10 -0400 Subject: [PATCH 39/70] Revert "Update BloodHelper.java" This reverts commit a64ae868534c23c6c8a5508cae262405f449be7c. --- src/main/java/magicbees/main/utils/compat/BloodHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index 1fd2d96..378a8e5 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -34,7 +34,7 @@ public class BloodHelper implements IModHelper { } public void preInit() { - if (Loader.isModLoaded(Name)) { + if (Loader.isModLoaded(Name) && Config.bloodMagicActive) { isBloodMagicActive = true; } } From 8412246e3eda632dfb121fcc296871da5660ea76 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:26:13 -0400 Subject: [PATCH 40/70] Revert "Update Config.java" This reverts commit d612f8c5206a2dc26f6adc28865c80a078d1518b. --- src/main/java/magicbees/main/Config.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 9a0f9b7..534b9ba 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -3,6 +3,7 @@ package magicbees.main; import java.io.File; import java.lang.reflect.Field; +import cpw.mods.fml.common.Loader; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -14,7 +15,6 @@ 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; @@ -254,7 +254,7 @@ public class Config { arsMagicaActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "BloodMagic", true); - // bloodMagicActive = p.getBoolean(); + // bloodMagicActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true); equivalentExchangeActive = p.getBoolean(); From 764fda09851402903ca6cb6ff7dcc9b54128a13c Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:26:17 -0400 Subject: [PATCH 41/70] Revert "Update Config.java" This reverts commit 806c326b6217bdb8439b6820a93bf43b2eabcab5. --- src/main/java/magicbees/main/Config.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 534b9ba..71b2bd0 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -3,7 +3,6 @@ package magicbees.main; import java.io.File; import java.lang.reflect.Field; -import cpw.mods.fml.common.Loader; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -210,8 +209,6 @@ public class Config { magicCapsule = new ItemCapsule(CapsuleType.MAGIC, capsuleStackSizeMax); voidCapsule = new ItemCapsule(CapsuleType.VOID, capsuleStackSizeMax); - bloodMagicActive = Loader.isModLoaded("AWWayofTime"); - setupThaumcraftItems(); setupBotaniaItems(); @@ -254,7 +251,7 @@ public class Config { arsMagicaActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "BloodMagic", true); - // bloodMagicActive = p.getBoolean(); + bloodMagicActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true); equivalentExchangeActive = p.getBoolean(); From c47b50b617e32bc39378b01404b9c1fd12ebbd7a Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:26:19 -0400 Subject: [PATCH 42/70] Revert "Update Config.java" This reverts commit c31726001baa6533f27b127cf62435b6fe9265b3. --- src/main/java/magicbees/main/Config.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 71b2bd0..06d33cd 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; @@ -146,9 +147,9 @@ public class Config { public static ItemMagicHiveFrame hiveFrameNecrotic; public static ItemMagicHiveFrame hiveFrameTemporal; public static ItemMagicHiveFrame hiveFrameOblivion; - public static Item hiveFrameBloodBase; public static Item hiveFrameBlood; public static Item hiveFrameFrenzy; + public static Item hiveFrameBloodBase; // ----- Backpacks ------------------------------------------ public static Item thaumaturgeBackpackT1; @@ -251,7 +252,8 @@ public class Config { arsMagicaActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "BloodMagic", true); - bloodMagicActive = p.getBoolean(); + // bloodMagicActive = p.getBoolean(); + bloodMagicActive = Loader.isModLoaded("AWWayofTime"); p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true); equivalentExchangeActive = p.getBoolean(); @@ -486,7 +488,7 @@ public class Config { voidGrafter = new ItemVoidGrafter(); GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); - if (BloodHelper.isActive()) { + if (bloodMagicActive) { BloodHelper.getItems(); } } From 8f919fc688c06c10cbf092f9fe121625d7c3462e Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:26:33 -0400 Subject: [PATCH 43/70] Revert "Update Config.java" This reverts commit c209ef59fbba224789eda22caf0d642cc92f000a. --- src/main/java/magicbees/main/Config.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 06d33cd..9a6fd5d 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -3,6 +3,7 @@ package magicbees.main; import java.io.File; import java.lang.reflect.Field; +import cpw.mods.fml.common.Loader; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -14,7 +15,6 @@ 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; @@ -252,7 +252,7 @@ public class Config { arsMagicaActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "BloodMagic", true); - // bloodMagicActive = p.getBoolean(); + //bloodMagicActive = p.getBoolean(); bloodMagicActive = Loader.isModLoaded("AWWayofTime"); p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true); From 2ea0a44429e19fdb87a1f428aaa9bc9371257737 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:26:36 -0400 Subject: [PATCH 44/70] Revert "Update Config.java" This reverts commit 98fd7c1e19cad1ed420c8dd064fa2c6900dbf072. --- src/main/java/magicbees/main/Config.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 9a6fd5d..5355a27 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -3,7 +3,6 @@ package magicbees.main; import java.io.File; import java.lang.reflect.Field; -import cpw.mods.fml.common.Loader; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -252,8 +251,7 @@ public class Config { arsMagicaActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "BloodMagic", true); - //bloodMagicActive = p.getBoolean(); - bloodMagicActive = Loader.isModLoaded("AWWayofTime"); + bloodMagicActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true); equivalentExchangeActive = p.getBoolean(); @@ -488,9 +486,10 @@ public class Config { voidGrafter = new ItemVoidGrafter(); GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); - if (bloodMagicActive) { + if (BloodHelper.isActive()) { BloodHelper.getItems(); } + } } From 918ec20739ecfc5a4f3228695947a681f3452aff Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:26:38 -0400 Subject: [PATCH 45/70] Revert "Update BloodHelper.java" This reverts commit 5b4aaf50f44f2bff344695562d39e4da7c904d6f. --- src/main/java/magicbees/main/utils/compat/BloodHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index 378a8e5..f99c7d3 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -34,7 +34,7 @@ public class BloodHelper implements IModHelper { } public void preInit() { - if (Loader.isModLoaded(Name) && Config.bloodMagicActive) { + if (Loader.isModLoaded(Name) && Config.thaumcraftActive) { isBloodMagicActive = true; } } From 79d02839012579d7d342559e3580c62e47d04643 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:26:40 -0400 Subject: [PATCH 46/70] Revert "Update Config.java" This reverts commit 17768a13000497e24b17c5bf362573df429c651e. --- src/main/java/magicbees/main/Config.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 5355a27..22faf86 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -488,6 +488,7 @@ public class Config { if (BloodHelper.isActive()) { BloodHelper.getItems(); + BloodHelper.getRecipes(); } } From 2c547e3851716eb0b05363e6a28a5ed11b33a800 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:26:42 -0400 Subject: [PATCH 47/70] Revert "please fix" This reverts commit 9f1642fd5b2b9721cdeace72faba955acd8cdb20. --- .../java/magicbees/main/utils/compat/ModHelperManager.java | 2 +- .../main/utils/compat/bloodmagic/ItemBloodBaseFrame.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java index 5c9c7bf..52194c2 100644 --- a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java +++ b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java @@ -39,6 +39,6 @@ public class ModHelperManager { helpers.add(new RedstoneArsenalHelper()); helpers.add(new BotaniaHelper()); helpers.add(new AppliedEnergisticsHelper()); - helpers.add(new BloodHelper()); + // helpers.add(new BloodHelper()); } } diff --git a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java index a830d47..d6b69b9 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java @@ -17,7 +17,7 @@ import magicbees.main.utils.TabMagicBees; public class ItemBloodBaseFrame extends EnergyItems implements IHiveFrame { - private final IBeeModifier beeModifier = new BloodBaseFrameBeeModifier(); + private final IBeeModifier beeModifier = new BloodFrameBeeModifier(); private EntityPlayer owner = null; public ItemBloodBaseFrame() { @@ -29,7 +29,7 @@ public class ItemBloodBaseFrame extends EnergyItems implements IHiveFrame { this.setUnlocalizedName("bloodSoakedFrame"); } - private static class BloodBaseFrameBeeModifier implements IBeeModifier { + private static class BloodFrameBeeModifier implements IBeeModifier { @Override public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { From 309a9c08182ca85bea297f1b61f3b8181666e243 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:26:46 -0400 Subject: [PATCH 48/70] Revert "work?" This reverts commit c3fcb6fc28e7d5a316202145f27e20a9ab0618a6. --- src/main/java/magicbees/main/Config.java | 2 +- src/main/java/magicbees/main/utils/compat/ModHelperManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 22faf86..b9051ae 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -488,7 +488,7 @@ public class Config { if (BloodHelper.isActive()) { BloodHelper.getItems(); - BloodHelper.getRecipes(); + // BloodHelper.getRecipes(); } } diff --git a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java index 52194c2..5c9c7bf 100644 --- a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java +++ b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java @@ -39,6 +39,6 @@ public class ModHelperManager { helpers.add(new RedstoneArsenalHelper()); helpers.add(new BotaniaHelper()); helpers.add(new AppliedEnergisticsHelper()); - // helpers.add(new BloodHelper()); + helpers.add(new BloodHelper()); } } From 639c53a01db385c5993684a84f77144350a6e73e Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:26:48 -0400 Subject: [PATCH 49/70] Revert "Gonna be annoyed if this works" This reverts commit bc963b0d7eb8d8c48b3031bee740c89c5460d774. --- src/main/java/magicbees/main/Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index b9051ae..22faf86 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -488,7 +488,7 @@ public class Config { if (BloodHelper.isActive()) { BloodHelper.getItems(); - // BloodHelper.getRecipes(); + BloodHelper.getRecipes(); } } From 756b186db4b877db94eea4d170bf3661d0aace73 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:26:50 -0400 Subject: [PATCH 50/70] Revert "fix?" This reverts commit 80c1c4d5da123724899c8ab890166568cebddded. --- src/main/java/magicbees/main/Config.java | 1 - src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 22faf86..5355a27 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -488,7 +488,6 @@ public class Config { if (BloodHelper.isActive()) { BloodHelper.getItems(); - BloodHelper.getRecipes(); } } diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java index 2043e2b..d9b92a1 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -445,6 +445,7 @@ public class ThaumcraftHelper implements IModHelper { if (BloodHelper.isActive()) { BloodHelper.thaumRecipes(); + BloodHelper.getRecipes(); } } From fdc1301b43f67fe12095a673f3bbd4a6a8a94b6e Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:26:52 -0400 Subject: [PATCH 51/70] Revert "fix the glitch" This reverts commit 3afee4f5533e6d59778434669b3520c4af5fa8d8. --- src/main/java/magicbees/main/utils/compat/BloodHelper.java | 2 ++ src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index f99c7d3..f430bc9 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -63,6 +63,8 @@ public class BloodHelper implements IModHelper { Config.hiveFrameFrenzy = new ItemFrenziedFrame(); GameRegistry .registerItem(Config.hiveFrameFrenzy, Config.hiveFrameFrenzy.getUnlocalizedName(), CommonProxy.DOMAIN); + + getRecipes(); } public static void getRecipes() { diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java index d9b92a1..2043e2b 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -445,7 +445,6 @@ public class ThaumcraftHelper implements IModHelper { if (BloodHelper.isActive()) { BloodHelper.thaumRecipes(); - BloodHelper.getRecipes(); } } 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 52/70] 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+ Date: Sat, 29 Apr 2023 15:02:18 -0400 Subject: [PATCH 53/70] Adding back the textures and lang file --- .../resources/assets/magicbees/lang/en_US.lang | 11 +++++++++++ .../magicbees/textures/items/bloodSoakedFrame.png | Bin 0 -> 363 bytes 2 files changed, 11 insertions(+) create mode 100644 src/main/resources/assets/magicbees/textures/items/bloodSoakedFrame.png diff --git a/src/main/resources/assets/magicbees/lang/en_US.lang b/src/main/resources/assets/magicbees/lang/en_US.lang index bc95993..8464c55 100644 --- a/src/main/resources/assets/magicbees/lang/en_US.lang +++ b/src/main/resources/assets/magicbees/lang/en_US.lang @@ -144,8 +144,19 @@ item.frameMetabolic.name=Metabolic Frame item.frameNecrotic.name=Necrotic Frame item.frameTemporal.name=Temporal Frame item.frameOblivion.name=Oblivion Frame + + +#Blood Magic Compat item.bloodFrame.name=Sanguis Artus item.frenziedFrame.name=Maddening Frame of Frenzy +item.bloodSoakedFrame.name=Blood Frame +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! + #Capsules capsule.magic=%s Magic Capsule diff --git a/src/main/resources/assets/magicbees/textures/items/bloodSoakedFrame.png b/src/main/resources/assets/magicbees/textures/items/bloodSoakedFrame.png new file mode 100644 index 0000000000000000000000000000000000000000..717f240c4efc899a8ecc9f42eb85401d91a6cf03 GIT binary patch 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+ Date: Sat, 29 Apr 2023 15:08:00 -0400 Subject: [PATCH 54/70] Remove comments + add helper --- src/main/java/magicbees/main/utils/compat/ModHelperManager.java | 1 + .../magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java | 2 -- .../main/utils/compat/bloodmagic/ItemFrenziedFrame.java | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java index c40d60b..5c9c7bf 100644 --- a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java +++ b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java @@ -39,5 +39,6 @@ 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/bloodmagic/ItemBloodFrame.java b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java index c45a47e..0a6c162 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java @@ -117,12 +117,10 @@ 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 66f96e3..f5590eb 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java @@ -116,12 +116,10 @@ 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()) { From 0efc169ef7038ab049fca6eaee5dd3387969cb0e Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 15:11:52 -0400 Subject: [PATCH 55/70] Revert "Remove comments + add helper" This reverts commit d83a0cc7755fce2a57c7f67164c8598679129d2d. --- src/main/java/magicbees/main/utils/compat/ModHelperManager.java | 1 - .../magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java | 2 ++ .../main/utils/compat/bloodmagic/ItemFrenziedFrame.java | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) 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/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()) { From 0b6c1cc34587d92e458c471c335040014cb8fbd5 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 15:12:04 -0400 Subject: [PATCH 56/70] Revert "Adding back the textures and lang file" This reverts commit 02afe5dbc878dec4d24741d50919a1425f537bd7. --- .../resources/assets/magicbees/lang/en_US.lang | 11 ----------- .../magicbees/textures/items/bloodSoakedFrame.png | Bin 363 -> 0 bytes 2 files changed, 11 deletions(-) delete mode 100644 src/main/resources/assets/magicbees/textures/items/bloodSoakedFrame.png diff --git a/src/main/resources/assets/magicbees/lang/en_US.lang b/src/main/resources/assets/magicbees/lang/en_US.lang index 8464c55..bc95993 100644 --- a/src/main/resources/assets/magicbees/lang/en_US.lang +++ b/src/main/resources/assets/magicbees/lang/en_US.lang @@ -144,19 +144,8 @@ item.frameMetabolic.name=Metabolic Frame item.frameNecrotic.name=Necrotic Frame item.frameTemporal.name=Temporal Frame item.frameOblivion.name=Oblivion Frame - - -#Blood Magic Compat item.bloodFrame.name=Sanguis Artus item.frenziedFrame.name=Maddening Frame of Frenzy -item.bloodSoakedFrame.name=Blood Frame -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! - #Capsules capsule.magic=%s Magic Capsule 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+ Date: Sat, 29 Apr 2023 15:12:06 -0400 Subject: [PATCH 57/70] Revert "Revert "Add recipes and research nodes"" This reverts commit fa10e888dcee283f363d61379371c8e234fa7a62. --- 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 0 -> 363 bytes 9 files changed, 242 insertions(+), 21 deletions(-) create mode 100644 src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java create 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 b75fccd..5355a27 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -14,7 +14,6 @@ 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; @@ -149,6 +148,7 @@ 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,8 +209,6 @@ public class Config { magicCapsule = new ItemCapsule(CapsuleType.MAGIC, capsuleStackSizeMax); voidCapsule = new ItemCapsule(CapsuleType.VOID, capsuleStackSizeMax); - bloodMagicActive = Loader.isModLoaded("AWWayofTime"); - setupThaumcraftItems(); setupBotaniaItems(); @@ -252,7 +250,7 @@ public class Config { p = configuration.get(CATEGORY_MODULES, "ArsMagica", true); arsMagicaActive = p.getBoolean(); - p = configuration.get(CATEGORY_MODULES, "AWWayofTime", true); + p = configuration.get(CATEGORY_MODULES, "BloodMagic", true); bloodMagicActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true); @@ -488,7 +486,7 @@ public class Config { voidGrafter = new ItemVoidGrafter(); GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); - if (Loader.isModLoaded("AWWayofTime")) { + if (BloodHelper.isActive()) { 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 278f987..f430bc9 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -5,6 +5,7 @@ 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; @@ -12,8 +13,13 @@ 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 { @@ -28,11 +34,15 @@ public class BloodHelper implements IModHelper { } public void preInit() { - if (Loader.isModLoaded(Name)) { + if (Loader.isModLoaded(Name) && Config.thaumcraftActive) { isBloodMagicActive = true; } } + public static void bloodMagicInstalled() { + isBloodMagicActive = true; + } + public void init() {} public void postInit() {} @@ -40,6 +50,12 @@ 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); @@ -53,22 +69,32 @@ public class BloodHelper implements IModHelper { public static void getRecipes() { AltarRecipeRegistry.registerAltarRecipe( - new ItemStack(Config.hiveFrameBlood), + new ItemStack(Config.hiveFrameBloodBase), new ItemStack(Config.hiveFrameMagic), - 3, - 30000, + 1, + 5000, 20, 20, false); + } - AltarRecipeRegistry.registerAltarRecipe( + 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", new ItemStack(Config.hiveFrameFrenzy), - new ItemStack(Config.hiveFrameNecrotic), - 3, - 30000, - 20, - 20, - false); + 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 }); + } 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 c40d60b..5c9c7bf 100644 --- a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java +++ b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java @@ -39,5 +39,6 @@ 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 a32071f..2043e2b 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -202,6 +202,14 @@ 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"; @@ -264,6 +272,9 @@ 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; @@ -431,6 +442,10 @@ 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() { @@ -519,7 +534,6 @@ 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", @@ -675,6 +689,43 @@ 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) { @@ -870,5 +921,6 @@ 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 new file mode 100644 index 0000000..d6b69b9 --- /dev/null +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java @@ -0,0 +1,137 @@ +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 c45a47e..0a6c162 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java @@ -117,12 +117,10 @@ 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 66f96e3..f5590eb 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java @@ -116,12 +116,10 @@ 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 bc95993..a1e93ca 100644 --- a/src/main/resources/assets/magicbees/lang/en_US.lang +++ b/src/main/resources/assets/magicbees/lang/en_US.lang @@ -146,6 +146,7 @@ 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 @@ -228,6 +229,16 @@ 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 new file mode 100644 index 0000000000000000000000000000000000000000..717f240c4efc899a8ecc9f42eb85401d91a6cf03 GIT binary patch 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+ Date: Sat, 29 Apr 2023 15:35:23 -0400 Subject: [PATCH 58/70] Everything works again --- src/main/java/magicbees/main/Config.java | 5 +++-- .../java/magicbees/main/utils/compat/ModHelperManager.java | 3 ++- .../java/magicbees/main/utils/compat/ThaumcraftHelper.java | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 5355a27..c9414d0 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -3,6 +3,7 @@ package magicbees.main; import java.io.File; import java.lang.reflect.Field; +import cpw.mods.fml.common.Loader; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -251,7 +252,7 @@ public class Config { arsMagicaActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "BloodMagic", true); - bloodMagicActive = p.getBoolean(); + bloodMagicActive = (Loader.isModLoaded("AWWayofTime")); p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true); equivalentExchangeActive = p.getBoolean(); @@ -486,7 +487,7 @@ public class Config { voidGrafter = new ItemVoidGrafter(); GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); - if (BloodHelper.isActive()) { + if (bloodMagicActive) { BloodHelper.getItems(); } diff --git a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java index 5c9c7bf..7c7f092 100644 --- a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java +++ b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java @@ -39,6 +39,7 @@ public class ModHelperManager { helpers.add(new RedstoneArsenalHelper()); helpers.add(new BotaniaHelper()); helpers.add(new AppliedEnergisticsHelper()); - helpers.add(new BloodHelper()); + // helpers.add(new BloodHelper()); + // Kuba, if you want this to be added to the helper list, you're going to have to be the one to fix it. } } diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java index 2043e2b..0f83d4d 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -443,7 +443,7 @@ public class ThaumcraftHelper implements IModHelper { new Object[] { " T", " s ", "s ", 's', Items.stick, 'T', new ItemStack(miscResource, 1, MiscResource.VOID_INGOT.ordinal()) }); - if (BloodHelper.isActive()) { + if (Config.bloodMagicActive) { BloodHelper.thaumRecipes(); } } @@ -690,7 +690,7 @@ public class ThaumcraftHelper implements IModHelper { new ResearchPage((IArcaneRecipe) visAuraProvider)) .setParentsHidden("VISPOWER").registerResearchItem(); - if (BloodHelper.isActive()) { + if (Config.bloodMagicActive) { bloodFrame1 = new ResearchPage("bloodFrame.1"); bloodFrame2 = new ResearchPage((IArcaneRecipe) bloodFrame); From fe56288c72bcff9823b217a04aa1835c686f4b7e Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 15:47:00 -0400 Subject: [PATCH 59/70] I forgot to spotless --- src/main/java/magicbees/main/Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index c9414d0..8b6f7b7 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -3,7 +3,6 @@ package magicbees.main; import java.io.File; import java.lang.reflect.Field; -import cpw.mods.fml.common.Loader; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -15,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; From 83b0bfc504edbb9fc8b7e5eb573deb073b1e32fd Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 16:34:34 -0400 Subject: [PATCH 60/70] I actually fixed it this time --- src/main/java/magicbees/main/Config.java | 24 ++++++++++++-- .../main/utils/compat/BloodHelper.java | 33 +++++-------------- .../main/utils/compat/ModHelperManager.java | 4 +-- 3 files changed, 32 insertions(+), 29 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 8b6f7b7..1cad7c5 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -57,6 +57,9 @@ import magicbees.main.utils.VersionInfo; import magicbees.main.utils.compat.BloodHelper; import magicbees.main.utils.compat.BotaniaHelper; import magicbees.main.utils.compat.ThaumcraftHelper; +import magicbees.main.utils.compat.bloodmagic.ItemBloodBaseFrame; +import magicbees.main.utils.compat.bloodmagic.ItemBloodFrame; +import magicbees.main.utils.compat.bloodmagic.ItemFrenziedFrame; import magicbees.storage.BackpackDefinition; import magicbees.tileentity.TileEntityEffectJar; import magicbees.tileentity.TileEntityMagicApiary; @@ -487,8 +490,25 @@ public class Config { voidGrafter = new ItemVoidGrafter(); GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); - if (bloodMagicActive) { - BloodHelper.getItems(); + if (BloodHelper.isActive()) { + 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); + + Config.hiveFrameFrenzy = new ItemFrenziedFrame(); + GameRegistry.registerItem( + Config.hiveFrameFrenzy, + Config.hiveFrameFrenzy.getUnlocalizedName(), + CommonProxy.DOMAIN); + } } diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index f430bc9..4a751bc 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -8,14 +8,9 @@ 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; 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; @@ -34,7 +29,7 @@ public class BloodHelper implements IModHelper { } public void preInit() { - if (Loader.isModLoaded(Name) && Config.thaumcraftActive) { + if (Loader.isModLoaded(Name) && Config.bloodMagicActive) { isBloodMagicActive = true; } } @@ -43,29 +38,17 @@ public class BloodHelper implements IModHelper { isBloodMagicActive = true; } - public void init() {} + public void init() { + getItems(); + } - public void postInit() {} + public void postInit() { + getRecipes(); + } 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); - - Config.hiveFrameFrenzy = new ItemFrenziedFrame(); - GameRegistry - .registerItem(Config.hiveFrameFrenzy, Config.hiveFrameFrenzy.getUnlocalizedName(), CommonProxy.DOMAIN); - - getRecipes(); - } + public static void getItems() {} public static void getRecipes() { AltarRecipeRegistry.registerAltarRecipe( diff --git a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java index 7c7f092..d398769 100644 --- a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java +++ b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java @@ -39,7 +39,7 @@ public class ModHelperManager { helpers.add(new RedstoneArsenalHelper()); helpers.add(new BotaniaHelper()); helpers.add(new AppliedEnergisticsHelper()); - // helpers.add(new BloodHelper()); - // Kuba, if you want this to be added to the helper list, you're going to have to be the one to fix it. + helpers.add(new BloodHelper()); + } } From 5f56b46e000e35cd02bfd2c0b8d32529b4b01da8 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 18:25:31 -0400 Subject: [PATCH 61/70] Kuba requested changes, what am I doing wrong? --- src/main/java/magicbees/main/Config.java | 28 +----- .../main/utils/compat/BloodHelper.java | 95 +++++++++++++++---- .../main/utils/compat/ModHelperManager.java | 1 - .../main/utils/compat/ThaumcraftHelper.java | 40 -------- 4 files changed, 79 insertions(+), 85 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 1cad7c5..b96aeba 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -14,7 +14,6 @@ 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; @@ -57,9 +56,6 @@ import magicbees.main.utils.VersionInfo; import magicbees.main.utils.compat.BloodHelper; import magicbees.main.utils.compat.BotaniaHelper; import magicbees.main.utils.compat.ThaumcraftHelper; -import magicbees.main.utils.compat.bloodmagic.ItemBloodBaseFrame; -import magicbees.main.utils.compat.bloodmagic.ItemBloodFrame; -import magicbees.main.utils.compat.bloodmagic.ItemFrenziedFrame; import magicbees.storage.BackpackDefinition; import magicbees.tileentity.TileEntityEffectJar; import magicbees.tileentity.TileEntityMagicApiary; @@ -150,9 +146,6 @@ public class Config { public static ItemMagicHiveFrame hiveFrameNecrotic; public static ItemMagicHiveFrame hiveFrameTemporal; public static ItemMagicHiveFrame hiveFrameOblivion; - public static Item hiveFrameBlood; - public static Item hiveFrameFrenzy; - public static Item hiveFrameBloodBase; // ----- Backpacks ------------------------------------------ public static Item thaumaturgeBackpackT1; @@ -255,7 +248,7 @@ public class Config { arsMagicaActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "BloodMagic", true); - bloodMagicActive = (Loader.isModLoaded("AWWayofTime")); + bloodMagicActive = p.getBoolean(); p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true); equivalentExchangeActive = p.getBoolean(); @@ -491,24 +484,7 @@ public class Config { GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); if (BloodHelper.isActive()) { - 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); - - Config.hiveFrameFrenzy = new ItemFrenziedFrame(); - GameRegistry.registerItem( - Config.hiveFrameFrenzy, - Config.hiveFrameFrenzy.getUnlocalizedName(), - CommonProxy.DOMAIN); - + 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 4a751bc..c0d6b58 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -1,25 +1,36 @@ package magicbees.main.utils.compat; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.common.config.Property; +import WayofTime.alchemicalWizardry.*; import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; 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.api.crafting.IArcaneRecipe; +import thaumcraft.api.research.ResearchCategories; +import thaumcraft.api.research.ResearchItem; +import thaumcraft.api.research.ResearchPage; import thaumcraft.common.config.ConfigItems; public class BloodHelper implements IModHelper { + public static Item hiveFrameBlood; + public static Item hiveFrameFrenzy; + public static Item hiveFrameBloodBase; + @SideOnly(Side.CLIENT) - public static IIcon subtileIcons[]; private static boolean isBloodMagicActive = false; public static final String Name = "AWWayofTime"; @@ -34,25 +45,38 @@ public class BloodHelper implements IModHelper { } } - public static void bloodMagicInstalled() { - isBloodMagicActive = true; - } - public void init() { - getItems(); + if (isActive()) { + getItems(); + } } public void postInit() { - getRecipes(); + if (isActive()) { + getRecipes(); + if (ThaumcraftHelper.isActive()) { + thaumRecipes(); + thaumResearch(); + } + } } public static void getBlocks() {} - public static void getItems() {} + public static void getItems() { + hiveFrameBloodBase = new ItemBloodBaseFrame(); + GameRegistry.registerItem(hiveFrameBloodBase, hiveFrameBloodBase.getUnlocalizedName(), CommonProxy.DOMAIN); + + hiveFrameBlood = new ItemBloodFrame(); + GameRegistry.registerItem(hiveFrameBlood, hiveFrameBlood.getUnlocalizedName(), CommonProxy.DOMAIN); + + hiveFrameFrenzy = new ItemFrenziedFrame(); + GameRegistry.registerItem(hiveFrameFrenzy, hiveFrameFrenzy.getUnlocalizedName(), CommonProxy.DOMAIN); + } public static void getRecipes() { AltarRecipeRegistry.registerAltarRecipe( - new ItemStack(Config.hiveFrameBloodBase), + new ItemStack(hiveFrameBloodBase), new ItemStack(Config.hiveFrameMagic), 1, 5000, @@ -64,24 +88,59 @@ public class BloodHelper implements IModHelper { public static void thaumRecipes() { ThaumcraftHelper.bloodFrame = ThaumcraftApi.addArcaneCraftingRecipe( "MB_BloodFrame", - new ItemStack(Config.hiveFrameBlood), + new ItemStack(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 }); + hiveFrameBloodBase }); ThaumcraftHelper.frenziedFrame = ThaumcraftApi.addArcaneCraftingRecipe( "MB_FrenziedFrame", - new ItemStack(Config.hiveFrameFrenzy), + new ItemStack(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(ConfigItems.itemResource, 1, 1), 'F', hiveFrameBloodBase }); } - public static void doBloodMagicModuleConfigs(Configuration configuration) { - Property p; + public static void thaumResearch() { + if (ThaumcraftHelper.isActive()) { + ThaumcraftHelper.bloodFrame1 = new ResearchPage("bloodFrame.1"); + ThaumcraftHelper.bloodFrame2 = new ResearchPage((IArcaneRecipe) ThaumcraftHelper.bloodFrame); + + ThaumcraftHelper.bloodFramePage = new ResearchItem( + "MB_BloodFrame", + "MAGICBEES", + 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(BloodHelper.hiveFrameBlood)); + + ThaumcraftHelper.frenzyFrame1 = new ResearchPage("frenziedFrame.1"); + ThaumcraftHelper.frenzyFrame2 = new ResearchPage((IArcaneRecipe) ThaumcraftHelper.frenziedFrame); + + ThaumcraftHelper.frenzyFramePage = new ResearchItem( + "MB_FrenziedFrame", + "MAGICBEES", + 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(BloodHelper.hiveFrameFrenzy)); + + ThaumcraftHelper.bloodFramePage.setPages(ThaumcraftHelper.bloodFrame1, ThaumcraftHelper.bloodFrame2); + ThaumcraftHelper.bloodFramePage.setParents("MB_FrameMagic"); + + ThaumcraftHelper.frenzyFramePage.setPages(ThaumcraftHelper.frenzyFrame1, ThaumcraftHelper.frenzyFrame2); + ThaumcraftHelper.frenzyFramePage.setParents("MB_FrameMagic"); + + ResearchCategories.addResearch(ThaumcraftHelper.bloodFramePage); + ResearchCategories.addResearch(ThaumcraftHelper.frenzyFramePage); + } } } diff --git a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java index d398769..5c9c7bf 100644 --- a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java +++ b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java @@ -40,6 +40,5 @@ public class ModHelperManager { 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 0f83d4d..abf9dba 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -442,10 +442,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 (Config.bloodMagicActive) { - BloodHelper.thaumRecipes(); - } } private static void setupResearch() { @@ -690,42 +686,6 @@ public class ThaumcraftHelper implements IModHelper { new ResearchPage((IArcaneRecipe) visAuraProvider)) .setParentsHidden("VISPOWER").registerResearchItem(); - if (Config.bloodMagicActive) { - 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) { From b0b38a472a0296572f1d388babd35a61e5ef0c51 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 18:31:27 -0400 Subject: [PATCH 62/70] small update to BloodBase --- src/main/java/magicbees/main/Config.java | 4 +--- src/main/java/magicbees/main/utils/compat/BloodHelper.java | 1 - .../main/utils/compat/bloodmagic/ItemBloodBaseFrame.java | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index b96aeba..90e1e17 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -483,9 +483,7 @@ public class Config { voidGrafter = new ItemVoidGrafter(); GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); - if (BloodHelper.isActive()) { - 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 c0d6b58..e7087e7 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -3,7 +3,6 @@ package magicbees.main.utils.compat; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import WayofTime.alchemicalWizardry.*; import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; import cpw.mods.fml.common.Loader; diff --git a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java index d6b69b9..709ef14 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java @@ -17,7 +17,7 @@ import magicbees.main.utils.TabMagicBees; public class ItemBloodBaseFrame extends EnergyItems implements IHiveFrame { - private final IBeeModifier beeModifier = new BloodFrameBeeModifier(); + private final IBeeModifier beeModifier = new BloodFrameBaseBeeModifier(); private EntityPlayer owner = null; public ItemBloodBaseFrame() { @@ -29,7 +29,7 @@ public class ItemBloodBaseFrame extends EnergyItems implements IHiveFrame { this.setUnlocalizedName("bloodSoakedFrame"); } - private static class BloodFrameBeeModifier implements IBeeModifier { + private static class BloodFrameBaseBeeModifier implements IBeeModifier { @Override public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { From 1cbe881ae39b8c900ef2f02ccc414620f1b749b7 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 18:49:47 -0400 Subject: [PATCH 63/70] firenoo fix --- src/main/java/magicbees/main/Config.java | 4 ---- src/main/java/magicbees/main/utils/compat/BloodHelper.java | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 90e1e17..f277a69 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -53,7 +53,6 @@ import magicbees.item.types.WaxType; import magicbees.main.utils.LocalizationManager; import magicbees.main.utils.LogHelper; import magicbees.main.utils.VersionInfo; -import magicbees.main.utils.compat.BloodHelper; import magicbees.main.utils.compat.BotaniaHelper; import magicbees.main.utils.compat.ThaumcraftHelper; import magicbees.storage.BackpackDefinition; @@ -482,9 +481,6 @@ public class Config { voidGrafter = new ItemVoidGrafter(); GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); - - - } } diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index e7087e7..e1d4658 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -7,8 +7,6 @@ import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; -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; @@ -29,8 +27,6 @@ public class BloodHelper implements IModHelper { public static Item hiveFrameFrenzy; public static Item hiveFrameBloodBase; - @SideOnly(Side.CLIENT) - private static boolean isBloodMagicActive = false; public static final String Name = "AWWayofTime"; From 966e4ba2f2c8daa3062dfd606b689c17d0406bde Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 19:34:52 -0400 Subject: [PATCH 64/70] WE'VE FINALLY FIXED IT 100% @kuba6000 @firenoo holy christ guys, we've actually finally fixed this piece of crap, it took 2 grueling days, but we actually fixed the thing. --- src/main/java/magicbees/main/utils/compat/BloodHelper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index e1d4658..2b879a1 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import magicbees.main.CommonProxy; import magicbees.main.Config; @@ -35,7 +36,7 @@ public class BloodHelper implements IModHelper { } public void preInit() { - if (Loader.isModLoaded(Name) && Config.bloodMagicActive) { + if (Loader.isModLoaded(Name)) { isBloodMagicActive = true; } } @@ -58,6 +59,7 @@ public class BloodHelper implements IModHelper { public static void getBlocks() {} + @Optional.Method(modid = Name) public static void getItems() { hiveFrameBloodBase = new ItemBloodBaseFrame(); GameRegistry.registerItem(hiveFrameBloodBase, hiveFrameBloodBase.getUnlocalizedName(), CommonProxy.DOMAIN); From 5dfa179c87a4c65342719754995af68ad60b9bf5 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 22:01:36 -0400 Subject: [PATCH 65/70] Final Pull on this PR There of course will need to be further balancing in the future, but I have handled this PR to the absolute best of my ability, and as I have little to no experience with BM within GTNH as a whole, I have no true ability to balance the passive LP cost by myself, as such I think we should let this out as it is, and balance as we get responses out in the wild. --- .../main/utils/compat/bloodmagic/ItemBloodBaseFrame.java | 4 +++- .../main/utils/compat/bloodmagic/ItemBloodFrame.java | 4 +++- .../main/utils/compat/bloodmagic/ItemFrenziedFrame.java | 4 +++- src/main/resources/assets/magicbees/lang/en_US.lang | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java index 709ef14..84077c1 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java @@ -19,12 +19,13 @@ public class ItemBloodBaseFrame extends EnergyItems implements IHiveFrame { private final IBeeModifier beeModifier = new BloodFrameBaseBeeModifier(); private EntityPlayer owner = null; + int energyUsed = 1000; public ItemBloodBaseFrame() { super(); this.maxStackSize = 1; this.setMaxDamage(1); - setEnergyUsed(1000); + setEnergyUsed(energyUsed); setCreativeTab(TabMagicBees.tabMagicBees); this.setUnlocalizedName("bloodSoakedFrame"); } @@ -85,6 +86,7 @@ public class ItemBloodBaseFrame extends EnergyItems implements IHiveFrame { @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("You feel gross touching this")); + par3List.add(StatCollector.translateToLocal("Uses " + String.valueOf(energyUsed) + " LP per cycle")); if (!(par1ItemStack.getTagCompound() == null)) { par3List.add( 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..b96353b 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java @@ -19,12 +19,13 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame { private final IBeeModifier beeModifier = new BloodFrameBeeModifier(); private EntityPlayer owner = null; + int energyUsed = 1000; public ItemBloodFrame() { super(); this.maxStackSize = 1; this.setMaxDamage(1); - setEnergyUsed(1000); + setEnergyUsed(energyUsed); setCreativeTab(TabMagicBees.tabMagicBees); this.setUnlocalizedName("bloodFrame"); } @@ -85,6 +86,7 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame { @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.bloodframe.desc")); + par3List.add(StatCollector.translateToLocal("Uses " + String.valueOf(energyUsed) + " LP per cycle")); if (!(par1ItemStack.getTagCompound() == null)) { par3List.add( 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..44fc649 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java @@ -19,12 +19,13 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame { private final IBeeModifier beeModifier = new FrenziedFrameBeeModifier(); private EntityPlayer owner = null; + int energyUsed = 1000; public ItemFrenziedFrame() { super(); this.maxStackSize = 1; this.setMaxDamage(1); - setEnergyUsed(1000); + setEnergyUsed(energyUsed); setCreativeTab(TabMagicBees.tabMagicBees); this.setUnlocalizedName("frenziedFrame"); } @@ -85,6 +86,7 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame { @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("MAY CHAOS TAKE THE WORLD")); + par3List.add(StatCollector.translateToLocal("Uses " + String.valueOf(energyUsed) + " LP per cycle")); if (!(par1ItemStack.getTagCompound() == null)) { par3List.add( diff --git a/src/main/resources/assets/magicbees/lang/en_US.lang b/src/main/resources/assets/magicbees/lang/en_US.lang index a1e93ca..69ee2b1 100644 --- a/src/main/resources/assets/magicbees/lang/en_US.lang +++ b/src/main/resources/assets/magicbees/lang/en_US.lang @@ -236,7 +236,7 @@ tc.research_text.MB_BloodFrame=Welcome, honored guest. To the birthplace of our 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! +bloodFrame.1=You feel a shiver pulse through your very soul as you hold this frame. You feel... horrified.
You aren't quite sure what you created while you were entranced in a blood-enraged frenzy, but you can only watch in abject terror as your bees slowly crumble before your very eyes, only to be replaced in a flash by grotesque simulacrum.
You almost swear you can see it... beating? As if somehow it were alive?
But... surely not, that would be madness after all... #Species From f85900d9a8ce0ebee17bb29c14c80e0fd57ca855 Mon Sep 17 00:00:00 2001 From: GitHub GTNH Actions <> Date: Sun, 30 Apr 2023 10:10:49 +0000 Subject: [PATCH 66/70] spotlessApply --- .../magicbees/client/gui/ContainerEffectRing.java | 3 +-- .../java/magicbees/client/gui/GUIEffectRing.java | 5 ++--- .../java/magicbees/client/gui/GUIHandler.java | 4 +--- src/main/java/magicbees/item/ItemBeeRing.java | 15 +++++++-------- .../java/magicbees/tileentity/RingHousing.java | 5 ++--- 5 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/main/java/magicbees/client/gui/ContainerEffectRing.java b/src/main/java/magicbees/client/gui/ContainerEffectRing.java index 56030ec..84d6d41 100644 --- a/src/main/java/magicbees/client/gui/ContainerEffectRing.java +++ b/src/main/java/magicbees/client/gui/ContainerEffectRing.java @@ -1,11 +1,10 @@ package magicbees.client.gui; -import magicbees.itemInventories.InventoryBeeRing; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.common.registry.GameRegistry; import forestry.core.gui.ContainerItemInventory; +import magicbees.itemInventories.InventoryBeeRing; public class ContainerEffectRing extends ContainerItemInventory { diff --git a/src/main/java/magicbees/client/gui/GUIEffectRing.java b/src/main/java/magicbees/client/gui/GUIEffectRing.java index 02ea052..5e4fa3c 100644 --- a/src/main/java/magicbees/client/gui/GUIEffectRing.java +++ b/src/main/java/magicbees/client/gui/GUIEffectRing.java @@ -1,8 +1,5 @@ package magicbees.client.gui; -import magicbees.itemInventories.InventoryBeeRing; -import magicbees.main.CommonProxy; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; @@ -10,6 +7,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import forestry.core.gui.GuiForestry; +import magicbees.itemInventories.InventoryBeeRing; +import magicbees.main.CommonProxy; public class GUIEffectRing extends GuiForestry { diff --git a/src/main/java/magicbees/client/gui/GUIHandler.java b/src/main/java/magicbees/client/gui/GUIHandler.java index 6513ecc..3a75411 100644 --- a/src/main/java/magicbees/client/gui/GUIHandler.java +++ b/src/main/java/magicbees/client/gui/GUIHandler.java @@ -1,12 +1,10 @@ package magicbees.client.gui; -import magicbees.itemInventories.InventoryBeeRing; -import magicbees.tileentity.TileEntityEffectJar; -import magicbees.tileentity.TileEntityMagicApiary; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import cpw.mods.fml.common.network.IGuiHandler; +import magicbees.itemInventories.InventoryBeeRing; import magicbees.tileentity.TileEntityEffectJar; import magicbees.tileentity.TileEntityMagicApiary; diff --git a/src/main/java/magicbees/item/ItemBeeRing.java b/src/main/java/magicbees/item/ItemBeeRing.java index 46bdd16..af8b599 100644 --- a/src/main/java/magicbees/item/ItemBeeRing.java +++ b/src/main/java/magicbees/item/ItemBeeRing.java @@ -4,14 +4,6 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import magicbees.bees.BeeManager; -import magicbees.client.gui.UIScreens; -import magicbees.itemInventories.InventoryBeeRing; -import magicbees.main.CommonProxy; -import magicbees.main.MagicBees; -import magicbees.main.utils.TabMagicBees; -import magicbees.tileentity.RingHousing; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -25,6 +17,13 @@ import baubles.common.lib.PlayerHandler; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.apiculture.IBee; import forestry.api.genetics.IEffectData; +import magicbees.bees.BeeManager; +import magicbees.client.gui.UIScreens; +import magicbees.itemInventories.InventoryBeeRing; +import magicbees.main.CommonProxy; +import magicbees.main.MagicBees; +import magicbees.main.utils.TabMagicBees; +import magicbees.tileentity.RingHousing; public class ItemBeeRing extends Item implements IBauble { diff --git a/src/main/java/magicbees/tileentity/RingHousing.java b/src/main/java/magicbees/tileentity/RingHousing.java index a738589..75c5751 100644 --- a/src/main/java/magicbees/tileentity/RingHousing.java +++ b/src/main/java/magicbees/tileentity/RingHousing.java @@ -4,9 +4,6 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import magicbees.bees.BeeManager; -import magicbees.itemInventories.InventoryBeeRing; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ChunkCoordinates; @@ -22,6 +19,8 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.IErrorLogic; import forestry.api.core.IErrorState; +import magicbees.bees.BeeManager; +import magicbees.itemInventories.InventoryBeeRing; // Class that simulates a BeeHouse using both player data and info from InventoryBeeRing public class RingHousing implements IBeeHousing { From 2870e06387e339282fc1bbd1de32336a70cce04c Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sun, 30 Apr 2023 10:16:06 -0400 Subject: [PATCH 67/70] Actual Final PR of this --- src/main/java/magicbees/main/Config.java | 5 +++-- .../main/utils/compat/bloodmagic/ItemBloodBaseFrame.java | 2 +- .../main/utils/compat/bloodmagic/ItemBloodFrame.java | 2 +- .../main/utils/compat/bloodmagic/ItemFrenziedFrame.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 8e82756..825455b 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -110,7 +110,7 @@ public class Config { public static ItemNugget nuggets; public static ItemMoonDial moonDial; public static ItemMysteriousMagnet magnet; - public static ItemBeeRing beeRing; + // public static Item beeRing; public static Item voidScoop; public static Item voidGrafter; @@ -182,7 +182,8 @@ public class Config { miscResources = new ItemMiscResources(); pollen = new ItemPollen(); moonDial = new ItemMoonDial(); - beeRing = new ItemBeeRing(); + // beeRing = new ItemBeeRing(); + // This is to be set comemented until someone gives it a recipe, it's causing errors. setupJellyBaby(); setupNuggets(); diff --git a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java index 84077c1..c6428f8 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java @@ -88,7 +88,7 @@ public class ItemBloodBaseFrame extends EnergyItems implements IHiveFrame { par3List.add(StatCollector.translateToLocal("You feel gross touching this")); par3List.add(StatCollector.translateToLocal("Uses " + String.valueOf(energyUsed) + " LP per cycle")); - if (!(par1ItemStack.getTagCompound() == null)) { + if (par1ItemStack.hasTagCompound()) { par3List.add( StatCollector.translateToLocal("tooltip.owner.currentowner") + " " + par1ItemStack.getTagCompound().getString("ownerName")); 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 b96353b..9a4b54f 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java @@ -88,7 +88,7 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame { par3List.add(StatCollector.translateToLocal("tooltip.bloodframe.desc")); par3List.add(StatCollector.translateToLocal("Uses " + String.valueOf(energyUsed) + " LP per cycle")); - if (!(par1ItemStack.getTagCompound() == null)) { + if (par1ItemStack.hasTagCompound()) { par3List.add( StatCollector.translateToLocal("tooltip.owner.currentowner") + " " + par1ItemStack.getTagCompound().getString("ownerName")); 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 44fc649..3a50cb7 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java @@ -88,7 +88,7 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame { par3List.add(StatCollector.translateToLocal("MAY CHAOS TAKE THE WORLD")); par3List.add(StatCollector.translateToLocal("Uses " + String.valueOf(energyUsed) + " LP per cycle")); - if (!(par1ItemStack.getTagCompound() == null)) { + if (par1ItemStack.hasTagCompound()) { par3List.add( StatCollector.translateToLocal("tooltip.owner.currentowner") + " " + par1ItemStack.getTagCompound().getString("ownerName")); From b338d9751719cc7684bfc8d303d98033cc825df2 Mon Sep 17 00:00:00 2001 From: Alexander Anishin Date: Sun, 30 Apr 2023 20:10:34 +0300 Subject: [PATCH 68/70] Fixed multipler issue with blood frames --- .../java/magicbees/main/utils/compat/BloodHelper.java | 7 ++++--- .../main/utils/compat/bloodmagic/ItemBloodBaseFrame.java | 8 +++----- .../main/utils/compat/bloodmagic/ItemBloodFrame.java | 8 +++----- .../main/utils/compat/bloodmagic/ItemFrenziedFrame.java | 8 +++----- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index 2b879a1..a4361b8 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -35,18 +35,21 @@ public class BloodHelper implements IModHelper { return isBloodMagicActive; } + @Override public void preInit() { if (Loader.isModLoaded(Name)) { isBloodMagicActive = true; } } + @Override public void init() { if (isActive()) { getItems(); } } + @Override public void postInit() { if (isActive()) { getRecipes(); @@ -57,10 +60,8 @@ public class BloodHelper implements IModHelper { } } - public static void getBlocks() {} - @Optional.Method(modid = Name) - public static void getItems() { + private static void getItems() { hiveFrameBloodBase = new ItemBloodBaseFrame(); GameRegistry.registerItem(hiveFrameBloodBase, hiveFrameBloodBase.getUnlocalizedName(), CommonProxy.DOMAIN); diff --git a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java index c6428f8..cce4bf0 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java @@ -8,6 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -18,7 +19,6 @@ import magicbees.main.utils.TabMagicBees; public class ItemBloodBaseFrame extends EnergyItems implements IHiveFrame { private final IBeeModifier beeModifier = new BloodFrameBaseBeeModifier(); - private EntityPlayer owner = null; int energyUsed = 1000; public ItemBloodBaseFrame() { @@ -84,6 +84,7 @@ public class ItemBloodBaseFrame extends EnergyItems implements IHiveFrame { } @Override + @SuppressWarnings({ "unchecked", "rawtypes" }) public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("You feel gross touching this")); par3List.add(StatCollector.translateToLocal("Uses " + String.valueOf(energyUsed) + " LP per cycle")); @@ -106,7 +107,6 @@ public class ItemBloodBaseFrame extends EnergyItems implements IHiveFrame { 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); @@ -120,9 +120,7 @@ public class ItemBloodBaseFrame extends EnergyItems implements IHiveFrame { @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); - } + SoulNetworkHandler.syphonFromNetwork(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/ItemBloodFrame.java b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java index 9a4b54f..61879a0 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java @@ -8,6 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -18,7 +19,6 @@ import magicbees.main.utils.TabMagicBees; public class ItemBloodFrame extends EnergyItems implements IHiveFrame { private final IBeeModifier beeModifier = new BloodFrameBeeModifier(); - private EntityPlayer owner = null; int energyUsed = 1000; public ItemBloodFrame() { @@ -84,6 +84,7 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame { } @Override + @SuppressWarnings({ "unchecked", "rawtypes" }) public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.bloodframe.desc")); par3List.add(StatCollector.translateToLocal("Uses " + String.valueOf(energyUsed) + " LP per cycle")); @@ -106,7 +107,6 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame { 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); @@ -120,9 +120,7 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame { @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); - } + SoulNetworkHandler.syphonFromNetwork(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 3a50cb7..fafb8fe 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java @@ -8,6 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -18,7 +19,6 @@ import magicbees.main.utils.TabMagicBees; public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame { private final IBeeModifier beeModifier = new FrenziedFrameBeeModifier(); - private EntityPlayer owner = null; int energyUsed = 1000; public ItemFrenziedFrame() { @@ -84,6 +84,7 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame { } @Override + @SuppressWarnings({ "unchecked", "rawtypes" }) public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("MAY CHAOS TAKE THE WORLD")); par3List.add(StatCollector.translateToLocal("Uses " + String.valueOf(energyUsed) + " LP per cycle")); @@ -105,7 +106,6 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame { 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); @@ -119,9 +119,7 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame { @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); - } + SoulNetworkHandler.syphonFromNetwork(frame, getEnergyUsed() * wear); } else { frame.setItemDamage(frame.getItemDamage() + wear); if (frame.getItemDamage() >= frame.getMaxDamage()) { From 614acf5114caa7d287d5095992d2e5191dfaf530 Mon Sep 17 00:00:00 2001 From: Alexander Anishin Date: Sun, 30 Apr 2023 20:13:07 +0300 Subject: [PATCH 69/70] Moved ring code to optional module --- .../client/gui/ContainerEffectRing.java | 2 +- .../magicbees/client/gui/GUIEffectRing.java | 2 +- .../java/magicbees/client/gui/GUIHandler.java | 2 +- src/main/java/magicbees/main/Config.java | 3 -- .../main/utils/compat/BaublesHelper.java | 41 +++++++++++++++++++ .../main/utils/compat/ModHelperManager.java | 1 + .../compat/baubles}/InventoryBeeRing.java | 2 +- .../utils/compat/baubles}/ItemBeeRing.java | 32 +++++---------- .../utils/compat/baubles}/RingHousing.java | 3 +- 9 files changed, 58 insertions(+), 30 deletions(-) create mode 100644 src/main/java/magicbees/main/utils/compat/BaublesHelper.java rename src/main/java/magicbees/{itemInventories => main/utils/compat/baubles}/InventoryBeeRing.java (98%) rename src/main/java/magicbees/{item => main/utils/compat/baubles}/ItemBeeRing.java (87%) rename src/main/java/magicbees/{tileentity => main/utils/compat/baubles}/RingHousing.java (98%) diff --git a/src/main/java/magicbees/client/gui/ContainerEffectRing.java b/src/main/java/magicbees/client/gui/ContainerEffectRing.java index 84d6d41..a258f0b 100644 --- a/src/main/java/magicbees/client/gui/ContainerEffectRing.java +++ b/src/main/java/magicbees/client/gui/ContainerEffectRing.java @@ -4,7 +4,7 @@ import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.common.registry.GameRegistry; import forestry.core.gui.ContainerItemInventory; -import magicbees.itemInventories.InventoryBeeRing; +import magicbees.main.utils.compat.baubles.InventoryBeeRing; public class ContainerEffectRing extends ContainerItemInventory { diff --git a/src/main/java/magicbees/client/gui/GUIEffectRing.java b/src/main/java/magicbees/client/gui/GUIEffectRing.java index 5e4fa3c..422e00a 100644 --- a/src/main/java/magicbees/client/gui/GUIEffectRing.java +++ b/src/main/java/magicbees/client/gui/GUIEffectRing.java @@ -7,8 +7,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import forestry.core.gui.GuiForestry; -import magicbees.itemInventories.InventoryBeeRing; import magicbees.main.CommonProxy; +import magicbees.main.utils.compat.baubles.InventoryBeeRing; public class GUIEffectRing extends GuiForestry { diff --git a/src/main/java/magicbees/client/gui/GUIHandler.java b/src/main/java/magicbees/client/gui/GUIHandler.java index 3a75411..83f52cb 100644 --- a/src/main/java/magicbees/client/gui/GUIHandler.java +++ b/src/main/java/magicbees/client/gui/GUIHandler.java @@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import cpw.mods.fml.common.network.IGuiHandler; -import magicbees.itemInventories.InventoryBeeRing; +import magicbees.main.utils.compat.baubles.InventoryBeeRing; import magicbees.tileentity.TileEntityEffectJar; import magicbees.tileentity.TileEntityMagicApiary; diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 825455b..be6e961 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -110,7 +110,6 @@ public class Config { public static ItemNugget nuggets; public static ItemMoonDial moonDial; public static ItemMysteriousMagnet magnet; - // public static Item beeRing; public static Item voidScoop; public static Item voidGrafter; @@ -182,8 +181,6 @@ public class Config { miscResources = new ItemMiscResources(); pollen = new ItemPollen(); moonDial = new ItemMoonDial(); - // beeRing = new ItemBeeRing(); - // This is to be set comemented until someone gives it a recipe, it's causing errors. setupJellyBaby(); setupNuggets(); diff --git a/src/main/java/magicbees/main/utils/compat/BaublesHelper.java b/src/main/java/magicbees/main/utils/compat/BaublesHelper.java new file mode 100644 index 0000000..a41b35f --- /dev/null +++ b/src/main/java/magicbees/main/utils/compat/BaublesHelper.java @@ -0,0 +1,41 @@ +package magicbees.main.utils.compat; + +import net.minecraft.item.Item; + +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.Optional; +import magicbees.main.utils.compat.baubles.ItemBeeRing; + +public class BaublesHelper implements IModHelper { + + private static final String Name = "Baubles"; + private static boolean isModActive = false; + + public static Item beeRing; + + public static boolean isActive() { + return BaublesHelper.isModActive; + } + + @Override + public void preInit() { + if (Loader.isModLoaded(Name)) { + isModActive = true; + } + } + + @Override + public void init() { + if (isActive()) { + getItems(); + } + } + + @Override + public void postInit() {} + + @Optional.Method(modid = Name) + private static void getItems() { + beeRing = new ItemBeeRing(); + } +} diff --git a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java index 5c9c7bf..7920acd 100644 --- a/src/main/java/magicbees/main/utils/compat/ModHelperManager.java +++ b/src/main/java/magicbees/main/utils/compat/ModHelperManager.java @@ -39,6 +39,7 @@ public class ModHelperManager { helpers.add(new RedstoneArsenalHelper()); helpers.add(new BotaniaHelper()); helpers.add(new AppliedEnergisticsHelper()); + helpers.add(new BaublesHelper()); helpers.add(new BloodHelper()); } } diff --git a/src/main/java/magicbees/itemInventories/InventoryBeeRing.java b/src/main/java/magicbees/main/utils/compat/baubles/InventoryBeeRing.java similarity index 98% rename from src/main/java/magicbees/itemInventories/InventoryBeeRing.java rename to src/main/java/magicbees/main/utils/compat/baubles/InventoryBeeRing.java index 7a9c9bf..fa7608f 100644 --- a/src/main/java/magicbees/itemInventories/InventoryBeeRing.java +++ b/src/main/java/magicbees/main/utils/compat/baubles/InventoryBeeRing.java @@ -1,4 +1,4 @@ -package magicbees.itemInventories; +package magicbees.main.utils.compat.baubles; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/magicbees/item/ItemBeeRing.java b/src/main/java/magicbees/main/utils/compat/baubles/ItemBeeRing.java similarity index 87% rename from src/main/java/magicbees/item/ItemBeeRing.java rename to src/main/java/magicbees/main/utils/compat/baubles/ItemBeeRing.java index af8b599..91c8493 100644 --- a/src/main/java/magicbees/item/ItemBeeRing.java +++ b/src/main/java/magicbees/main/utils/compat/baubles/ItemBeeRing.java @@ -1,4 +1,4 @@ -package magicbees.item; +package magicbees.main.utils.compat.baubles; import java.util.HashMap; import java.util.Map; @@ -19,11 +19,9 @@ import forestry.api.apiculture.IBee; import forestry.api.genetics.IEffectData; import magicbees.bees.BeeManager; import magicbees.client.gui.UIScreens; -import magicbees.itemInventories.InventoryBeeRing; import magicbees.main.CommonProxy; import magicbees.main.MagicBees; import magicbees.main.utils.TabMagicBees; -import magicbees.tileentity.RingHousing; public class ItemBeeRing extends Item implements IBauble { @@ -76,19 +74,17 @@ public class ItemBeeRing extends Item implements IBauble { @Override public void onWornTick(ItemStack itemStack, EntityLivingBase entityLivingBase) { - if (entityLivingBase.worldObj.getWorldTime() % 20 == 0) { - if (!(entityLivingBase instanceof EntityPlayer)) { - return; - } + if (!(entityLivingBase instanceof EntityPlayer)) { + return; + } - EntityPlayer player = (EntityPlayer) entityLivingBase; - InventoryBeeRing inventoryBeeRing = new InventoryBeeRing(itemStack, player); + EntityPlayer player = (EntityPlayer) entityLivingBase; + InventoryBeeRing inventoryBeeRing = new InventoryBeeRing(itemStack, player); - if (inventoryBeeRing.hasQueen()) { - tickQueen(player, inventoryBeeRing); - } else if (inventoryBeeRing.hasDrone()) { - createQueenFromDrone(inventoryBeeRing); - } + if (inventoryBeeRing.hasQueen()) { + tickQueen(player, inventoryBeeRing); + } else if (inventoryBeeRing.hasDrone()) { + createQueenFromDrone(inventoryBeeRing); } } @@ -125,12 +121,6 @@ public class ItemBeeRing extends Item implements IBauble { int index = inventoryBeeRing.getRingSlotIndex(); RingHousing housingLogic = new RingHousing(player, inventoryBeeRing); effects[index] = queen.doEffect(effects[index], housingLogic); - - try { - effects[index][0].setInteger(0, effects[index][0].getInteger(index) + 20); - effects[index][1].setInteger(0, effects[index][1].getInteger(index) + 20); - } catch (Exception ignored) {} - if (player.worldObj.isRemote && player.worldObj.getWorldTime() % 5 == 0) { effects[index] = queen.doFX(effects[index], housingLogic); } @@ -150,7 +140,7 @@ public class ItemBeeRing extends Item implements IBauble { inventoryBeeRing.setQueen(queenStack); } } else { - inventoryBeeRing.setThrottle(throttle + 20); + inventoryBeeRing.setThrottle(throttle + 1); } } diff --git a/src/main/java/magicbees/tileentity/RingHousing.java b/src/main/java/magicbees/main/utils/compat/baubles/RingHousing.java similarity index 98% rename from src/main/java/magicbees/tileentity/RingHousing.java rename to src/main/java/magicbees/main/utils/compat/baubles/RingHousing.java index 75c5751..10f6663 100644 --- a/src/main/java/magicbees/tileentity/RingHousing.java +++ b/src/main/java/magicbees/main/utils/compat/baubles/RingHousing.java @@ -1,4 +1,4 @@ -package magicbees.tileentity; +package magicbees.main.utils.compat.baubles; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -20,7 +20,6 @@ import forestry.api.core.EnumTemperature; import forestry.api.core.IErrorLogic; import forestry.api.core.IErrorState; import magicbees.bees.BeeManager; -import magicbees.itemInventories.InventoryBeeRing; // Class that simulates a BeeHouse using both player data and info from InventoryBeeRing public class RingHousing implements IBeeHousing { From 9f17d8ceff563056a8821e51ae4c5682a4206ea5 Mon Sep 17 00:00:00 2001 From: Alexander Anishin Date: Sun, 30 Apr 2023 20:36:44 +0300 Subject: [PATCH 70/70] Added configuration for new modules --- src/main/java/magicbees/main/Config.java | 4 ++++ src/main/java/magicbees/main/utils/VersionInfo.java | 2 +- src/main/java/magicbees/main/utils/compat/BaublesHelper.java | 3 ++- src/main/java/magicbees/main/utils/compat/BloodHelper.java | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index be6e961..840e258 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -74,6 +74,7 @@ public class Config { public static int thaumcraftNodeMaxSize; public static boolean arsMagicaActive; + public static boolean baublesActive; public static boolean bloodMagicActive; public static boolean equivalentExchangeActive; public static boolean extraBeesActive; @@ -230,6 +231,9 @@ public class Config { p = configuration.get(CATEGORY_MODULES, "ArsMagica", true); arsMagicaActive = p.getBoolean(); + p = configuration.get(CATEGORY_MODULES, "Baubles", true); + baublesActive = p.getBoolean(); + p = configuration.get(CATEGORY_MODULES, "BloodMagic", true); bloodMagicActive = p.getBoolean(); diff --git a/src/main/java/magicbees/main/utils/VersionInfo.java b/src/main/java/magicbees/main/utils/VersionInfo.java index 8b41142..92ce70c 100644 --- a/src/main/java/magicbees/main/utils/VersionInfo.java +++ b/src/main/java/magicbees/main/utils/VersionInfo.java @@ -11,5 +11,5 @@ public class VersionInfo { public static final String Version = "GRADLETOKEN_VERSION"; public static final String GUI_FACTORY_CLASS = "magicbees.client.gui.GuiFactory"; public static final String Logo = "/gfx/magicbees/logo.png"; - public static final String Depends = "required-after:Forestry@[4.2.5,);after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft;after:ThermalFoundation;after:ThermalExpansion;after:RedstoneArsenal;after:AWWayofTime;after:Botania;after:appliedenergistics2"; + public static final String Depends = "required-after:Forestry@[4.2.5,);after:Baubles;after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft;after:ThermalFoundation;after:ThermalExpansion;after:RedstoneArsenal;after:AWWayofTime;after:Botania;after:appliedenergistics2"; } diff --git a/src/main/java/magicbees/main/utils/compat/BaublesHelper.java b/src/main/java/magicbees/main/utils/compat/BaublesHelper.java index a41b35f..6405ee6 100644 --- a/src/main/java/magicbees/main/utils/compat/BaublesHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BaublesHelper.java @@ -4,6 +4,7 @@ import net.minecraft.item.Item; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Optional; +import magicbees.main.Config; import magicbees.main.utils.compat.baubles.ItemBeeRing; public class BaublesHelper implements IModHelper { @@ -19,7 +20,7 @@ public class BaublesHelper implements IModHelper { @Override public void preInit() { - if (Loader.isModLoaded(Name)) { + if (Loader.isModLoaded(Name) && Config.baublesActive) { isModActive = true; } } diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index a4361b8..b30c508 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -37,7 +37,7 @@ public class BloodHelper implements IModHelper { @Override public void preInit() { - if (Loader.isModLoaded(Name)) { + if (Loader.isModLoaded(Name) && Config.bloodMagicActive) { isBloodMagicActive = true; } }