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 {