From ddaadfbe5275bd513903e02d0bf24677f396c843 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 5 Feb 2018 17:04:38 -0800 Subject: [PATCH] Swap the API packages The new one is now built for the api jar and the old one is now internal. It will slowly be moved around to sane places within the internal code. Most of the features provided in the old "api" are addon specific features which will generally rely on the main jar anyways. The new API will be specific to compatibility features, such as blacklists, recipes, and value modification. --- build.gradle | 1 + .../java/WayofTime/bloodmagic/BloodMagic.java | 12 ++++----- .../AlchemyArrayEffectAttractor.java | 2 +- .../AlchemyArrayEffectBinding.java | 4 +-- .../AlchemyArrayEffectBounce.java | 4 +-- .../AlchemyArrayEffectMovement.java | 4 +-- .../alchemyArray/AlchemyArrayEffectSigil.java | 4 +-- .../AlchemyArrayEffectSkeletonTurret.java | 2 +- .../AlchemyArrayEffectUpdraft.java | 4 +-- .../bloodmagic/altar/BloodAltar.java | 22 +++++++--------- .../{apiv2 => api}/BloodMagicPlugin.java | 2 +- .../{apiv2 => api}/IBloodMagicAPI.java | 2 +- .../{apiv2 => api}/IBloodMagicBlacklist.java | 2 +- .../{apiv2 => api}/IBloodMagicPlugin.java | 2 +- .../{api_impl => api/impl}/BloodMagicAPI.java | 6 ++--- .../impl}/BloodMagicBlacklist.java | 4 +-- .../impl}/BloodMagicCorePlugin.java | 10 +++---- .../bloodmagic/api/package-info.java | 2 +- .../{api => apibutnotreally}/BlockStack.java | 2 +- .../BloodMagicAPI.java | 4 +-- .../{api => apibutnotreally}/Constants.java | 2 +- .../DamageSourceBloodMagic.java | 2 +- .../ItemStackWrapper.java | 2 +- .../alchemyCrafting/AlchemyArrayEffect.java | 4 +-- .../AlchemyArrayEffectCrafting.java | 2 +- .../AlchemyCircleRenderer.java | 2 +- .../altar/AltarComponent.java | 2 +- .../altar/AltarUpgrade.java | 2 +- .../altar/EnumAltarComponent.java | 2 +- .../altar/EnumAltarTier.java | 2 +- .../altar/IAltarComponent.java | 2 +- .../altar/IAltarManipulator.java | 2 +- .../altar/IBloodAltar.java | 2 +- .../compress/CompressionHandler.java | 2 +- .../compress/CompressionRegistry.java | 2 +- .../event/AddToNetworkEvent.java | 2 +- .../event/AltarCraftedEvent.java | 4 +-- .../event/BoundToolEvent.java | 2 +- .../event/ItemBindEvent.java | 4 +-- .../event/RitualEvent.java | 10 +++---- .../event/SacrificeKnifeUsedEvent.java | 2 +- .../event/SoulNetworkEvent.java | 4 +-- .../event/TeleposeEvent.java | 2 +- .../iface/IActivatable.java | 2 +- .../iface/IAlchemyArray.java | 2 +- .../iface/IAltarReader.java | 2 +- .../iface/IBindable.java | 2 +- .../iface/ICustomAlchemyConsumable.java | 2 +- .../iface/IDemonWillViewer.java | 2 +- .../iface/IDocumentedBlock.java | 2 +- .../iface/IHarvestHandler.java | 6 ++--- .../iface/IItemLPContainer.java | 2 +- .../iface/IMultiWillTool.java | 4 +-- .../iface/INodeRenderer.java | 2 +- .../iface/IPurificationAsh.java | 2 +- .../iface/ISentientSwordEffectProvider.java | 4 +-- .../iface/ISentientTool.java | 2 +- .../iface/ISigil.java | 4 +-- .../iface/IUpgradeTrainer.java | 2 +- .../impl/ItemBindable.java | 6 ++--- .../impl/ItemSigil.java | 8 +++--- .../impl/ItemSigilToggleable.java | 14 +++++----- .../incense/EnumTranquilityType.java | 2 +- .../incense/IIncensePath.java | 2 +- .../incense/ITranquilityHandler.java | 2 +- .../incense/IncenseTranquilityRegistry.java | 2 +- .../incense/TranquilityStack.java | 2 +- .../livingArmour/ILivingArmour.java | 2 +- .../livingArmour/LivingArmourHandler.java | 4 +-- .../livingArmour/LivingArmourUpgrade.java | 2 +- .../livingArmour/StatTracker.java | 2 +- .../orb/BloodOrb.java | 2 +- .../orb/IBloodOrb.java | 2 +- .../apibutnotreally/package-info.java | 6 +++++ .../recipe/AlchemyTableCustomRecipe.java | 4 +-- .../recipe/AlchemyTableRecipe.java | 2 +- .../recipe/LivingArmourDowngradeRecipe.java | 4 +-- .../recipe/TartaricForgeRecipe.java | 2 +- .../registry/AlchemyArrayRecipeRegistry.java | 10 +++---- .../registry/AlchemyTableRecipeRegistry.java | 4 +-- .../registry/AltarRecipeRegistry.java | 8 +++--- .../registry/HarvestRegistry.java | 6 ++--- .../registry/ImperfectRitualRegistry.java | 8 +++--- .../LivingArmourDowngradeRecipeRegistry.java | 6 ++--- .../registry/OrbRegistry.java | 6 ++--- .../registry/RitualRegistry.java | 6 ++--- .../registry/TartaricForgeRecipeRegistry.java | 4 +-- .../ritual/AreaDescriptor.java | 4 +-- .../ritual/CapabilityRuneType.java | 2 +- .../ritual/EnumRitualReaderState.java | 2 +- .../ritual/EnumRuneType.java | 2 +- .../ritual/IMasterRitualStone.java | 6 ++--- .../ritual/IRitualStone.java | 2 +- .../ritual/Ritual.java | 8 +++--- .../ritual/RitualComponent.java | 2 +- .../ritual/RitualRenderer.java | 2 +- .../imperfect/IImperfectRitualStone.java | 2 +- .../ritual/imperfect/ImperfectRitual.java | 6 ++--- .../ritual/imperfect/package-info.java | 2 +- .../saving/BMWorldSavedData.java | 4 +-- .../saving/SoulNetwork.java | 10 +++---- .../soul/DemonWillHolder.java | 2 +- .../soul/EnumDemonWillType.java | 2 +- .../soul/IDemonWill.java | 2 +- .../soul/IDemonWillConduit.java | 2 +- .../soul/IDemonWillGem.java | 2 +- .../soul/IDemonWillWeapon.java | 2 +- .../soul/IDiscreteDemonWill.java | 2 +- .../soul/PlayerDemonWillHandler.java | 4 +-- .../teleport/ITeleport.java | 2 +- .../teleport/PortalLocation.java | 4 +-- .../teleport/Teleport.java | 2 +- .../teleport/TeleportQueue.java | 2 +- .../teleport/TeleporterBloodMagic.java | 2 +- .../util/helper/BindableHelper.java | 8 +++--- .../util/helper/IncenseHelper.java | 4 +-- .../util/helper/ItemHelper.java | 12 ++++----- .../util/helper/LogHelper.java | 4 +-- .../util/helper/NBTHelper.java | 2 +- .../util/helper/NetworkHelper.java | 16 ++++++------ .../util/helper/PlayerHelper.java | 4 +-- .../util/helper/PlayerSacrificeHelper.java | 6 ++--- .../util/helper/PurificationHelper.java | 4 +-- .../util/helper/RitualHelper.java | 12 ++++----- .../bloodmagic/block/BlockAlchemyTable.java | 2 +- .../bloodmagic/block/BlockAltar.java | 20 +++++++------- .../bloodmagic/block/BlockDemonCrucible.java | 4 +-- .../bloodmagic/block/BlockDemonCrystal.java | 4 +-- .../block/BlockDimensionalPortal.java | 6 ++--- .../block/BlockInputRoutingNode.java | 2 +- .../bloodmagic/block/BlockLifeEssence.java | 2 +- .../bloodmagic/block/BlockMimic.java | 4 +-- .../block/BlockOutputRoutingNode.java | 2 +- .../WayofTime/bloodmagic/block/BlockPath.java | 2 +- .../block/BlockRitualController.java | 14 +++++----- .../bloodmagic/block/BlockRitualStone.java | 4 +-- .../bloodmagic/block/BlockSoulForge.java | 2 +- .../bloodmagic/block/BlockTeleposer.java | 2 +- .../block/enums/EnumSubWillType.java | 2 +- .../bloodmagic/client/gui/GuiHandler.java | 2 +- .../client/hud/HUDElementDemonWillAura.java | 2 +- .../mesh/CustomMeshDefinitionActivatable.java | 2 +- .../mesh/CustomMeshDefinitionMultiWill.java | 4 +-- .../mesh/CustomMeshDefinitionWillGem.java | 2 +- .../AttractorAlchemyCircleRenderer.java | 2 +- .../BindingAlchemyCircleRenderer.java | 2 +- .../DualAlchemyCircleRenderer.java | 2 +- .../SingleAlchemyCircleRenderer.java | 2 +- .../StaticAlchemyCircleRenderer.java | 2 +- .../render/block/RenderAlchemyArray.java | 4 +-- .../client/render/block/RenderAltar.java | 4 +-- .../render/block/RenderItemRoutingNode.java | 2 +- .../command/sub/SubCommandBind.java | 8 +++--- .../command/sub/SubCommandNetwork.java | 4 +-- .../bloodmagic/command/sub/SubCommandOrb.java | 6 ++--- .../bloodmagic/compat/guideapi/BookUtils.java | 4 +-- .../compat/guideapi/book/CategoryAlchemy.java | 2 +- .../guideapi/book/CategoryArchitect.java | 6 ++--- .../compat/guideapi/book/CategoryDemon.java | 2 +- .../compat/guideapi/book/CategoryRitual.java | 4 +-- .../compat/guideapi/book/CategorySpell.java | 2 +- .../compat/guideapi/page/PageAltarRecipe.java | 4 +-- .../page/PageTartaricForgeRecipe.java | 4 +-- .../compat/jei/BloodMagicPlugin.java | 6 ++--- .../AlchemyArrayCraftingCategory.java | 2 +- .../AlchemyArrayCraftingRecipeHandler.java | 2 +- .../AlchemyArrayCraftingRecipeMaker.java | 8 +++--- .../AlchemyTableRecipeCategory.java | 4 +-- .../AlchemyTableRecipeHandler.java | 2 +- .../alchemyTable/AlchemyTableRecipeJEI.java | 2 +- .../alchemyTable/AlchemyTableRecipeMaker.java | 4 +-- .../compat/jei/altar/AltarRecipeCategory.java | 2 +- .../compat/jei/altar/AltarRecipeHandler.java | 2 +- .../compat/jei/altar/AltarRecipeJEI.java | 6 +++-- .../compat/jei/altar/AltarRecipeMaker.java | 6 ++--- .../ArmourDowngradeRecipeCategory.java | 2 +- .../ArmourDowngradeRecipeHandler.java | 2 +- .../ArmourDowngradeRecipeJEI.java | 4 +-- .../ArmourDowngradeRecipeMaker.java | 4 +-- .../jei/binding/BindingRecipeCategory.java | 2 +- .../jei/binding/BindingRecipeHandler.java | 2 +- .../jei/binding/BindingRecipeMaker.java | 6 ++--- .../forge/TartaricForgeRecipeCategory.java | 2 +- .../jei/forge/TartaricForgeRecipeHandler.java | 2 +- .../jei/forge/TartaricForgeRecipeJEI.java | 2 +- .../jei/forge/TartaricForgeRecipeMaker.java | 4 +-- .../compat/waila/WailaPluginBloodMagic.java | 2 +- .../provider/DataProviderAlchemyArray.java | 2 +- .../provider/DataProviderBloodAltar.java | 2 +- .../waila/provider/DataProviderBloodTank.java | 2 +- .../DataProviderRitualController.java | 12 ++++----- .../waila/provider/DataProviderTeleposer.java | 2 +- .../compress/AdvancedCompressionHandler.java | 4 +-- .../compress/BaseCompressionHandler.java | 2 +- .../compress/StorageBlockCraftingManager.java | 2 +- .../bloodmagic/core/RegistrarBloodMagic.java | 4 +-- .../core/RegistrarBloodMagicRecipes.java | 2 +- .../core/recipe/IngredientBloodOrb.java | 6 ++--- .../bloodmagic/demonAura/WillChunk.java | 2 +- .../demonAura/WorldDemonWillHandler.java | 6 ++--- .../entity/mob/EntityAspectedDemonBase.java | 4 +-- .../entity/mob/EntityCorruptedChicken.java | 2 +- .../entity/mob/EntityCorruptedSheep.java | 2 +- .../entity/mob/EntityCorruptedSpider.java | 2 +- .../entity/mob/EntitySentientSpecter.java | 4 +-- .../entity/projectile/EntityBloodLight.java | 2 +- .../entity/projectile/EntityMeteor.java | 2 +- .../projectile/EntitySentientArrow.java | 6 ++--- .../bloodmagic/gson/Serializers.java | 2 +- .../incense/TranquilityHandlers.java | 6 ++--- .../inversion/CorruptionHandler.java | 2 +- .../inversion/InversionPillarHandler.java | 2 +- .../bloodmagic/item/ItemAltarMaker.java | 8 +++--- .../bloodmagic/item/ItemBindableBase.java | 4 +-- .../bloodmagic/item/ItemBloodOrb.java | 10 +++---- .../bloodmagic/item/ItemBoundAxe.java | 6 ++--- .../bloodmagic/item/ItemBoundPickaxe.java | 6 ++--- .../bloodmagic/item/ItemBoundShovel.java | 6 ++--- .../bloodmagic/item/ItemBoundSword.java | 12 ++++----- .../bloodmagic/item/ItemBoundTool.java | 16 ++++++------ .../item/ItemDaggerOfSacrifice.java | 8 +++--- .../bloodmagic/item/ItemDemonCrystal.java | 4 +-- .../bloodmagic/item/ItemDemonWillGauge.java | 2 +- .../bloodmagic/item/ItemExperienceBook.java | 2 +- .../bloodmagic/item/ItemInscriptionTool.java | 6 ++--- .../bloodmagic/item/ItemLavaCrystal.java | 4 +-- .../bloodmagic/item/ItemPotionFlask.java | 2 +- .../bloodmagic/item/ItemRitualDiviner.java | 14 +++++----- .../bloodmagic/item/ItemRitualReader.java | 12 ++++----- .../item/ItemSacrificialDagger.java | 12 ++++----- .../bloodmagic/item/ItemSanguineBook.java | 10 +++---- .../item/ItemTelepositionFocus.java | 4 +-- .../bloodmagic/item/ItemUpgradeTome.java | 6 ++--- .../bloodmagic/item/ItemUpgradeTrainer.java | 8 +++--- .../item/alchemy/ItemCuttingFluid.java | 4 +-- .../item/armour/ItemLivingArmour.java | 12 ++++----- .../item/armour/ItemSentientArmour.java | 10 +++---- .../item/block/ItemBlockDemonCrystal.java | 2 +- .../item/gear/ItemPackSacrifice.java | 12 ++++----- .../item/gear/ItemPackSelfSacrifice.java | 14 +++++----- .../item/inventory/ContainerHolding.java | 2 +- .../item/inventory/InventoryHolding.java | 4 +-- .../item/inventory/ItemInventory.java | 4 +-- .../item/routing/ItemNodeRouter.java | 6 ++--- .../bloodmagic/item/sigil/ItemSigilAir.java | 10 +++---- .../bloodmagic/item/sigil/ItemSigilBase.java | 4 +-- .../item/sigil/ItemSigilBloodLight.java | 10 +++---- .../item/sigil/ItemSigilBounce.java | 2 +- .../bloodmagic/item/sigil/ItemSigilClaw.java | 2 +- .../item/sigil/ItemSigilCompression.java | 4 +-- .../item/sigil/ItemSigilDivination.java | 10 +++---- .../sigil/ItemSigilElementalAffinity.java | 2 +- .../item/sigil/ItemSigilEnderSeverance.java | 2 +- .../item/sigil/ItemSigilFastMiner.java | 4 +-- .../item/sigil/ItemSigilFilledHand.java | 2 +- .../bloodmagic/item/sigil/ItemSigilFrost.java | 2 +- .../item/sigil/ItemSigilGreenGrove.java | 4 +-- .../bloodmagic/item/sigil/ItemSigilHaste.java | 2 +- .../item/sigil/ItemSigilHolding.java | 12 ++++----- .../bloodmagic/item/sigil/ItemSigilLava.java | 6 ++--- .../item/sigil/ItemSigilMagnetism.java | 2 +- .../item/sigil/ItemSigilPhantomBridge.java | 2 +- .../bloodmagic/item/sigil/ItemSigilSeer.java | 10 +++---- .../item/sigil/ItemSigilSuppression.java | 2 +- .../item/sigil/ItemSigilTeleposition.java | 10 +++---- .../item/sigil/ItemSigilToggleableBase.java | 5 ++-- .../item/sigil/ItemSigilTransposition.java | 14 +++++----- .../bloodmagic/item/sigil/ItemSigilVoid.java | 6 ++--- .../bloodmagic/item/sigil/ItemSigilWater.java | 6 ++--- .../item/sigil/ItemSigilWhirlwind.java | 2 +- .../bloodmagic/item/soul/ItemMonsterSoul.java | 8 +++--- .../item/soul/ItemSentientArmourGem.java | 4 +-- .../bloodmagic/item/soul/ItemSentientAxe.java | 18 ++++++------- .../bloodmagic/item/soul/ItemSentientBow.java | 12 ++++----- .../item/soul/ItemSentientPickaxe.java | 18 ++++++------- .../item/soul/ItemSentientShovel.java | 18 ++++++------- .../item/soul/ItemSentientSword.java | 18 ++++++------- .../bloodmagic/item/soul/ItemSoulGem.java | 14 +++++----- .../bloodmagic/livingArmour/LivingArmour.java | 10 +++---- .../LivingArmourUpgradeBattleHungry.java | 4 +-- .../LivingArmourUpgradeCrippledArm.java | 4 +-- .../LivingArmourUpgradeDigSlowdown.java | 4 +-- .../LivingArmourUpgradeDisoriented.java | 4 +-- .../LivingArmourUpgradeMeleeDecrease.java | 4 +-- .../LivingArmourUpgradeQuenched.java | 4 +-- .../LivingArmourUpgradeSlippery.java | 4 +-- .../LivingArmourUpgradeSlowHeal.java | 4 +-- .../LivingArmourUpgradeSlowness.java | 4 +-- .../LivingArmourUpgradeStormTrooper.java | 4 +-- .../tracker/StatTrackerArrowProtect.java | 4 +-- .../tracker/StatTrackerArrowShot.java | 4 +-- .../tracker/StatTrackerCriticalStrike.java | 4 +-- .../tracker/StatTrackerDigging.java | 4 +-- .../tracker/StatTrackerExperience.java | 4 +-- .../tracker/StatTrackerFallProtect.java | 4 +-- .../tracker/StatTrackerFireResist.java | 4 +-- .../livingArmour/tracker/StatTrackerFood.java | 4 +-- .../tracker/StatTrackerGraveDigger.java | 4 +-- .../tracker/StatTrackerGrimReaperSprint.java | 4 +-- .../tracker/StatTrackerHealthboost.java | 4 +-- .../livingArmour/tracker/StatTrackerJump.java | 4 +-- .../tracker/StatTrackerMeleeDamage.java | 4 +-- .../tracker/StatTrackerMovement.java | 4 +-- .../tracker/StatTrackerNightSight.java | 4 +-- .../tracker/StatTrackerPhysicalProtect.java | 4 +-- .../tracker/StatTrackerPoison.java | 4 +-- .../tracker/StatTrackerRepairing.java | 4 +-- .../tracker/StatTrackerSelfSacrifice.java | 4 +-- .../tracker/StatTrackerSolarPowered.java | 4 +-- .../tracker/StatTrackerSprintAttack.java | 4 +-- .../tracker/StatTrackerStepAssist.java | 4 +-- .../LivingArmourUpgradeArrowProtect.java | 2 +- .../upgrade/LivingArmourUpgradeArrowShot.java | 4 +-- .../LivingArmourUpgradeCriticalStrike.java | 2 +- .../upgrade/LivingArmourUpgradeDigging.java | 4 +-- .../upgrade/LivingArmourUpgradeElytra.java | 4 +-- .../LivingArmourUpgradeExperience.java | 2 +- .../LivingArmourUpgradeFallProtect.java | 2 +- .../LivingArmourUpgradeFireResist.java | 6 ++--- .../LivingArmourUpgradeGraveDigger.java | 2 +- .../LivingArmourUpgradeGrimReaperSprint.java | 4 +-- .../LivingArmourUpgradeHealthboost.java | 4 +-- .../upgrade/LivingArmourUpgradeJump.java | 4 +-- .../LivingArmourUpgradeKnockbackResist.java | 2 +- .../LivingArmourUpgradeMeleeDamage.java | 4 +-- .../LivingArmourUpgradeNightSight.java | 6 ++--- .../LivingArmourUpgradePhysicalProtect.java | 2 +- .../LivingArmourUpgradePoisonResist.java | 6 ++--- .../upgrade/LivingArmourUpgradeRepairing.java | 4 +-- .../LivingArmourUpgradeSelfSacrifice.java | 2 +- .../LivingArmourUpgradeSolarPowered.java | 4 +-- .../upgrade/LivingArmourUpgradeSpeed.java | 4 +-- .../LivingArmourUpgradeSprintAttack.java | 2 +- .../LivingArmourUpgradeStepAssist.java | 4 +-- .../bloodmagic/meteor/MeteorRegistry.java | 2 +- .../network/DemonAuraPacketProcessor.java | 4 +-- .../bloodmagic/potion/BMPotionUtils.java | 8 +++--- .../potion/PotionEventHandlers.java | 2 +- .../bloodmagic/proxy/ClientProxy.java | 4 +-- .../bloodmagic/proxy/CommonProxy.java | 6 ++--- .../AlchemyTableDyeableRecipe.java | 4 +-- .../AlchemyTablePotionRecipe.java | 2 +- .../registry/ModArmourTrackers.java | 2 +- .../registry/ModCorruptionBlocks.java | 2 +- .../bloodmagic/registry/ModRecipes.java | 14 +++++----- .../bloodmagic/registry/ModRituals.java | 12 ++++----- .../registry/ModTranquilityHandlers.java | 2 +- .../bloodmagic/ritual/RitualAltarBuilder.java | 16 ++++++------ .../bloodmagic/ritual/RitualAnimalGrowth.java | 4 +-- .../bloodmagic/ritual/RitualArmourEvolve.java | 2 +- .../bloodmagic/ritual/RitualCobblestone.java | 2 +- .../bloodmagic/ritual/RitualContainment.java | 4 +-- .../bloodmagic/ritual/RitualCrushing.java | 10 +++---- .../ritual/RitualCrystalHarvest.java | 2 +- .../bloodmagic/ritual/RitualExpulsion.java | 6 ++--- .../ritual/RitualFeatheredKnife.java | 10 +++---- .../bloodmagic/ritual/RitualFelling.java | 2 +- .../bloodmagic/ritual/RitualForsakenSoul.java | 4 +-- .../bloodmagic/ritual/RitualFullStomach.java | 2 +- .../bloodmagic/ritual/RitualGreenGrove.java | 8 +++--- .../bloodmagic/ritual/RitualHarvest.java | 8 +++--- .../bloodmagic/ritual/RitualInterdiction.java | 4 +-- .../bloodmagic/ritual/RitualJumping.java | 2 +- .../bloodmagic/ritual/RitualLava.java | 8 +++--- .../ritual/RitualLivingArmourDowngrade.java | 8 +++--- .../bloodmagic/ritual/RitualMagnetic.java | 4 +-- .../bloodmagic/ritual/RitualMeteor.java | 4 +-- .../bloodmagic/ritual/RitualPlacer.java | 2 +- .../bloodmagic/ritual/RitualPortal.java | 10 +++---- .../bloodmagic/ritual/RitualPump.java | 2 +- .../bloodmagic/ritual/RitualRegeneration.java | 6 ++--- .../bloodmagic/ritual/RitualSpeed.java | 4 +-- .../bloodmagic/ritual/RitualSuppression.java | 2 +- .../ritual/RitualUpgradeRemove.java | 8 +++--- .../bloodmagic/ritual/RitualWater.java | 2 +- .../ritual/RitualWellOfSuffering.java | 4 +-- .../bloodmagic/ritual/RitualZephyr.java | 2 +- .../harvest/HarvestHandlerPlantable.java | 6 ++--- .../ritual/harvest/HarvestHandlerStem.java | 6 ++--- .../ritual/harvest/HarvestHandlerTall.java | 6 ++--- .../ritual/imperfect/ImperfectRitualDay.java | 6 ++--- .../imperfect/ImperfectRitualNight.java | 6 ++--- .../ritual/imperfect/ImperfectRitualRain.java | 6 ++--- .../imperfect/ImperfectRitualResistance.java | 6 ++--- .../imperfect/ImperfectRitualZombie.java | 6 ++--- .../ritual/portal/LocationsHandler.java | 4 +-- .../bloodmagic/ritual/portal/Teleports.java | 8 +++--- .../bloodmagic/structures/Dungeon.java | 2 +- .../bloodmagic/structures/DungeonRoom.java | 2 +- .../bloodmagic/tile/TileAlchemyArray.java | 8 +++--- .../bloodmagic/tile/TileAlchemyTable.java | 14 +++++----- .../WayofTime/bloodmagic/tile/TileAltar.java | 4 +-- .../bloodmagic/tile/TileBloodTank.java | 2 +- .../bloodmagic/tile/TileDemonCrucible.java | 8 +++--- .../bloodmagic/tile/TileDemonCrystal.java | 4 +-- .../tile/TileDemonCrystallizer.java | 6 ++--- .../bloodmagic/tile/TileDemonPylon.java | 6 ++--- .../tile/TileImperfectRitualStone.java | 10 +++---- .../bloodmagic/tile/TileIncenseAltar.java | 12 ++++----- .../bloodmagic/tile/TileInversionPillar.java | 4 +-- .../tile/TileMasterRitualStone.java | 22 ++++++++-------- .../bloodmagic/tile/TilePhantomBlock.java | 2 +- .../tile/TilePurificationAltar.java | 6 ++--- .../bloodmagic/tile/TileSoulForge.java | 14 +++++----- .../bloodmagic/tile/TileSpectralBlock.java | 2 +- .../bloodmagic/tile/TileTeleposer.java | 12 ++++----- .../tile/container/ContainerAlchemyTable.java | 2 +- .../tile/container/ContainerSoulForge.java | 4 +-- .../tile/routing/TileFilteredRoutingNode.java | 2 +- .../tile/routing/TileMasterRoutingNode.java | 4 +-- .../tile/routing/TileRoutingNode.java | 2 +- .../bloodmagic/util/GhostItemHelper.java | 4 +-- .../WayofTime/bloodmagic/util/PluginUtil.java | 7 ++--- .../java/WayofTime/bloodmagic/util/Utils.java | 10 +++---- .../util/handler/event/ClientHandler.java | 8 +++--- .../util/handler/event/CraftingHandler.java | 12 ++++----- .../util/handler/event/GenericHandler.java | 26 +++++++++---------- .../handler/event/LivingArmourHandler.java | 4 +-- .../handler/event/StatTrackerHandler.java | 2 +- .../util/handler/event/WillHandler.java | 2 +- .../bloodmagic/util/helper/RecipeHelper.java | 6 ++--- 421 files changed, 1006 insertions(+), 999 deletions(-) rename src/main/java/WayofTime/bloodmagic/{apiv2 => api}/BloodMagicPlugin.java (88%) rename src/main/java/WayofTime/bloodmagic/{apiv2 => api}/IBloodMagicAPI.java (92%) rename src/main/java/WayofTime/bloodmagic/{apiv2 => api}/IBloodMagicBlacklist.java (94%) rename src/main/java/WayofTime/bloodmagic/{apiv2 => api}/IBloodMagicPlugin.java (68%) rename src/main/java/WayofTime/bloodmagic/{api_impl => api/impl}/BloodMagicAPI.java (91%) rename src/main/java/WayofTime/bloodmagic/{api_impl => api/impl}/BloodMagicBlacklist.java (96%) rename src/main/java/WayofTime/bloodmagic/{api_impl => api/impl}/BloodMagicCorePlugin.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/BlockStack.java (97%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/BloodMagicAPI.java (79%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/Constants.java (99%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/DamageSourceBloodMagic.java (93%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ItemStackWrapper.java (98%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/alchemyCrafting/AlchemyArrayEffect.java (86%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/alchemyCrafting/AlchemyArrayEffectCrafting.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/alchemyCrafting/AlchemyCircleRenderer.java (98%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/altar/AltarComponent.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/altar/AltarUpgrade.java (98%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/altar/EnumAltarComponent.java (91%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/altar/EnumAltarTier.java (99%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/altar/IAltarComponent.java (84%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/altar/IAltarManipulator.java (73%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/altar/IBloodAltar.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/compress/CompressionHandler.java (89%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/compress/CompressionRegistry.java (98%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/event/AddToNetworkEvent.java (94%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/event/AltarCraftedEvent.java (87%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/event/BoundToolEvent.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/event/ItemBindEvent.java (87%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/event/RitualEvent.java (89%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/event/SacrificeKnifeUsedEvent.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/event/SoulNetworkEvent.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/event/TeleposeEvent.java (98%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IActivatable.java (78%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IAlchemyArray.java (66%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IAltarReader.java (72%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IBindable.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/ICustomAlchemyConsumable.java (82%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IDemonWillViewer.java (86%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IDocumentedBlock.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IHarvestHandler.java (78%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IItemLPContainer.java (83%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IMultiWillTool.java (52%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/INodeRenderer.java (72%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IPurificationAsh.java (80%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/ISentientSwordEffectProvider.java (74%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/ISentientTool.java (79%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/ISigil.java (76%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/iface/IUpgradeTrainer.java (86%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/impl/ItemBindable.java (82%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/impl/ItemSigil.java (80%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/impl/ItemSigilToggleable.java (89%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/incense/EnumTranquilityType.java (70%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/incense/IIncensePath.java (89%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/incense/ITranquilityHandler.java (84%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/incense/IncenseTranquilityRegistry.java (94%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/incense/TranquilityStack.java (81%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/livingArmour/ILivingArmour.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/livingArmour/LivingArmourHandler.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/livingArmour/LivingArmourUpgrade.java (97%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/livingArmour/StatTracker.java (97%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/orb/BloodOrb.java (97%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/orb/IBloodOrb.java (75%) create mode 100644 src/main/java/WayofTime/bloodmagic/apibutnotreally/package-info.java rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/recipe/AlchemyTableCustomRecipe.java (91%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/recipe/AlchemyTableRecipe.java (99%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/recipe/LivingArmourDowngradeRecipe.java (97%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/recipe/TartaricForgeRecipe.java (99%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/registry/AlchemyArrayRecipeRegistry.java (97%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/registry/AlchemyTableRecipeRegistry.java (90%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/registry/AltarRecipeRegistry.java (97%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/registry/HarvestRegistry.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/registry/ImperfectRitualRegistry.java (92%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/registry/LivingArmourDowngradeRecipeRegistry.java (90%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/registry/OrbRegistry.java (91%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/registry/RitualRegistry.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/registry/TartaricForgeRecipeRegistry.java (90%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/AreaDescriptor.java (99%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/CapabilityRuneType.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/EnumRitualReaderState.java (62%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/EnumRuneType.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/IMasterRitualStone.java (88%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/IRitualStone.java (91%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/Ritual.java (98%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/RitualComponent.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/RitualRenderer.java (87%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/imperfect/IImperfectRitualStone.java (88%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/imperfect/ImperfectRitual.java (93%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/ritual/imperfect/package-info.java (71%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/saving/BMWorldSavedData.java (93%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/saving/SoulNetwork.java (94%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/soul/DemonWillHolder.java (97%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/soul/EnumDemonWillType.java (91%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/soul/IDemonWill.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/soul/IDemonWillConduit.java (90%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/soul/IDemonWillGem.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/soul/IDemonWillWeapon.java (84%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/soul/IDiscreteDemonWill.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/soul/PlayerDemonWillHandler.java (98%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/teleport/ITeleport.java (59%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/teleport/PortalLocation.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/teleport/Teleport.java (97%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/teleport/TeleportQueue.java (93%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/teleport/TeleporterBloodMagic.java (94%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/util/helper/BindableHelper.java (95%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/util/helper/IncenseHelper.java (84%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/util/helper/ItemHelper.java (92%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/util/helper/LogHelper.java (87%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/util/helper/NBTHelper.java (83%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/util/helper/NetworkHelper.java (91%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/util/helper/PlayerHelper.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/util/helper/PlayerSacrificeHelper.java (96%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/util/helper/PurificationHelper.java (89%) rename src/main/java/WayofTime/bloodmagic/{api => apibutnotreally}/util/helper/RitualHelper.java (92%) diff --git a/build.gradle b/build.gradle index 66a57a25..27fe1311 100644 --- a/build.gradle +++ b/build.gradle @@ -93,6 +93,7 @@ task apiJar(type: Jar) { from sourceSets.main.allSource from sourceSets.main.output include 'WayofTime/bloodmagic/api/**/*' + exclude 'WayofTime/bloodmagic/api/impl/**/*' classifier = 'api' } diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 86705236..08bdce42 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic; -import WayofTime.bloodmagic.api.registry.OrbRegistry; -import WayofTime.bloodmagic.api.registry.RitualRegistry; -import WayofTime.bloodmagic.api.util.helper.LogHelper; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; -import WayofTime.bloodmagic.apiv2.BloodMagicPlugin; -import WayofTime.bloodmagic.apiv2.IBloodMagicPlugin; +import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.util.helper.LogHelper; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; +import WayofTime.bloodmagic.api.BloodMagicPlugin; +import WayofTime.bloodmagic.api.IBloodMagicPlugin; import WayofTime.bloodmagic.client.gui.GuiHandler; import WayofTime.bloodmagic.command.CommandBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagic; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java index 9a796c9c..e5888e90 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.alchemyArray; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; import WayofTime.bloodmagic.fakePlayer.FakePlayerBM; import WayofTime.bloodmagic.tile.TileAlchemyArray; import com.mojang.authlib.GameProfile; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java index 8310f713..d8f09294 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffectCrafting; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffectCrafting; import WayofTime.bloodmagic.client.render.alchemyArray.BindingAlchemyCircleRenderer; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java index 7b0211bd..a5d962b1 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBounce.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.iface.IAlchemyArray; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java index f7425b3b..46cc3ed0 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMovement.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.iface.IAlchemyArray; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java index afa6ce77..66ce98a8 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSigil.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java index 464cd6cd..5f02f6c4 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; import WayofTime.bloodmagic.tile.TileAlchemyArray; import com.google.common.base.Predicate; import net.minecraft.entity.EntityLiving; diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java index 2b778e11..4f89481b 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectUpdraft.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.iface.IAlchemyArray; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index b4846dfa..37f49e00 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -1,19 +1,18 @@ package WayofTime.bloodmagic.altar; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.altar.*; -import WayofTime.bloodmagic.api.event.AltarCraftedEvent; -import WayofTime.bloodmagic.api.orb.BloodOrb; -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry.AltarRecipe; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.altar.*; +import WayofTime.bloodmagic.apibutnotreally.event.AltarCraftedEvent; +import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; +import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; +import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry.AltarRecipe; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.tile.TileAltar; -import WayofTime.bloodmagic.util.Utils; import com.google.common.base.Enums; import com.google.common.base.Strings; import net.minecraft.block.state.IBlockState; @@ -31,7 +30,6 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.capability.FluidTankPropertiesWrapper; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidTankProperties; -import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import java.util.List; diff --git a/src/main/java/WayofTime/bloodmagic/apiv2/BloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java similarity index 88% rename from src/main/java/WayofTime/bloodmagic/apiv2/BloodMagicPlugin.java rename to src/main/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java index 6458977d..04907dfa 100644 --- a/src/main/java/WayofTime/bloodmagic/apiv2/BloodMagicPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/BloodMagicPlugin.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apiv2; +package WayofTime.bloodmagic.api; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicAPI.java rename to src/main/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java index 0e7c8d50..a439d73e 100644 --- a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicAPI.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apiv2; +package WayofTime.bloodmagic.api; import net.minecraft.block.state.IBlockState; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicBlacklist.java b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicBlacklist.java similarity index 94% rename from src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicBlacklist.java rename to src/main/java/WayofTime/bloodmagic/api/IBloodMagicBlacklist.java index f1f1b0ad..64ba641f 100644 --- a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicBlacklist.java +++ b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicBlacklist.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apiv2; +package WayofTime.bloodmagic.api; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java similarity index 68% rename from src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicPlugin.java rename to src/main/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java index ad2098a7..450076db 100644 --- a/src/main/java/WayofTime/bloodmagic/apiv2/IBloodMagicPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/IBloodMagicPlugin.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.apiv2; +package WayofTime.bloodmagic.api; public interface IBloodMagicPlugin { diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicAPI.java rename to src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java index b2fc17ce..a8e9426e 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicAPI.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.api_impl; +package WayofTime.bloodmagic.api.impl; -import WayofTime.bloodmagic.api.altar.EnumAltarComponent; -import WayofTime.bloodmagic.apiv2.IBloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; +import WayofTime.bloodmagic.api.IBloodMagicAPI; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java rename to src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java index b88d64b6..c07e979c 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicBlacklist.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicBlacklist.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api_impl; +package WayofTime.bloodmagic.api.impl; -import WayofTime.bloodmagic.apiv2.IBloodMagicBlacklist; +import WayofTime.bloodmagic.api.IBloodMagicBlacklist; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicCorePlugin.java b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicCorePlugin.java rename to src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java index aab81509..659a87d6 100644 --- a/src/main/java/WayofTime/bloodmagic/api_impl/BloodMagicCorePlugin.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/BloodMagicCorePlugin.java @@ -1,11 +1,11 @@ -package WayofTime.bloodmagic.api_impl; +package WayofTime.bloodmagic.api.impl; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.altar.EnumAltarComponent; -import WayofTime.bloodmagic.apiv2.BloodMagicPlugin; -import WayofTime.bloodmagic.apiv2.IBloodMagicAPI; -import WayofTime.bloodmagic.apiv2.IBloodMagicPlugin; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; +import WayofTime.bloodmagic.api.BloodMagicPlugin; +import WayofTime.bloodmagic.api.IBloodMagicAPI; +import WayofTime.bloodmagic.api.IBloodMagicPlugin; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.block.BlockDecorative; import WayofTime.bloodmagic.block.enums.EnumBloodRune; diff --git a/src/main/java/WayofTime/bloodmagic/api/package-info.java b/src/main/java/WayofTime/bloodmagic/api/package-info.java index 3f175867..d77cfda2 100644 --- a/src/main/java/WayofTime/bloodmagic/api/package-info.java +++ b/src/main/java/WayofTime/bloodmagic/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = BloodMagic.MODID, provides = BloodMagic.MODID + "|API", apiVersion = BloodMagic.VERSION) +@API(owner = BloodMagic.MODID, provides = BloodMagic.MODID + "|api", apiVersion = "2.0.0") package WayofTime.bloodmagic.api; import WayofTime.bloodmagic.BloodMagic; diff --git a/src/main/java/WayofTime/bloodmagic/api/BlockStack.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/BlockStack.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/api/BlockStack.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/BlockStack.java index 72752c81..74e50107 100644 --- a/src/main/java/WayofTime/bloodmagic/api/BlockStack.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/BlockStack.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api; +package WayofTime.bloodmagic.apibutnotreally; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/BloodMagicAPI.java similarity index 79% rename from src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/BloodMagicAPI.java index e69115f3..48b7bc95 100644 --- a/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/BloodMagicAPI.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api; +package WayofTime.bloodmagic.apibutnotreally; -import WayofTime.bloodmagic.api.util.helper.LogHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.LogHelper; import net.minecraft.util.DamageSource; /** diff --git a/src/main/java/WayofTime/bloodmagic/api/Constants.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/Constants.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/api/Constants.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/Constants.java index 4ead21b0..11d1830b 100644 --- a/src/main/java/WayofTime/bloodmagic/api/Constants.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/Constants.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api; +package WayofTime.bloodmagic.apibutnotreally; import WayofTime.bloodmagic.BloodMagic; import net.minecraft.item.Item; diff --git a/src/main/java/WayofTime/bloodmagic/api/DamageSourceBloodMagic.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/DamageSourceBloodMagic.java similarity index 93% rename from src/main/java/WayofTime/bloodmagic/api/DamageSourceBloodMagic.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/DamageSourceBloodMagic.java index d9747ad3..75af1dd6 100644 --- a/src/main/java/WayofTime/bloodmagic/api/DamageSourceBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/DamageSourceBloodMagic.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api; +package WayofTime.bloodmagic.apibutnotreally; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/api/ItemStackWrapper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ItemStackWrapper.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/api/ItemStackWrapper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ItemStackWrapper.java index d0949cbe..a48a0acd 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ItemStackWrapper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ItemStackWrapper.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api; +package WayofTime.bloodmagic.apibutnotreally; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffect.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffect.java similarity index 86% rename from src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffect.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffect.java index 7455ca08..d08c968c 100644 --- a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffect.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffect.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.alchemyCrafting; +package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting; -import WayofTime.bloodmagic.api.iface.IAlchemyArray; +import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffectCrafting.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCrafting.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffectCrafting.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCrafting.java index a15da577..16712dee 100644 --- a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffectCrafting.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyArrayEffectCrafting.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.alchemyCrafting; +package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyCircleRenderer.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyCircleRenderer.java index f6276316..789257c5 100644 --- a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/alchemyCrafting/AlchemyCircleRenderer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.alchemyCrafting; +package WayofTime.bloodmagic.apibutnotreally.alchemyCrafting; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.Minecraft; diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/AltarComponent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarComponent.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api/altar/AltarComponent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarComponent.java index 470097e1..20a70d23 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/AltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarComponent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.altar; +package WayofTime.bloodmagic.apibutnotreally.altar; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/AltarUpgrade.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarUpgrade.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/api/altar/AltarUpgrade.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarUpgrade.java index c18801eb..7598f58a 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/AltarUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/AltarUpgrade.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.altar; +package WayofTime.bloodmagic.apibutnotreally.altar; public class AltarUpgrade { private int speedCount; diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarComponent.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarComponent.java index 8443bc1a..8f863756 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarComponent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.altar; +package WayofTime.bloodmagic.apibutnotreally.altar; import java.util.Locale; diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarTier.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarTier.java index 16a4e7e1..b783a928 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/EnumAltarTier.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.altar; +package WayofTime.bloodmagic.apibutnotreally.altar; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/IAltarComponent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarComponent.java similarity index 84% rename from src/main/java/WayofTime/bloodmagic/api/altar/IAltarComponent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarComponent.java index 52d1d763..666f5be0 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/IAltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarComponent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.altar; +package WayofTime.bloodmagic.apibutnotreally.altar; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/IAltarManipulator.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarManipulator.java similarity index 73% rename from src/main/java/WayofTime/bloodmagic/api/altar/IAltarManipulator.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarManipulator.java index 57509bc0..5a69420e 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/IAltarManipulator.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IAltarManipulator.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.altar; +package WayofTime.bloodmagic.apibutnotreally.altar; /** * Any item that implements this interface will not be pulled into the Altar on diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/IBloodAltar.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IBloodAltar.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/altar/IBloodAltar.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IBloodAltar.java index 843d2a0e..a8642b89 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/IBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/altar/IBloodAltar.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.altar; +package WayofTime.bloodmagic.apibutnotreally.altar; public interface IBloodAltar { int getCapacity(); diff --git a/src/main/java/WayofTime/bloodmagic/api/compress/CompressionHandler.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionHandler.java similarity index 89% rename from src/main/java/WayofTime/bloodmagic/api/compress/CompressionHandler.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionHandler.java index 22a8fe9e..e36149c6 100644 --- a/src/main/java/WayofTime/bloodmagic/api/compress/CompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionHandler.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.compress; +package WayofTime.bloodmagic.apibutnotreally.compress; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/api/compress/CompressionRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionRegistry.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/api/compress/CompressionRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionRegistry.java index 7fc1bbae..786306c9 100644 --- a/src/main/java/WayofTime/bloodmagic/api/compress/CompressionRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/compress/CompressionRegistry.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.compress; +package WayofTime.bloodmagic.apibutnotreally.compress; import WayofTime.bloodmagic.util.Utils; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/event/AddToNetworkEvent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AddToNetworkEvent.java similarity index 94% rename from src/main/java/WayofTime/bloodmagic/api/event/AddToNetworkEvent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AddToNetworkEvent.java index ddd5c637..4f84073f 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/AddToNetworkEvent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AddToNetworkEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.event; +package WayofTime.bloodmagic.apibutnotreally.event; import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.fml.common.eventhandler.Event; diff --git a/src/main/java/WayofTime/bloodmagic/api/event/AltarCraftedEvent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AltarCraftedEvent.java similarity index 87% rename from src/main/java/WayofTime/bloodmagic/api/event/AltarCraftedEvent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AltarCraftedEvent.java index f20d0ec7..2875f168 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/AltarCraftedEvent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/AltarCraftedEvent.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.event; +package WayofTime.bloodmagic.apibutnotreally.event; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.eventhandler.Event; diff --git a/src/main/java/WayofTime/bloodmagic/api/event/BoundToolEvent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/BoundToolEvent.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api/event/BoundToolEvent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/event/BoundToolEvent.java index ab2de72a..3e848cf9 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/BoundToolEvent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/BoundToolEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.event; +package WayofTime.bloodmagic.apibutnotreally.event; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/event/ItemBindEvent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/ItemBindEvent.java similarity index 87% rename from src/main/java/WayofTime/bloodmagic/api/event/ItemBindEvent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/event/ItemBindEvent.java index 03348e02..d072d39f 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/ItemBindEvent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/ItemBindEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.event; +package WayofTime.bloodmagic.apibutnotreally.event; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,7 +13,7 @@ public class ItemBindEvent extends Event { /** * This event is called whenever a player attempts to bind a - * {@link WayofTime.bloodmagic.api.iface.IBindable} item. + * {@link WayofTime.bloodmagic.apibutnotreally.iface.IBindable} item. * * @param player The player doing the binding * @param key The UUID of the player doing the binding diff --git a/src/main/java/WayofTime/bloodmagic/api/event/RitualEvent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/RitualEvent.java similarity index 89% rename from src/main/java/WayofTime/bloodmagic/api/event/RitualEvent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/event/RitualEvent.java index 9036f4cb..dd118b83 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/RitualEvent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/RitualEvent.java @@ -1,9 +1,9 @@ -package WayofTime.bloodmagic.api.event; +package WayofTime.bloodmagic.apibutnotreally.event; -import WayofTime.bloodmagic.api.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.api.ritual.Ritual; -import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/api/event/SacrificeKnifeUsedEvent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SacrificeKnifeUsedEvent.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api/event/SacrificeKnifeUsedEvent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SacrificeKnifeUsedEvent.java index 93f72b23..991e7a15 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/SacrificeKnifeUsedEvent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SacrificeKnifeUsedEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.event; +package WayofTime.bloodmagic.apibutnotreally.event; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.common.eventhandler.Cancelable; diff --git a/src/main/java/WayofTime/bloodmagic/api/event/SoulNetworkEvent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SoulNetworkEvent.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/event/SoulNetworkEvent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SoulNetworkEvent.java index 06928b8a..a39674a3 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/SoulNetworkEvent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/SoulNetworkEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.event; +package WayofTime.bloodmagic.apibutnotreally.event; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -24,7 +24,7 @@ public class SoulNetworkEvent extends Event { /** * This event is called when an - * {@link WayofTime.bloodmagic.api.impl.ItemBindable} is being drained + * {@link WayofTime.bloodmagic.apibutnotreally.impl.ItemBindable} is being drained * inside of a {@link net.minecraft.tileentity.TileEntity}. *

* If canceled, the drain will not be executed. diff --git a/src/main/java/WayofTime/bloodmagic/api/event/TeleposeEvent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/TeleposeEvent.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/api/event/TeleposeEvent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/event/TeleposeEvent.java index d474e46b..d17ea312 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/TeleposeEvent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/event/TeleposeEvent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.event; +package WayofTime.bloodmagic.apibutnotreally.event; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IActivatable.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IActivatable.java similarity index 78% rename from src/main/java/WayofTime/bloodmagic/api/iface/IActivatable.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IActivatable.java index c760dd5c..c72c4cb7 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IActivatable.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IActivatable.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAlchemyArray.java similarity index 66% rename from src/main/java/WayofTime/bloodmagic/api/iface/IAlchemyArray.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAlchemyArray.java index 60d34f08..dfa4559a 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAlchemyArray.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IAltarReader.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAltarReader.java similarity index 72% rename from src/main/java/WayofTime/bloodmagic/api/iface/IAltarReader.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAltarReader.java index 292e2e74..d3d0bdc3 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IAltarReader.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IAltarReader.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; /** * Any item that implements this interface will not be pulled into the Altar on diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IBindable.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IBindable.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/iface/IBindable.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IBindable.java index 5b515342..19cca36f 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IBindable.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IBindable.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/ICustomAlchemyConsumable.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ICustomAlchemyConsumable.java similarity index 82% rename from src/main/java/WayofTime/bloodmagic/api/iface/ICustomAlchemyConsumable.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ICustomAlchemyConsumable.java index b7d6f034..547eb869 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/ICustomAlchemyConsumable.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ICustomAlchemyConsumable.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IDemonWillViewer.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDemonWillViewer.java similarity index 86% rename from src/main/java/WayofTime/bloodmagic/api/iface/IDemonWillViewer.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDemonWillViewer.java index cfcbd3d9..ecaa8dd3 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IDemonWillViewer.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDemonWillViewer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IDocumentedBlock.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDocumentedBlock.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/iface/IDocumentedBlock.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDocumentedBlock.java index fca40184..68ba0fd8 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IDocumentedBlock.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IDocumentedBlock.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IHarvestHandler.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IHarvestHandler.java similarity index 78% rename from src/main/java/WayofTime/bloodmagic/api/iface/IHarvestHandler.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IHarvestHandler.java index f25382f5..c4b38f18 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IHarvestHandler.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IHarvestHandler.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; -import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -16,7 +16,7 @@ public interface IHarvestHandler { * the block types you want. * * @param world - The world the - * {@link WayofTime.bloodmagic.api.ritual.IMasterRitualStone} is in. + * {@link WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone} is in. * @param pos - The position of the Block being checked * @param blockStack - The Block being checked * @return If the block was successfully harvested. diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IItemLPContainer.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IItemLPContainer.java similarity index 83% rename from src/main/java/WayofTime/bloodmagic/api/iface/IItemLPContainer.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IItemLPContainer.java index b909856d..72e05cd9 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IItemLPContainer.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IItemLPContainer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IMultiWillTool.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IMultiWillTool.java similarity index 52% rename from src/main/java/WayofTime/bloodmagic/api/iface/IMultiWillTool.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IMultiWillTool.java index 9ff0d689..519fc6cd 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IMultiWillTool.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IMultiWillTool.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import net.minecraft.item.ItemStack; public interface IMultiWillTool { diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/INodeRenderer.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/INodeRenderer.java similarity index 72% rename from src/main/java/WayofTime/bloodmagic/api/iface/INodeRenderer.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/INodeRenderer.java index 27b48335..a12114b0 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/INodeRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/INodeRenderer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; /** * Held items that implement this will cause the beams between routing nodes to diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IPurificationAsh.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IPurificationAsh.java similarity index 80% rename from src/main/java/WayofTime/bloodmagic/api/iface/IPurificationAsh.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IPurificationAsh.java index b6b7940b..777a04e9 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IPurificationAsh.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IPurificationAsh.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/ISentientSwordEffectProvider.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientSwordEffectProvider.java similarity index 74% rename from src/main/java/WayofTime/bloodmagic/api/iface/ISentientSwordEffectProvider.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientSwordEffectProvider.java index 69ed3b28..16225306 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/ISentientSwordEffectProvider.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientSwordEffectProvider.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/ISentientTool.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientTool.java similarity index 79% rename from src/main/java/WayofTime/bloodmagic/api/iface/ISentientTool.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientTool.java index 979c1066..18ed5e29 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/ISentientTool.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISentientTool.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/ISigil.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISigil.java similarity index 76% rename from src/main/java/WayofTime/bloodmagic/api/iface/ISigil.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISigil.java index bc625ee5..12f54b04 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/ISigil.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/ISigil.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -8,7 +8,7 @@ import net.minecraft.world.World; import javax.annotation.Nonnull; /** - * Used for all {@link WayofTime.bloodmagic.api.impl.ItemSigil} EXCEPT + * Used for all {@link WayofTime.bloodmagic.apibutnotreally.impl.ItemSigil} EXCEPT * Sigils of Holdings. */ public interface ISigil { diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IUpgradeTrainer.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IUpgradeTrainer.java similarity index 86% rename from src/main/java/WayofTime/bloodmagic/api/iface/IUpgradeTrainer.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IUpgradeTrainer.java index 6d4300bb..f8d30032 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IUpgradeTrainer.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/iface/IUpgradeTrainer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.iface; +package WayofTime.bloodmagic.apibutnotreally.iface; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/ItemBindable.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemBindable.java similarity index 82% rename from src/main/java/WayofTime/bloodmagic/api/impl/ItemBindable.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemBindable.java index 11fe41a2..bb705a2c 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/ItemBindable.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemBindable.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.api.impl; +package WayofTime.bloodmagic.apibutnotreally.impl; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/ItemSigil.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemSigil.java similarity index 80% rename from src/main/java/WayofTime/bloodmagic/api/impl/ItemSigil.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemSigil.java index ff17b437..3d2dbe87 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/ItemSigil.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemSigil.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.api.impl; +package WayofTime.bloodmagic.apibutnotreally.impl; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/ItemSigilToggleable.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemSigilToggleable.java similarity index 89% rename from src/main/java/WayofTime/bloodmagic/api/impl/ItemSigilToggleable.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemSigilToggleable.java index bd243ec5..9c905233 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/ItemSigilToggleable.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/impl/ItemSigilToggleable.java @@ -1,11 +1,11 @@ -package WayofTime.bloodmagic.api.impl; +package WayofTime.bloodmagic.apibutnotreally.impl; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IActivatable; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IActivatable; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import com.google.common.base.Strings; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/api/incense/EnumTranquilityType.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/EnumTranquilityType.java similarity index 70% rename from src/main/java/WayofTime/bloodmagic/api/incense/EnumTranquilityType.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/EnumTranquilityType.java index ba589df3..af381ab7 100644 --- a/src/main/java/WayofTime/bloodmagic/api/incense/EnumTranquilityType.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/EnumTranquilityType.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.incense; +package WayofTime.bloodmagic.apibutnotreally.incense; public enum EnumTranquilityType { PLANT(), diff --git a/src/main/java/WayofTime/bloodmagic/api/incense/IIncensePath.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/IIncensePath.java similarity index 89% rename from src/main/java/WayofTime/bloodmagic/api/incense/IIncensePath.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/IIncensePath.java index bb7bc0ad..5f75c546 100644 --- a/src/main/java/WayofTime/bloodmagic/api/incense/IIncensePath.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/IIncensePath.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.incense; +package WayofTime.bloodmagic.apibutnotreally.incense; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/api/incense/ITranquilityHandler.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/ITranquilityHandler.java similarity index 84% rename from src/main/java/WayofTime/bloodmagic/api/incense/ITranquilityHandler.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/ITranquilityHandler.java index e6b88a4d..baee7500 100644 --- a/src/main/java/WayofTime/bloodmagic/api/incense/ITranquilityHandler.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/ITranquilityHandler.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.incense; +package WayofTime.bloodmagic.apibutnotreally.incense; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/api/incense/IncenseTranquilityRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/IncenseTranquilityRegistry.java similarity index 94% rename from src/main/java/WayofTime/bloodmagic/api/incense/IncenseTranquilityRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/IncenseTranquilityRegistry.java index 165b80cf..24d04fb7 100644 --- a/src/main/java/WayofTime/bloodmagic/api/incense/IncenseTranquilityRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/IncenseTranquilityRegistry.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.incense; +package WayofTime.bloodmagic.apibutnotreally.incense; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/api/incense/TranquilityStack.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/TranquilityStack.java similarity index 81% rename from src/main/java/WayofTime/bloodmagic/api/incense/TranquilityStack.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/TranquilityStack.java index 5852d488..ff94b0b0 100644 --- a/src/main/java/WayofTime/bloodmagic/api/incense/TranquilityStack.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/incense/TranquilityStack.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.incense; +package WayofTime.bloodmagic.apibutnotreally.incense; public class TranquilityStack { public final EnumTranquilityType type; diff --git a/src/main/java/WayofTime/bloodmagic/api/livingArmour/ILivingArmour.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/ILivingArmour.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/livingArmour/ILivingArmour.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/ILivingArmour.java index 3a487a6c..c260d452 100644 --- a/src/main/java/WayofTime/bloodmagic/api/livingArmour/ILivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/ILivingArmour.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.livingArmour; +package WayofTime.bloodmagic.apibutnotreally.livingArmour; import com.google.common.collect.Multimap; import net.minecraft.entity.ai.attributes.AttributeModifier; diff --git a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/LivingArmourHandler.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourHandler.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/LivingArmourHandler.java index 129ea2d8..193a6570 100644 --- a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/LivingArmourHandler.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.livingArmour; +package WayofTime.bloodmagic.apibutnotreally.livingArmour; -import WayofTime.bloodmagic.api.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; import net.minecraft.nbt.NBTTagCompound; import java.lang.reflect.Constructor; diff --git a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/LivingArmourUpgrade.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/LivingArmourUpgrade.java index 703478fa..2fa4e8cc 100644 --- a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/LivingArmourUpgrade.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.livingArmour; +package WayofTime.bloodmagic.apibutnotreally.livingArmour; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; diff --git a/src/main/java/WayofTime/bloodmagic/api/livingArmour/StatTracker.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/StatTracker.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/api/livingArmour/StatTracker.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/StatTracker.java index a43b7448..f450b4aa 100644 --- a/src/main/java/WayofTime/bloodmagic/api/livingArmour/StatTracker.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/livingArmour/StatTracker.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.livingArmour; +package WayofTime.bloodmagic.apibutnotreally.livingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/api/orb/BloodOrb.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/BloodOrb.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/api/orb/BloodOrb.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/BloodOrb.java index f5acc317..adbe7c7a 100644 --- a/src/main/java/WayofTime/bloodmagic/api/orb/BloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/BloodOrb.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.orb; +package WayofTime.bloodmagic.apibutnotreally.orb; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraftforge.registries.IForgeRegistryEntry; diff --git a/src/main/java/WayofTime/bloodmagic/api/orb/IBloodOrb.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/IBloodOrb.java similarity index 75% rename from src/main/java/WayofTime/bloodmagic/api/orb/IBloodOrb.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/IBloodOrb.java index 76f1161b..6b87ddd5 100644 --- a/src/main/java/WayofTime/bloodmagic/api/orb/IBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/orb/IBloodOrb.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.orb; +package WayofTime.bloodmagic.apibutnotreally.orb; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/apibutnotreally/package-info.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/package-info.java new file mode 100644 index 00000000..20478ed8 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/package-info.java @@ -0,0 +1,6 @@ +@Deprecated // This entire "api" is going to be nuked over time. Consider all of this unstable. +@API(owner = BloodMagic.MODID, provides = BloodMagic.MODID + "|API", apiVersion = BloodMagic.VERSION) +package WayofTime.bloodmagic.apibutnotreally; + +import WayofTime.bloodmagic.BloodMagic; +import net.minecraftforge.fml.common.API; \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/recipe/AlchemyTableCustomRecipe.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableCustomRecipe.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/api/recipe/AlchemyTableCustomRecipe.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableCustomRecipe.java index be9afea1..5ce7e83c 100644 --- a/src/main/java/WayofTime/bloodmagic/api/recipe/AlchemyTableCustomRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableCustomRecipe.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.recipe; +package WayofTime.bloodmagic.apibutnotreally.recipe; -import WayofTime.bloodmagic.api.iface.ICustomAlchemyConsumable; +import WayofTime.bloodmagic.apibutnotreally.iface.ICustomAlchemyConsumable; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/recipe/AlchemyTableRecipe.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableRecipe.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/api/recipe/AlchemyTableRecipe.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableRecipe.java index 553cdb6d..6cb1cf8d 100644 --- a/src/main/java/WayofTime/bloodmagic/api/recipe/AlchemyTableRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/AlchemyTableRecipe.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.recipe; +package WayofTime.bloodmagic.apibutnotreally.recipe; import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/api/recipe/LivingArmourDowngradeRecipe.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/LivingArmourDowngradeRecipe.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/api/recipe/LivingArmourDowngradeRecipe.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/LivingArmourDowngradeRecipe.java index 65aa9c3a..d40eab8b 100644 --- a/src/main/java/WayofTime/bloodmagic/api/recipe/LivingArmourDowngradeRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/LivingArmourDowngradeRecipe.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.recipe; +package WayofTime.bloodmagic.apibutnotreally.recipe; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/src/main/java/WayofTime/bloodmagic/api/recipe/TartaricForgeRecipe.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/TartaricForgeRecipe.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/api/recipe/TartaricForgeRecipe.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/TartaricForgeRecipe.java index d4becd01..028744fd 100644 --- a/src/main/java/WayofTime/bloodmagic/api/recipe/TartaricForgeRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/recipe/TartaricForgeRecipe.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.recipe; +package WayofTime.bloodmagic.apibutnotreally.recipe; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyArrayRecipeRegistry.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyArrayRecipeRegistry.java index c4cf383e..fd939ba5 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyArrayRecipeRegistry.java @@ -1,9 +1,9 @@ -package WayofTime.bloodmagic.api.registry; +package WayofTime.bloodmagic.apibutnotreally.registry; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffectCrafting; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffectCrafting; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyTableRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyTableRecipeRegistry.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/api/registry/AlchemyTableRecipeRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyTableRecipeRegistry.java index daceba43..ff55fd94 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyTableRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AlchemyTableRecipeRegistry.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.registry; +package WayofTime.bloodmagic.apibutnotreally.registry; -import WayofTime.bloodmagic.api.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AltarRecipeRegistry.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AltarRecipeRegistry.java index 64342bfa..4e4c9352 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/AltarRecipeRegistry.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.api.registry; +package WayofTime.bloodmagic.apibutnotreally.registry; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.altar.EnumAltarTier; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/HarvestRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/HarvestRegistry.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/registry/HarvestRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/HarvestRegistry.java index 90b2fa42..a0a5eeba 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/HarvestRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/HarvestRegistry.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.api.registry; +package WayofTime.bloodmagic.apibutnotreally.registry; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.iface.IHarvestHandler; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler; import net.minecraft.block.Block; import net.minecraft.block.BlockStem; diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/ImperfectRitualRegistry.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/ImperfectRitualRegistry.java index feebf365..16c5a510 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/ImperfectRitualRegistry.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.api.registry; +package WayofTime.bloodmagic.apibutnotreally.registry; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/LivingArmourDowngradeRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/LivingArmourDowngradeRecipeRegistry.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/api/registry/LivingArmourDowngradeRecipeRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/LivingArmourDowngradeRecipeRegistry.java index 3f635ed3..f2787e34 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/LivingArmourDowngradeRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/LivingArmourDowngradeRecipeRegistry.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.api.registry; +package WayofTime.bloodmagic.apibutnotreally.registry; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.recipe.LivingArmourDowngradeRecipe; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.recipe.LivingArmourDowngradeRecipe; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/OrbRegistry.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/OrbRegistry.java index 13cdde2b..0efd5b88 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/OrbRegistry.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.api.registry; +package WayofTime.bloodmagic.apibutnotreally.registry; -import WayofTime.bloodmagic.api.altar.EnumAltarTier; -import WayofTime.bloodmagic.api.orb.BloodOrb; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; +import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; import com.google.common.collect.ArrayListMultimap; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/RitualRegistry.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/RitualRegistry.java index e62ece62..ced086b2 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/RitualRegistry.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.api.registry; +package WayofTime.bloodmagic.apibutnotreally.registry; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.ritual.Ritual; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/TartaricForgeRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/TartaricForgeRecipeRegistry.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/api/registry/TartaricForgeRecipeRegistry.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/TartaricForgeRecipeRegistry.java index f9df0ffd..1090c897 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/TartaricForgeRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/registry/TartaricForgeRecipeRegistry.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.registry; +package WayofTime.bloodmagic.apibutnotreally.registry; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/AreaDescriptor.java similarity index 99% rename from src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/AreaDescriptor.java index 521c9dca..f2ea64be 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/AreaDescriptor.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.ritual; +package WayofTime.bloodmagic.apibutnotreally.ritual; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/CapabilityRuneType.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/CapabilityRuneType.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api/ritual/CapabilityRuneType.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/CapabilityRuneType.java index af658b4f..40be45bf 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/CapabilityRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/CapabilityRuneType.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.ritual; +package WayofTime.bloodmagic.apibutnotreally.ritual; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagByte; diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRitualReaderState.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRitualReaderState.java similarity index 62% rename from src/main/java/WayofTime/bloodmagic/api/ritual/EnumRitualReaderState.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRitualReaderState.java index b1b9597f..f2d3cc8f 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRitualReaderState.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRitualReaderState.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.ritual; +package WayofTime.bloodmagic.apibutnotreally.ritual; public enum EnumRitualReaderState { SET_AREA, diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRuneType.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRuneType.java index 74c7aeb4..39685b3e 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/EnumRuneType.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.ritual; +package WayofTime.bloodmagic.apibutnotreally.ritual; import net.minecraft.init.Items; import net.minecraft.item.Item; diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/IMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IMasterRitualStone.java similarity index 88% rename from src/main/java/WayofTime/bloodmagic/api/ritual/IMasterRitualStone.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IMasterRitualStone.java index 6fb8544e..8cf47ab3 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/IMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IMasterRitualStone.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.api.ritual; +package WayofTime.bloodmagic.apibutnotreally.ritual; -import WayofTime.bloodmagic.api.saving.SoulNetwork; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/IRitualStone.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IRitualStone.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/api/ritual/IRitualStone.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IRitualStone.java index 846d6267..073b9b4b 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/IRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/IRitualStone.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.ritual; +package WayofTime.bloodmagic.apibutnotreally.ritual; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/Ritual.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/Ritual.java index 35763652..aa8c8c1c 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/Ritual.java @@ -1,7 +1,7 @@ -package WayofTime.bloodmagic.api.ritual; +package WayofTime.bloodmagic.apibutnotreally.ritual; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -21,7 +21,7 @@ import java.util.Map.Entry; /** * Abstract class for creating new rituals. Rituals need be registered with - * {@link WayofTime.bloodmagic.api.registry.RitualRegistry#registerRitual(Ritual, String)} + * {@link WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry#registerRitual(Ritual, String)} */ public abstract class Ritual { public final ArrayList ritualComponents = new ArrayList(); diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/RitualComponent.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualComponent.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api/ritual/RitualComponent.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualComponent.java index 97d8893d..ad864ce7 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/RitualComponent.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualComponent.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.ritual; +package WayofTime.bloodmagic.apibutnotreally.ritual; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/RitualRenderer.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualRenderer.java similarity index 87% rename from src/main/java/WayofTime/bloodmagic/api/ritual/RitualRenderer.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualRenderer.java index 57251f8d..4c999f20 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/RitualRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/RitualRenderer.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.ritual; +package WayofTime.bloodmagic.apibutnotreally.ritual; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/IImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/IImperfectRitualStone.java similarity index 88% rename from src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/IImperfectRitualStone.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/IImperfectRitualStone.java index 6c8620db..f468513e 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/IImperfectRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/IImperfectRitualStone.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.ritual.imperfect; +package WayofTime.bloodmagic.apibutnotreally.ritual.imperfect; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/ImperfectRitual.java similarity index 93% rename from src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/ImperfectRitual.java index d19ef961..c6f668d3 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/ImperfectRitual.java @@ -1,13 +1,13 @@ -package WayofTime.bloodmagic.api.ritual.imperfect; +package WayofTime.bloodmagic.apibutnotreally.ritual.imperfect; -import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; /** * Abstract class for creating new imperfect rituals. ImperfectRituals need be * registered with - * {@link WayofTime.bloodmagic.api.registry.ImperfectRitualRegistry#registerRitual(ImperfectRitual)} + * {@link WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry#registerRitual(ImperfectRitual)} */ public abstract class ImperfectRitual { diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/package-info.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/package-info.java similarity index 71% rename from src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/package-info.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/package-info.java index 5740241a..e47d4b81 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/package-info.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/ritual/imperfect/package-info.java @@ -1,6 +1,6 @@ @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -package WayofTime.bloodmagic.api.ritual.imperfect; +package WayofTime.bloodmagic.apibutnotreally.ritual.imperfect; import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/WayofTime/bloodmagic/api/saving/BMWorldSavedData.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/BMWorldSavedData.java similarity index 93% rename from src/main/java/WayofTime/bloodmagic/api/saving/BMWorldSavedData.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/BMWorldSavedData.java index 16470fa5..be15d0a9 100644 --- a/src/main/java/WayofTime/bloodmagic/api/saving/BMWorldSavedData.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/BMWorldSavedData.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.saving; +package WayofTime.bloodmagic.apibutnotreally.saving; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/WayofTime/bloodmagic/api/saving/SoulNetwork.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/SoulNetwork.java similarity index 94% rename from src/main/java/WayofTime/bloodmagic/api/saving/SoulNetwork.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/SoulNetwork.java index 4fdb465b..54098c72 100644 --- a/src/main/java/WayofTime/bloodmagic/api/saving/SoulNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/saving/SoulNetwork.java @@ -1,9 +1,9 @@ -package WayofTime.bloodmagic.api.saving; +package WayofTime.bloodmagic.apibutnotreally.saving; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.event.AddToNetworkEvent; -import WayofTime.bloodmagic.api.event.SoulNetworkEvent; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.event.AddToNetworkEvent; +import WayofTime.bloodmagic.apibutnotreally.event.SoulNetworkEvent; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import com.google.common.base.Strings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/DemonWillHolder.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/DemonWillHolder.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/api/soul/DemonWillHolder.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/DemonWillHolder.java index 8ec0283e..721cbb99 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/DemonWillHolder.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/DemonWillHolder.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.soul; +package WayofTime.bloodmagic.apibutnotreally.soul; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/EnumDemonWillType.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/EnumDemonWillType.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/api/soul/EnumDemonWillType.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/EnumDemonWillType.java index 445697f7..55a1dd42 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/EnumDemonWillType.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/EnumDemonWillType.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.soul; +package WayofTime.bloodmagic.apibutnotreally.soul; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/IDemonWill.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWill.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api/soul/IDemonWill.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWill.java index 7ef8c777..1387372b 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/IDemonWill.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWill.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.soul; +package WayofTime.bloodmagic.apibutnotreally.soul; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillConduit.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillConduit.java similarity index 90% rename from src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillConduit.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillConduit.java index bfa3a253..96947c98 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillConduit.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillConduit.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.soul; +package WayofTime.bloodmagic.apibutnotreally.soul; /** * Implement this interface on a block that can accept and store Demonic Will. diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillGem.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillGem.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillGem.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillGem.java index 26c90de5..4878ca07 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillGem.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillGem.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.soul; +package WayofTime.bloodmagic.apibutnotreally.soul; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillWeapon.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillWeapon.java similarity index 84% rename from src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillWeapon.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillWeapon.java index a24d804f..dc989bd2 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillWeapon.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDemonWillWeapon.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.soul; +package WayofTime.bloodmagic.apibutnotreally.soul; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/IDiscreteDemonWill.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDiscreteDemonWill.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/soul/IDiscreteDemonWill.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDiscreteDemonWill.java index d9ae26d6..c5a34382 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/IDiscreteDemonWill.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/IDiscreteDemonWill.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.soul; +package WayofTime.bloodmagic.apibutnotreally.soul; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/PlayerDemonWillHandler.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/PlayerDemonWillHandler.java similarity index 98% rename from src/main/java/WayofTime/bloodmagic/api/soul/PlayerDemonWillHandler.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/PlayerDemonWillHandler.java index 464245f5..07d95f3a 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/PlayerDemonWillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/soul/PlayerDemonWillHandler.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.soul; +package WayofTime.bloodmagic.apibutnotreally.soul; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -8,7 +8,7 @@ import net.minecraft.util.NonNullList; * This class provides several helper methods in order to handle soul * consumption and use for a player. This refers to the Soul System, meaning * Monster Souls and Soul Gems, etc. The Soul Network's helper methods are found - * in {@link WayofTime.bloodmagic.api.util.helper.NetworkHelper} + * in {@link WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper} */ public class PlayerDemonWillHandler { /** diff --git a/src/main/java/WayofTime/bloodmagic/api/teleport/ITeleport.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/ITeleport.java similarity index 59% rename from src/main/java/WayofTime/bloodmagic/api/teleport/ITeleport.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/ITeleport.java index 567b9052..f5a1392e 100644 --- a/src/main/java/WayofTime/bloodmagic/api/teleport/ITeleport.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/ITeleport.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.teleport; +package WayofTime.bloodmagic.apibutnotreally.teleport; public interface ITeleport { void teleport(); diff --git a/src/main/java/WayofTime/bloodmagic/api/teleport/PortalLocation.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/PortalLocation.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/teleport/PortalLocation.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/PortalLocation.java index 094c195d..a861f5c9 100644 --- a/src/main/java/WayofTime/bloodmagic/api/teleport/PortalLocation.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/PortalLocation.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.teleport; +package WayofTime.bloodmagic.apibutnotreally.teleport; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/api/teleport/Teleport.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/Teleport.java similarity index 97% rename from src/main/java/WayofTime/bloodmagic/api/teleport/Teleport.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/Teleport.java index 72f64bf3..b733e538 100644 --- a/src/main/java/WayofTime/bloodmagic/api/teleport/Teleport.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/Teleport.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.teleport; +package WayofTime.bloodmagic.apibutnotreally.teleport; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/api/teleport/TeleportQueue.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleportQueue.java similarity index 93% rename from src/main/java/WayofTime/bloodmagic/api/teleport/TeleportQueue.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleportQueue.java index 941afa9d..6e56b7d9 100644 --- a/src/main/java/WayofTime/bloodmagic/api/teleport/TeleportQueue.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleportQueue.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.teleport; +package WayofTime.bloodmagic.apibutnotreally.teleport; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; diff --git a/src/main/java/WayofTime/bloodmagic/api/teleport/TeleporterBloodMagic.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleporterBloodMagic.java similarity index 94% rename from src/main/java/WayofTime/bloodmagic/api/teleport/TeleporterBloodMagic.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleporterBloodMagic.java index 148eab4a..0bcb1d36 100644 --- a/src/main/java/WayofTime/bloodmagic/api/teleport/TeleporterBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/teleport/TeleporterBloodMagic.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.teleport; +package WayofTime.bloodmagic.apibutnotreally.teleport; import net.minecraft.entity.Entity; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/BindableHelper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/BindableHelper.java similarity index 95% rename from src/main/java/WayofTime/bloodmagic/api/util/helper/BindableHelper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/BindableHelper.java index e21b2d92..ca573a46 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/BindableHelper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/BindableHelper.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.api.util.helper; +package WayofTime.bloodmagic.apibutnotreally.util.helper; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.event.ItemBindEvent; -import WayofTime.bloodmagic.api.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.event.ItemBindEvent; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; import WayofTime.bloodmagic.util.handler.event.GenericHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/IncenseHelper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/IncenseHelper.java similarity index 84% rename from src/main/java/WayofTime/bloodmagic/api/util/helper/IncenseHelper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/IncenseHelper.java index 8e835696..47aca8bc 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/IncenseHelper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/IncenseHelper.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.util.helper; +package WayofTime.bloodmagic.apibutnotreally.util.helper; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/ItemHelper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/ItemHelper.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/api/util/helper/ItemHelper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/ItemHelper.java index 35a27909..740043c0 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/ItemHelper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/ItemHelper.java @@ -1,10 +1,10 @@ -package WayofTime.bloodmagic.api.util.helper; +package WayofTime.bloodmagic.apibutnotreally.util.helper; -import WayofTime.bloodmagic.api.altar.IBloodAltar; -import WayofTime.bloodmagic.api.iface.IItemLPContainer; -import WayofTime.bloodmagic.api.iface.IUpgradeTrainer; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; +import WayofTime.bloodmagic.apibutnotreally.iface.IItemLPContainer; +import WayofTime.bloodmagic.apibutnotreally.iface.IUpgradeTrainer; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.item.ItemUpgradeTome; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/LogHelper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/LogHelper.java similarity index 87% rename from src/main/java/WayofTime/bloodmagic/api/util/helper/LogHelper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/LogHelper.java index bc10f82e..bc6d8de5 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/LogHelper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/LogHelper.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.util.helper; +package WayofTime.bloodmagic.apibutnotreally.util.helper; -import WayofTime.bloodmagic.api.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/NBTHelper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NBTHelper.java similarity index 83% rename from src/main/java/WayofTime/bloodmagic/api/util/helper/NBTHelper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NBTHelper.java index 6c1985da..ec5202a6 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/NBTHelper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NBTHelper.java @@ -1,4 +1,4 @@ -package WayofTime.bloodmagic.api.util.helper; +package WayofTime.bloodmagic.apibutnotreally.util.helper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NetworkHelper.java similarity index 91% rename from src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NetworkHelper.java index 6e4ae4fe..cfef4b4b 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/NetworkHelper.java @@ -1,12 +1,12 @@ -package WayofTime.bloodmagic.api.util.helper; +package WayofTime.bloodmagic.apibutnotreally.util.helper; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.event.SoulNetworkEvent; -import WayofTime.bloodmagic.api.orb.BloodOrb; -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import WayofTime.bloodmagic.api.registry.OrbRegistry; -import WayofTime.bloodmagic.api.saving.BMWorldSavedData; -import WayofTime.bloodmagic.api.saving.SoulNetwork; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.event.SoulNetworkEvent; +import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; +import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; +import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; +import WayofTime.bloodmagic.apibutnotreally.saving.BMWorldSavedData; +import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; import com.google.common.base.Strings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerHelper.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerHelper.java index 348dc3d8..de1c9c62 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerHelper.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.util.helper; +package WayofTime.bloodmagic.apibutnotreally.util.helper; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import com.google.common.base.Strings; import com.google.common.collect.Lists; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerSacrificeHelper.java similarity index 96% rename from src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerSacrificeHelper.java index 6c1fdc9d..541a1472 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PlayerSacrificeHelper.java @@ -1,8 +1,8 @@ -package WayofTime.bloodmagic.api.util.helper; +package WayofTime.bloodmagic.apibutnotreally.util.helper; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.altar.IBloodAltar; -import WayofTime.bloodmagic.api.event.SacrificeKnifeUsedEvent; +import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; +import WayofTime.bloodmagic.apibutnotreally.event.SacrificeKnifeUsedEvent; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/PurificationHelper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PurificationHelper.java similarity index 89% rename from src/main/java/WayofTime/bloodmagic/api/util/helper/PurificationHelper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PurificationHelper.java index 60e8bda7..3c6ef594 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/PurificationHelper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/PurificationHelper.java @@ -1,6 +1,6 @@ -package WayofTime.bloodmagic.api.util.helper; +package WayofTime.bloodmagic.apibutnotreally.util.helper; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/RitualHelper.java similarity index 92% rename from src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java rename to src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/RitualHelper.java index 9597d969..321e778d 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java +++ b/src/main/java/WayofTime/bloodmagic/apibutnotreally/util/helper/RitualHelper.java @@ -1,10 +1,10 @@ -package WayofTime.bloodmagic.api.util.helper; +package WayofTime.bloodmagic.apibutnotreally.util.helper; -import WayofTime.bloodmagic.api.registry.RitualRegistry; -import WayofTime.bloodmagic.api.ritual.EnumRuneType; -import WayofTime.bloodmagic.api.ritual.IRitualStone; -import WayofTime.bloodmagic.api.ritual.Ritual; -import WayofTime.bloodmagic.api.ritual.RitualComponent; +import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; +import WayofTime.bloodmagic.apibutnotreally.ritual.IRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; +import WayofTime.bloodmagic.apibutnotreally.ritual.RitualComponent; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java index 16380c15..1ced3484 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.item.block.ItemBlockAlchemyTable; import WayofTime.bloodmagic.tile.TileAlchemyTable; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index 886bbe25..81b6dc1a 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -2,16 +2,16 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.altar.BloodAltar; -import WayofTime.bloodmagic.api.altar.EnumAltarComponent; -import WayofTime.bloodmagic.api.altar.IAltarManipulator; -import WayofTime.bloodmagic.api.altar.IBloodAltar; -import WayofTime.bloodmagic.api.iface.IAltarReader; -import WayofTime.bloodmagic.api.iface.IBindable; -import WayofTime.bloodmagic.api.iface.IDocumentedBlock; -import WayofTime.bloodmagic.api.orb.BloodOrb; -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import WayofTime.bloodmagic.api.saving.SoulNetwork; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; +import WayofTime.bloodmagic.apibutnotreally.altar.IAltarManipulator; +import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; +import WayofTime.bloodmagic.apibutnotreally.iface.IAltarReader; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.iface.IDocumentedBlock; +import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; +import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; +import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java index b0bfcfb1..09af9235 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.soul.IDemonWillGem; -import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillGem; +import WayofTime.bloodmagic.apibutnotreally.soul.IDiscreteDemonWill; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileDemonCrucible; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java index 95352a33..53fd27cb 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; import WayofTime.bloodmagic.item.ItemDemonCrystal; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java index 31361c34..44681800 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.api.teleport.PortalLocation; -import WayofTime.bloodmagic.api.teleport.TeleportQueue; +import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; +import WayofTime.bloodmagic.apibutnotreally.teleport.PortalLocation; +import WayofTime.bloodmagic.apibutnotreally.teleport.TeleportQueue; import WayofTime.bloodmagic.block.base.BlockInteger; import WayofTime.bloodmagic.ritual.portal.LocationsHandler; import WayofTime.bloodmagic.ritual.portal.Teleports; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java index 848afb35..6dba2cde 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.tile.routing.TileInputRoutingNode; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java index 44c1766c..5b666693 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.block.material.Material; import net.minecraft.util.BlockRenderLayer; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java index a93df99e..56a40037 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.altar.EnumAltarComponent; -import WayofTime.bloodmagic.api.altar.IAltarComponent; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; +import WayofTime.bloodmagic.apibutnotreally.altar.IAltarComponent; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumMimic; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java index d3335a6f..92e59c3c 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.tile.routing.TileOutputRoutingNode; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java index 69333f47..35674e6e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.incense.IIncensePath; +import WayofTime.bloodmagic.apibutnotreally.incense.IIncensePath; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumPath; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java index 0449705c..726b1af4 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.iface.IBindable; -import WayofTime.bloodmagic.api.registry.ImperfectRitualRegistry; -import WayofTime.bloodmagic.api.registry.RitualRegistry; -import WayofTime.bloodmagic.api.ritual.Ritual; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; -import WayofTime.bloodmagic.api.util.helper.RitualHelper; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.util.helper.RitualHelper; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.block.enums.EnumRitualController; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java index 1a573969..4d51b164 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.EnumRuneType; -import WayofTime.bloodmagic.api.ritual.IRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; +import WayofTime.bloodmagic.apibutnotreally.ritual.IRitualStone; import WayofTime.bloodmagic.block.base.BlockEnum; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java index 2c200c2c..c56ac05e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileSoulForge; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java index 6ac92d99..c242b3b8 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.block; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.tile.TileTeleposer; diff --git a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java b/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java index 9f5f9c52..08188509 100644 --- a/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java +++ b/src/main/java/WayofTime/bloodmagic/block/enums/EnumSubWillType.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.block.enums; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import net.minecraft.util.IStringSerializable; import java.util.Locale; diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java index e2b95ea5..f2c1399e 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.gui; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.item.inventory.ContainerHolding; import WayofTime.bloodmagic.item.inventory.InventoryHolding; import WayofTime.bloodmagic.tile.TileAlchemyTable; diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java index 946b2ca0..07b1f281 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.client.hud; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.proxy.ClientProxy; import WayofTime.bloodmagic.util.Utils; import net.minecraft.client.Minecraft; diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java index 27f9f414..75792062 100644 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java +++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.client.mesh; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.iface.IActivatable; +import WayofTime.bloodmagic.apibutnotreally.iface.IActivatable; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java index 89267744..a27b8eba 100644 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java +++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.client.mesh; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.iface.IMultiWillTool; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.iface.IMultiWillTool; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java index ea2d04e2..6900eead 100644 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java +++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.client.mesh; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.soul.ItemSoulGem; import net.minecraft.client.renderer.ItemMeshDefinition; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java index 41fdcf94..b90de1bf 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.render.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java index 2df29bc5..91fbb1b7 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.render.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java index 4e334205..e5e91378 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.render.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java index 3bd566f0..e7ec2570 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.render.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java index 5e3e3ff5..c91a06c3 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.client.render.alchemyArray; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java index 13700c19..a886a981 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.client.render.block; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; -import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java index b471e4f4..1f592774 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.client.render.block; -import WayofTime.bloodmagic.api.altar.AltarComponent; -import WayofTime.bloodmagic.api.altar.EnumAltarTier; +import WayofTime.bloodmagic.apibutnotreally.altar.AltarComponent; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.handler.event.ClientHandler; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java index 083de767..eb13193b 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.client.render.block; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.iface.INodeRenderer; +import WayofTime.bloodmagic.apibutnotreally.iface.INodeRenderer; import WayofTime.bloodmagic.client.helper.ShaderHelper; import WayofTime.bloodmagic.tile.routing.TileRoutingNode; import net.minecraft.client.Minecraft; diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java index 3e5cbb48..98828c1d 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.command.sub; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IBindable; -import WayofTime.bloodmagic.api.util.helper.BindableHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.util.helper.BindableHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; import net.minecraft.command.CommandBase; diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java index 21717206..1b164e28 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.command.sub; -import WayofTime.bloodmagic.api.saving.SoulNetwork; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import WayofTime.bloodmagic.command.CommandBloodMagic; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java index 6fac129d..92eda02e 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.command.sub; -import WayofTime.bloodmagic.api.saving.SoulNetwork; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.command.CommandBloodMagic; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java index 0c70656d..13b1c7d6 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/BookUtils.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.guideapi; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; -import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyCircleRenderer; +import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; import WayofTime.bloodmagic.client.render.alchemyArray.DualAlchemyCircleRenderer; import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray; import amerifrance.guideapi.page.PageIRecipe; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java index a161cb2c..eb3b8127 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryAlchemy.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java index ba1b8d31..b623e8a6 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryArchitect.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry.AltarRecipe; -import WayofTime.bloodmagic.api.registry.OrbRegistry; +import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry.AltarRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; import WayofTime.bloodmagic.compat.guideapi.page.PageAlchemyArray; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java index 3c5c338d..2363e749 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryDemon.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; import WayofTime.bloodmagic.compat.guideapi.page.PageTartaricForgeRecipe; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java index a294a615..5b9c507e 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategoryRitual.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.compat.guideapi.book; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry.AltarRecipe; -import WayofTime.bloodmagic.api.ritual.EnumRuneType; +import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry.AltarRecipe; +import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; import WayofTime.bloodmagic.compat.guideapi.BookUtils; import WayofTime.bloodmagic.compat.guideapi.entry.EntryText; import WayofTime.bloodmagic.compat.guideapi.page.PageAltarRecipe; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java index 765791a1..4f5446fd 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/book/CategorySpell.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.guideapi.book; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java index 6117a981..5c925f74 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.guideapi.page; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry; import WayofTime.bloodmagic.util.helper.TextHelper; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.Page; diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java index 7f52af4a..a8189038 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.guideapi.page; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.api.registry.OrbRegistry; +import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; import WayofTime.bloodmagic.util.helper.TextHelper; import amerifrance.guideapi.api.impl.Book; import amerifrance.guideapi.api.impl.Page; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java index 5c58acbf..dca1919e 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.compat.jei; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.client.gui.GuiSoulForge; import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingCategory; import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingRecipeHandler; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java index 5b9b8e22..9dddc706 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.alchemyArray; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.IDrawable; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeHandler.java index 4a0168a5..f05a4cbd 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.alchemyArray; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java index 23fc84db..3d95e801 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.compat.jei.alchemyArray; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffectCrafting; -import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffectCrafting; +import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; import com.google.common.collect.BiMap; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java index 4ade8678..64058d7a 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.registry.OrbRegistry; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.ICraftingGridHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeHandler.java index 420793e9..8010e978 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java index 0079d60a..f86b8b14 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeJEI.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable; -import WayofTime.bloodmagic.api.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.Lists; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java index e526d182..db5ebc33 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeMaker.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable; -import WayofTime.bloodmagic.api.recipe.AlchemyTableRecipe; -import WayofTime.bloodmagic.api.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyTableRecipeRegistry; import javax.annotation.Nonnull; import java.util.ArrayList; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java index 482b98ab..2701f7d5 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.altar; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.IDrawable; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java index efd8c457..c8955819 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.altar; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java index d7de9b3d..36294a82 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.util.helper.NumeralHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; +import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; @@ -12,7 +13,7 @@ import java.awt.Color; import java.util.ArrayList; import java.util.List; -public class AltarRecipeJEI extends BlankRecipeWrapper { +public class AltarRecipeJEI implements IRecipeWrapper { @Nonnull private final List input; @Nonnull @@ -32,11 +33,12 @@ public class AltarRecipeJEI extends BlankRecipeWrapper { } @Override - public void getIngredients(IIngredients ingredients) { + public void getIngredients(@Nonnull IIngredients ingredients) { ingredients.setInputs(ItemStack.class, input); ingredients.setOutput(ItemStack.class, output); } + @Nonnull @Override public List getTooltipStrings(int mouseX, int mouseY) { ArrayList ret = new ArrayList(); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java index 760852b2..41b2cd1c 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.compat.jei.altar; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; +import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry; import WayofTime.bloodmagic.block.BlockLifeEssence; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeModContainer; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java index f8a93172..28e67e3a 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeCategory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.ICraftingGridHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeHandler.java index 233f7ee5..b1e1eaf9 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java index d8155ace..611cd8d8 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeJEI.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade; -import WayofTime.bloodmagic.api.recipe.LivingArmourDowngradeRecipe; -import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades; +import WayofTime.bloodmagic.apibutnotreally.recipe.LivingArmourDowngradeRecipe; +import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import com.google.common.collect.Lists; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java index 4aeafbef..f0194367 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/armourDowngrade/ArmourDowngradeRecipeMaker.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.armourDowngrade; -import WayofTime.bloodmagic.api.recipe.LivingArmourDowngradeRecipe; -import WayofTime.bloodmagic.api.registry.LivingArmourDowngradeRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.recipe.LivingArmourDowngradeRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.LivingArmourDowngradeRecipeRegistry; import javax.annotation.Nonnull; import java.util.ArrayList; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java index c511fa04..95e51d0e 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.binding; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.IDrawable; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java index ce2fad06..4f756e80 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.binding; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java index 561f6b21..38a92b55 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.compat.jei.binding; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectBinding; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; import com.google.common.collect.BiMap; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java index ceee68d8..a6a11a1c 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.forge; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; import mezz.jei.api.gui.ICraftingGridHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeHandler.java index 608d97be..9cd307ca 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.forge; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java index 9919a733..d1004898 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.jei.forge; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeMaker.java index 9f66cc27..cea35588 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeMaker.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.forge; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.api.registry.TartaricForgeRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.TartaricForgeRecipeRegistry; import javax.annotation.Nonnull; import java.util.ArrayList; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/WailaPluginBloodMagic.java b/src/main/java/WayofTime/bloodmagic/compat/waila/WailaPluginBloodMagic.java index 5cfd9622..bafdcc27 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/WailaPluginBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/WailaPluginBloodMagic.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.waila; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.block.*; import WayofTime.bloodmagic.compat.waila.provider.*; import mcp.mobius.waila.api.IWailaPlugin; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java index a11aae07..e3bd3c3e 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.waila.provider; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.tile.TileAlchemyArray; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java index 9e3ddf39..57282503 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.waila.provider; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.block.BlockAltar; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java index 7bd19ddd..1add88c3 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.waila.provider; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.block.BlockBloodTank; import WayofTime.bloodmagic.tile.TileBloodTank; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java index 8e1c8868..f60db24a 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.compat.waila.provider; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.registry.ImperfectRitualRegistry; -import WayofTime.bloodmagic.api.registry.RitualRegistry; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.block.BlockRitualController; import WayofTime.bloodmagic.tile.TileImperfectRitualStone; import WayofTime.bloodmagic.tile.TileMasterRitualStone; diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java index d76f0043..2f7c4273 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compat.waila.provider; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.block.BlockTeleposer; import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.tile.TileTeleposer; diff --git a/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java index fc018d59..b13f6d36 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compress; -import WayofTime.bloodmagic.api.compress.CompressionHandler; -import WayofTime.bloodmagic.api.compress.CompressionRegistry; +import WayofTime.bloodmagic.apibutnotreally.compress.CompressionHandler; +import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; diff --git a/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java index 00dd6361..9f4a2fcc 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.compress; -import WayofTime.bloodmagic.api.compress.CompressionHandler; +import WayofTime.bloodmagic.apibutnotreally.compress.CompressionHandler; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java index 093dbff0..2d51470c 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java +++ b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compress; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.compress.CompressionRegistry; +import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java index 80b2cf1f..7a0c416d 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.core; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.orb.BloodOrb; -import WayofTime.bloodmagic.api.registry.OrbRegistry; +import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; +import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; import WayofTime.bloodmagic.entity.mob.*; import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; import WayofTime.bloodmagic.entity.projectile.EntityMeteor; diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java index 542ce653..46a42aee 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicRecipes.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.core; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.item.ItemDemonCrystal; import WayofTime.bloodmagic.item.soul.ItemSoulGem; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java b/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java index 99d8b83d..9c71bb94 100644 --- a/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/core/recipe/IngredientBloodOrb.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.core.recipe; -import WayofTime.bloodmagic.api.orb.BloodOrb; -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import WayofTime.bloodmagic.api.registry.OrbRegistry; +import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; +import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; +import WayofTime.bloodmagic.apibutnotreally.registry.OrbRegistry; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntComparators; import it.unimi.dsi.fastutil.ints.IntList; diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java b/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java index 01547e6f..818bffc3 100644 --- a/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java +++ b/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.demonAura; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; import net.minecraft.world.chunk.Chunk; import java.lang.ref.WeakReference; diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java index 98201ee6..96c4c15c 100644 --- a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.demonAura; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java index 69b5ceac..34879915 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.entity.mob; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.gson.Serializers; import com.google.common.base.Predicate; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java index ca6ec8be..0ae9a398 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.entity.mob; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.entity.ai.EntityAIAttackStealthMelee; import WayofTime.bloodmagic.entity.ai.EntityAIStealthRetreat; import WayofTime.bloodmagic.entity.ai.EntityAIStealthTowardsTarget; diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java index cf128414..6bed3068 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.entity.mob; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.entity.ai.EntityAIEatAndCorruptBlock; import WayofTime.bloodmagic.entity.ai.EntityAIProtectAlly; import com.google.common.collect.Maps; diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java index 871bfb50..f4fcbe89 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSpider.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.entity.mob; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.entity.ai.EntityAIPickUpAlly; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java index 084df078..4ffeb770 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.entity.mob; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.entity.ai.EntityAIAttackRangedBow; diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java index c596696c..db068c77 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.entity.projectile; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import io.netty.buffer.ByteBuf; import net.minecraft.entity.Entity; diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java index bfbbe0e8..71e6bb84 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.entity.projectile; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.meteor.MeteorRegistry; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java index 8946d035..e96c4cc9 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.entity.projectile; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/gson/Serializers.java b/src/main/java/WayofTime/bloodmagic/gson/Serializers.java index 1f947941..d629f793 100644 --- a/src/main/java/WayofTime/bloodmagic/gson/Serializers.java +++ b/src/main/java/WayofTime/bloodmagic/gson/Serializers.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.gson; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import com.google.gson.*; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java b/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java index f6b01f98..9fcad4b6 100644 --- a/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.incense; -import WayofTime.bloodmagic.api.incense.EnumTranquilityType; -import WayofTime.bloodmagic.api.incense.ITranquilityHandler; -import WayofTime.bloodmagic.api.incense.TranquilityStack; +import WayofTime.bloodmagic.apibutnotreally.incense.EnumTranquilityType; +import WayofTime.bloodmagic.apibutnotreally.incense.ITranquilityHandler; +import WayofTime.bloodmagic.apibutnotreally.incense.TranquilityStack; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import net.minecraft.block.*; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java b/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java index c7b0abc7..3b9002b1 100644 --- a/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/inversion/CorruptionHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.inversion; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java b/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java index d1a1e9aa..0bcf8815 100644 --- a/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java +++ b/src/main/java/WayofTime/bloodmagic/inversion/InversionPillarHandler.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.inversion; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java index 442ecd96..c6c24cce 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java @@ -2,10 +2,10 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.altar.BloodAltar; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.altar.*; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.altar.*; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.block.BlockAltar; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.ChatUtil; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java b/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java index 195be959..c413e43b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.impl.ItemBindable; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.impl.ItemBindable; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java index 0b7311a5..4318a90f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.iface.IBindable; -import WayofTime.bloodmagic.api.orb.BloodOrb; -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; +import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java index 651a8e91..19d2d6e3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import com.google.common.collect.HashMultiset; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java index 37076c1e..3de0de3b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import com.google.common.collect.HashMultiset; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java index 2f2600ec..898fec90 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import com.google.common.collect.HashMultiset; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java index cf6a8809..ebfd3952 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IActivatable; -import WayofTime.bloodmagic.api.iface.IBindable; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IActivatable; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java index fae76626..ee605c35 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.event.BoundToolEvent; -import WayofTime.bloodmagic.api.iface.IActivatable; -import WayofTime.bloodmagic.api.iface.IBindable; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.event.BoundToolEvent; +import WayofTime.bloodmagic.apibutnotreally.iface.IActivatable; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java index b5cdb49c..eb4fec00 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.util.helper.PlayerSacrificeHelper; -import WayofTime.bloodmagic.api.util.helper.PurificationHelper; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerSacrificeHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PurificationHelper; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.client.IVariantProvider; import com.google.common.collect.Lists; import net.minecraft.entity.EntityLivingBase; @@ -69,7 +69,7 @@ public class ItemDaggerOfSacrifice extends Item implements IVariantProvider { if (PlayerSacrificeHelper.findAndFillAltar(attacker.getEntityWorld(), target, lifeEssence, true)) { target.getEntityWorld().playSound(null, target.posX, target.posY, target.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (target.getEntityWorld().rand.nextFloat() - target.getEntityWorld().rand.nextFloat()) * 0.8F); target.setHealth(-1); - target.onDeath(WayofTime.bloodmagic.api.BloodMagicAPI.damageSource); + target.onDeath(WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI.damageSource); } return false; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java index bd8143dc..bd45e9cc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDiscreteDemonWill; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import com.google.common.collect.Lists; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java index 68dcc7cf..4cc7940a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.iface.IDemonWillViewer; +import WayofTime.bloodmagic.apibutnotreally.iface.IDemonWillViewer; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java index 45fad002..e029fe4f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java index 4481c2a2..1a16af89 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.ritual.EnumRuneType; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.block.BlockRitualStone; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index c224ea7d..3bb6f750 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IVariantProvider; import com.google.common.collect.Lists; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java index 3f5e15ac..524f1888 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.Lists; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index 616b01a2..e24e5e98 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.registry.RitualRegistry; -import WayofTime.bloodmagic.api.ritual.EnumRuneType; -import WayofTime.bloodmagic.api.ritual.Ritual; -import WayofTime.bloodmagic.api.ritual.RitualComponent; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.util.helper.RitualHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; +import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; +import WayofTime.bloodmagic.apibutnotreally.ritual.RitualComponent; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.util.helper.RitualHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.tile.TileMasterRitualStone; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java index 455e3f1c..193d027f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.ritual.EnumRitualReaderState; -import WayofTime.bloodmagic.api.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRitualReaderState; +import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDiscreteDemonWill; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index 1444de0e..8107f15d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -2,12 +2,12 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.event.SacrificeKnifeUsedEvent; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerSacrificeHelper; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.event.SacrificeKnifeUsedEvent; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java index f17328f6..081c8a5d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.altar.EnumAltarTier; -import WayofTime.bloodmagic.api.altar.IAltarManipulator; -import WayofTime.bloodmagic.api.iface.IDocumentedBlock; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; +import WayofTime.bloodmagic.apibutnotreally.altar.IAltarManipulator; +import WayofTime.bloodmagic.apibutnotreally.iface.IDocumentedBlock; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileAltar; import WayofTime.bloodmagic.util.ChatUtil; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java index 64895638..684e8cfa 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java index c7bd3f2c..1647562f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java index f22ac3c0..832d90f2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.iface.IUpgradeTrainer; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades; +import WayofTime.bloodmagic.apibutnotreally.iface.IUpgradeTrainer; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java index f65f891c..663d38ba 100644 --- a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java +++ b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item.alchemy; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.iface.ICustomAlchemyConsumable; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.iface.ICustomAlchemyConsumable; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index bfd67b55..2f84dc7b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item.armour; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; -import WayofTime.bloodmagic.api.saving.SoulNetwork; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.ItemComponent; diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java index 962a6272..62eb5cb9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.item.armour; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IMultiWillTool; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IMultiWillTool; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import com.google.common.collect.HashMultimap; diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java index 611c8150..21908bf8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.block; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java index 3abdfdce..90a11db4 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item.gear; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.altar.IAltarManipulator; -import WayofTime.bloodmagic.api.altar.IBloodAltar; -import WayofTime.bloodmagic.api.iface.IItemLPContainer; -import WayofTime.bloodmagic.api.util.helper.ItemHelper.LPContainer; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.altar.IAltarManipulator; +import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; +import WayofTime.bloodmagic.apibutnotreally.iface.IItemLPContainer; +import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LPContainer; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java index 1dd19a4b..80f9a90b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.item.gear; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.altar.IAltarManipulator; -import WayofTime.bloodmagic.api.altar.IBloodAltar; -import WayofTime.bloodmagic.api.iface.IItemLPContainer; -import WayofTime.bloodmagic.api.util.helper.ItemHelper.LPContainer; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.altar.IAltarManipulator; +import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; +import WayofTime.bloodmagic.apibutnotreally.iface.IItemLPContainer; +import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LPContainer; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/inventory/ContainerHolding.java b/src/main/java/WayofTime/bloodmagic/item/inventory/ContainerHolding.java index 09508f3f..ccfd1a2b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/inventory/ContainerHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/inventory/ContainerHolding.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.inventory; -import WayofTime.bloodmagic.api.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; import WayofTime.bloodmagic.item.sigil.ItemSigilHolding; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java b/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java index 83440993..62947841 100644 --- a/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item.inventory; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; import WayofTime.bloodmagic.item.sigil.ItemSigilHolding; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java b/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java index 78c49062..6e6b44d6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java +++ b/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item.inventory; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java index 3cdb1aa0..882a5556 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.item.routing; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.INodeRenderer; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.INodeRenderer; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.routing.IMasterRoutingNode; import WayofTime.bloodmagic.routing.IRoutingNode; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java index 885f02b5..e0bbdf8c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.iface.ISentientSwordEffectProvider; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientSwordEffectProvider; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java index 7de088ff..6accf15c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.impl.ItemSigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.impl.ItemSigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java index 5f9fd16a..67881d1c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; import net.minecraft.entity.Entity; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java index 37a6eccb..07528ccf 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java index 44753b5b..61e779d7 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java index 34e2d061..25a4d2b3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.compress.CompressionRegistry; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java index bc77fa24..13f9c407 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.altar.IBloodAltar; -import WayofTime.bloodmagic.api.iface.IAltarReader; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; +import WayofTime.bloodmagic.apibutnotreally.iface.IAltarReader; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.tile.TileIncenseAltar; import WayofTime.bloodmagic.tile.TileInversionPillar; import WayofTime.bloodmagic.util.ChatUtil; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java index e28a310f..fc124828 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java index 855c29ab..06bce035 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.Entity; import net.minecraft.entity.monster.EntityEnderman; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java index 8c6b1a27..94bf6f8f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFilledHand.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFilledHand.java index 9ef7189e..b941152b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFilledHand.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFilledHand.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.handler.event.GenericHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFrost.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFrost.java index dfaab6cd..5287c105 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFrost.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFrost.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.enchantment.EnchantmentFrostWalker; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java index 842b69ad..5faaad29 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import net.minecraft.block.IGrowable; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java index 02559204..37cbf27d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java index da59eee5..13276673 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IAltarReader; -import WayofTime.bloodmagic.api.iface.IBindable; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IAltarReader; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.key.IKeybindable; import WayofTime.bloodmagic.client.key.KeyBindings; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java index 919b2dab..abfdebb8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java index f4b7e412..eccf3a77 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java index 61631c72..118d528c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java index d05a105b..fc2fb523 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.altar.IBloodAltar; -import WayofTime.bloodmagic.api.iface.IAltarReader; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; +import WayofTime.bloodmagic.apibutnotreally.iface.IAltarReader; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.tile.TileIncenseAltar; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.NumeralHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java index 57064bf5..b5c6608e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.tile.TileSpectralBlock; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java index e4fd869f..425d43ea 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.teleport.TeleportQueue; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.teleport.TeleportQueue; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.ritual.portal.Teleports; import WayofTime.bloodmagic.tile.TileTeleposer; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java index 7590fc19..1f9d78c8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.impl.ItemSigilToggleable; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.impl.ItemSigilToggleable; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import WayofTime.bloodmagic.util.helper.TextHelper; @@ -14,7 +14,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.apache.commons.lang3.text.WordUtils; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java index ac8429f4..250daeb6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java index 1dca46ef..1e0aa5ea 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java index 8fa03754..e45ad632 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.block.BlockCauldron; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java index 05bb2c43..b8dd34cc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.item.sigil; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java index 3be9b4be..743ea4b1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDemonWill; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.util.ITooltipFlag; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java index e25ae539..2ca80fed 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.item.armour.ItemSentientArmour; import com.google.common.collect.Lists; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java index b86fc3ea..d4c7536c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java @@ -1,15 +1,15 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IMultiWillTool; -import WayofTime.bloodmagic.api.iface.ISentientSwordEffectProvider; -import WayofTime.bloodmagic.api.iface.ISentientTool; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDemonWill; -import WayofTime.bloodmagic.api.soul.IDemonWillWeapon; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IMultiWillTool; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientSwordEffectProvider; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientTool; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillWeapon; +import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index ef658a06..6aeade8d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IMultiWillTool; -import WayofTime.bloodmagic.api.iface.ISentientTool; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IMultiWillTool; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientTool; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.entity.mob.EntitySentientSpecter; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java index ca8a0502..490edb06 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java @@ -1,15 +1,15 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IMultiWillTool; -import WayofTime.bloodmagic.api.iface.ISentientSwordEffectProvider; -import WayofTime.bloodmagic.api.iface.ISentientTool; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDemonWill; -import WayofTime.bloodmagic.api.soul.IDemonWillWeapon; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IMultiWillTool; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientSwordEffectProvider; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientTool; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillWeapon; +import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java index e86ee440..e5b90eef 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java @@ -1,15 +1,15 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IMultiWillTool; -import WayofTime.bloodmagic.api.iface.ISentientSwordEffectProvider; -import WayofTime.bloodmagic.api.iface.ISentientTool; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDemonWill; -import WayofTime.bloodmagic.api.soul.IDemonWillWeapon; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IMultiWillTool; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientSwordEffectProvider; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientTool; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillWeapon; +import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java index 4753c957..9546f2ac 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java @@ -1,15 +1,15 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IMultiWillTool; -import WayofTime.bloodmagic.api.iface.ISentientSwordEffectProvider; -import WayofTime.bloodmagic.api.iface.ISentientTool; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDemonWill; -import WayofTime.bloodmagic.api.soul.IDemonWillWeapon; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IMultiWillTool; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientSwordEffectProvider; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientTool; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillWeapon; +import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionMultiWill; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java index a4095e15..90fd0023 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.item.soul; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IMultiWillTool; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDemonWill; -import WayofTime.bloodmagic.api.soul.IDemonWillGem; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.iface.IMultiWillTool; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillGem; +import WayofTime.bloodmagic.apibutnotreally.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionWillGem; import WayofTime.bloodmagic.util.helper.TextHelper; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java index e9e3edfb..57df9a6c 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.livingArmour; -import WayofTime.bloodmagic.api.iface.IUpgradeTrainer; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.iface.IUpgradeTrainer; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.HashMultimap; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java index 2de24a51..9162ab95 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java index a187eacd..eea9e27e 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java index 50655a92..b837ba77 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java index 90dcf8a7..af2b15ca 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java index f5648b37..0b3b6095 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java index 394b308a..c2fb14e7 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java index 31ddcfcc..f30ef882 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java index 57118a87..a9bc44d3 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java index 4a8827cc..2877f3be 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java index 0b8f7788..4546f447 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.downgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java index bcb98f2a..57584dc9 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeArrowProtect; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java index 1a408791..95e1357f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeArrowShot; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java index 4fb581c8..2a843bcb 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeCriticalStrike; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java index 8d5cafe3..a063e192 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeDigging; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java index 459d947a..57c67bea 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeExperience; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java index 64440c23..fc0017ea 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeFallProtect; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java index 3be711ab..c69e03e4 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeFireResist; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java index e3b35918..06a9ecad 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeKnockbackResist; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java index e7069b4e..bbab4ad4 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeGraveDigger; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java index 21670c1f..ff48cb51 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeGrimReaperSprint; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java index a5375402..e9701d9b 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeHealthboost; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java index 9d26e3c8..eebfcbc4 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeJump; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java index e2ee5927..177ad61a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeMeleeDamage; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java index 26ebe64b..53a91cf1 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSpeed; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java index 1cd463bd..105885bb 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeNightSight; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java index 11580b8f..1333750b 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePhysicalProtect; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java index dd76abe2..31d24e54 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePoisonResist; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java index d3929d36..082a28d4 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeRepairing; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java index fe7b7258..a0744780 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java index 8e2ecb20..d338e77b 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSolarPowered; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java index ae0451e9..00be46cb 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSprintAttack; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java index 438f5d59..700edfe1 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.tracker; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeStepAssist; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java index 48d96ee4..d790ca2f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java index 95f9c7b4..c9714184 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java index 75ffd6b0..65077f41 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java index 1ba86bcb..4b69347c 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.livingArmour.LivingArmour; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java index 7908f9d8..d43a8482 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java index 83a98ede..73a23691 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.nbt.NBTTagCompound; public class LivingArmourUpgradeExperience extends LivingArmourUpgrade { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java index d00394dd..d829d828 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java index e76812e1..6cb7e0f6 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java index e7c285e9..f277bea7 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemSpade; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java index e6dc11ad..05f6644f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java index 19181cda..acb057e3 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java index dd831b75..6cec3d05 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java index 84363286..faf8d7d5 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java index 5b59193e..5214502d 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java index 6a39ff37..966c9b1f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java index 0cb14b98..5143860a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java index d5ed775f..f563ba66 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java index 8f8ec4d2..318ab46f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java index acc05450..ca20ddb3 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.nbt.NBTTagCompound; public class LivingArmourUpgradeSelfSacrifice extends LivingArmourUpgrade { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java index 34291867..3295882a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java index 2677eaba..87791649 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java index 22d175b6..d74bce15 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java index 48c8d7c6..2f14ec9d 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import net.minecraft.nbt.NBTTagCompound; public class LivingArmourUpgradeStepAssist extends LivingArmourUpgrade { diff --git a/src/main/java/WayofTime/bloodmagic/meteor/MeteorRegistry.java b/src/main/java/WayofTime/bloodmagic/meteor/MeteorRegistry.java index 4550aca7..4870d5ff 100644 --- a/src/main/java/WayofTime/bloodmagic/meteor/MeteorRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/meteor/MeteorRegistry.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.meteor; -import WayofTime.bloodmagic.api.ItemStackWrapper; +import WayofTime.bloodmagic.apibutnotreally.ItemStackWrapper; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/network/DemonAuraPacketProcessor.java b/src/main/java/WayofTime/bloodmagic/network/DemonAuraPacketProcessor.java index eb8b9724..f7d1f8c4 100644 --- a/src/main/java/WayofTime/bloodmagic/network/DemonAuraPacketProcessor.java +++ b/src/main/java/WayofTime/bloodmagic/network/DemonAuraPacketProcessor.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.network; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.proxy.ClientProxy; import io.netty.buffer.ByteBuf; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java b/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java index cb0ea468..0a9f94d7 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java +++ b/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.potion; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.recipe.alchemyTable.AlchemyTablePotionAugmentRecipe; import net.minecraft.block.Block; import net.minecraft.block.IGrowable; @@ -66,7 +66,7 @@ public class BMPotionUtils { } if (incurredDamage > 0) { - entity.attackEntityFrom(WayofTime.bloodmagic.api.BloodMagicAPI.damageSource, (float) incurredDamage); + entity.attackEntityFrom(WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI.damageSource, (float) incurredDamage); } return incurredDamage; diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java index a393cb53..2e2bdfa1 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.potion; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.event.SacrificeKnifeUsedEvent; +import WayofTime.bloodmagic.apibutnotreally.event.SacrificeKnifeUsedEvent; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.Entity; import net.minecraft.entity.IProjectile; diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index 3d9d0233..42ef7613 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.proxy; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.client.helper.ShaderHelper; diff --git a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java index 636310a4..18885435 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.proxy; -import WayofTime.bloodmagic.api.ritual.CapabilityRuneType; -import WayofTime.bloodmagic.api.ritual.IRitualStone; -import WayofTime.bloodmagic.api.teleport.TeleportQueue; +import WayofTime.bloodmagic.apibutnotreally.ritual.CapabilityRuneType; +import WayofTime.bloodmagic.apibutnotreally.ritual.IRitualStone; +import WayofTime.bloodmagic.apibutnotreally.teleport.TeleportQueue; import WayofTime.bloodmagic.fuel.FuelHandler; import com.google.common.collect.ImmutableMap; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java index 971e44cb..52d221eb 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.recipe.alchemyTable; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemBanner; diff --git a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java index bd97772c..8c21e8e2 100644 --- a/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.recipe.alchemyTable; -import WayofTime.bloodmagic.api.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java index 4e0e9d18..c3564204 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.registry; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourHandler; import WayofTime.bloodmagic.livingArmour.downgrade.*; import WayofTime.bloodmagic.livingArmour.tracker.*; import WayofTime.bloodmagic.livingArmour.upgrade.*; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java b/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java index fff4f109..58516481 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModCorruptionBlocks.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.registry; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.inversion.CorruptionHandler; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 2b27d46d..2f244a80 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -2,13 +2,13 @@ package WayofTime.bloodmagic.registry; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.alchemyArray.*; -import WayofTime.bloodmagic.api.altar.EnumAltarTier; -import WayofTime.bloodmagic.api.compress.CompressionRegistry; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.recipe.AlchemyTableCustomRecipe; -import WayofTime.bloodmagic.api.registry.*; -import WayofTime.bloodmagic.api.ritual.EnumRuneType; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; +import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry; +import WayofTime.bloodmagic.apibutnotreally.iface.ISigil; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableCustomRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; import WayofTime.bloodmagic.client.render.alchemyArray.*; import WayofTime.bloodmagic.compress.AdvancedCompressionHandler; import WayofTime.bloodmagic.compress.BaseCompressionHandler; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java index 3d0def9a..1343d5fe 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.registry; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.registry.HarvestRegistry; -import WayofTime.bloodmagic.api.registry.ImperfectRitualRegistry; -import WayofTime.bloodmagic.api.registry.RitualRegistry; -import WayofTime.bloodmagic.api.ritual.Ritual; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.registry.HarvestRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; import WayofTime.bloodmagic.item.alchemy.ItemCuttingFluid; import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerPlantable; diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java b/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java index 69834f08..2fa8e433 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.registry; -import WayofTime.bloodmagic.api.incense.IncenseTranquilityRegistry; +import WayofTime.bloodmagic.apibutnotreally.incense.IncenseTranquilityRegistry; import WayofTime.bloodmagic.incense.TranquilityHandlers; public class ModTranquilityHandlers { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java index 69ccc38a..a9785bf9 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.altar.AltarComponent; -import WayofTime.bloodmagic.api.altar.EnumAltarComponent; -import WayofTime.bloodmagic.api.altar.EnumAltarTier; -import WayofTime.bloodmagic.api.ritual.EnumRuneType; -import WayofTime.bloodmagic.api.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.api.ritual.Ritual; -import WayofTime.bloodmagic.api.ritual.RitualComponent; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.altar.AltarComponent; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; +import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; +import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; +import WayofTime.bloodmagic.apibutnotreally.ritual.RitualComponent; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java index d5671333..e555c69a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java index 8db309d0..93df19e4 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; import com.google.common.collect.Iterables; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java index 2a8be8aa..ccb845b9 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.item.ItemComponent; import WayofTime.bloodmagic.tile.TileAlchemyArray; import net.minecraft.block.Block; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java index b5a4953e..41b8098d 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java index ea01a579..f31a03f0 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.compress.CompressionRegistry; -import WayofTime.bloodmagic.api.recipe.AlchemyTableRecipe; -import WayofTime.bloodmagic.api.registry.AlchemyTableRecipeRegistry; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.compress.CompressionRegistry; +import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java index 00e1b34f..c40acf12 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrystalHarvest.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java index 5c9b254a..5a52ad05 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.iface.IBindable; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.Utils; import com.google.common.base.Strings; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java index 38a5b4fb..c70de21b 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java @@ -2,11 +2,11 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.altar.IBloodAltar; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.util.helper.PlayerSacrificeHelper; +import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java index 52c22bf5..1207dd3c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java index de8a4a54..b8fe4a66 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualForsakenSoul.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntityAnimal; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java index 37e6c56b..3bce44ba 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemFood; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java index 9f2af4fa..9e42209c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java index e48c6b36..574ed869 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.iface.IHarvestHandler; -import WayofTime.bloodmagic.api.registry.HarvestRegistry; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler; +import WayofTime.bloodmagic.apibutnotreally.registry.HarvestRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java index 69e6c61d..0d4e0f61 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java index 45ab5d5c..1d27ada9 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java index 1b6d15c1..082edc55 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java index 70d01e55..8034d1b8 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualLivingArmourDowngrade.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.recipe.LivingArmourDowngradeRecipe; -import WayofTime.bloodmagic.api.registry.LivingArmourDowngradeRecipeRegistry; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.recipe.LivingArmourDowngradeRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.LivingArmourDowngradeRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.util.ChatUtil; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java index 948ce689..1f55d2f8 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.BlockOre; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java index 90a9412f..81299c17 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualMeteor.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.entity.projectile.EntityMeteor; import WayofTime.bloodmagic.meteor.MeteorRegistry; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java index 938a3fab..37dd74e7 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java index 4732b101..85acd27b 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.EnumRuneType; -import WayofTime.bloodmagic.api.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.api.ritual.Ritual; -import WayofTime.bloodmagic.api.ritual.RitualComponent; -import WayofTime.bloodmagic.api.teleport.PortalLocation; +import WayofTime.bloodmagic.apibutnotreally.ritual.EnumRuneType; +import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; +import WayofTime.bloodmagic.apibutnotreally.ritual.RitualComponent; +import WayofTime.bloodmagic.apibutnotreally.teleport.PortalLocation; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.ritual.portal.LocationsHandler; import WayofTime.bloodmagic.tile.TileDimensionalPortal; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java index 0158e15c..ede507a1 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import com.google.common.collect.Lists; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java index 64537627..9eea0094 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java index 4cc59843..bb3035b6 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java index 967ca362..369f8873 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.tile.TileSpectralBlock; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java index f1c12561..3b42d23a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.StatTracker; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java index c8291570..13e0e257 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java index e16184bd..2715bd64 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.tile.TileAltar; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java index 7db7ffea..c406b163 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.apibutnotreally.ritual.*; import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java index 55512361..258fdfbe 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.harvest; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.iface.IHarvestHandler; -import WayofTime.bloodmagic.api.registry.HarvestRegistry; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler; +import WayofTime.bloodmagic.apibutnotreally.registry.HarvestRegistry; import net.minecraft.block.Block; import net.minecraft.block.BlockCrops; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java index 5454ca0b..6200a003 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual.harvest; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.iface.IHarvestHandler; -import WayofTime.bloodmagic.api.registry.HarvestRegistry; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler; +import WayofTime.bloodmagic.apibutnotreally.registry.HarvestRegistry; import net.minecraft.block.BlockStem; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java index 19f045b3..408eab39 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual.harvest; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.iface.IHarvestHandler; -import WayofTime.bloodmagic.api.registry.HarvestRegistry; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.iface.IHarvestHandler; +import WayofTime.bloodmagic.apibutnotreally.registry.HarvestRegistry; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java index ef7523fa..49c280ac 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java index d8d9093c..80857a9a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java index 243bd5e3..6ec3a207 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java index 871769f2..88907218 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.MobEffects; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java index 39bec8d2..5404ec97 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.imperfect; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java index 1a1c0555..7ec1d9a0 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.ritual.portal; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.teleport.PortalLocation; +import WayofTime.bloodmagic.apibutnotreally.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.teleport.PortalLocation; import net.minecraftforge.common.DimensionManager; import java.io.*; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java index b005e751..bde56486 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.ritual.portal; -import WayofTime.bloodmagic.api.event.TeleposeEvent; -import WayofTime.bloodmagic.api.saving.SoulNetwork; -import WayofTime.bloodmagic.api.teleport.Teleport; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.event.TeleposeEvent; +import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; +import WayofTime.bloodmagic.apibutnotreally.teleport.Teleport; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; diff --git a/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java b/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java index 11209c0c..42cf8ab8 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java +++ b/src/main/java/WayofTime/bloodmagic/structures/Dungeon.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.structures; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; +import WayofTime.bloodmagic.apibutnotreally.ritual.AreaDescriptor; import net.minecraft.util.EnumFacing; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java index d9ab71a6..84a2843d 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java +++ b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoom.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.structures; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; +import WayofTime.bloodmagic.apibutnotreally.ritual.AreaDescriptor; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java index 6905948d..39d77472 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.iface.IAlchemyArray; -import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.apibutnotreally.iface.IAlchemyArray; +import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyArrayRecipeRegistry; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java index 0290cf78..3ceab6be 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.orb.BloodOrb; -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import WayofTime.bloodmagic.api.recipe.AlchemyTableRecipe; -import WayofTime.bloodmagic.api.registry.AlchemyTableRecipeRegistry; -import WayofTime.bloodmagic.api.saving.SoulNetwork; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; +import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; +import WayofTime.bloodmagic.apibutnotreally.recipe.AlchemyTableRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.AlchemyTableRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; import com.google.common.base.Strings; import net.minecraft.block.state.IBlockState; import net.minecraft.inventory.ISidedInventory; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java index 945c7918..bfaeefbb 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.altar.BloodAltar; -import WayofTime.bloodmagic.api.altar.EnumAltarTier; -import WayofTime.bloodmagic.api.altar.IBloodAltar; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarTier; +import WayofTime.bloodmagic.apibutnotreally.altar.IBloodAltar; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java b/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java index 2bf3e98e..8e161c77 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.tile.base.TileBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java index ac4a0e7b..df286a8b 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDemonWillConduit; -import WayofTime.bloodmagic.api.soul.IDemonWillGem; -import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillConduit; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillGem; +import WayofTime.bloodmagic.apibutnotreally.soul.IDiscreteDemonWill; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java index 2cfda269..d4fbdd7d 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.block.BlockDemonCrystal; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.tile.base.TileTicking; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java index 78d2424e..4e5d3fdb 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDemonWillConduit; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillConduit; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.tile.base.TileTicking; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java index e1e73718..86ae91b0 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDemonWillConduit; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillConduit; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.tile.base.TileTicking; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java index ec1fc4b8..3899cc39 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.registry.ImperfectRitualRegistry; -import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.registry.ImperfectRitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.imperfect.ImperfectRitual; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.tile.base.TileBase; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java index 8f90b289..26daca95 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.incense.EnumTranquilityType; -import WayofTime.bloodmagic.api.incense.IIncensePath; -import WayofTime.bloodmagic.api.incense.IncenseTranquilityRegistry; -import WayofTime.bloodmagic.api.incense.TranquilityStack; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -import WayofTime.bloodmagic.api.util.helper.PlayerSacrificeHelper; +import WayofTime.bloodmagic.apibutnotreally.incense.EnumTranquilityType; +import WayofTime.bloodmagic.apibutnotreally.incense.IIncensePath; +import WayofTime.bloodmagic.apibutnotreally.incense.IncenseTranquilityRegistry; +import WayofTime.bloodmagic.apibutnotreally.incense.TranquilityStack; +import WayofTime.bloodmagic.apibutnotreally.ritual.AreaDescriptor; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.incense.IncenseAltarHandler; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java b/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java index 7ba2a285..1d2e8a19 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.inversion.InversionPillarHandler; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index c812f552..4431af8f 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -1,16 +1,16 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.event.RitualEvent; -import WayofTime.bloodmagic.api.registry.RitualRegistry; -import WayofTime.bloodmagic.api.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.api.ritual.Ritual; -import WayofTime.bloodmagic.api.saving.SoulNetwork; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.api.util.helper.RitualHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.event.RitualEvent; +import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.IMasterRitualStone; +import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; +import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.RitualHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.ItemActivationCrystal; import WayofTime.bloodmagic.tile.base.TileTicking; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java index e9cbe72a..a1b3a63d 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.tile.base.TileTicking; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java index 4e0f8872..bf3dddc8 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.iface.IPurificationAsh; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -import WayofTime.bloodmagic.api.util.helper.PurificationHelper; +import WayofTime.bloodmagic.apibutnotreally.iface.IPurificationAsh; +import WayofTime.bloodmagic.apibutnotreally.ritual.AreaDescriptor; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PurificationHelper; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java index 7bdf5b3e..fd066671 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.api.registry.TartaricForgeRecipeRegistry; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDemonWill; -import WayofTime.bloodmagic.api.soul.IDemonWillConduit; -import WayofTime.bloodmagic.api.soul.IDemonWillGem; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.TartaricForgeRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillConduit; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillGem; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java index 44696136..172c7adb 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.tile.base.TileTicking; import com.google.common.base.Strings; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java index 97c51571..a8124376 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.tile; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.event.TeleposeEvent; -import WayofTime.bloodmagic.api.teleport.TeleportQueue; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.event.TeleposeEvent; +import WayofTime.bloodmagic.apibutnotreally.teleport.TeleportQueue; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NetworkHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.PlayerHelper; import WayofTime.bloodmagic.block.BlockTeleposer; import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.ritual.portal.Teleports; diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java index 9ba7f05a..c2569ba8 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerAlchemyTable.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile.container; -import WayofTime.bloodmagic.api.orb.IBloodOrb; +import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; import WayofTime.bloodmagic.tile.TileAlchemyTable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java index ced03f85..bd82760e 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.tile.container; -import WayofTime.bloodmagic.api.soul.IDemonWill; -import WayofTime.bloodmagic.api.soul.IDemonWillGem; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWill; +import WayofTime.bloodmagic.apibutnotreally.soul.IDemonWillGem; import WayofTime.bloodmagic.tile.TileSoulForge; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java index 83a22f14..5deac5ea 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile.routing; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.item.inventory.ItemInventory; import WayofTime.bloodmagic.util.GhostItemHelper; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java index cbe898e4..2d17f476 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.tile.routing; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.routing.*; import WayofTime.bloodmagic.tile.TileInventory; diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java index a8b7aa2c..6e13a518 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.tile.routing; -import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.apibutnotreally.Constants; import WayofTime.bloodmagic.routing.IItemRoutingNode; import WayofTime.bloodmagic.routing.IMasterRoutingNode; import WayofTime.bloodmagic.routing.IRoutingNode; diff --git a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java b/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java index 36b29da4..77862f48 100644 --- a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.util; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java b/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java index 5b09e100..0b69af06 100644 --- a/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java +++ b/src/main/java/WayofTime/bloodmagic/util/PluginUtil.java @@ -1,7 +1,8 @@ package WayofTime.bloodmagic.util; -import WayofTime.bloodmagic.apiv2.BloodMagicPlugin; -import WayofTime.bloodmagic.apiv2.IBloodMagicPlugin; +import WayofTime.bloodmagic.api.BloodMagicPlugin; +import WayofTime.bloodmagic.api.IBloodMagicPlugin; +import WayofTime.bloodmagic.api.impl.BloodMagicCorePlugin; import com.google.common.collect.Lists; import net.minecraftforge.fml.common.discovery.ASMDataTable; import org.apache.commons.lang3.tuple.Pair; @@ -32,7 +33,7 @@ public class PluginUtil { } // Bring core plugin up to top - discoveredAnnotations.sort((o1, o2) -> o1.getLeft().getClass().getCanonicalName().startsWith("WayofTime") ? 1 : 0); + discoveredAnnotations.sort((o1, o2) -> o1.getLeft().getClass() == BloodMagicCorePlugin.class ? 1 : 0); return discoveredAnnotations; } } diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index ae3b50ef..19d1e886 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.util; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.altar.EnumAltarComponent; -import WayofTime.bloodmagic.api.iface.IDemonWillViewer; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.BlockStack; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.altar.EnumAltarComponent; +import WayofTime.bloodmagic.apibutnotreally.iface.IDemonWillViewer; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.network.BloodMagicPacketHandler; import WayofTime.bloodmagic.network.PlayerVelocityPacketProcessor; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index 530d4ca5..2719671e 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -2,10 +2,10 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.registry.RitualRegistry; -import WayofTime.bloodmagic.api.ritual.Ritual; -import WayofTime.bloodmagic.api.ritual.RitualComponent; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.registry.RitualRegistry; +import WayofTime.bloodmagic.apibutnotreally.ritual.Ritual; +import WayofTime.bloodmagic.apibutnotreally.ritual.RitualComponent; import WayofTime.bloodmagic.client.hud.HUDElement; import WayofTime.bloodmagic.client.key.KeyBindings; import WayofTime.bloodmagic.client.render.block.RenderFakeBlocks; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java index 3c9ca214..add509dc 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/CraftingHandler.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.event.AltarCraftedEvent; -import WayofTime.bloodmagic.api.iface.IUpgradeTrainer; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.util.helper.ItemHelper; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.event.AltarCraftedEvent; +import WayofTime.bloodmagic.apibutnotreally.iface.IUpgradeTrainer; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.util.helper.ItemHelper; +import WayofTime.bloodmagic.apibutnotreally.util.helper.NBTHelper; import WayofTime.bloodmagic.block.BlockLifeEssence; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.ItemInscriptionTool; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java index 16cd191c..387af240 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java @@ -2,19 +2,19 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.event.ItemBindEvent; -import WayofTime.bloodmagic.api.event.SacrificeKnifeUsedEvent; -import WayofTime.bloodmagic.api.event.TeleposeEvent; -import WayofTime.bloodmagic.api.iface.IBindable; -import WayofTime.bloodmagic.api.iface.ISentientTool; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.orb.BloodOrb; -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import WayofTime.bloodmagic.api.saving.SoulNetwork; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; -import WayofTime.bloodmagic.api.util.helper.*; -import WayofTime.bloodmagic.api_impl.BloodMagicAPI; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.event.ItemBindEvent; +import WayofTime.bloodmagic.apibutnotreally.event.SacrificeKnifeUsedEvent; +import WayofTime.bloodmagic.apibutnotreally.event.TeleposeEvent; +import WayofTime.bloodmagic.apibutnotreally.iface.IBindable; +import WayofTime.bloodmagic.apibutnotreally.iface.ISentientTool; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.orb.BloodOrb; +import WayofTime.bloodmagic.apibutnotreally.orb.IBloodOrb; +import WayofTime.bloodmagic.apibutnotreally.saving.SoulNetwork; +import WayofTime.bloodmagic.apibutnotreally.soul.DemonWillHolder; +import WayofTime.bloodmagic.apibutnotreally.util.helper.*; +import WayofTime.bloodmagic.api.impl.BloodMagicAPI; import WayofTime.bloodmagic.block.BlockAltar; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java index 0e202ffe..42e866f8 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.Constants; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java index 8aee28b8..a98a8e9f 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/StatTrackerHandler.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.apibutnotreally.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.item.armour.ItemSentientArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java index 4857c90e..b83bb3d3 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.soul.*; +import WayofTime.bloodmagic.apibutnotreally.soul.*; import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.demonAura.PosXY; diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java index 069246a9..fd8e6bcf 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/RecipeHelper.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.util.helper; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; -import WayofTime.bloodmagic.api.registry.TartaricForgeRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.recipe.TartaricForgeRecipe; +import WayofTime.bloodmagic.apibutnotreally.registry.AltarRecipeRegistry; +import WayofTime.bloodmagic.apibutnotreally.registry.TartaricForgeRecipeRegistry; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.fml.common.registry.ForgeRegistries;