From 6c729db70c00a165196a2abcf32ba56c9ac9fe8e Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 17 Mar 2016 13:00:44 -0700 Subject: [PATCH] Initial 1.9 commit This DOES NOT BUILD. Do not even attempt. Almost everything has been ported besides the block/item packages. Then it's a matter of testing what broke. --- build.gradle | 14 +- gradle.properties | 6 +- .../java/WayofTime/bloodmagic/BloodMagic.java | 28 ++-- .../WayofTime/bloodmagic/ConfigHandler.java | 18 +-- .../AlchemyArrayEffectBinding.java | 8 +- .../bloodmagic/altar/BloodAltar.java | 45 +++---- .../WayofTime/bloodmagic/api/BlockStack.java | 2 +- .../bloodmagic/api/BloodMagicAPI.java | 12 +- .../WayofTime/bloodmagic/api/Constants.java | 6 +- .../api/DamageSourceBloodMagic.java | 12 +- .../AlchemyArrayEffectCrafting.java | 2 +- .../AlchemyCircleRenderer.java | 4 +- .../bloodmagic/api/altar/AltarComponent.java | 2 +- .../bloodmagic/api/altar/EnumAltarTier.java | 6 +- .../api/compress/CompressionRegistry.java | 6 +- .../api/event/AltarCraftedEvent.java | 2 +- .../bloodmagic/api/event/RitualEvent.java | 13 +- .../bloodmagic/api/event/TeleposeEvent.java | 4 +- .../bloodmagic/api/iface/IHarvestHandler.java | 4 +- .../bloodmagic/api/iface/IUpgradeTrainer.java | 4 +- .../bloodmagic/api/incense/IIncensePath.java | 2 +- .../incense/IncenseTranquilityRegistry.java | 8 +- .../api/incense/TranquilityHandler.java | 2 +- .../api/livingArmour/ILivingArmour.java | 3 +- .../api/livingArmour/LivingArmourHandler.java | 4 +- .../api/livingArmour/LivingArmourUpgrade.java | 5 +- .../api/livingArmour/StatTracker.java | 6 +- .../bloodmagic/api/network/SoulNetwork.java | 22 ++-- .../api/recipe/ShapedBloodOrbRecipe.java | 14 +- .../api/recipe/ShapelessBloodOrbRecipe.java | 14 +- .../api/recipe/TartaricForgeRecipe.java | 10 +- .../registry/AlchemyArrayRecipeRegistry.java | 18 ++- .../api/registry/AltarRecipeRegistry.java | 11 +- .../api/registry/HarvestRegistry.java | 13 +- .../api/registry/ImperfectRitualRegistry.java | 9 +- .../bloodmagic/api/registry/OrbRegistry.java | 23 ++-- .../api/registry/RitualRegistry.java | 11 +- .../registry/TartaricForgeRecipeRegistry.java | 10 +- .../bloodmagic/api/ritual/AreaDescriptor.java | 7 +- .../api/ritual/CapabilityRuneType.java | 4 +- .../bloodmagic/api/ritual/EnumRuneType.java | 6 +- .../api/ritual/IMasterRitualStone.java | 2 +- .../bloodmagic/api/ritual/IRitualStone.java | 2 +- .../bloodmagic/api/ritual/Ritual.java | 10 +- .../api/ritual/RitualComponent.java | 2 +- .../imperfect/IImperfectRitualStone.java | 2 +- .../api/ritual/imperfect/ImperfectRitual.java | 5 +- .../bloodmagic/api/soul/DemonWillHolder.java | 4 +- .../api/soul/EnumDemonWillType.java | 2 +- .../bloodmagic/api/soul/IDemonWillWeapon.java | 4 +- .../api/teleport/ChunkPairSerializable.java | 6 +- .../api/teleport/PortalLocation.java | 8 +- .../bloodmagic/api/teleport/Teleport.java | 2 +- .../api/teleport/TeleportQueue.java | 6 +- .../api/teleport/TeleporterBloodMagic.java | 2 +- .../api/util/helper/BindableHelper.java | 10 +- .../api/util/helper/IncenseHelper.java | 2 +- .../bloodmagic/api/util/helper/LogHelper.java | 3 +- .../api/util/helper/NetworkHelper.java | 28 ++-- .../api/util/helper/PlayerHelper.java | 15 +-- .../util/helper/PlayerSacrificeHelper.java | 7 +- .../api/util/helper/RitualHelper.java | 18 +-- .../bloodmagic/block/BlockAlchemyArray.java | 20 ++- .../bloodmagic/block/BlockAltar.java | 23 ++-- .../bloodmagic/block/BlockBloodLight.java | 8 +- .../bloodmagic/block/BlockBloodRune.java | 4 +- .../block/BlockBloodStoneBrick.java | 4 +- .../bloodmagic/block/BlockBloodTank.java | 14 +- .../bloodmagic/block/BlockCrystal.java | 4 +- .../bloodmagic/block/BlockDemonCrucible.java | 12 +- .../bloodmagic/block/BlockDemonCrystal.java | 23 ++-- .../block/BlockDemonCrystallizer.java | 6 +- .../bloodmagic/block/BlockDemonPylon.java | 6 +- .../block/BlockDimensionalPortal.java | 22 ++-- .../bloodmagic/block/BlockIncenseAltar.java | 6 +- .../block/BlockInputRoutingNode.java | 6 +- .../block/BlockItemRoutingNode.java | 6 +- .../bloodmagic/block/BlockLifeEssence.java | 10 +- .../block/BlockMasterRoutingNode.java | 6 +- .../block/BlockOutputRoutingNode.java | 6 +- .../WayofTime/bloodmagic/block/BlockPath.java | 8 +- .../bloodmagic/block/BlockPedestal.java | 10 +- .../bloodmagic/block/BlockPhantom.java | 14 +- .../block/BlockRitualController.java | 18 +-- .../bloodmagic/block/BlockRitualStone.java | 10 +- .../bloodmagic/block/BlockRoutingNode.java | 2 +- .../bloodmagic/block/BlockSoulForge.java | 6 +- .../bloodmagic/block/BlockSpectral.java | 12 +- .../bloodmagic/block/BlockTeleposer.java | 8 +- .../bloodmagic/block/BlockTestSpellBlock.java | 4 +- .../bloodmagic/block/base/BlockInteger.java | 6 +- .../bloodmagic/block/base/BlockString.java | 10 +- .../block/property/PropertyString.java | 9 +- .../property/UnlistedPropertyString.java | 4 +- .../bloodmagic/client/gui/GuiHandler.java | 10 +- .../client/gui/GuiItemRoutingNode.java | 14 +- .../client/gui/GuiMasterRoutingNode.java | 4 +- .../bloodmagic/client/gui/GuiSoulForge.java | 8 +- .../bloodmagic/client/gui/GuiTeleposer.java | 6 +- .../client/gui/config/ConfigGui.java | 10 +- .../client/gui/config/ConfigGuiFactory.java | 4 +- .../client/helper/ShaderHelper.java | 11 +- .../mesh/CustomMeshDefinitionActivatable.java | 6 +- .../client/render/RenderAlchemyArray.java | 4 +- .../bloodmagic/client/render/RenderAltar.java | 12 +- .../client/render/RenderDemonCrucible.java | 4 +- .../client/render/RenderFakeBlocks.java | 5 +- .../client/render/RenderItemRoutingNode.java | 19 ++- .../BindingAlchemyCircleRenderer.java | 6 +- .../entity/BloodLightRenderFactory.java | 2 +- .../render/entity/RenderEntityBloodLight.java | 6 +- .../entity/RenderEntitySentientArrow.java | 4 +- .../render/entity/RenderEntitySoulSnare.java | 6 +- .../entity/SentientArrowRenderFactory.java | 2 +- .../render/entity/SoulSnareRenderFactory.java | 2 +- .../bloodmagic/command/CommandBloodMagic.java | 7 +- .../bloodmagic/command/ISubCommand.java | 3 +- .../bloodmagic/command/SubCommandBase.java | 43 +----- .../command/sub/SubCommandBind.java | 21 +-- .../command/sub/SubCommandHelp.java | 14 +- .../command/sub/SubCommandNetwork.java | 20 +-- .../bloodmagic/command/sub/SubCommandOrb.java | 17 +-- .../guideapi/CompatibilityGuideAPI.java | 27 ---- .../guideapi/guide/GuideBloodMagic.java | 79 ----------- .../guideapi/guide/page/PageAltarRecipe.java | 72 ---------- .../compat/jei/BloodMagicPlugin.java | 84 ------------ .../jei/CompatibilityJustEnoughItems.java | 24 ---- .../AlchemyArrayCraftingCategory.java | 77 ----------- .../AlchemyArrayCraftingRecipeHandler.java | 37 ------ .../AlchemyArrayCraftingRecipeJEI.java | 39 ------ .../AlchemyArrayCraftingRecipeMaker.java | 46 ------- .../compat/jei/altar/AltarRecipeCategory.java | 72 ---------- .../compat/jei/altar/AltarRecipeHandler.java | 37 ------ .../compat/jei/altar/AltarRecipeJEI.java | 70 ---------- .../compat/jei/altar/AltarRecipeMaker.java | 41 ------ .../jei/binding/BindingRecipeCategory.java | 77 ----------- .../jei/binding/BindingRecipeHandler.java | 37 ------ .../compat/jei/binding/BindingRecipeJEI.java | 38 ------ .../jei/binding/BindingRecipeMaker.java | 46 ------- .../forge/TartaricForgeRecipeCategory.java | 98 -------------- .../jei/forge/TartaricForgeRecipeHandler.java | 37 ------ .../jei/forge/TartaricForgeRecipeJEI.java | 83 ------------ .../jei/forge/TartaricForgeRecipeMaker.java | 24 ---- .../jei/orb/ShapedOrbRecipeHandler.java | 41 ------ .../compat/jei/orb/ShapedOrbRecipeJEI.java | 123 ------------------ .../jei/orb/ShapelessOrbRecipeHandler.java | 39 ------ .../compat/jei/orb/ShapelessOrbRecipeJEI.java | 111 ---------------- .../thaumcraft/CompatibilityThaumcraft.java | 34 ----- .../LivingArmourUpgradeThaumRevealing.java | 50 ------- ...ivingArmourUpgradeThaumRunicShielding.java | 58 --------- .../StatTrackerThaumRunicShielding.java | 97 -------------- .../research/BloodMagicResearch.java | 31 ----- .../research/SanguineResearchItem.java | 34 ----- .../compat/waila/CompatibilityWaila.java | 26 ---- .../compat/waila/WailaCallbackHandler.java | 30 ----- .../provider/DataProviderAlchemyArray.java | 71 ---------- .../provider/DataProviderBloodAltar.java | 122 ----------------- .../DataProviderRitualController.java | 103 --------------- .../waila/provider/DataProviderTeleposer.java | 74 ----------- .../compress/AdvancedCompressionHandler.java | 4 +- .../compress/BaseCompressionHandler.java | 2 +- .../compress/StorageBlockCraftingManager.java | 10 +- ...StorageBlockCraftingRecipeAssimilator.java | 11 +- .../WayofTime/bloodmagic/demonAura/PosXY.java | 6 +- .../bloodmagic/demonAura/WillChunk.java | 6 +- .../bloodmagic/demonAura/WillWorld.java | 4 +- .../demonAura/WorldDemonWillHandler.java | 24 ++-- .../entity/projectile/EntityBloodLight.java | 25 ++-- .../projectile/EntitySentientArrow.java | 4 +- .../entity/projectile/EntitySoulSnare.java | 2 +- .../incense/CropTranquilityHandler.java | 10 +- .../incense/EarthTranquilityHandler.java | 8 +- .../incense/FireTranquilityHandler.java | 8 +- .../incense/IncenseAltarComponent.java | 2 +- .../incense/IncenseAltarHandler.java | 12 +- .../incense/LavaTranquilityHandler.java | 10 +- .../incense/PlantTranquilityHandler.java | 10 +- .../incense/TreeTranquilityHandler.java | 10 +- .../incense/WaterTranquilityHandler.java | 10 +- .../item/ItemActivationCrystal.java | 10 +- .../bloodmagic/item/ItemAltarMaker.java | 26 ++-- .../bloodmagic/item/ItemArcaneAshes.java | 14 +- .../bloodmagic/item/ItemBindable.java | 15 +-- .../bloodmagic/item/ItemBloodOrb.java | 19 ++- .../bloodmagic/item/ItemBloodShard.java | 10 +- .../bloodmagic/item/ItemBoundAxe.java | 22 ++-- .../bloodmagic/item/ItemBoundPickaxe.java | 21 ++- .../bloodmagic/item/ItemBoundShovel.java | 21 ++- .../bloodmagic/item/ItemBoundSword.java | 27 ++-- .../bloodmagic/item/ItemBoundTool.java | 26 ++-- .../bloodmagic/item/ItemBucketEssence.java | 4 +- .../bloodmagic/item/ItemComponent.java | 12 +- .../item/ItemDaggerOfSacrifice.java | 12 +- .../bloodmagic/item/ItemDemonCrystal.java | 16 +-- .../bloodmagic/item/ItemInscriptionTool.java | 18 +-- .../bloodmagic/item/ItemLavaCrystal.java | 7 +- .../bloodmagic/item/ItemRitualDiviner.java | 28 ++-- .../item/ItemSacrificialDagger.java | 26 ++-- .../WayofTime/bloodmagic/item/ItemSlate.java | 14 +- .../item/ItemTelepositionFocus.java | 33 ++--- .../bloodmagic/item/ItemUpgradeTome.java | 24 ++-- .../bloodmagic/item/ItemUpgradeTrainer.java | 22 ++-- .../item/armour/ItemLivingArmour.java | 25 ++-- .../item/armour/ItemSentientArmour.java | 18 +-- .../item/block/ItemBlockBloodRune.java | 2 +- .../item/block/ItemBlockBloodStoneBrick.java | 2 +- .../item/block/ItemBlockBloodTank.java | 6 +- .../item/block/ItemBlockCrystal.java | 2 +- .../item/block/ItemBlockDemonCrystal.java | 4 +- .../bloodmagic/item/block/ItemBlockPath.java | 2 +- .../item/block/ItemBlockPedestal.java | 2 +- .../item/block/ItemBlockRitualController.java | 2 +- .../item/block/ItemBlockRitualStone.java | 2 +- .../item/gear/ItemPackSacrifice.java | 18 +-- .../item/gear/ItemPackSelfSacrifice.java | 20 +-- .../item/inventory/ItemInventory.java | 4 +- .../item/routing/IItemFilterProvider.java | 2 +- .../item/routing/ItemNodeRouter.java | 22 ++-- .../item/routing/ItemRouterFilter.java | 23 ++-- .../bloodmagic/item/sigil/ItemSigilAir.java | 2 +- .../bloodmagic/item/sigil/ItemSigilBase.java | 18 +-- .../item/sigil/ItemSigilBloodLight.java | 6 +- .../item/sigil/ItemSigilCompression.java | 4 +- .../item/sigil/ItemSigilDivination.java | 20 +-- .../sigil/ItemSigilElementalAffinity.java | 2 +- .../item/sigil/ItemSigilEnderSeverance.java | 8 +- .../item/sigil/ItemSigilFastMiner.java | 2 +- .../item/sigil/ItemSigilGreenGrove.java | 4 +- .../bloodmagic/item/sigil/ItemSigilHaste.java | 4 +- .../bloodmagic/item/sigil/ItemSigilLava.java | 2 +- .../item/sigil/ItemSigilMagnetism.java | 6 +- .../item/sigil/ItemSigilPhantomBridge.java | 4 +- .../bloodmagic/item/sigil/ItemSigilSeer.java | 14 +- .../item/sigil/ItemSigilSuppression.java | 6 +- .../item/sigil/ItemSigilTeleposition.java | 16 +-- .../item/sigil/ItemSigilToggleable.java | 10 +- .../item/sigil/ItemSigilTransposition.java | 12 +- .../bloodmagic/item/sigil/ItemSigilVoid.java | 13 +- .../bloodmagic/item/sigil/ItemSigilWater.java | 2 +- .../item/sigil/ItemSigilWhirlwind.java | 4 +- .../bloodmagic/item/soul/ItemMonsterSoul.java | 16 +-- .../item/soul/ItemSentientArmourGem.java | 10 +- .../bloodmagic/item/soul/ItemSentientBow.java | 6 +- .../item/soul/ItemSentientSword.java | 33 +++-- .../bloodmagic/item/soul/ItemSoulGem.java | 22 ++-- .../bloodmagic/item/soul/ItemSoulSnare.java | 16 +-- .../bloodmagic/livingArmour/LivingArmour.java | 25 ++-- .../tracker/StatTrackerArrowShot.java | 14 +- .../tracker/StatTrackerDigging.java | 14 +- .../livingArmour/tracker/StatTrackerFood.java | 16 +-- .../tracker/StatTrackerGrimReaperSprint.java | 14 +- .../tracker/StatTrackerHealthboost.java | 14 +- .../tracker/StatTrackerMeleeDamage.java | 14 +- .../tracker/StatTrackerMovement.java | 16 +-- .../tracker/StatTrackerPhysicalProtect.java | 14 +- .../tracker/StatTrackerPoison.java | 16 +-- .../tracker/StatTrackerSelfSacrifice.java | 14 +- .../tracker/StatTrackerSolarPowered.java | 14 +- .../upgrade/LivingArmourUpgradeArrowShot.java | 6 +- .../upgrade/LivingArmourUpgradeDigging.java | 16 +-- .../LivingArmourUpgradeGrimReaperSprint.java | 6 +- .../LivingArmourUpgradeHealthboost.java | 15 +-- .../LivingArmourUpgradeKnockbackResist.java | 15 +-- .../LivingArmourUpgradeMeleeDamage.java | 15 +-- .../LivingArmourUpgradePhysicalProtect.java | 4 +- .../LivingArmourUpgradePoisonResist.java | 16 +-- .../LivingArmourUpgradeSelfSacrifice.java | 2 +- .../LivingArmourUpgradeSolarPowered.java | 8 +- .../upgrade/LivingArmourUpgradeSpeed.java | 21 ++- .../LivingArmourUpgradeStepAssist.java | 2 +- .../network/BloodMagicPacketHandler.java | 6 +- .../ItemRouterButtonPacketProcessor.java | 6 +- .../potion/PotionEventHandlers.java | 10 +- .../bloodmagic/proxy/ClientProxy.java | 20 +-- .../bloodmagic/proxy/CommonProxy.java | 10 +- .../registry/ModArmourTrackers.java | 25 +--- .../bloodmagic/registry/ModBlocks.java | 54 +------- .../bloodmagic/registry/ModCompatibility.java | 18 +-- .../bloodmagic/registry/ModEntities.java | 2 +- .../bloodmagic/registry/ModItems.java | 58 +-------- .../bloodmagic/registry/ModPotions.java | 4 +- .../bloodmagic/registry/ModRecipes.java | 16 +-- .../bloodmagic/registry/ModRituals.java | 29 +---- .../registry/ModTranquilityHandlers.java | 8 +- .../bloodmagic/ritual/RitualAltarBuilder.java | 32 ++--- .../bloodmagic/ritual/RitualAnimalGrowth.java | 22 ++-- .../bloodmagic/ritual/RitualArmourEvolve.java | 25 ++-- .../bloodmagic/ritual/RitualCobblestone.java | 20 ++- .../bloodmagic/ritual/RitualContainment.java | 18 +-- .../bloodmagic/ritual/RitualCrushing.java | 24 ++-- .../bloodmagic/ritual/RitualExpulsion.java | 38 +++--- .../ritual/RitualFeatheredKnife.java | 24 ++-- .../bloodmagic/ritual/RitualFelling.java | 24 ++-- .../bloodmagic/ritual/RitualFullStomach.java | 20 ++- .../bloodmagic/ritual/RitualGreenGrove.java | 24 ++-- .../bloodmagic/ritual/RitualHarvest.java | 14 +- .../bloodmagic/ritual/RitualInterdiction.java | 18 +-- .../bloodmagic/ritual/RitualJumping.java | 20 ++- .../bloodmagic/ritual/RitualLava.java | 16 +-- .../bloodmagic/ritual/RitualMagnetic.java | 26 ++-- .../bloodmagic/ritual/RitualPlacer.java | 18 +-- .../bloodmagic/ritual/RitualPortal.java | 22 ++-- .../bloodmagic/ritual/RitualPump.java | 20 ++- .../bloodmagic/ritual/RitualRegeneration.java | 24 ++-- .../bloodmagic/ritual/RitualSpeed.java | 18 +-- .../bloodmagic/ritual/RitualSuppression.java | 23 ++-- .../ritual/RitualUpgradeRemove.java | 39 +++--- .../bloodmagic/ritual/RitualWater.java | 16 +-- .../ritual/RitualWellOfSuffering.java | 26 ++-- .../bloodmagic/ritual/RitualZephyr.java | 22 ++-- .../harvest/HarvestHandlerPlantable.java | 12 +- .../ritual/harvest/HarvestHandlerStem.java | 14 +- .../ritual/harvest/HarvestHandlerTall.java | 16 +-- .../ritual/imperfect/ImperfectRitualDay.java | 4 +- .../imperfect/ImperfectRitualNight.java | 4 +- .../ritual/imperfect/ImperfectRitualRain.java | 4 +- .../imperfect/ImperfectRitualResistance.java | 10 +- .../imperfect/ImperfectRitualZombie.java | 14 +- .../ritual/portal/LocationsHandler.java | 16 +-- .../bloodmagic/ritual/portal/Teleports.java | 29 +++-- .../bloodmagic/routing/DefaultItemFilter.java | 10 +- .../bloodmagic/routing/IItemFilter.java | 4 +- .../routing/IMasterRoutingNode.java | 4 +- .../bloodmagic/routing/IRoutingNode.java | 6 +- .../bloodmagic/routing/NodeHelper.java | 2 +- .../bloodmagic/routing/TestItemFilter.java | 8 +- .../bloodmagic/tile/TileAlchemyArray.java | 10 +- .../WayofTime/bloodmagic/tile/TileAltar.java | 6 +- .../bloodmagic/tile/TileBloodTank.java | 7 +- .../bloodmagic/tile/TileDemonCrucible.java | 16 +-- .../bloodmagic/tile/TileDemonCrystal.java | 22 ++-- .../tile/TileDemonCrystallizer.java | 10 +- .../bloodmagic/tile/TileDemonPylon.java | 10 +- .../tile/TileDimensionalPortal.java | 7 +- .../tile/TileImperfectRitualStone.java | 14 +- .../bloodmagic/tile/TileIncenseAltar.java | 30 ++--- .../bloodmagic/tile/TileInventory.java | 23 ++-- .../tile/TileMasterRitualStone.java | 37 +++--- .../bloodmagic/tile/TilePhantomBlock.java | 10 +- .../bloodmagic/tile/TileSoulForge.java | 12 +- .../bloodmagic/tile/TileSpectralBlock.java | 11 +- .../bloodmagic/tile/TileTeleposer.java | 49 +++---- .../container/ContainerItemRoutingNode.java | 8 +- .../tile/container/ContainerSoulForge.java | 6 +- .../tile/container/ContainerTeleposer.java | 2 +- .../tile/routing/TileFilteredRoutingNode.java | 2 +- .../tile/routing/TileInputRoutingNode.java | 8 +- .../tile/routing/TileMasterRoutingNode.java | 27 ++-- .../tile/routing/TileOutputRoutingNode.java | 8 +- .../tile/routing/TileRoutingNode.java | 28 ++-- .../WayofTime/bloodmagic/util/ChatUtil.java | 64 ++++----- .../bloodmagic/util/GhostItemHelper.java | 4 +- .../java/WayofTime/bloodmagic/util/Utils.java | 39 +++--- .../util/handler/ClientEventHandler.java | 50 ++++--- .../bloodmagic/util/handler/EventHandler.java | 108 ++++++--------- .../bloodmagic/util/handler/IMCHandler.java | 4 +- .../util/helper/InventoryRenderHelper.java | 6 +- .../util/helper/InventoryRenderHelperV2.java | 2 +- .../bloodmagic/util/helper/TextHelper.java | 9 +- 359 files changed, 1858 insertions(+), 4447 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/CompatibilityGuideAPI.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/guide/GuideBloodMagic.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/guide/page/PageAltarRecipe.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/CompatibilityJustEnoughItems.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeJEI.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeMaker.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapedOrbRecipeHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapedOrbRecipeJEI.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapelessOrbRecipeHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapelessOrbRecipeJEI.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/thaumcraft/CompatibilityThaumcraft.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/thaumcraft/LivingArmourUpgradeThaumRevealing.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/thaumcraft/LivingArmourUpgradeThaumRunicShielding.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/thaumcraft/StatTrackerThaumRunicShielding.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/thaumcraft/research/BloodMagicResearch.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/thaumcraft/research/SanguineResearchItem.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/waila/CompatibilityWaila.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/waila/WailaCallbackHandler.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java diff --git a/build.gradle b/build.gradle index 93480952..efc015a1 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,7 @@ buildscript { mavenCentral() maven { url "http://files.minecraftforge.net/maven" } maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } + maven { url "http://maven.modmuss50.me" } } dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' @@ -47,7 +48,8 @@ repositories { maven { url "http://dvs1.progwml6.com/files/maven" } maven { url "http://mobiusstrip.eu/maven" } maven { url "http://tehnut.info/maven" } - + maven { url "http://maven.modmuss50.me" } + ivy { name "Thaumcraft" artifactPattern "https://dl.dropboxusercontent.com/u/47135879/[module]-[revision]-deobf.[ext]" @@ -59,12 +61,12 @@ repositories { } dependencies { - deobfCompile "mezz.jei:jei_${mc_version}:${jei_version}" - deobfCompile "info.amerifrance.guideapi:Guide-API:${mc_version}-${guideapi_version}" +// deobfCompile "mezz.jei:jei_${mc_version}:${jei_version}" +// deobfCompile "info.amerifrance.guideapi:Guide-API:${mc_version}-${guideapi_version}" - compile "mcp.mobius.waila:Waila:${waila_version}_1.8.8:dev" - compile name: "Thaumcraft", version: "${mc_version}-${thaumcraft_version}", ext: "jar" - compile name: 'Baubles', version: "${baubles_version}", ext: 'jar' +// compile "mcp.mobius.waila:Waila:${waila_version}_1.8.8:dev" +// compile name: "Thaumcraft", version: "${mc_version}-${thaumcraft_version}", ext: "jar" +// compile name: 'Baubles', version: "${baubles_version}", ext: 'jar' } minecraft { diff --git a/gradle.properties b/gradle.properties index d8fbab4e..8217a2d7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic mod_version=2.0.0 -mc_version=1.8.9 -forge_version=latest +mc_version=1.9 +forge_version=12.16.0.0-1.9 curse_id=224791 -mappings_version=snapshot_20160109 +mappings_version=snapshot_20160312 jei_version=2.27.0.157 waila_version=1.6.0-B3 diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index 7eac4175..e53a92ab 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -1,8 +1,14 @@ package WayofTime.bloodmagic; -import java.io.File; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.util.helper.LogHelper; +import WayofTime.bloodmagic.client.gui.GuiHandler; import WayofTime.bloodmagic.command.CommandBloodMagic; +import WayofTime.bloodmagic.compat.ICompatibility; +import WayofTime.bloodmagic.network.BloodMagicPacketHandler; +import WayofTime.bloodmagic.proxy.CommonProxy; +import WayofTime.bloodmagic.registry.*; +import WayofTime.bloodmagic.util.handler.IMCHandler; import lombok.Getter; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -11,22 +17,8 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.*; import net.minecraftforge.fml.common.network.NetworkRegistry; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.util.helper.LogHelper; -import WayofTime.bloodmagic.client.gui.GuiHandler; -import WayofTime.bloodmagic.compat.ICompatibility; -import WayofTime.bloodmagic.network.BloodMagicPacketHandler; -import WayofTime.bloodmagic.proxy.CommonProxy; -import WayofTime.bloodmagic.registry.ModArmourTrackers; -import WayofTime.bloodmagic.registry.ModBlocks; -import WayofTime.bloodmagic.registry.ModCompatibility; -import WayofTime.bloodmagic.registry.ModEntities; -import WayofTime.bloodmagic.registry.ModItems; -import WayofTime.bloodmagic.registry.ModPotions; -import WayofTime.bloodmagic.registry.ModRecipes; -import WayofTime.bloodmagic.registry.ModRituals; -import WayofTime.bloodmagic.registry.ModTranquilityHandlers; -import WayofTime.bloodmagic.util.handler.IMCHandler; + +import java.io.File; @Mod(modid = Constants.Mod.MODID, name = Constants.Mod.NAME, version = Constants.Mod.VERSION, dependencies = Constants.Mod.DEPEND, guiFactory = "WayofTime.bloodmagic.client.gui.config.ConfigGuiFactory") @Getter diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index 53ee7d31..70b33af1 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -1,21 +1,17 @@ package WayofTime.bloodmagic; -import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.api.BloodMagicAPI; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.util.Utils; import lombok.Getter; import net.minecraft.block.Block; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.util.Utils; + +import java.io.File; +import java.util.*; public class ConfigHandler { diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java index 593126a7..a1cfbc85 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectBinding.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.alchemyArray; +import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.client.render.alchemyArray.BindingAlchemyCircleRenderer; import lombok.Getter; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.client.render.alchemyArray.BindingAlchemyCircleRenderer; public class AlchemyArrayEffectBinding extends AlchemyArrayEffect { @@ -61,7 +61,7 @@ public class AlchemyArrayEffectBinding extends AlchemyArrayEffect double dispX = distance * Math.sin(angle); double dispZ = -distance * Math.cos(angle); - EntityLightningBolt lightning = new EntityLightningBolt(world, pos.getX() + dispX, pos.getY(), pos.getZ() + dispZ); + EntityLightningBolt lightning = new EntityLightningBolt(world, pos.getX() + dispX, pos.getY(), pos.getZ() + dispZ, true); world.spawnEntityInWorld(lightning); } } diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 254bf7c0..604a66e3 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -1,29 +1,9 @@ package WayofTime.bloodmagic.altar; -import java.util.List; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.world.World; -import net.minecraft.world.WorldServer; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; import WayofTime.bloodmagic.api.BlockStack; import WayofTime.bloodmagic.api.BloodMagicAPI; import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.altar.AltarComponent; -import WayofTime.bloodmagic.api.altar.AltarUpgrade; -import WayofTime.bloodmagic.api.altar.EnumAltarComponent; -import WayofTime.bloodmagic.api.altar.EnumAltarTier; -import WayofTime.bloodmagic.api.altar.IAltarComponent; +import WayofTime.bloodmagic.api.altar.*; import WayofTime.bloodmagic.api.event.AltarCraftedEvent; import WayofTime.bloodmagic.api.orb.IBloodOrb; import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; @@ -33,9 +13,20 @@ 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; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.world.World; +import net.minecraft.world.WorldServer; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fluids.*; + +import java.util.List; public class BloodAltar implements IFluidHandler { @@ -296,7 +287,7 @@ public class BloodAltar implements IFluidHandler public void startCycle() { if (tileAltar.getWorld() != null) - tileAltar.getWorld().markBlockForUpdate(tileAltar.getPos()); + tileAltar.markDirty(); checkTier(); @@ -364,7 +355,7 @@ public class BloodAltar implements IFluidHandler fluidOutputted = Math.min(this.fluid.amount, fluidOutputted); this.fluidOutput.amount += fluidOutputted; this.fluid.amount -= fluidOutputted; - world.markBlockForUpdate(pos); + tileAltar.markDirty(); } if (internalCounter % this.getChargingFrequency() == 0 && !this.isActive) @@ -373,7 +364,7 @@ public class BloodAltar implements IFluidHandler chargeInputted = Math.min(chargeInputted, maxCharge - totalCharge); totalCharge += chargeInputted; this.fluid.amount -= chargeInputted; - world.markBlockForUpdate(pos); + tileAltar.markDirty(); } if (internalCounter % 100 == 0 && (this.isActive || this.cooldownAfterCrafting <= 0)) @@ -500,7 +491,7 @@ public class BloodAltar implements IFluidHandler } } - world.markBlockForUpdate(pos); + tileAltar.markDirty(); } public void checkTier() @@ -555,7 +546,7 @@ public class BloodAltar implements IFluidHandler if (this.totalCharge > this.maxCharge) this.totalCharge = this.maxCharge; - tileAltar.getWorld().markBlockForUpdate(tileAltar.getPos()); + tileAltar.markDirty(); } public int fillMainTank(int amount) diff --git a/src/main/java/WayofTime/bloodmagic/api/BlockStack.java b/src/main/java/WayofTime/bloodmagic/api/BlockStack.java index 4fb523ac..de54b988 100644 --- a/src/main/java/WayofTime/bloodmagic/api/BlockStack.java +++ b/src/main/java/WayofTime/bloodmagic/api/BlockStack.java @@ -5,7 +5,7 @@ import lombok.Getter; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameData; diff --git a/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java index fd1243ce..140b462f 100644 --- a/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java +++ b/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java @@ -1,10 +1,6 @@ package WayofTime.bloodmagic.api; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import WayofTime.bloodmagic.api.util.helper.LogHelper; import lombok.Getter; import lombok.Setter; import net.minecraft.block.Block; @@ -13,7 +9,11 @@ import net.minecraft.item.Item; import net.minecraft.util.DamageSource; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fml.common.registry.GameRegistry; -import WayofTime.bloodmagic.api.util.helper.LogHelper; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * The primary API class. Includes helper methods and blacklists. diff --git a/src/main/java/WayofTime/bloodmagic/api/Constants.java b/src/main/java/WayofTime/bloodmagic/api/Constants.java index 2683843b..3a0632a0 100644 --- a/src/main/java/WayofTime/bloodmagic/api/Constants.java +++ b/src/main/java/WayofTime/bloodmagic/api/Constants.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.api; -import java.util.Locale; - import lombok.Getter; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.potion.Potion; import net.minecraftforge.fml.common.registry.GameRegistry; +import java.util.Locale; + public class Constants { public static class NBT @@ -144,7 +144,7 @@ public class Constants public static class Misc { - public static final int POTION_ARRAY_SIZE = Potion.potionTypes.length; + public static final int POTION_ARRAY_SIZE = 256; } public enum BloodMagicItem diff --git a/src/main/java/WayofTime/bloodmagic/api/DamageSourceBloodMagic.java b/src/main/java/WayofTime/bloodmagic/api/DamageSourceBloodMagic.java index c07b65bf..8dab8ad2 100644 --- a/src/main/java/WayofTime/bloodmagic/api/DamageSourceBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/api/DamageSourceBloodMagic.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.api; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.DamageSource; -import net.minecraft.util.IChatComponent; import WayofTime.bloodmagic.util.helper.TextHelper; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.DamageSource; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; public class DamageSourceBloodMagic extends DamageSource { @@ -17,8 +17,8 @@ public class DamageSourceBloodMagic extends DamageSource } @Override - public IChatComponent getDeathMessage(EntityLivingBase livingBase) + public ITextComponent getDeathMessage(EntityLivingBase livingBase) { - return new ChatComponentText(TextHelper.localizeEffect("chat.BloodMagic.damageSource", livingBase.getName())); + return new TextComponentString(TextHelper.localizeEffect("chat.BloodMagic.damageSource", livingBase.getName())); } } diff --git a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffectCrafting.java b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffectCrafting.java index 7cf348ed..594f107e 100644 --- a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffectCrafting.java +++ b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffectCrafting.java @@ -4,7 +4,7 @@ import lombok.Getter; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; public class AlchemyArrayEffectCrafting extends AlchemyArrayEffect { diff --git a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java index d415814b..c560c396 100644 --- a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java @@ -3,7 +3,7 @@ package WayofTime.bloodmagic.api.alchemyCrafting; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -73,7 +73,7 @@ public class AlchemyCircleRenderer public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) { Tessellator tessellator = Tessellator.getInstance(); - WorldRenderer wr = tessellator.getWorldRenderer(); + VertexBuffer wr = tessellator.getBuffer(); GlStateManager.pushMatrix(); // float rot = (float)(this.worldObj.provider.getWorldTime() % (360 / diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/AltarComponent.java b/src/main/java/WayofTime/bloodmagic/api/altar/AltarComponent.java index 0538f8b6..7fd90b66 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/AltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/api/altar/AltarComponent.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.api.altar; import lombok.Getter; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * Used for building the altar structure. diff --git a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java b/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java index ffe8e6fe..6d7cfcb8 100644 --- a/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java +++ b/src/main/java/WayofTime/bloodmagic/api/altar/EnumAltarTier.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.api.altar; -import java.util.ArrayList; - import lombok.Getter; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; + +import java.util.ArrayList; //@formatter:off @Getter diff --git a/src/main/java/WayofTime/bloodmagic/api/compress/CompressionRegistry.java b/src/main/java/WayofTime/bloodmagic/api/compress/CompressionRegistry.java index ebd5f985..e941d695 100644 --- a/src/main/java/WayofTime/bloodmagic/api/compress/CompressionRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/compress/CompressionRegistry.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.api.compress; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - /** * A registry aimed to help compress items in an inventory into its compressible * form. diff --git a/src/main/java/WayofTime/bloodmagic/api/event/AltarCraftedEvent.java b/src/main/java/WayofTime/bloodmagic/api/event/AltarCraftedEvent.java index 6380bc85..6ea69d0e 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/AltarCraftedEvent.java +++ b/src/main/java/WayofTime/bloodmagic/api/event/AltarCraftedEvent.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.api.event; +import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; import lombok.Getter; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.eventhandler.Event; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; /** * Fired whenever a craft is completed in a BloodAltar. diff --git a/src/main/java/WayofTime/bloodmagic/api/event/RitualEvent.java b/src/main/java/WayofTime/bloodmagic/api/event/RitualEvent.java index 784de638..5f721603 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/RitualEvent.java +++ b/src/main/java/WayofTime/bloodmagic/api/event/RitualEvent.java @@ -1,15 +1,14 @@ package WayofTime.bloodmagic.api.event; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.eventhandler.Cancelable; -import net.minecraftforge.fml.common.eventhandler.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 net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.fml.common.eventhandler.Cancelable; +import net.minecraftforge.fml.common.eventhandler.Event; public class RitualEvent extends Event { @@ -51,7 +50,7 @@ public class RitualEvent extends Event * This event is called when a Ritual effect is performed. If cancelled, the * effect will not happen. * - * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#performRitual(World, BlockPos)} + * {@link WayofTime.bloodmagic.tile.TileMasterRitualStone#performRitual(World, net.minecraft.util.math.BlockPos)} */ @Cancelable public static class RitualRunEvent extends RitualEvent diff --git a/src/main/java/WayofTime/bloodmagic/api/event/TeleposeEvent.java b/src/main/java/WayofTime/bloodmagic/api/event/TeleposeEvent.java index cce220d9..ef7378ab 100644 --- a/src/main/java/WayofTime/bloodmagic/api/event/TeleposeEvent.java +++ b/src/main/java/WayofTime/bloodmagic/api/event/TeleposeEvent.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.api.event; +import WayofTime.bloodmagic.api.BlockStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.eventhandler.Cancelable; import net.minecraftforge.fml.common.eventhandler.Event; -import WayofTime.bloodmagic.api.BlockStack; /** * Fired when a teleposer attempts to transpose two blocks. Use this to perform diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IHarvestHandler.java b/src/main/java/WayofTime/bloodmagic/api/iface/IHarvestHandler.java index e8423ddf..1ba46fd4 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IHarvestHandler.java +++ b/src/main/java/WayofTime/bloodmagic/api/iface/IHarvestHandler.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.api.iface; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.BlockStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; /** * Used to define a HarvestHandler for the Harvest Ritual. diff --git a/src/main/java/WayofTime/bloodmagic/api/iface/IUpgradeTrainer.java b/src/main/java/WayofTime/bloodmagic/api/iface/IUpgradeTrainer.java index 26bfa051..892aefad 100644 --- a/src/main/java/WayofTime/bloodmagic/api/iface/IUpgradeTrainer.java +++ b/src/main/java/WayofTime/bloodmagic/api/iface/IUpgradeTrainer.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.api.iface; -import java.util.List; - import net.minecraft.item.ItemStack; +import java.util.List; + /** * This interface is used for items intended to train specific upgrades while * held in the player's inventory. diff --git a/src/main/java/WayofTime/bloodmagic/api/incense/IIncensePath.java b/src/main/java/WayofTime/bloodmagic/api/incense/IIncensePath.java index e6071510..797f6a11 100644 --- a/src/main/java/WayofTime/bloodmagic/api/incense/IIncensePath.java +++ b/src/main/java/WayofTime/bloodmagic/api/incense/IIncensePath.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.api.incense; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public interface IIncensePath diff --git a/src/main/java/WayofTime/bloodmagic/api/incense/IncenseTranquilityRegistry.java b/src/main/java/WayofTime/bloodmagic/api/incense/IncenseTranquilityRegistry.java index 322a4130..e0783b33 100644 --- a/src/main/java/WayofTime/bloodmagic/api/incense/IncenseTranquilityRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/incense/IncenseTranquilityRegistry.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.api.incense; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import java.util.ArrayList; +import java.util.List; + public class IncenseTranquilityRegistry { public static List handlerList = new ArrayList(); diff --git a/src/main/java/WayofTime/bloodmagic/api/incense/TranquilityHandler.java b/src/main/java/WayofTime/bloodmagic/api/incense/TranquilityHandler.java index 279663a5..6abbd0d3 100644 --- a/src/main/java/WayofTime/bloodmagic/api/incense/TranquilityHandler.java +++ b/src/main/java/WayofTime/bloodmagic/api/incense/TranquilityHandler.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.api.incense; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public abstract class TranquilityHandler diff --git a/src/main/java/WayofTime/bloodmagic/api/livingArmour/ILivingArmour.java b/src/main/java/WayofTime/bloodmagic/api/livingArmour/ILivingArmour.java index e5d045cb..04024943 100644 --- a/src/main/java/WayofTime/bloodmagic/api/livingArmour/ILivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/api/livingArmour/ILivingArmour.java @@ -1,12 +1,11 @@ package WayofTime.bloodmagic.api.livingArmour; +import com.google.common.collect.Multimap; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import com.google.common.collect.Multimap; - /** * An interface this is used purely for internal implementation. * diff --git a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourHandler.java index 6251a15c..c296e4b2 100644 --- a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourHandler.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.api.livingArmour; +import net.minecraft.nbt.NBTTagCompound; + import java.lang.reflect.Constructor; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import net.minecraft.nbt.NBTTagCompound; - public class LivingArmourHandler { public static List> trackers = new ArrayList>(); diff --git a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java b/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java index 3aed341f..a8582aeb 100644 --- a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourUpgrade.java @@ -1,5 +1,7 @@ package WayofTime.bloodmagic.api.livingArmour; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; @@ -7,9 +9,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - public abstract class LivingArmourUpgrade { public static String chatBase = "chat.BloodMagic.livingArmour.upgrade."; diff --git a/src/main/java/WayofTime/bloodmagic/api/livingArmour/StatTracker.java b/src/main/java/WayofTime/bloodmagic/api/livingArmour/StatTracker.java index 2524f9d0..8b35a8f8 100644 --- a/src/main/java/WayofTime/bloodmagic/api/livingArmour/StatTracker.java +++ b/src/main/java/WayofTime/bloodmagic/api/livingArmour/StatTracker.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.api.livingArmour; -import java.util.List; - +import WayofTime.bloodmagic.livingArmour.LivingArmour; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import WayofTime.bloodmagic.livingArmour.LivingArmour; + +import java.util.List; public abstract class StatTracker { diff --git a/src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java b/src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java index 2dcf3be3..3aca5fb0 100644 --- a/src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/api/network/SoulNetwork.java @@ -1,7 +1,11 @@ package WayofTime.bloodmagic.api.network; -import javax.annotation.Nullable; - +import WayofTime.bloodmagic.api.BloodMagicAPI; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.event.AddToNetworkEvent; +import WayofTime.bloodmagic.api.event.SoulNetworkEvent; +import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import com.google.common.base.Strings; import lombok.Getter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -11,14 +15,10 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; import net.minecraft.world.WorldSavedData; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.Event; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.event.AddToNetworkEvent; -import WayofTime.bloodmagic.api.event.SoulNetworkEvent; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import com.google.common.base.Strings; +import javax.annotation.Nullable; @Getter public class SoulNetwork extends WorldSavedData @@ -58,10 +58,10 @@ public class SoulNetwork extends WorldSavedData if (MinecraftForge.EVENT_BUS.post(event)) return 0; - if (MinecraftServer.getServer() == null) + if (FMLCommonHandler.instance().getMinecraftServerInstance() == null) return 0; - World world = MinecraftServer.getServer().worldServers[0]; + World world = FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[0]; SoulNetwork data = (SoulNetwork) world.loadItemData(SoulNetwork.class, event.ownerNetwork); if (data == null) @@ -177,7 +177,7 @@ public class SoulNetwork extends WorldSavedData { if (getPlayer() != null) { - getPlayer().addPotionEffect(new PotionEffect(Potion.confusion.getId(), 99)); + getPlayer().addPotionEffect(new PotionEffect(Potion.getPotionFromResourceLocation("confusion"), 99)); } } diff --git a/src/main/java/WayofTime/bloodmagic/api/recipe/ShapedBloodOrbRecipe.java b/src/main/java/WayofTime/bloodmagic/api/recipe/ShapedBloodOrbRecipe.java index 75a39a7c..265113a3 100644 --- a/src/main/java/WayofTime/bloodmagic/api/recipe/ShapedBloodOrbRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/api/recipe/ShapedBloodOrbRecipe.java @@ -1,11 +1,6 @@ package WayofTime.bloodmagic.api.recipe; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - +import WayofTime.bloodmagic.api.orb.IBloodOrb; import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; @@ -14,7 +9,12 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; -import WayofTime.bloodmagic.api.orb.IBloodOrb; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; /** * Shaped Blood Orb Recipe Handler by joshie * diff --git a/src/main/java/WayofTime/bloodmagic/api/recipe/ShapelessBloodOrbRecipe.java b/src/main/java/WayofTime/bloodmagic/api/recipe/ShapelessBloodOrbRecipe.java index f6ce521c..c5626e3b 100644 --- a/src/main/java/WayofTime/bloodmagic/api/recipe/ShapelessBloodOrbRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/api/recipe/ShapelessBloodOrbRecipe.java @@ -1,11 +1,6 @@ package WayofTime.bloodmagic.api.recipe; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - +import WayofTime.bloodmagic.api.orb.IBloodOrb; import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; @@ -14,7 +9,12 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; -import WayofTime.bloodmagic.api.orb.IBloodOrb; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; /** * Shapeless Blood Orb Recipe Handler by joshie * diff --git a/src/main/java/WayofTime/bloodmagic/api/recipe/TartaricForgeRecipe.java b/src/main/java/WayofTime/bloodmagic/api/recipe/TartaricForgeRecipe.java index a5a4ed38..073ea5c5 100644 --- a/src/main/java/WayofTime/bloodmagic/api/recipe/TartaricForgeRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/api/recipe/TartaricForgeRecipe.java @@ -1,17 +1,17 @@ package WayofTime.bloodmagic.api.recipe; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - import lombok.Getter; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + public class TartaricForgeRecipe { protected ItemStack output = null; diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java index 53a57577..7a33878c 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java @@ -1,21 +1,19 @@ package WayofTime.bloodmagic.api.registry; -import java.util.Map.Entry; - -import javax.annotation.Nullable; - +import WayofTime.bloodmagic.api.ItemStackWrapper; +import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffectCrafting; +import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffectCrafting; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; +import javax.annotation.Nullable; +import java.util.Map.Entry; public class AlchemyArrayRecipeRegistry { diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java index 67dd27b3..3ead6593 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/AltarRecipeRegistry.java @@ -1,16 +1,15 @@ package WayofTime.bloodmagic.api.registry; -import javax.annotation.Nullable; - +import WayofTime.bloodmagic.api.BloodMagicAPI; +import WayofTime.bloodmagic.api.altar.EnumAltarTier; +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; import net.minecraft.item.ItemStack; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.altar.EnumAltarTier; -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; +import javax.annotation.Nullable; public class AltarRecipeRegistry { diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/HarvestRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/HarvestRegistry.java index a5ae97d6..a12bf312 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/HarvestRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/HarvestRegistry.java @@ -1,16 +1,11 @@ package WayofTime.bloodmagic.api.registry; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockStem; import WayofTime.bloodmagic.api.BlockStack; import WayofTime.bloodmagic.api.iface.IHarvestHandler; +import net.minecraft.block.Block; +import net.minecraft.block.BlockStem; + +import java.util.*; public class HarvestRegistry { diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java index c068e4d0..36456448 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java @@ -1,16 +1,15 @@ package WayofTime.bloodmagic.api.registry; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - import WayofTime.bloodmagic.api.BlockStack; import WayofTime.bloodmagic.api.BloodMagicAPI; import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; - import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + public class ImperfectRitualRegistry { public static final Map enabledRituals = new HashMap(); diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java index d8b406c0..226626a4 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java @@ -1,24 +1,23 @@ package WayofTime.bloodmagic.api.registry; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import net.minecraft.client.resources.model.ModelBakery; -import net.minecraft.client.resources.model.ModelResourceLocation; +import WayofTime.bloodmagic.api.BloodMagicAPI; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.altar.EnumAltarTier; +import WayofTime.bloodmagic.api.orb.BloodOrb; +import WayofTime.bloodmagic.api.orb.IBloodOrb; +import com.google.common.collect.ArrayListMultimap; +import net.minecraft.client.renderer.block.model.ModelBakery; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.altar.EnumAltarTier; -import WayofTime.bloodmagic.api.orb.BloodOrb; -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import com.google.common.collect.ArrayListMultimap; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; /** * This is only for those who wish to add a basic {@link BloodOrb}. If you need diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java index 39a70eec..ff0c43d9 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java @@ -1,15 +1,14 @@ package WayofTime.bloodmagic.api.registry; +import WayofTime.bloodmagic.api.BloodMagicAPI; +import WayofTime.bloodmagic.api.ritual.Ritual; +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; + import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.ritual.Ritual; - -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; - public class RitualRegistry { public static final Map enabledRituals = new HashMap(); diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/TartaricForgeRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/TartaricForgeRecipeRegistry.java index b89bd1da..35c6edfa 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/TartaricForgeRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/TartaricForgeRecipeRegistry.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.api.registry; +import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import java.util.ArrayList; import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; - public class TartaricForgeRecipeRegistry { private static List recipeList = new ArrayList(); diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java b/src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java index 45875d97..7a1999a5 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java @@ -1,14 +1,15 @@ package WayofTime.bloodmagic.api.ritual; + +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; + import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.function.Consumer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; - public abstract class AreaDescriptor implements Iterator { public List getContainedPositions(BlockPos pos) diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/CapabilityRuneType.java b/src/main/java/WayofTime/bloodmagic/api/ritual/CapabilityRuneType.java index 3adc484e..d166dc4d 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/CapabilityRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/CapabilityRuneType.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.api.ritual; -import java.util.concurrent.Callable; - import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagByte; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; +import java.util.concurrent.Callable; + public final class CapabilityRuneType { public static class RuneTypeStorage implements Capability.IStorage diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java b/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java index 16925b30..b619caca 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.api.ritual; -import java.util.Locale; - +import WayofTime.bloodmagic.api.Constants; import net.minecraft.item.ItemStack; import net.minecraft.util.IStringSerializable; -import WayofTime.bloodmagic.api.Constants; + +import java.util.Locale; public enum EnumRuneType implements IStringSerializable { diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/IMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/api/ritual/IMasterRitualStone.java index 4e1bcb92..d5a11679 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/IMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/IMasterRitualStone.java @@ -2,8 +2,8 @@ package WayofTime.bloodmagic.api.ritual; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/IRitualStone.java b/src/main/java/WayofTime/bloodmagic/api/ritual/IRitualStone.java index 223a47db..3c623ce2 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/IRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/IRitualStone.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.api.ritual; -import net.minecraft.util.BlockPos; +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/api/ritual/Ritual.java index ef65716a..59a6b356 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/Ritual.java @@ -1,9 +1,5 @@ package WayofTime.bloodmagic.api.ritual; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -11,9 +7,13 @@ import lombok.ToString; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + /** * Abstract class for creating new rituals. Rituals need be registered with * {@link WayofTime.bloodmagic.api.registry.RitualRegistry#registerRitual(Ritual, String)} diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/RitualComponent.java b/src/main/java/WayofTime/bloodmagic/api/ritual/RitualComponent.java index f8fc0b2b..2fdf3ab9 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/RitualComponent.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/RitualComponent.java @@ -2,8 +2,8 @@ package WayofTime.bloodmagic.api.ritual; import lombok.Getter; import lombok.RequiredArgsConstructor; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; /** * Used to set a {@link EnumRuneType} type to a given {@link BlockPos} for usage diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/IImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/IImperfectRitualStone.java index e2ca632d..fbdcd02a 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/IImperfectRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/IImperfectRitualStone.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.api.ritual.imperfect; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java b/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java index 58ec75eb..c9ec02a6 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/imperfect/ImperfectRitual.java @@ -1,12 +1,11 @@ package WayofTime.bloodmagic.api.ritual.imperfect; +import WayofTime.bloodmagic.api.BlockStack; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.RequiredArgsConstructor; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.BlockStack; /** * Abstract class for creating new imperfect rituals. ImperfectRituals need be @@ -40,7 +39,7 @@ public abstract class ImperfectRitual /** * Called when the player activates the ritual - * {@link WayofTime.bloodmagic.tile.TileImperfectRitualStone#performRitual(World, BlockPos, ImperfectRitual, EntityPlayer)} + * {@link WayofTime.bloodmagic.tile.TileImperfectRitualStone#performRitual(World, net.minecraft.util.math.BlockPos, ImperfectRitual, EntityPlayer)} * * @param imperfectRitualStone * - The {@link IImperfectRitualStone} that the ritual is bound to diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/DemonWillHolder.java b/src/main/java/WayofTime/bloodmagic/api/soul/DemonWillHolder.java index 70c9719a..792381d6 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/DemonWillHolder.java +++ b/src/main/java/WayofTime/bloodmagic/api/soul/DemonWillHolder.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.api.soul; +import net.minecraft.nbt.NBTTagCompound; + import java.util.HashMap; import java.util.Map.Entry; -import net.minecraft.nbt.NBTTagCompound; - public class DemonWillHolder { public HashMap willMap = new HashMap(); diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/EnumDemonWillType.java b/src/main/java/WayofTime/bloodmagic/api/soul/EnumDemonWillType.java index 5d5263f0..3716496b 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/EnumDemonWillType.java +++ b/src/main/java/WayofTime/bloodmagic/api/soul/EnumDemonWillType.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.api.soul; -import net.minecraft.util.IStringSerializable; import lombok.Getter; +import net.minecraft.util.IStringSerializable; @Getter public enum EnumDemonWillType implements IStringSerializable diff --git a/src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillWeapon.java b/src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillWeapon.java index 3a0a5032..1b3699b0 100644 --- a/src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillWeapon.java +++ b/src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillWeapon.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.api.soul; -import java.util.List; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; +import java.util.List; + public interface IDemonWillWeapon { List getRandomDemonWillDrop(EntityLivingBase killedEntity, EntityLivingBase attackingEntity, ItemStack stack, int looting); diff --git a/src/main/java/WayofTime/bloodmagic/api/teleport/ChunkPairSerializable.java b/src/main/java/WayofTime/bloodmagic/api/teleport/ChunkPairSerializable.java index 457b1698..1ff58db1 100644 --- a/src/main/java/WayofTime/bloodmagic/api/teleport/ChunkPairSerializable.java +++ b/src/main/java/WayofTime/bloodmagic/api/teleport/ChunkPairSerializable.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.api.teleport; -import java.io.Serializable; - import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; + +import java.io.Serializable; @ToString @EqualsAndHashCode diff --git a/src/main/java/WayofTime/bloodmagic/api/teleport/PortalLocation.java b/src/main/java/WayofTime/bloodmagic/api/teleport/PortalLocation.java index 227e0780..644b4ffd 100644 --- a/src/main/java/WayofTime/bloodmagic/api/teleport/PortalLocation.java +++ b/src/main/java/WayofTime/bloodmagic/api/teleport/PortalLocation.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.api.teleport; -import java.io.Serializable; - +import WayofTime.bloodmagic.api.Constants; import lombok.Getter; import lombok.ToString; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; -import WayofTime.bloodmagic.api.Constants; +import net.minecraft.util.math.BlockPos; + +import java.io.Serializable; @ToString public class PortalLocation implements Serializable diff --git a/src/main/java/WayofTime/bloodmagic/api/teleport/Teleport.java b/src/main/java/WayofTime/bloodmagic/api/teleport/Teleport.java index 0b301587..8b0d470c 100644 --- a/src/main/java/WayofTime/bloodmagic/api/teleport/Teleport.java +++ b/src/main/java/WayofTime/bloodmagic/api/teleport/Teleport.java @@ -4,7 +4,7 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; import net.minecraft.entity.Entity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; @ToString @EqualsAndHashCode diff --git a/src/main/java/WayofTime/bloodmagic/api/teleport/TeleportQueue.java b/src/main/java/WayofTime/bloodmagic/api/teleport/TeleportQueue.java index 6e60aa20..d4a374cd 100644 --- a/src/main/java/WayofTime/bloodmagic/api/teleport/TeleportQueue.java +++ b/src/main/java/WayofTime/bloodmagic/api/teleport/TeleportQueue.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.api.teleport; -import java.util.ArrayList; -import java.util.List; - import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; +import java.util.ArrayList; +import java.util.List; + public class TeleportQueue { private static TeleportQueue INSTANCE = new TeleportQueue(); diff --git a/src/main/java/WayofTime/bloodmagic/api/teleport/TeleporterBloodMagic.java b/src/main/java/WayofTime/bloodmagic/api/teleport/TeleporterBloodMagic.java index bd85a830..2c164ee8 100644 --- a/src/main/java/WayofTime/bloodmagic/api/teleport/TeleporterBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/api/teleport/TeleporterBloodMagic.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.api.teleport; import net.minecraft.entity.Entity; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.Teleporter; import net.minecraft.world.WorldServer; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/BindableHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/BindableHelper.java index 591a5412..4d3a5c2c 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/BindableHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/BindableHelper.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.api.util.helper; -import java.util.UUID; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.event.ItemBindEvent; +import WayofTime.bloodmagic.api.iface.IBindable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.event.ItemBindEvent; -import WayofTime.bloodmagic.api.iface.IBindable; + +import java.util.UUID; public class BindableHelper { diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/IncenseHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/IncenseHelper.java index 8f084e20..4fd64661 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/IncenseHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/IncenseHelper.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.api.util.helper; +import WayofTime.bloodmagic.api.Constants; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import WayofTime.bloodmagic.api.Constants; public class IncenseHelper { diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/LogHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/LogHelper.java index 583f962d..c18c715a 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/LogHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/LogHelper.java @@ -1,10 +1,9 @@ package WayofTime.bloodmagic.api.util.helper; +import WayofTime.bloodmagic.api.BloodMagicAPI; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import WayofTime.bloodmagic.api.BloodMagicAPI; - public class LogHelper { private Logger logger; diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java index 99f3b13a..4cf6a8ee 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java @@ -1,23 +1,23 @@ package WayofTime.bloodmagic.api.util.helper; -import java.util.UUID; - +import WayofTime.bloodmagic.api.BloodMagicAPI; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.event.AddToNetworkEvent; +import WayofTime.bloodmagic.api.event.SoulNetworkEvent; +import WayofTime.bloodmagic.api.network.SoulNetwork; import WayofTime.bloodmagic.api.orb.IBloodOrb; import WayofTime.bloodmagic.api.registry.OrbRegistry; +import com.google.common.base.Strings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.Event; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.event.AddToNetworkEvent; -import WayofTime.bloodmagic.api.event.SoulNetworkEvent; -import WayofTime.bloodmagic.api.network.SoulNetwork; -import com.google.common.base.Strings; +import java.util.UUID; public class NetworkHelper { @@ -271,10 +271,10 @@ public class NetworkHelper @Deprecated public static int syphonFromNetwork(String ownerName, int syphon) { - if (MinecraftServer.getServer() == null) + if (FMLCommonHandler.instance().getMinecraftServerInstance() == null) return 0; - World world = MinecraftServer.getServer().worldServers[0]; + World world = FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[0]; SoulNetwork network = (SoulNetwork) world.loadItemData(SoulNetwork.class, ownerName); if (network == null) @@ -308,10 +308,10 @@ public class NetworkHelper if (MinecraftForge.EVENT_BUS.post(event)) return 0; - if (MinecraftServer.getServer() == null) + if (FMLCommonHandler.instance().getMinecraftServerInstance() == null) return 0; - World world = MinecraftServer.getServer().worldServers[0]; + World world = FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[0]; SoulNetwork data = (SoulNetwork) world.loadItemData(SoulNetwork.class, event.ownerNetwork); if (data == null) @@ -337,10 +337,10 @@ public class NetworkHelper @Deprecated public static int getCurrentEssence(String ownerName) { - if (MinecraftServer.getServer() == null) + if (FMLCommonHandler.instance().getMinecraftServerInstance() == null) return 0; - World world = MinecraftServer.getServer().worldServers[0]; + World world = FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[0]; SoulNetwork network = (SoulNetwork) world.loadItemData(SoulNetwork.class, ownerName); if (network == null) diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java index e1c3d588..23c8e282 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.api.util.helper; -import java.util.ArrayList; -import java.util.UUID; - +import WayofTime.bloodmagic.api.Constants; +import com.google.common.base.Strings; +import com.google.common.collect.Lists; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -12,10 +12,9 @@ import net.minecraftforge.common.UsernameCache; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; -import WayofTime.bloodmagic.api.Constants; -import com.google.common.base.Strings; -import com.google.common.collect.Lists; +import java.util.ArrayList; +import java.util.UUID; public class PlayerHelper { @@ -36,7 +35,7 @@ public class PlayerHelper if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) return null; - return MinecraftServer.getServer().getConfigurationManager().getPlayerByUsername(username); + return FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerByUsername(username); } public static EntityPlayer getPlayerFromUUID(String uuid) @@ -94,6 +93,6 @@ public class PlayerHelper if (player == null) return; - player.addPotionEffect(new PotionEffect(Potion.confusion.id, 80)); + player.addPotionEffect(new PotionEffect(Potion.getPotionFromResourceLocation("confusion"), 80)); } } diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java index f03b5d90..32b7c3ff 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java @@ -1,12 +1,13 @@ package WayofTime.bloodmagic.api.util.helper; +import WayofTime.bloodmagic.api.altar.IBloodAltar; +import WayofTime.bloodmagic.registry.ModPotions; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.altar.IBloodAltar; public class PlayerSacrificeHelper { @@ -63,7 +64,7 @@ public class PlayerSacrificeHelper { player.setHealth(maxHealth / 10.0f); setPlayerIncense(player, 0); - player.addPotionEffect(new PotionEffect(soulFrayId.id, soulFrayDuration)); + player.addPotionEffect(new PotionEffect(ModPotions.soulFray, soulFrayDuration)); return true; } diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java index 77e82b44..2d98b0a6 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java @@ -1,19 +1,19 @@ package WayofTime.bloodmagic.api.util.helper; -import java.util.ArrayList; - -import net.minecraft.block.Block; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.capabilities.CapabilityInject; 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 net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.CapabilityInject; + +import java.util.ArrayList; public class RitualHelper { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java index 3d01d645..6e7c00b7 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java @@ -1,8 +1,9 @@ package WayofTime.bloodmagic.block; -import java.util.List; -import java.util.Random; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.registry.ModItems; +import WayofTime.bloodmagic.tile.TileAlchemyArray; +import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -10,18 +11,13 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.registry.ModItems; -import WayofTime.bloodmagic.tile.TileAlchemyArray; -import WayofTime.bloodmagic.util.Utils; + +import java.util.List; +import java.util.Random; public class BlockAlchemyArray extends BlockContainer { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index e200baec..83db4f70 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -1,6 +1,17 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.altar.IAltarManipulator; +import WayofTime.bloodmagic.api.iface.IAltarReader; +import WayofTime.bloodmagic.api.iface.IBindable; +import WayofTime.bloodmagic.api.network.SoulNetwork; +import WayofTime.bloodmagic.api.orb.IBloodOrb; +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.tile.TileAltar; +import WayofTime.bloodmagic.util.Utils; +import com.google.common.base.Strings; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -10,18 +21,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.altar.IAltarManipulator; -import WayofTime.bloodmagic.api.iface.IAltarReader; -import WayofTime.bloodmagic.api.iface.IBindable; -import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.tile.TileAltar; -import WayofTime.bloodmagic.util.Utils; - -import com.google.common.base.Strings; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java index 1c3eb7a8..a20aa195 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java @@ -1,8 +1,6 @@ package WayofTime.bloodmagic.block; -import java.util.List; -import java.util.Random; - +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.registry.ModItems; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -17,7 +15,9 @@ import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.api.Constants; + +import java.util.List; +import java.util.Random; public class BlockBloodLight extends Block { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java index e5b0c4bc..b81606f7 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.block; -import WayofTime.bloodmagic.client.IVariantProvider; -import net.minecraft.block.material.Material; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.block.base.BlockString; +import WayofTime.bloodmagic.client.IVariantProvider; +import net.minecraft.block.material.Material; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java index eeed7197..756b83ff 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.block; -import WayofTime.bloodmagic.client.IVariantProvider; -import net.minecraft.block.material.Material; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.block.base.BlockString; +import WayofTime.bloodmagic.client.IVariantProvider; +import net.minecraft.block.material.Material; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java index ba1eeded..4b25887f 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java @@ -1,8 +1,9 @@ package WayofTime.bloodmagic.block; -import java.util.ArrayList; -import java.util.List; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.tile.TileBloodTank; +import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -18,10 +19,9 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.tile.TileBloodTank; -import WayofTime.bloodmagic.util.Utils; + +import java.util.ArrayList; +import java.util.List; public class BlockBloodTank extends BlockContainer { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java index 141ddc30..a2ec5aaf 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.block; -import WayofTime.bloodmagic.client.IVariantProvider; -import net.minecraft.block.material.Material; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.block.base.BlockString; +import WayofTime.bloodmagic.client.IVariantProvider; +import net.minecraft.block.material.Material; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java index 651e9c3c..d814a0db 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java @@ -1,6 +1,12 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.soul.IDemonWillGem; +import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.tile.TileDemonCrucible; +import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -10,12 +16,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.soul.IDemonWillGem; -import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill; -import WayofTime.bloodmagic.tile.TileDemonCrucible; -import WayofTime.bloodmagic.util.Utils; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java index 0fc2c62e..a19ac92f 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java @@ -1,8 +1,11 @@ package WayofTime.bloodmagic.block; -import java.util.List; -import java.util.Random; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.item.ItemDemonCrystal; +import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -22,17 +25,9 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.altar.IAltarManipulator; -import WayofTime.bloodmagic.api.iface.IAltarReader; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.item.ItemComponent; -import WayofTime.bloodmagic.item.ItemDemonCrystal; -import WayofTime.bloodmagic.tile.TileAltar; -import WayofTime.bloodmagic.tile.TileDemonCrystal; -import WayofTime.bloodmagic.util.Utils; + +import java.util.List; +import java.util.Random; public class BlockDemonCrystal extends BlockContainer { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java index cbd5c108..cad7190b 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java @@ -1,6 +1,9 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.tile.TileDemonCrystallizer; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; @@ -8,9 +11,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.tile.TileDemonCrystallizer; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java index 1b2203d6..fa5c153b 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.tile.TileDemonPylon; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.tile.TileDemonPylon; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java index f0919c5e..b1d0b488 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java @@ -1,8 +1,13 @@ package WayofTime.bloodmagic.block; -import java.util.ArrayList; -import java.util.Random; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.ritual.IMasterRitualStone; +import WayofTime.bloodmagic.api.teleport.PortalLocation; +import WayofTime.bloodmagic.api.teleport.TeleportQueue; +import WayofTime.bloodmagic.block.base.BlockIntegerContainer; +import WayofTime.bloodmagic.ritual.portal.LocationsHandler; +import WayofTime.bloodmagic.ritual.portal.Teleports; +import WayofTime.bloodmagic.tile.TileDimensionalPortal; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -15,14 +20,9 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.ritual.IMasterRitualStone; -import WayofTime.bloodmagic.api.teleport.PortalLocation; -import WayofTime.bloodmagic.api.teleport.TeleportQueue; -import WayofTime.bloodmagic.block.base.BlockIntegerContainer; -import WayofTime.bloodmagic.ritual.portal.LocationsHandler; -import WayofTime.bloodmagic.ritual.portal.Teleports; -import WayofTime.bloodmagic.tile.TileDimensionalPortal; + +import java.util.ArrayList; +import java.util.Random; public class BlockDimensionalPortal extends BlockIntegerContainer { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java index 408c9be1..81775b00 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java @@ -1,15 +1,15 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.tile.TileIncenseAltar; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.tile.TileIncenseAltar; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java index b8684134..300ce851 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.tile.routing.TileInputRoutingNode; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.tile.routing.TileInputRoutingNode; public class BlockInputRoutingNode extends BlockRoutingNode { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java index 23698ef1..1a37403e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.tile.routing.TileItemRoutingNode; +import WayofTime.bloodmagic.tile.routing.TileRoutingNode; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.tile.routing.TileItemRoutingNode; -import WayofTime.bloodmagic.tile.routing.TileRoutingNode; public class BlockItemRoutingNode extends BlockRoutingNode { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java index 68b85a71..71fa0a14 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java @@ -1,7 +1,8 @@ package WayofTime.bloodmagic.block; -import java.awt.Color; - +import WayofTime.bloodmagic.api.BloodMagicAPI; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.util.helper.TextHelper; import lombok.Getter; import net.minecraft.block.material.Material; import net.minecraft.util.BlockPos; @@ -11,9 +12,8 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.util.helper.TextHelper; + +import java.awt.*; public class BlockLifeEssence extends BlockFluidClassic { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java index 9d43d4db..dac680aa 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode; public class BlockMasterRoutingNode extends BlockRoutingNode { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java index ae9e60fa..99184761 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.tile.routing.TileOutputRoutingNode; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.tile.routing.TileOutputRoutingNode; public class BlockOutputRoutingNode extends BlockRoutingNode { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java index 6a031d78..3854aec3 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.incense.IIncensePath; +import WayofTime.bloodmagic.block.base.BlockString; import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.incense.IIncensePath; -import WayofTime.bloodmagic.block.base.BlockString; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPedestal.java b/src/main/java/WayofTime/bloodmagic/block/BlockPedestal.java index d57bfd41..4aceda06 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPedestal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPedestal.java @@ -1,5 +1,10 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.block.base.BlockStringContainer; +import WayofTime.bloodmagic.tile.TilePlinth; +import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -8,11 +13,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.block.base.BlockStringContainer; -import WayofTime.bloodmagic.tile.TilePlinth; -import WayofTime.bloodmagic.util.Utils; public class BlockPedestal extends BlockStringContainer { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java index 45214b1f..824b8c91 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java @@ -1,10 +1,9 @@ package WayofTime.bloodmagic.block; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.tile.TilePhantomBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -17,12 +16,13 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.tile.TilePhantomBlock; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + public class BlockPhantom extends BlockContainer implements IVariantProvider { public BlockPhantom() diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java index 2458a3d6..fdcf45c0 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java @@ -1,14 +1,5 @@ package WayofTime.bloodmagic.block; -import WayofTime.bloodmagic.client.IVariantProvider; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.Explosion; -import net.minecraft.world.World; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.BlockStack; import WayofTime.bloodmagic.api.Constants; @@ -17,10 +8,19 @@ import WayofTime.bloodmagic.api.registry.RitualRegistry; import WayofTime.bloodmagic.api.ritual.Ritual; import WayofTime.bloodmagic.api.util.helper.RitualHelper; import WayofTime.bloodmagic.block.base.BlockStringContainer; +import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.registry.ModItems; import WayofTime.bloodmagic.tile.TileImperfectRitualStone; import WayofTime.bloodmagic.tile.TileMasterRitualStone; import WayofTime.bloodmagic.util.ChatUtil; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.Explosion; +import net.minecraft.world.World; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java index ea1fa60d..a26aa0f4 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java @@ -1,16 +1,16 @@ package WayofTime.bloodmagic.block; -import WayofTime.bloodmagic.client.IVariantProvider; -import net.minecraft.block.material.Material; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.ritual.EnumRuneType; import WayofTime.bloodmagic.api.ritual.IRitualStone; import WayofTime.bloodmagic.block.base.BlockString; +import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.registry.ModBlocks; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java index bd6985b9..07886c96 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.BloodMagic; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -9,7 +10,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.world.IBlockAccess; -import WayofTime.bloodmagic.BloodMagic; public abstract class BlockRoutingNode extends BlockContainer { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java index a8b10a70..0eb279e7 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java @@ -1,6 +1,9 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.tile.TileSoulForge; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -9,9 +12,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.tile.TileSoulForge; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java index ce360ecc..dacbf3bd 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java @@ -1,10 +1,8 @@ package WayofTime.bloodmagic.block; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.tile.TileSpectralBlock; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -17,11 +15,13 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.tile.TileSpectralBlock; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + public class BlockSpectral extends BlockContainer implements IVariantProvider { public BlockSpectral() diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java index 581dc7b9..d9031b6f 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java @@ -1,6 +1,10 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.item.ItemTelepositionFocus; +import WayofTime.bloodmagic.tile.TileTeleposer; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -10,10 +14,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.item.ItemTelepositionFocus; -import WayofTime.bloodmagic.tile.TileTeleposer; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockTestSpellBlock.java b/src/main/java/WayofTime/bloodmagic/block/BlockTestSpellBlock.java index c234694d..a1d068c9 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockTestSpellBlock.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockTestSpellBlock.java @@ -1,5 +1,7 @@ package WayofTime.bloodmagic.block; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -9,8 +11,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; public class BlockTestSpellBlock extends Block { diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java index 23c1ecf3..666e493d 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.block.base; -import java.util.List; - +import WayofTime.bloodmagic.block.property.UnlistedPropertyInteger; import lombok.Getter; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -22,7 +21,8 @@ import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.block.property.UnlistedPropertyInteger; + +import java.util.List; /** * Creates a block that has multiple meta-based states. diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockString.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockString.java index 2e7c4481..414ea610 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockString.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockString.java @@ -1,8 +1,7 @@ package WayofTime.bloodmagic.block.base; -import java.util.Arrays; -import java.util.List; - +import WayofTime.bloodmagic.block.property.PropertyString; +import WayofTime.bloodmagic.block.property.UnlistedPropertyString; import lombok.Getter; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -22,8 +21,9 @@ import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.block.property.PropertyString; -import WayofTime.bloodmagic.block.property.UnlistedPropertyString; + +import java.util.Arrays; +import java.util.List; /** * Creates a block that has multiple meta-based states. diff --git a/src/main/java/WayofTime/bloodmagic/block/property/PropertyString.java b/src/main/java/WayofTime/bloodmagic/block/property/PropertyString.java index 407df662..74cec31b 100644 --- a/src/main/java/WayofTime/bloodmagic/block/property/PropertyString.java +++ b/src/main/java/WayofTime/bloodmagic/block/property/PropertyString.java @@ -1,14 +1,13 @@ package WayofTime.bloodmagic.block.property; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; +import net.minecraft.block.properties.PropertyHelper; + import java.util.Arrays; import java.util.Collection; import java.util.HashSet; -import net.minecraft.block.properties.PropertyHelper; - -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; - public class PropertyString extends PropertyHelper { private final ImmutableSet allowedValues; diff --git a/src/main/java/WayofTime/bloodmagic/block/property/UnlistedPropertyString.java b/src/main/java/WayofTime/bloodmagic/block/property/UnlistedPropertyString.java index c5920886..01f20774 100644 --- a/src/main/java/WayofTime/bloodmagic/block/property/UnlistedPropertyString.java +++ b/src/main/java/WayofTime/bloodmagic/block/property/UnlistedPropertyString.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.block.property; +import net.minecraftforge.common.property.IUnlistedProperty; + import java.util.Arrays; import java.util.List; -import net.minecraftforge.common.property.IUnlistedProperty; - public class UnlistedPropertyString implements IUnlistedProperty { private List values; diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java index 783a6f44..e2399bc5 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHandler.java @@ -1,10 +1,5 @@ package WayofTime.bloodmagic.client.gui; -import net.minecraft.client.multiplayer.WorldClient; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fml.common.network.IGuiHandler; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.tile.TileSoulForge; import WayofTime.bloodmagic.tile.TileTeleposer; @@ -14,6 +9,11 @@ import WayofTime.bloodmagic.tile.container.ContainerSoulForge; import WayofTime.bloodmagic.tile.container.ContainerTeleposer; import WayofTime.bloodmagic.tile.routing.TileFilteredRoutingNode; import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode; +import net.minecraft.client.multiplayer.WorldClient; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.fml.common.network.IGuiHandler; public class GuiHandler implements IGuiHandler { diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java index e4abd8ec..648d0588 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java @@ -1,7 +1,10 @@ package WayofTime.bloodmagic.client.gui; -import java.io.IOException; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.network.BloodMagicPacketHandler; +import WayofTime.bloodmagic.network.ItemRouterButtonPacketProcessor; +import WayofTime.bloodmagic.tile.container.ContainerItemRoutingNode; +import WayofTime.bloodmagic.tile.routing.TileFilteredRoutingNode; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; @@ -11,11 +14,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.network.BloodMagicPacketHandler; -import WayofTime.bloodmagic.network.ItemRouterButtonPacketProcessor; -import WayofTime.bloodmagic.tile.container.ContainerItemRoutingNode; -import WayofTime.bloodmagic.tile.routing.TileFilteredRoutingNode; + +import java.io.IOException; @SideOnly(Side.CLIENT) public class GuiItemRoutingNode extends GuiContainer diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java index 168aa879..ec110458 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiMasterRoutingNode.java @@ -1,5 +1,7 @@ package WayofTime.bloodmagic.client.gui; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.tile.container.ContainerMasterRoutingNode; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; @@ -8,8 +10,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.tile.container.ContainerMasterRoutingNode; @SideOnly(Side.CLIENT) public class GuiMasterRoutingNode extends GuiContainer diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java index 4de1271c..55e7bb42 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java @@ -1,5 +1,9 @@ package WayofTime.bloodmagic.client.gui; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.tile.TileSoulForge; +import WayofTime.bloodmagic.tile.container.ContainerSoulForge; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; @@ -7,10 +11,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.tile.TileSoulForge; -import WayofTime.bloodmagic.tile.container.ContainerSoulForge; -import WayofTime.bloodmagic.util.helper.TextHelper; @SideOnly(Side.CLIENT) public class GuiSoulForge extends GuiContainer diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java index 2c5e6abe..bb2ecd56 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java @@ -1,5 +1,8 @@ package WayofTime.bloodmagic.client.gui; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.tile.container.ContainerTeleposer; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.InventoryPlayer; @@ -7,9 +10,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.tile.container.ContainerTeleposer; -import WayofTime.bloodmagic.util.helper.TextHelper; @SideOnly(Side.CLIENT) public class GuiTeleposer extends GuiContainer diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java b/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java index c433999b..9daa85d1 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.client.gui.config; -import java.util.ArrayList; -import java.util.List; - +import WayofTime.bloodmagic.ConfigHandler; +import WayofTime.bloodmagic.api.Constants; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.fml.client.config.GuiConfig; import net.minecraftforge.fml.client.config.IConfigElement; -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.Constants; + +import java.util.ArrayList; +import java.util.List; public class ConfigGui extends GuiConfig { diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGuiFactory.java b/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGuiFactory.java index 6d7478ad..05c72094 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGuiFactory.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGuiFactory.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.client.gui.config; -import java.util.Set; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.fml.client.IModGuiFactory; +import java.util.Set; + public class ConfigGuiFactory implements IModGuiFactory { diff --git a/src/main/java/WayofTime/bloodmagic/client/helper/ShaderHelper.java b/src/main/java/WayofTime/bloodmagic/client/helper/ShaderHelper.java index 825ba554..39e2ed73 100644 --- a/src/main/java/WayofTime/bloodmagic/client/helper/ShaderHelper.java +++ b/src/main/java/WayofTime/bloodmagic/client/helper/ShaderHelper.java @@ -10,20 +10,19 @@ */ package WayofTime.bloodmagic.client.helper; -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.function.Consumer; - import net.minecraft.client.renderer.OpenGlHelper; import net.minecraftforge.fml.common.FMLLog; - import org.apache.logging.log4j.Level; import org.lwjgl.opengl.ARBFragmentShader; import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.ARBVertexShader; import org.lwjgl.opengl.GL11; +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.function.Consumer; + public final class ShaderHelper { private static final int VERT_ST = ARBVertexShader.GL_VERTEX_SHADER_ARB; diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java index dded64fd..934600ff 100644 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java +++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.client.mesh; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.item.ItemStack; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.iface.IActivatable; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; public class CustomMeshDefinitionActivatable implements ItemMeshDefinition diff --git a/src/main/java/WayofTime/bloodmagic/client/render/RenderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/client/render/RenderAlchemyArray.java index a470d3ba..09bc75c5 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/RenderAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/RenderAlchemyArray.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.client.render; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.item.ItemStack; import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyCircleRenderer; import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry; import WayofTime.bloodmagic.tile.TileAlchemyArray; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.item.ItemStack; public class RenderAlchemyArray extends TileEntitySpecialRenderer { diff --git a/src/main/java/WayofTime/bloodmagic/client/render/RenderAltar.java b/src/main/java/WayofTime/bloodmagic/client/render/RenderAltar.java index 2093c4d2..ef40acbb 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/RenderAltar.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/RenderAltar.java @@ -1,12 +1,10 @@ package WayofTime.bloodmagic.client.render; +import WayofTime.bloodmagic.block.BlockLifeEssence; +import WayofTime.bloodmagic.tile.TileAltar; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -17,8 +15,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import WayofTime.bloodmagic.block.BlockLifeEssence; -import WayofTime.bloodmagic.tile.TileAltar; public class RenderAltar extends TileEntitySpecialRenderer { @@ -51,7 +47,7 @@ public class RenderAltar extends TileEntitySpecialRenderer GlStateManager.translate(0.5, minHeight + (fluidLevel) * (maxHeight - minHeight), 0.5); Tessellator tessellator = Tessellator.getInstance(); - WorldRenderer wr = tessellator.getWorldRenderer(); + VertexBuffer wr = tessellator.getBuffer(); float size = 0.8f; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/RenderDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/client/render/RenderDemonCrucible.java index 4926971c..0dbf3efe 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/RenderDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/RenderDemonCrucible.java @@ -1,16 +1,16 @@ package WayofTime.bloodmagic.client.render; +import WayofTime.bloodmagic.tile.TileDemonCrucible; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import WayofTime.bloodmagic.tile.TileDemonCrucible; public class RenderDemonCrucible extends TileEntitySpecialRenderer { diff --git a/src/main/java/WayofTime/bloodmagic/client/render/RenderFakeBlocks.java b/src/main/java/WayofTime/bloodmagic/client/render/RenderFakeBlocks.java index 84c28548..a91ffac4 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/RenderFakeBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/RenderFakeBlocks.java @@ -2,12 +2,11 @@ package WayofTime.bloodmagic.client.render; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.world.World; - import org.lwjgl.opengl.GL11; public class RenderFakeBlocks @@ -21,7 +20,7 @@ public class RenderFakeBlocks double maxY = minY + 1; double maxZ = minZ + 1; Tessellator tessellator = Tessellator.getInstance(); - WorldRenderer wr = tessellator.getWorldRenderer(); + VertexBuffer wr = tessellator.getBuffer(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/RenderItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/render/RenderItemRoutingNode.java index d716e024..71c9cc0b 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/RenderItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/RenderItemRoutingNode.java @@ -1,25 +1,22 @@ package WayofTime.bloodmagic.client.render; -import java.util.List; - import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.iface.INodeRenderer; -import WayofTime.bloodmagic.registry.ModItems; +import WayofTime.bloodmagic.client.helper.ShaderHelper; +import WayofTime.bloodmagic.tile.routing.TileRoutingNode; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; - +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import org.lwjgl.opengl.GL11; -import WayofTime.bloodmagic.client.helper.ShaderHelper; -import WayofTime.bloodmagic.tile.routing.TileRoutingNode; +import java.util.List; public class RenderItemRoutingNode extends TileEntitySpecialRenderer { @@ -31,7 +28,7 @@ public class RenderItemRoutingNode extends TileEntitySpecialRenderer connectionList = tileNode.getConnected(); for (BlockPos wantedPos : connectionList) @@ -51,7 +48,7 @@ public class RenderItemRoutingNode extends TileEntitySpecialRenderer { diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java index cab998d4..c7d3d4d8 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java @@ -1,15 +1,15 @@ package WayofTime.bloodmagic.client.render.entity; +import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; +import WayofTime.bloodmagic.item.ItemComponent; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.ResourceLocation; -import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; -import WayofTime.bloodmagic.item.ItemComponent; public class RenderEntityBloodLight extends Render { diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java index ab1a1434..f9eb9d86 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.client.render.entity; +import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; @@ -10,11 +11,8 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; - import org.lwjgl.opengl.GL11; -import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; - @SideOnly(Side.CLIENT) public class RenderEntitySentientArrow extends Render { diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java index f0be28da..0a1cc2a0 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java @@ -1,16 +1,16 @@ package WayofTime.bloodmagic.client.render.entity; +import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; +import WayofTime.bloodmagic.registry.ModItems; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; -import WayofTime.bloodmagic.registry.ModItems; public class RenderEntitySoulSnare extends Render { diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientArrowRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientArrowRenderFactory.java index 78dad32f..1d821634 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientArrowRenderFactory.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/SentientArrowRenderFactory.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.client.render.entity; +import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraftforge.fml.client.registry.IRenderFactory; -import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; public class SentientArrowRenderFactory implements IRenderFactory { diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/SoulSnareRenderFactory.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/SoulSnareRenderFactory.java index d125e906..cb755a27 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/SoulSnareRenderFactory.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/SoulSnareRenderFactory.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.client.render.entity; +import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraftforge.fml.client.registry.IRenderFactory; -import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; public class SoulSnareRenderFactory implements IRenderFactory { diff --git a/src/main/java/WayofTime/bloodmagic/command/CommandBloodMagic.java b/src/main/java/WayofTime/bloodmagic/command/CommandBloodMagic.java index 5783f97b..36b0b80b 100644 --- a/src/main/java/WayofTime/bloodmagic/command/CommandBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/command/CommandBloodMagic.java @@ -7,7 +7,8 @@ import WayofTime.bloodmagic.command.sub.SubCommandOrb; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; -import net.minecraft.util.ChatComponentText; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.text.TextComponentString; import java.util.*; @@ -55,7 +56,7 @@ public class CommandBloodMagic extends CommandBase } @Override - public void processCommand(ICommandSender commandSender, String[] args) + public void execute(MinecraftServer server, ICommandSender commandSender, String[] args) { if (args.length > 0 && subCommands.containsKey(args[0])) { @@ -65,7 +66,7 @@ public class CommandBloodMagic extends CommandBase subCommand.processSubCommand(commandSender, subArgs); } else { - commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect("commands.error.unknown"))); + commandSender.addChatMessage(new TextComponentString(TextHelper.localizeEffect("commands.error.unknown"))); } } diff --git a/src/main/java/WayofTime/bloodmagic/command/ISubCommand.java b/src/main/java/WayofTime/bloodmagic/command/ISubCommand.java index 63503d38..e8d95798 100644 --- a/src/main/java/WayofTime/bloodmagic/command/ISubCommand.java +++ b/src/main/java/WayofTime/bloodmagic/command/ISubCommand.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.command; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; +import net.minecraft.server.MinecraftServer; public interface ISubCommand { @@ -14,5 +15,5 @@ public interface ISubCommand String getHelpText(); - void processSubCommand(ICommandSender commandSender, String[] args); + void processSubCommand(MinecraftServer server, ICommandSender commandSender, String[] args); } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/command/SubCommandBase.java b/src/main/java/WayofTime/bloodmagic/command/SubCommandBase.java index a703ef64..5e6f33c9 100644 --- a/src/main/java/WayofTime/bloodmagic/command/SubCommandBase.java +++ b/src/main/java/WayofTime/bloodmagic/command/SubCommandBase.java @@ -3,12 +3,8 @@ package WayofTime.bloodmagic.command; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; -import net.minecraft.command.PlayerNotFoundException; -import net.minecraft.command.PlayerSelector; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.TextComponentString; import java.util.Locale; @@ -37,39 +33,14 @@ public abstract class SubCommandBase implements ISubCommand } @Override - public void processSubCommand(ICommandSender commandSender, String[] args) + public void processSubCommand(MinecraftServer server, ICommandSender commandSender, String[] args) { if (args.length == 0 && !getSubCommandName().equals("help")) - displayErrorString(commandSender, String.format(StatCollector.translateToLocal("commands.format.error"), capitalizeFirstLetter(getSubCommandName()), getArgUsage(commandSender))); + displayErrorString(commandSender, String.format(TextHelper.localizeEffect("commands.format.error"), capitalizeFirstLetter(getSubCommandName()), getArgUsage(commandSender))); if (isBounded(0, 2, args.length) && args[0].equals("help")) - displayHelpString(commandSender, String.format(StatCollector.translateToLocal("commands.format.help"), capitalizeFirstLetter(getSubCommandName()), getHelpText())); - } - - protected EntityPlayerMP getCommandSenderAsPlayer(ICommandSender commandSender) throws PlayerNotFoundException - { - if (commandSender instanceof EntityPlayerMP) - return (EntityPlayerMP) commandSender; - else - throw new PlayerNotFoundException(StatCollector.translateToLocal("commands.error.arg.player.missing")); - } - - protected EntityPlayerMP getPlayer(ICommandSender commandSender, String playerName) throws PlayerNotFoundException - { - EntityPlayerMP entityplayermp = PlayerSelector.matchOnePlayer(commandSender, playerName); - - if (entityplayermp != null) - return entityplayermp; - else - { - entityplayermp = MinecraftServer.getServer().getConfigurationManager().getPlayerByUsername(playerName); - - if (entityplayermp == null) - throw new PlayerNotFoundException(); - else - return entityplayermp; - } + displayHelpString(commandSender, String.format(TextHelper.localizeEffect("commands.format.help"), capitalizeFirstLetter(getSubCommandName()), getHelpText())); } protected String capitalizeFirstLetter(String toCapital) @@ -84,16 +55,16 @@ public abstract class SubCommandBase implements ISubCommand protected void displayHelpString(ICommandSender commandSender, String display, Object... info) { - commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect(display, info))); + commandSender.addChatMessage(new TextComponentString(TextHelper.localizeEffect(display, info))); } protected void displayErrorString(ICommandSender commandSender, String display, Object... info) { - commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect(display, info))); + commandSender.addChatMessage(new TextComponentString(TextHelper.localizeEffect(display, info))); } protected void displaySuccessString(ICommandSender commandSender, String display, Object... info) { - commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect(display, info))); + commandSender.addChatMessage(new TextComponentString(TextHelper.localizeEffect(display, info))); } } diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java index 76b09ab5..755bea76 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java @@ -7,13 +7,14 @@ import WayofTime.bloodmagic.api.util.helper.PlayerHelper; import WayofTime.bloodmagic.command.SubCommandBase; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; +import net.minecraft.command.CommandBase; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.command.PlayerNotFoundException; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.text.TextComponentTranslation; public class SubCommandBind extends SubCommandBase { @@ -36,19 +37,19 @@ public class SubCommandBind extends SubCommandBase } @Override - public void processSubCommand(ICommandSender commandSender, String[] args) + public void processSubCommand(MinecraftServer server, ICommandSender commandSender, String[] args) { - super.processSubCommand(commandSender, args); + super.processSubCommand(server, commandSender, args); if (commandSender.getEntityWorld().isRemote) return; try { - EntityPlayer player = getCommandSenderAsPlayer(commandSender); + EntityPlayer player = CommandBase.getCommandSenderAsPlayer(commandSender); String playerName = player.getName(); String uuid = PlayerHelper.getUUIDFromPlayer(player).toString(); - ItemStack held = player.getHeldItem(); + ItemStack held = player.getHeldItemMainhand(); boolean bind = true; if (held != null && held.getItem() instanceof IBindable) @@ -68,7 +69,7 @@ public class SubCommandBind extends SubCommandBase } else { playerName = args[0]; - uuid = PlayerHelper.getUUIDFromPlayer(getPlayer(commandSender, playerName)).toString(); + uuid = PlayerHelper.getUUIDFromPlayer(CommandBase.getPlayer(server, commandSender, playerName)).toString(); } } @@ -76,20 +77,20 @@ public class SubCommandBind extends SubCommandBase { BindableHelper.setItemOwnerName(held, playerName); BindableHelper.setItemOwnerUUID(held, uuid); - commandSender.addChatMessage(new ChatComponentTranslation("commands.bind.success")); + commandSender.addChatMessage(new TextComponentTranslation("commands.bind.success")); } else { if (!Strings.isNullOrEmpty(((IBindable) held.getItem()).getOwnerUUID(held))) { held.getTagCompound().removeTag(Constants.NBT.OWNER_UUID); held.getTagCompound().removeTag(Constants.NBT.OWNER_NAME); - commandSender.addChatMessage(new ChatComponentTranslation("commands.bind.remove.success")); + commandSender.addChatMessage(new TextComponentTranslation("commands.bind.remove.success")); } } } } catch (PlayerNotFoundException e) { - commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect("commands.error.404"))); + commandSender.addChatMessage(new TextComponentTranslation(TextHelper.localizeEffect("commands.error.404"))); } } diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandHelp.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandHelp.java index d35364e4..22dfd1d6 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandHelp.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandHelp.java @@ -6,8 +6,8 @@ import WayofTime.bloodmagic.command.SubCommandBase; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.StatCollector; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.text.TextComponentString; public class SubCommandHelp extends SubCommandBase { @@ -20,24 +20,24 @@ public class SubCommandHelp extends SubCommandBase @Override public String getArgUsage(ICommandSender commandSender) { - return StatCollector.translateToLocal("commands.help.usage"); + return TextHelper.localize("commands.help.usage"); } @Override public String getHelpText() { - return StatCollector.translateToLocal("commands.help.help"); + return TextHelper.localizeEffect("commands.help.help"); } @Override - public void processSubCommand(ICommandSender commandSender, String[] args) + public void processSubCommand(MinecraftServer server, ICommandSender commandSender, String[] args) { - super.processSubCommand(commandSender, args); + super.processSubCommand(server, commandSender, args); if (args.length > 0) return; for (ISubCommand subCommand : ((CommandBloodMagic) getParentCommand()).getSubCommands().values()) - commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect("commands.format.help", capitalizeFirstLetter(subCommand.getSubCommandName()), subCommand.getArgUsage(commandSender)))); + commandSender.addChatMessage(new TextComponentString(TextHelper.localizeEffect("commands.format.help", capitalizeFirstLetter(subCommand.getSubCommandName()), subCommand.getArgUsage(commandSender)))); } } diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java index 669fefed..fed11c7f 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java @@ -2,16 +2,16 @@ package WayofTime.bloodmagic.command.sub; import WayofTime.bloodmagic.api.network.SoulNetwork; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; import WayofTime.bloodmagic.command.SubCommandBase; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.TextHelper; +import net.minecraft.command.CommandBase; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.command.PlayerNotFoundException; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.StatCollector; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.text.TextComponentString; import java.util.Locale; @@ -26,19 +26,19 @@ public class SubCommandNetwork extends SubCommandBase @Override public String getArgUsage(ICommandSender commandSender) { - return StatCollector.translateToLocal("commands.network.usage"); + return TextHelper.localizeEffect("commands.network.usage"); } @Override public String getHelpText() { - return StatCollector.translateToLocal("commands.network.help"); + return TextHelper.localizeEffect("commands.network.help"); } @Override - public void processSubCommand(ICommandSender commandSender, String[] args) + public void processSubCommand(MinecraftServer server, ICommandSender commandSender, String[] args) { - super.processSubCommand(commandSender, args); + super.processSubCommand(server, commandSender, args); if (args.length > 0) { @@ -49,12 +49,12 @@ public class SubCommandNetwork extends SubCommandBase try { String givenName = commandSender.getName(); - EntityPlayer player = getPlayer(commandSender, givenName); + EntityPlayer player = CommandBase.getCommandSenderAsPlayer(commandSender); if (args.length > 1) { givenName = args[1]; - player = getPlayer(commandSender, givenName); + player = CommandBase.getPlayer(server, commandSender, givenName); } SoulNetwork network = NetworkHelper.getSoulNetwork(player); @@ -151,7 +151,7 @@ public class SubCommandNetwork extends SubCommandBase } if (args.length > 1) - commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect("message.divinationsigil.currentessence", network.getCurrentEssence()))); + commandSender.addChatMessage(new TextComponentString(TextHelper.localizeEffect("message.divinationsigil.currentessence", network.getCurrentEssence()))); break; } diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java index 2ed7d8b2..9f08f92f 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java @@ -6,12 +6,13 @@ import WayofTime.bloodmagic.api.util.helper.PlayerHelper; import WayofTime.bloodmagic.command.SubCommandBase; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.TextHelper; +import net.minecraft.command.CommandBase; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.command.PlayerNotFoundException; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.StatCollector; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.text.TextComponentString; import java.util.Locale; @@ -26,19 +27,19 @@ public class SubCommandOrb extends SubCommandBase @Override public String getArgUsage(ICommandSender commandSender) { - return StatCollector.translateToLocal("commands.orb.usage"); + return TextHelper.localizeEffect("commands.orb.usage"); } @Override public String getHelpText() { - return StatCollector.translateToLocal("commands.orb.help"); + return TextHelper.localizeEffect("commands.orb.help"); } @Override - public void processSubCommand(ICommandSender commandSender, String[] args) + public void processSubCommand(MinecraftServer server, ICommandSender commandSender, String[] args) { - super.processSubCommand(commandSender, args); + super.processSubCommand(server, commandSender, args); if (args.length > 0) { @@ -53,7 +54,7 @@ public class SubCommandOrb extends SubCommandBase if (args.length > 1) givenName = args[1]; - EntityPlayer player = getPlayer(commandSender, givenName); + EntityPlayer player = CommandBase.getPlayer(server, commandSender, givenName); String uuid = PlayerHelper.getUUIDFromPlayer(player).toString(); SoulNetwork network = NetworkHelper.getSoulNetwork(uuid); @@ -98,7 +99,7 @@ public class SubCommandOrb extends SubCommandBase } if (args.length > 1) - commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect("message.orb.currenttier", network.getOrbTier()))); + commandSender.addChatMessage(new TextComponentString(TextHelper.localizeEffect("message.orb.currenttier", network.getOrbTier()))); break; } diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/CompatibilityGuideAPI.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/CompatibilityGuideAPI.java deleted file mode 100644 index e29e7db8..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/CompatibilityGuideAPI.java +++ /dev/null @@ -1,27 +0,0 @@ -package WayofTime.bloodmagic.compat.guideapi; - -import WayofTime.bloodmagic.compat.ICompatibility; -import WayofTime.bloodmagic.compat.guideapi.guide.GuideBloodMagic; - -public class CompatibilityGuideAPI implements ICompatibility -{ - - @Override - public void loadCompatibility(InitializationPhase phase) - { - if (phase == InitializationPhase.PRE_INIT) - GuideBloodMagic.initGuide(); - } - - @Override - public String getModId() - { - return "guideapi"; - } - - @Override - public boolean enableCompat() - { - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/guide/GuideBloodMagic.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/guide/GuideBloodMagic.java deleted file mode 100644 index 0dcd8762..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/guide/GuideBloodMagic.java +++ /dev/null @@ -1,79 +0,0 @@ -package WayofTime.bloodmagic.compat.guideapi.guide; - -import WayofTime.bloodmagic.api.altar.EnumAltarTier; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; -import WayofTime.bloodmagic.api.registry.OrbRegistry; -import WayofTime.bloodmagic.compat.guideapi.guide.page.PageAltarRecipe; -import WayofTime.bloodmagic.registry.ModBlocks; -import WayofTime.bloodmagic.registry.ModItems; -import WayofTime.bloodmagic.util.helper.TextHelper; -import amerifrance.guideapi.api.GuideAPIItems; -import amerifrance.guideapi.api.GuideRegistry; -import amerifrance.guideapi.api.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.abstraction.EntryAbstract; -import amerifrance.guideapi.api.abstraction.IPage; -import amerifrance.guideapi.api.base.Book; -import amerifrance.guideapi.api.util.PageHelper; -import amerifrance.guideapi.category.CategoryItemStack; -import amerifrance.guideapi.entry.EntryItemStack; -import amerifrance.guideapi.page.PageIRecipe; -import lombok.Getter; -import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.oredict.ShapedOreRecipe; - -import java.awt.Color; -import java.util.ArrayList; -import java.util.List; - -public class GuideBloodMagic -{ - - @Getter - private static Book bloodMagicGuide; - - public static List categories = new ArrayList(); - - public static void initGuide() - { - bloodMagicGuide = new Book(); - bloodMagicGuide.setAuthor("guide.BloodMagic.book.author"); - bloodMagicGuide.setUnlocBookTitle("guide.BloodMagic.book.title"); - bloodMagicGuide.setUnlocDisplayName("guide.BloodMagic.book.display"); - bloodMagicGuide.setUnlocWelcomeMessage("guide.BloodMagic.book.welcome"); - bloodMagicGuide.setBookColor(new Color(0xFF100F)); - - addArchitect(); - - bloodMagicGuide.setCategoryList(categories); - - GuideRegistry.registerBook(bloodMagicGuide, null); - if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) - ModelLoader.setCustomModelResourceLocation(GuideAPIItems.guideBook, GuideRegistry.getIndexOf(bloodMagicGuide), new ModelResourceLocation(new ResourceLocation("guideapi", "ItemGuideBook"), "type=book")); - } - - private static void addArchitect() - { - List entries = new ArrayList(); - - List introPages = new ArrayList(); - introPages.addAll(PageHelper.pagesForLongText(TextHelper.localize("guide.BloodMagic.entry.architect.intro.1"), 315)); - entries.add(new EntryItemStack(introPages, "guide.BloodMagic.entry.architect.intro", new ItemStack(Items.writable_book))); - - List bloodAltarPages = new ArrayList(); - bloodAltarPages.add(new PageIRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.altar), "a a", "aba", "cdc", 'a', "stone", 'b', Blocks.furnace, 'c', "ingotGold", 'd', new ItemStack(ModItems.monsterSoul)))); - bloodAltarPages.add(new PageIRecipe(new ShapedOreRecipe(new ItemStack(ModItems.sacrificialDagger), "aaa", " ba", "c a", 'a', "blockGlass", 'b', "ingotGold", 'c', "ingotIron"))); - bloodAltarPages.addAll(PageHelper.pagesForLongText(TextHelper.localize("guide.BloodMagic.entry.architect.bloodAltar.1"), 340)); - bloodAltarPages.add(new PageAltarRecipe(new AltarRecipeRegistry.AltarRecipe(new ItemStack(Items.diamond), OrbRegistry.getOrbStack(ModItems.orbWeak), EnumAltarTier.ONE, 2000, 2, 1))); - bloodAltarPages.addAll(PageHelper.pagesForLongText(TextHelper.localize("guide.BloodMagic.entry.architect.bloodAltar.2"))); - entries.add(new EntryItemStack(bloodAltarPages, "guide.BloodMagic.entry.architect.bloodAltar", new ItemStack(ModBlocks.altar))); - - categories.add(new CategoryItemStack(entries, "guide.BloodMagic.category.architect.name", new ItemStack(ModBlocks.altar))); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/guide/page/PageAltarRecipe.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/guide/page/PageAltarRecipe.java deleted file mode 100644 index 31a3bc0f..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/guide/page/PageAltarRecipe.java +++ /dev/null @@ -1,72 +0,0 @@ -package WayofTime.bloodmagic.compat.guideapi.guide.page; - -import WayofTime.bloodmagic.api.altar.EnumAltarTier; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; -import WayofTime.bloodmagic.util.helper.TextHelper; -import amerifrance.guideapi.api.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.abstraction.EntryAbstract; -import amerifrance.guideapi.api.base.Book; -import amerifrance.guideapi.api.base.PageBase; -import amerifrance.guideapi.api.util.GuiHelper; -import amerifrance.guideapi.gui.GuiBase; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class PageAltarRecipe extends PageBase -{ - - public ItemStack input; - public ItemStack output; - public EnumAltarTier tier; - public int bloodRequired; - - public PageAltarRecipe(AltarRecipeRegistry.AltarRecipe recipe) - { - this.input = recipe.getInput(); - this.output = recipe.getOutput(); - this.tier = recipe.getMinTier(); - this.bloodRequired = recipe.getSyphon(); - } - - @Override - @SideOnly(Side.CLIENT) - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) - { - Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("bloodmagicguide" + ":textures/gui/altar.png")); - guiBase.drawTexturedModalRect(guiLeft + 42, guiTop + 53, 0, 0, 146, 104); - - guiBase.drawCenteredString(fontRenderer, TextHelper.localize("guide.BloodMagic.page.bloodAltar"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); - - int inputX = (1 + 1) * 20 + (guiLeft + guiBase.xSize / 7) + 1; - int inputY = (20) + (guiTop + guiBase.ySize / 5) - 1; //1 * 20 - GuiHelper.drawItemStack(input, inputX, inputY); - - if (output == null) - output = new ItemStack(Blocks.barrier); - - int outputX = (5 * 20) + (guiLeft + guiBase.xSize / 7) + 1; - int outputY = (20) + (guiTop + guiBase.xSize / 5) - 1; // 1 * 20 - GuiHelper.drawItemStack(output, outputX, outputY); - - if (GuiHelper.isMouseBetween(mouseX, mouseY, inputX, inputY, 15, 15)) - guiBase.renderToolTip(input, mouseX, mouseY); - - if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) - guiBase.renderToolTip(output, mouseX, mouseY); - - if (output.getItem() == Item.getItemFromBlock(Blocks.barrier)) - { - guiBase.drawCenteredString(fontRenderer, TextHelper.localize("text.furnace.error"), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6, 0xED073D); - return; - } - - guiBase.drawCenteredString(fontRenderer, TextHelper.localize("guide.BloodMagic.page.tier", tier.toInt()), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6, 0); - guiBase.drawCenteredString(fontRenderer, TextHelper.localize("guide.BloodMagic.page.lp", bloodRequired), guiLeft + guiBase.xSize / 2, guiTop + 4 * guiBase.ySize / 6 + 15, 0); - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java deleted file mode 100644 index 51d7cc12..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java +++ /dev/null @@ -1,84 +0,0 @@ -package WayofTime.bloodmagic.compat.jei; - -import java.util.Map; - -import javax.annotation.Nonnull; - -import mezz.jei.api.BlankModPlugin; -import mezz.jei.api.IJeiHelpers; -import mezz.jei.api.IModRegistry; -import mezz.jei.api.JEIPlugin; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingCategory; -import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingRecipeHandler; -import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingRecipeMaker; -import WayofTime.bloodmagic.compat.jei.altar.AltarRecipeCategory; -import WayofTime.bloodmagic.compat.jei.altar.AltarRecipeHandler; -import WayofTime.bloodmagic.compat.jei.altar.AltarRecipeMaker; -import WayofTime.bloodmagic.compat.jei.binding.BindingRecipeCategory; -import WayofTime.bloodmagic.compat.jei.binding.BindingRecipeHandler; -import WayofTime.bloodmagic.compat.jei.binding.BindingRecipeMaker; -import WayofTime.bloodmagic.compat.jei.forge.TartaricForgeRecipeCategory; -import WayofTime.bloodmagic.compat.jei.forge.TartaricForgeRecipeHandler; -import WayofTime.bloodmagic.compat.jei.forge.TartaricForgeRecipeMaker; -import WayofTime.bloodmagic.compat.jei.orb.ShapedOrbRecipeHandler; -import WayofTime.bloodmagic.compat.jei.orb.ShapelessOrbRecipeHandler; -import WayofTime.bloodmagic.item.ItemUpgradeTome; -import WayofTime.bloodmagic.registry.ModBlocks; -import WayofTime.bloodmagic.registry.ModItems; - -@JEIPlugin -public class BloodMagicPlugin extends BlankModPlugin -{ - public static IJeiHelpers jeiHelper; - - @Override - public void register(@Nonnull IModRegistry registry) - { - jeiHelper = registry.getJeiHelpers(); - - registry.addRecipeCategories(new AltarRecipeCategory(), new BindingRecipeCategory(), new AlchemyArrayCraftingCategory(), new TartaricForgeRecipeCategory()); - - registry.addRecipeHandlers(new AltarRecipeHandler(), new BindingRecipeHandler(), new AlchemyArrayCraftingRecipeHandler(), new TartaricForgeRecipeHandler(), new ShapedOrbRecipeHandler(), new ShapelessOrbRecipeHandler()); - - registry.addRecipes(AltarRecipeMaker.getRecipes()); - registry.addRecipes(BindingRecipeMaker.getRecipes()); - registry.addRecipes(AlchemyArrayCraftingRecipeMaker.getRecipes()); - registry.addRecipes(TartaricForgeRecipeMaker.getRecipes()); - - registry.addDescription(new ItemStack(ModItems.altarMaker), "jei.BloodMagic.desc.altarBuilder"); - registry.addDescription(new ItemStack(ModItems.monsterSoul), "jei.BloodMagic.desc.demonicWill"); - - jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.bloodLight)); - jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.spectralBlock)); - jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.phantomBlock)); - jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.alchemyArray)); - jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.dimensionalPortal, 1, OreDictionary.WILDCARD_VALUE)); - - for (Map.Entry entry : LivingArmourHandler.upgradeMaxLevelMap.entrySet()) - { - String key = entry.getKey(); - int maxLevel = entry.getValue(); - for (int i = 0; i < maxLevel - 1; i++) - { - ItemStack stack = new ItemStack(ModItems.upgradeTome); - ItemUpgradeTome.setKey(stack, key); - ItemUpgradeTome.setLevel(stack, i); - jeiHelper.getItemBlacklist().addItemToBlacklist(stack); - } - } - - jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.OWNER_UUID); - jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.OWNER_NAME); - jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.USES); - jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.SOULS); - jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.X_COORD); - jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.Y_COORD); - jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.Z_COORD); - jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.DIMENSION_ID); - jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.ITEM_INVENTORY); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/CompatibilityJustEnoughItems.java b/src/main/java/WayofTime/bloodmagic/compat/jei/CompatibilityJustEnoughItems.java deleted file mode 100644 index dc95a10d..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/CompatibilityJustEnoughItems.java +++ /dev/null @@ -1,24 +0,0 @@ -package WayofTime.bloodmagic.compat.jei; - -import WayofTime.bloodmagic.compat.ICompatibility; - -public class CompatibilityJustEnoughItems implements ICompatibility -{ - @Override - public void loadCompatibility(InitializationPhase phase) - { - - } - - @Override - public String getModId() - { - return "JEI"; - } - - @Override - public boolean enableCompat() - { - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java deleted file mode 100644 index 59d8a10e..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java +++ /dev/null @@ -1,77 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.alchemyArray; - -import javax.annotation.Nonnull; - -import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.recipe.IRecipeCategory; -import mezz.jei.api.recipe.IRecipeWrapper; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; -import WayofTime.bloodmagic.util.helper.TextHelper; - -public class AlchemyArrayCraftingCategory implements IRecipeCategory -{ - private static final int INPUT_SLOT = 0; - private static final int CATALYST_SLOT = 1; - private static final int OUTPUT_SLOT = 2; - - @Nonnull - private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/binding.png"), 0, 0, 100, 30); - @Nonnull - private final String localizedName = TextHelper.localize("jei.BloodMagic.recipe.alchemyArrayCrafting"); - - @Nonnull - @Override - public String getUid() - { - return Constants.Compat.JEI_CATEGORY_ALCHEMYARRAY; - } - - @Nonnull - @Override - public String getTitle() - { - return localizedName; - } - - @Nonnull - @Override - public IDrawable getBackground() - { - return background; - } - - @Override - public void drawExtras(Minecraft minecraft) - { - - } - - @Override - public void drawAnimations(Minecraft minecraft) - { - - } - - @Override - @SuppressWarnings("unchecked") - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) - { - - recipeLayout.getItemStacks().init(INPUT_SLOT, true, 0, 5); - recipeLayout.getItemStacks().init(CATALYST_SLOT, true, 50, 5); - recipeLayout.getItemStacks().init(OUTPUT_SLOT, false, 73, 5); - - if (recipeWrapper instanceof AlchemyArrayCraftingRecipeJEI) - { - AlchemyArrayCraftingRecipeJEI alchemyArrayWrapper = (AlchemyArrayCraftingRecipeJEI) recipeWrapper; - recipeLayout.getItemStacks().set(INPUT_SLOT, (ItemStack) alchemyArrayWrapper.getInputs().get(0)); - recipeLayout.getItemStacks().set(CATALYST_SLOT, (ItemStack) alchemyArrayWrapper.getInputs().get(1)); - recipeLayout.getItemStacks().set(OUTPUT_SLOT, alchemyArrayWrapper.getOutputs()); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeHandler.java deleted file mode 100644 index 300e3bac..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeHandler.java +++ /dev/null @@ -1,37 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.alchemyArray; - -import javax.annotation.Nonnull; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; -import WayofTime.bloodmagic.api.Constants; - -public class AlchemyArrayCraftingRecipeHandler implements IRecipeHandler -{ - @Nonnull - @Override - public Class getRecipeClass() - { - return AlchemyArrayCraftingRecipeJEI.class; - } - - @Nonnull - @Override - public String getRecipeCategoryUid() - { - return Constants.Compat.JEI_CATEGORY_ALCHEMYARRAY; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull AlchemyArrayCraftingRecipeJEI recipe) - { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull AlchemyArrayCraftingRecipeJEI recipe) - { - return recipe.getInputs().size() > 0 && recipe.getOutputs().size() > 0; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java deleted file mode 100644 index 9e307a28..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java +++ /dev/null @@ -1,39 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.alchemyArray; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import mezz.jei.api.recipe.BlankRecipeWrapper; -import net.minecraft.item.ItemStack; - -public class AlchemyArrayCraftingRecipeJEI extends BlankRecipeWrapper -{ - @Nonnull - private final List inputs; - - @Nonnull - private final ItemStack output; - - @SuppressWarnings("unchecked") - public AlchemyArrayCraftingRecipeJEI(@Nonnull ItemStack input, @Nullable ItemStack catalyst, @Nonnull ItemStack output) - { - this.inputs = Arrays.asList(input, catalyst); - this.output = output; - } - - @Override - public List getInputs() - { - return inputs; - } - - @Override - public List getOutputs() - { - return Collections.singletonList(output); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java deleted file mode 100644 index 423ceb2a..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java +++ /dev/null @@ -1,46 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.alchemyArray; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import javax.annotation.Nonnull; - -import net.minecraft.item.ItemStack; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffectCrafting; -import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry; - -import com.google.common.collect.BiMap; - -public class AlchemyArrayCraftingRecipeMaker -{ - @Nonnull - public static List getRecipes() - { - Map alchemyArrayRecipeMap = AlchemyArrayRecipeRegistry.getRecipes(); - - ArrayList recipes = new ArrayList(); - - for (Map.Entry itemStackAlchemyArrayRecipeEntry : alchemyArrayRecipeMap.entrySet()) - { - ItemStack input = itemStackAlchemyArrayRecipeEntry.getValue().getInputStack(); - BiMap catalystMap = itemStackAlchemyArrayRecipeEntry.getValue().catalystMap; - - for (Map.Entry entry : catalystMap.entrySet()) - { - ItemStack catalyst = entry.getKey().toStack(); - if (AlchemyArrayRecipeRegistry.getAlchemyArrayEffect(input, catalyst) instanceof AlchemyArrayEffectCrafting) - { - ItemStack output = ((AlchemyArrayEffectCrafting) itemStackAlchemyArrayRecipeEntry.getValue().getAlchemyArrayEffectForCatalyst(catalyst)).getOutputStack(); - - AlchemyArrayCraftingRecipeJEI recipe = new AlchemyArrayCraftingRecipeJEI(input, catalyst, output); - recipes.add(recipe); - } - } - } - - return recipes; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java deleted file mode 100644 index 8deceb10..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java +++ /dev/null @@ -1,72 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.altar; - -import javax.annotation.Nonnull; - -import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.recipe.IRecipeCategory; -import mezz.jei.api.recipe.IRecipeWrapper; -import net.minecraft.client.Minecraft; -import net.minecraft.util.ResourceLocation; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; -import WayofTime.bloodmagic.util.helper.TextHelper; - -public class AltarRecipeCategory implements IRecipeCategory -{ - private static final int INPUT_SLOT = 0; - private static final int OUTPUT_SLOT = 1; - - @Nonnull - private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/altar.png"), 3, 4, 155, 65); - @Nonnull - private final String localizedName = TextHelper.localize("jei.BloodMagic.recipe.altar"); - - @Nonnull - @Override - public String getUid() - { - return Constants.Compat.JEI_CATEGORY_ALTAR; - } - - @Nonnull - @Override - public String getTitle() - { - return localizedName; - } - - @Nonnull - @Override - public IDrawable getBackground() - { - return background; - } - - @Override - public void drawExtras(Minecraft minecraft) - { - - } - - @Override - public void drawAnimations(Minecraft minecraft) - { - - } - - @Override - @SuppressWarnings("unchecked") - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) - { - recipeLayout.getItemStacks().init(INPUT_SLOT, true, 31, 0); - recipeLayout.getItemStacks().init(OUTPUT_SLOT, false, 125, 30); - - if (recipeWrapper instanceof AltarRecipeJEI) - { - AltarRecipeJEI altarRecipeWrapper = (AltarRecipeJEI) recipeWrapper; - recipeLayout.getItemStacks().set(INPUT_SLOT, altarRecipeWrapper.getInputs()); - recipeLayout.getItemStacks().set(OUTPUT_SLOT, altarRecipeWrapper.getOutputs()); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java deleted file mode 100644 index 536236ca..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java +++ /dev/null @@ -1,37 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.altar; - -import javax.annotation.Nonnull; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; -import WayofTime.bloodmagic.api.Constants; - -public class AltarRecipeHandler implements IRecipeHandler -{ - @Nonnull - @Override - public Class getRecipeClass() - { - return AltarRecipeJEI.class; - } - - @Nonnull - @Override - public String getRecipeCategoryUid() - { - return Constants.Compat.JEI_CATEGORY_ALTAR; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull AltarRecipeJEI recipe) - { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull AltarRecipeJEI recipe) - { - return recipe.getInputs().size() > 0 && recipe.getOutputs().size() > 0; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java deleted file mode 100644 index 8ec234ac..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java +++ /dev/null @@ -1,70 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.altar; - -import java.awt.Color; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import mezz.jei.api.recipe.BlankRecipeWrapper; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import WayofTime.bloodmagic.util.helper.TextHelper; - -public class AltarRecipeJEI extends BlankRecipeWrapper -{ - @Nonnull - private final ItemStack input; - - @Nonnull - private final ItemStack output; - - private final String[] infoString; - private final int consumptionRate; - private final int drainRate; - - public AltarRecipeJEI(@Nonnull ItemStack input, @Nonnull ItemStack output, int tier, int requiredLP, int consumptionRate, int drainRate) - { - this.input = input; - this.output = output; - - this.infoString = new String[] { TextHelper.localize("jei.BloodMagic.recipe.requiredTier", tier), TextHelper.localize("jei.BloodMagic.recipe.requiredLP", requiredLP) }; - this.consumptionRate = consumptionRate; - this.drainRate = drainRate; - } - - @Override - public List getInputs() - { - return Collections.singletonList(input); - } - - @Override - public List getOutputs() - { - return Collections.singletonList(output); - } - - @Nullable - @Override - public List getTooltipStrings(int mouseX, int mouseY) - { - ArrayList ret = new ArrayList(); - if (mouseX >= 13 && mouseX <= 64 && mouseY >= 27 && mouseY <= 58) - { - ret.add(TextHelper.localize("jei.BloodMagic.recipe.consumptionRate", consumptionRate)); - ret.add(TextHelper.localize("jei.BloodMagic.recipe.drainRate", drainRate)); - return ret; - } - return null; - } - - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) - { - minecraft.fontRendererObj.drawString(infoString[0], 90 - minecraft.fontRendererObj.getStringWidth(infoString[0]) / 2, 0, Color.gray.getRGB()); - minecraft.fontRendererObj.drawString(infoString[1], 90 - minecraft.fontRendererObj.getStringWidth(infoString[1]) / 2, 10, Color.gray.getRGB()); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java deleted file mode 100644 index a41f6dce..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java +++ /dev/null @@ -1,41 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.altar; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import javax.annotation.Nonnull; - -import net.minecraft.item.ItemStack; -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import WayofTime.bloodmagic.api.registry.AltarRecipeRegistry; - -public class AltarRecipeMaker -{ - @Nonnull - public static List getRecipes() - { - Map altarMap = AltarRecipeRegistry.getRecipes(); - - ArrayList recipes = new ArrayList(); - - for (Map.Entry itemStackAltarRecipeEntry : altarMap.entrySet()) - { - if (!(itemStackAltarRecipeEntry.getKey().getItem() instanceof IBloodOrb)) - { - // Make sure input is not a Blood Orb. If it is, the recipe is for a filling orb, and we don't want that. - ItemStack input = itemStackAltarRecipeEntry.getKey(); - ItemStack output = itemStackAltarRecipeEntry.getValue().getOutput(); - int requiredTier = itemStackAltarRecipeEntry.getValue().getMinTier().toInt(); - int requiredLP = itemStackAltarRecipeEntry.getValue().getSyphon(); - int consumptionRate = itemStackAltarRecipeEntry.getValue().getConsumeRate(); - int drainRate = itemStackAltarRecipeEntry.getValue().getDrainRate(); - - AltarRecipeJEI recipe = new AltarRecipeJEI(input, output, requiredTier, requiredLP, consumptionRate, drainRate); - recipes.add(recipe); - } - } - - return recipes; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java deleted file mode 100644 index 66312e58..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java +++ /dev/null @@ -1,77 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.binding; - -import javax.annotation.Nonnull; - -import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.recipe.IRecipeCategory; -import mezz.jei.api.recipe.IRecipeWrapper; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; -import WayofTime.bloodmagic.util.helper.TextHelper; - -public class BindingRecipeCategory implements IRecipeCategory -{ - private static final int INPUT_SLOT = 0; - private static final int CATALYST_SLOT = 1; - private static final int OUTPUT_SLOT = 2; - - @Nonnull - private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/binding.png"), 0, 0, 100, 30); - @Nonnull - private final String localizedName = TextHelper.localize("jei.BloodMagic.recipe.binding"); - - @Nonnull - @Override - public String getUid() - { - return Constants.Compat.JEI_CATEGORY_BINDING; - } - - @Nonnull - @Override - public String getTitle() - { - return localizedName; - } - - @Nonnull - @Override - public IDrawable getBackground() - { - return background; - } - - @Override - public void drawExtras(Minecraft minecraft) - { - - } - - @Override - public void drawAnimations(Minecraft minecraft) - { - - } - - @Override - @SuppressWarnings("unchecked") - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) - { - - recipeLayout.getItemStacks().init(INPUT_SLOT, true, 0, 5); - recipeLayout.getItemStacks().init(CATALYST_SLOT, true, 50, 5); - recipeLayout.getItemStacks().init(OUTPUT_SLOT, false, 73, 5); - - if (recipeWrapper instanceof BindingRecipeJEI) - { - BindingRecipeJEI bindingRecipe = (BindingRecipeJEI) recipeWrapper; - recipeLayout.getItemStacks().set(INPUT_SLOT, (ItemStack) bindingRecipe.getInputs().get(0)); - recipeLayout.getItemStacks().set(CATALYST_SLOT, (ItemStack) bindingRecipe.getInputs().get(1)); - recipeLayout.getItemStacks().set(OUTPUT_SLOT, bindingRecipe.getOutputs()); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java deleted file mode 100644 index 36ead526..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java +++ /dev/null @@ -1,37 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.binding; - -import javax.annotation.Nonnull; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; -import WayofTime.bloodmagic.api.Constants; - -public class BindingRecipeHandler implements IRecipeHandler -{ - @Nonnull - @Override - public Class getRecipeClass() - { - return BindingRecipeJEI.class; - } - - @Nonnull - @Override - public String getRecipeCategoryUid() - { - return Constants.Compat.JEI_CATEGORY_BINDING; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull BindingRecipeJEI recipe) - { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull BindingRecipeJEI recipe) - { - return recipe.getInputs().size() > 0 && recipe.getOutputs().size() > 0; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeJEI.java deleted file mode 100644 index 22f33019..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeJEI.java +++ /dev/null @@ -1,38 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.binding; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import javax.annotation.Nonnull; - -import mezz.jei.api.recipe.BlankRecipeWrapper; -import net.minecraft.item.ItemStack; - -public class BindingRecipeJEI extends BlankRecipeWrapper -{ - @Nonnull - private final List inputs; - - @Nonnull - private final ItemStack output; - - @SuppressWarnings("unchecked") - public BindingRecipeJEI(@Nonnull ItemStack input, @Nonnull ItemStack catalyst, @Nonnull ItemStack output) - { - this.inputs = Arrays.asList(input, catalyst); - this.output = output; - } - - @Override - public List getInputs() - { - return inputs; - } - - @Override - public List getOutputs() - { - return Collections.singletonList(output); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java deleted file mode 100644 index 93bcd6e9..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java +++ /dev/null @@ -1,46 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.binding; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import javax.annotation.Nonnull; - -import net.minecraft.item.ItemStack; -import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectBinding; -import WayofTime.bloodmagic.api.ItemStackWrapper; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry; - -import com.google.common.collect.BiMap; - -public class BindingRecipeMaker -{ - @Nonnull - public static List getRecipes() - { - Map alchemyArrayRecipeMap = AlchemyArrayRecipeRegistry.getRecipes(); - - ArrayList recipes = new ArrayList(); - - for (Map.Entry itemStackAlchemyArrayRecipeEntry : alchemyArrayRecipeMap.entrySet()) - { - ItemStack input = itemStackAlchemyArrayRecipeEntry.getValue().getInputStack(); - BiMap catalystMap = itemStackAlchemyArrayRecipeEntry.getValue().catalystMap; - - for (Map.Entry entry : catalystMap.entrySet()) - { - ItemStack catalyst = entry.getKey().toStack(); - if (AlchemyArrayRecipeRegistry.getAlchemyArrayEffect(input, catalyst) instanceof AlchemyArrayEffectBinding) - { - ItemStack output = ((AlchemyArrayEffectBinding) itemStackAlchemyArrayRecipeEntry.getValue().getAlchemyArrayEffectForCatalyst(catalyst)).getOutputStack(); - - BindingRecipeJEI recipe = new BindingRecipeJEI(input, catalyst, output); - recipes.add(recipe); - } - } - } - - return recipes; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java deleted file mode 100644 index 999d6e8f..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeCategory.java +++ /dev/null @@ -1,98 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.forge; - -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - -import mezz.jei.api.gui.ICraftingGridHelper; -import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.gui.IGuiItemStackGroup; -import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.recipe.IRecipeCategory; -import mezz.jei.api.recipe.IRecipeWrapper; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; -import WayofTime.bloodmagic.util.helper.TextHelper; - -public class TartaricForgeRecipeCategory implements IRecipeCategory -{ - private static final int OUTPUT_SLOT = 0; - private static final int GEM_SLOT = 1; - private static final int INPUT_SLOT = 2; - - @Nonnull - private final IDrawable background = BloodMagicPlugin.jeiHelper.getGuiHelper().createDrawable(new ResourceLocation(Constants.Mod.DOMAIN + "gui/jei/soulForge.png"), 0, 0, 100, 40); - @Nonnull - private final String localizedName = TextHelper.localize("jei.BloodMagic.recipe.soulForge"); - @Nonnull - private final ICraftingGridHelper craftingGridHelper; - - public TartaricForgeRecipeCategory() - { - craftingGridHelper = BloodMagicPlugin.jeiHelper.getGuiHelper().createCraftingGridHelper(INPUT_SLOT, OUTPUT_SLOT); - } - - @Nonnull - @Override - public String getUid() - { - return Constants.Compat.JEI_CATEGORY_SOULFORGE; - } - - @Nonnull - @Override - public String getTitle() - { - return localizedName; - } - - @Nonnull - @Override - public IDrawable getBackground() - { - return background; - } - - @Override - public void drawExtras(Minecraft minecraft) - { - - } - - @Override - public void drawAnimations(Minecraft minecraft) - { - - } - - @Override - @SuppressWarnings("unchecked") - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) - { - IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); - - guiItemStacks.init(OUTPUT_SLOT, false, 73, 13); - guiItemStacks.init(GEM_SLOT, true, 42, 0); - - for (int y = 0; y < 3; ++y) - { - for (int x = 0; x < 3; ++x) - { - int index = INPUT_SLOT + x + (y * 3); - guiItemStacks.init(index, true, x * 18, y * 18); - } - } - - if (recipeWrapper instanceof TartaricForgeRecipeJEI) - { - TartaricForgeRecipeJEI recipe = (TartaricForgeRecipeJEI) recipeWrapper; - guiItemStacks.set(GEM_SLOT, (ArrayList) recipe.getInputs().get(1)); - craftingGridHelper.setOutput(guiItemStacks, recipe.getOutputs()); - craftingGridHelper.setInput(guiItemStacks, (List) recipe.getInputs().get(0), 2, 3); - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeHandler.java deleted file mode 100644 index c20261cb..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeHandler.java +++ /dev/null @@ -1,37 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.forge; - -import javax.annotation.Nonnull; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; -import WayofTime.bloodmagic.api.Constants; - -public class TartaricForgeRecipeHandler implements IRecipeHandler -{ - @Nonnull - @Override - public Class getRecipeClass() - { - return TartaricForgeRecipeJEI.class; - } - - @Nonnull - @Override - public String getRecipeCategoryUid() - { - return Constants.Compat.JEI_CATEGORY_SOULFORGE; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull TartaricForgeRecipeJEI recipe) - { - return recipe; - } - - @Override - public boolean isRecipeValid(@Nonnull TartaricForgeRecipeJEI recipe) - { - return recipe.getInputs().get(0).size() > 0 && recipe.getOutputs().size() > 0; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java deleted file mode 100644 index f1174adc..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeJEI.java +++ /dev/null @@ -1,83 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.forge; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import lombok.Getter; -import mezz.jei.api.recipe.BlankRecipeWrapper; -import net.minecraft.item.ItemStack; -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.registry.ModItems; -import WayofTime.bloodmagic.util.helper.TextHelper; - -public class TartaricForgeRecipeJEI extends BlankRecipeWrapper -{ - @Getter - private TartaricForgeRecipe recipe; - @Getter - private ArrayList validGems = new ArrayList(); - - public TartaricForgeRecipeJEI(TartaricForgeRecipe recipe) - { - this.recipe = recipe; - - for (DefaultWill will : DefaultWill.values()) - if (will.minSouls >= recipe.getMinimumSouls()) - this.validGems.add(will.willStack); - } - - @Override - @Nonnull - public List getInputs() - { - ArrayList ret = new ArrayList(); - ret.add(recipe.getInput()); - ret.add(validGems); - return ret; - } - - @Override - @Nonnull - public List getOutputs() - { - return Collections.singletonList(recipe.getRecipeOutput()); - } - - @Nullable - @Override - public List getTooltipStrings(int mouseX, int mouseY) - { - ArrayList ret = new ArrayList(); - if (mouseX >= 40 && mouseX <= 60 && mouseY >= 21 && mouseY <= 34) - { - ret.add(TextHelper.localize("jei.BloodMagic.recipe.minimumSouls", recipe.getMinimumSouls())); - ret.add(TextHelper.localize("jei.BloodMagic.recipe.soulsDrained", recipe.getSoulsDrained())); - return ret; - } - return null; - } - - public enum DefaultWill - { - SOUL(new ItemStack(ModItems.monsterSoul, 1, 0), 64), - PETTY(new ItemStack(ModItems.soulGem, 1, 0), 64), - LESSER(new ItemStack(ModItems.soulGem, 1, 1), 256), - COMMON(new ItemStack(ModItems.soulGem, 1, 2), 1024), - GREATER(new ItemStack(ModItems.soulGem, 1, 3), 4096), - GRAND(new ItemStack(ModItems.soulGem, 1, 4), 16384); - - public final ItemStack willStack; - public final double minSouls; - - DefaultWill(ItemStack willStack, double minSouls) - { - this.willStack = willStack; - this.minSouls = minSouls; - } - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeMaker.java deleted file mode 100644 index f8577cc8..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/forge/TartaricForgeRecipeMaker.java +++ /dev/null @@ -1,24 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.forge; - -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - -import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; -import WayofTime.bloodmagic.api.registry.TartaricForgeRecipeRegistry; - -public class TartaricForgeRecipeMaker -{ - @Nonnull - public static List getRecipes() - { - List recipeList = TartaricForgeRecipeRegistry.getRecipeList(); - ArrayList recipes = new ArrayList(); - - for (TartaricForgeRecipe recipe : recipeList) - recipes.add(new TartaricForgeRecipeJEI(recipe)); - - return recipes; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapedOrbRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapedOrbRecipeHandler.java deleted file mode 100644 index 71a5a9b4..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapedOrbRecipeHandler.java +++ /dev/null @@ -1,41 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.orb; - -import java.util.Arrays; - -import javax.annotation.Nonnull; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; -import mezz.jei.api.recipe.VanillaRecipeCategoryUid; -import WayofTime.bloodmagic.api.recipe.ShapedBloodOrbRecipe; - -public class ShapedOrbRecipeHandler implements IRecipeHandler -{ - - @Nonnull - @Override - public Class getRecipeClass() - { - return ShapedBloodOrbRecipe.class; - } - - @Nonnull - @Override - public String getRecipeCategoryUid() - { - return VanillaRecipeCategoryUid.CRAFTING; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull ShapedBloodOrbRecipe recipe) - { - return new ShapedOrbRecipeJEI(Arrays.asList(recipe.getInput()), recipe.getTier(), recipe.getRecipeOutput()); - } - - @Override - public boolean isRecipeValid(@Nonnull ShapedBloodOrbRecipe recipe) - { - return recipe.getInput().length > 0; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapedOrbRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapedOrbRecipeJEI.java deleted file mode 100644 index 7f49158e..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapedOrbRecipeJEI.java +++ /dev/null @@ -1,123 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.orb; - -import java.awt.Color; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import mezz.jei.api.recipe.wrapper.IShapedCraftingRecipeWrapper; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; -import WayofTime.bloodmagic.api.registry.OrbRegistry; -import WayofTime.bloodmagic.util.helper.TextHelper; - -public class ShapedOrbRecipeJEI implements IShapedCraftingRecipeWrapper -{ - - @Nonnull - private final List inputs; - - private final int tier; - - @Nonnull - private final ItemStack output; - - @SuppressWarnings("unchecked") - public ShapedOrbRecipeJEI(@Nonnull List input, int tier, @Nonnull ItemStack output) - { - ArrayList inputList = new ArrayList(input); - int replaceIndex = 0; - Object toReplace = null; - - for (Object object : inputList) - { - if (object instanceof Integer) - { - replaceIndex = inputList.indexOf(object); - toReplace = object; - } - } - - if (toReplace != null) - { - inputList.remove(replaceIndex); - inputList.add(replaceIndex, OrbRegistry.getOrbsDownToTier((Integer) toReplace)); - } - - this.inputs = inputList; - this.tier = tier; - this.output = output; - } - - @Override - public int getWidth() - { - return 3; - } - - @Override - public int getHeight() - { - return 3; - } - - @Override - public List getInputs() - { - return inputs; - } - - @Override - public List getOutputs() - { - return Collections.singletonList(output); - } - - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) - { - String draw = TextHelper.localize("jei.BloodMagic.recipe.requiredTier", tier); - minecraft.fontRendererObj.drawString(draw, 72 - minecraft.fontRendererObj.getStringWidth(draw) / 2, 10, Color.gray.getRGB()); - } - - @Override - public List getFluidInputs() - { - return null; - } - - @Override - public List getFluidOutputs() - { - return null; - } - - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) - { - - } - - @Override - public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) - { - - } - - @Nullable - @Override - public List getTooltipStrings(int mouseX, int mouseY) - { - return null; - } - - @Override - public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton) - { - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapelessOrbRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapelessOrbRecipeHandler.java deleted file mode 100644 index e98d5a99..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapelessOrbRecipeHandler.java +++ /dev/null @@ -1,39 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.orb; - -import javax.annotation.Nonnull; - -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeWrapper; -import mezz.jei.api.recipe.VanillaRecipeCategoryUid; -import WayofTime.bloodmagic.api.recipe.ShapelessBloodOrbRecipe; - -public class ShapelessOrbRecipeHandler implements IRecipeHandler -{ - - @Nonnull - @Override - public Class getRecipeClass() - { - return ShapelessBloodOrbRecipe.class; - } - - @Nonnull - @Override - public String getRecipeCategoryUid() - { - return VanillaRecipeCategoryUid.CRAFTING; - } - - @Nonnull - @Override - public IRecipeWrapper getRecipeWrapper(@Nonnull ShapelessBloodOrbRecipe recipe) - { - return new ShapelessOrbRecipeJEI(recipe.getInput(), recipe.getTier(), recipe.getRecipeOutput()); - } - - @Override - public boolean isRecipeValid(@Nonnull ShapelessBloodOrbRecipe recipe) - { - return recipe.getInput().size() > 0; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapelessOrbRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapelessOrbRecipeJEI.java deleted file mode 100644 index 594fb23b..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapelessOrbRecipeJEI.java +++ /dev/null @@ -1,111 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.orb; - -import java.awt.Color; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import mezz.jei.api.recipe.wrapper.ICraftingRecipeWrapper; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; -import WayofTime.bloodmagic.api.registry.OrbRegistry; -import WayofTime.bloodmagic.util.helper.TextHelper; - -public class ShapelessOrbRecipeJEI implements ICraftingRecipeWrapper -{ - - @Nonnull - private final List inputs; - - private final int tier; - - @Nonnull - private final ItemStack output; - - @SuppressWarnings("unchecked") - public ShapelessOrbRecipeJEI(@Nonnull List input, int tier, @Nonnull ItemStack output) - { - ArrayList inputList = new ArrayList(input); - int replaceIndex = 0; - Object toReplace = null; - - for (Object object : inputList) - { - if (object instanceof Integer) - { - replaceIndex = inputList.indexOf(object); - toReplace = object; - } - } - - if (toReplace != null) - { - inputList.remove(replaceIndex); - inputList.add(replaceIndex, OrbRegistry.getOrbsDownToTier((Integer) toReplace)); - } - - this.inputs = inputList; - this.tier = tier; - this.output = output; - } - - @Override - public List getInputs() - { - return inputs; - } - - @Override - public List getOutputs() - { - return Collections.singletonList(output); - } - - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) - { - String draw = TextHelper.localize("jei.BloodMagic.recipe.requiredTier", tier); - minecraft.fontRendererObj.drawString(draw, 72 - minecraft.fontRendererObj.getStringWidth(draw) / 2, 10, Color.gray.getRGB()); - } - - @Override - public List getFluidInputs() - { - return null; - } - - @Override - public List getFluidOutputs() - { - return null; - } - - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) - { - - } - - @Override - public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) - { - - } - - @Nullable - @Override - public List getTooltipStrings(int mouseX, int mouseY) - { - return null; - } - - @Override - public boolean handleClick(@Nonnull Minecraft minecraft, int mouseX, int mouseY, int mouseButton) - { - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/CompatibilityThaumcraft.java b/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/CompatibilityThaumcraft.java deleted file mode 100644 index 7d5a0467..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/CompatibilityThaumcraft.java +++ /dev/null @@ -1,34 +0,0 @@ -package WayofTime.bloodmagic.compat.thaumcraft; - -import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.compat.ICompatibility; -import WayofTime.bloodmagic.compat.thaumcraft.research.BloodMagicResearch; - -public class CompatibilityThaumcraft implements ICompatibility -{ - @Override - public void loadCompatibility(InitializationPhase phase) - { - if (phase == InitializationPhase.POST_INIT) - { - BloodMagicResearch.addResearch(); - - LivingArmourHandler.registerStatTracker(StatTrackerThaumRunicShielding.class); - - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeThaumRunicShielding(0)); - LivingArmourHandler.registerArmourUpgrade(new LivingArmourUpgradeThaumRevealing(0)); - } - } - - @Override - public String getModId() - { - return "Thaumcraft"; - } - - @Override - public boolean enableCompat() - { - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/LivingArmourUpgradeThaumRevealing.java b/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/LivingArmourUpgradeThaumRevealing.java deleted file mode 100644 index 5389abdc..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/LivingArmourUpgradeThaumRevealing.java +++ /dev/null @@ -1,50 +0,0 @@ -package WayofTime.bloodmagic.compat.thaumcraft; - -import net.minecraft.nbt.NBTTagCompound; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; - -public class LivingArmourUpgradeThaumRevealing extends LivingArmourUpgrade -{ - - public LivingArmourUpgradeThaumRevealing(int level) - { - super(level); - } - - @Override - public String getUniqueIdentifier() - { - return Constants.Mod.MODID + ".upgrade.revealing"; - } - - @Override - public String getUnlocalizedName() - { - return tooltipBase + "revealing"; - } - - @Override - public int getMaxTier() - { - return 1; - } - - @Override - public int getCostOfUpgrade() - { - return 5; - } - - @Override - public void writeToNBT(NBTTagCompound tag) - { - - } - - @Override - public void readFromNBT(NBTTagCompound tag) - { - - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/LivingArmourUpgradeThaumRunicShielding.java b/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/LivingArmourUpgradeThaumRunicShielding.java deleted file mode 100644 index ad34571d..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/LivingArmourUpgradeThaumRunicShielding.java +++ /dev/null @@ -1,58 +0,0 @@ -package WayofTime.bloodmagic.compat.thaumcraft; - -import net.minecraft.nbt.NBTTagCompound; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; - -public class LivingArmourUpgradeThaumRunicShielding extends LivingArmourUpgrade -{ - public static final int[] costs = new int[] { 5, 12, 20, 35, 49, 78, 110, 160, 215, 320 }; - public static final int[] healthModifier = new int[] { 2, 4, 6, 8, 10, 13, 16, 19, 22, 25 }; - - public LivingArmourUpgradeThaumRunicShielding(int level) - { - super(level); - } - - @Override - public String getUniqueIdentifier() - { - return Constants.Mod.MODID + ".upgrade.thaumRunicShielding"; - } - - @Override - public int getMaxTier() - { - return 10; - } - - @Override - public int getCostOfUpgrade() - { - return costs[this.level]; - } - - @Override - public void writeToNBT(NBTTagCompound tag) - { - // EMPTY - } - - @Override - public void readFromNBT(NBTTagCompound tag) - { - // EMPTY - } - - @Override - public String getUnlocalizedName() - { - return tooltipBase + "thaumRunicShielding"; - } - - @Override - public int getRunicShielding() - { - return healthModifier[this.level]; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/StatTrackerThaumRunicShielding.java b/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/StatTrackerThaumRunicShielding.java deleted file mode 100644 index ea2e1c3d..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/StatTrackerThaumRunicShielding.java +++ /dev/null @@ -1,97 +0,0 @@ -package WayofTime.bloodmagic.compat.thaumcraft; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; -import WayofTime.bloodmagic.livingArmour.LivingArmour; - -public class StatTrackerThaumRunicShielding extends StatTracker -{ - public float totalShieldDamage = 0; - - public static HashMap changeMap = new HashMap(); - public static int[] healthedRequired = new int[] { 80, 200, 340, 540, 800, 1600, 2800, 5000, 7600, 10000 }; - - @Override - public String getUniqueIdentifier() - { - return Constants.Mod.MODID + ".tracker.thaumRunicShielding"; - } - - @Override - public void resetTracker() - { - this.totalShieldDamage = 0; - } - - @Override - public void readFromNBT(NBTTagCompound tag) - { - totalShieldDamage = tag.getFloat(Constants.Mod.MODID + ".tracker.thaumRunicShielding"); - } - - @Override - public void writeToNBT(NBTTagCompound tag) - { - tag.setFloat(Constants.Mod.MODID + ".tracker.thaumRunicShielding", totalShieldDamage); - } - - @Override - public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) - { - if (changeMap.containsKey(livingArmour)) - { - float lastCharge = Math.abs(changeMap.get(livingArmour)); - float currentCharge = player.getAbsorptionAmount(); - if (currentCharge < lastCharge) - { - totalShieldDamage += lastCharge - currentCharge; - - this.markDirty(); - - changeMap.put(livingArmour, currentCharge); - return true; - } - - if (currentCharge != lastCharge && !player.isPotionActive(Potion.absorption)) //Charge is only updated if the "shielding" isn't caused by Absorption. - { - changeMap.put(livingArmour, currentCharge); - } - } else - { - changeMap.put(livingArmour, 0f); - } - - return false; - } - - @Override - public List getUpgrades() - { - List upgradeList = new ArrayList(); - - for (int i = 0; i < 10; i++) - { - if (totalShieldDamage >= healthedRequired[i]) - { - upgradeList.add(new LivingArmourUpgradeThaumRunicShielding(i)); - } - } - - return upgradeList; - } - - @Override - public boolean providesUpgrade(String key) - { - return key.equals(Constants.Mod.MODID + ".upgrade.thaumRunicShielding"); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/research/BloodMagicResearch.java b/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/research/BloodMagicResearch.java deleted file mode 100644 index 3008d04f..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/research/BloodMagicResearch.java +++ /dev/null @@ -1,31 +0,0 @@ -package WayofTime.bloodmagic.compat.thaumcraft.research; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.research.ResearchCategories; -import thaumcraft.api.research.ResearchPage; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.Constants; - -public class BloodMagicResearch -{ - public static void addResearch() - { - final String BLOOD_MAGIC = "BLOODMAGIC"; - - ResearchCategories.registerCategory(BLOOD_MAGIC, null, new ResourceLocation("bloodmagic", "textures/items/WeakBloodOrb.png"), new ResourceLocation("bloodmagic", "textures/gui/thaumcraft/gui_research_back.jpg"), new ResourceLocation("bloodmagic", "textures/gui/thaumcraft/gui_research_back_over.png")); - - (new SanguineResearchItem("BLOODMAGIC", BLOOD_MAGIC, new AspectList(), 0, 0, 0, new ItemStack(BloodMagicAPI.getItem(Constants.BloodMagicItem.BLOOD_ORB), 1, 0))).setPages(new ResearchPage[] { new ResearchPage(researchPage("BLOODMAGIC")) }).setAutoUnlock().setStub().setRound().registerResearchItem(); - } - - private static String researchPage(String researchName) - { - return researchPage(researchName, 1); - } - - private static String researchPage(String researchName, int pageNumber) - { - return "bloodmagic.research_page." + researchName + "." + pageNumber; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/research/SanguineResearchItem.java b/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/research/SanguineResearchItem.java deleted file mode 100644 index 1fbe3804..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/thaumcraft/research/SanguineResearchItem.java +++ /dev/null @@ -1,34 +0,0 @@ -package WayofTime.bloodmagic.compat.thaumcraft.research; - -import net.minecraft.util.StatCollector; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.research.ResearchItem; - -public class SanguineResearchItem extends ResearchItem -{ - public SanguineResearchItem(String key, String category) - { - super(key, category); - } - - public SanguineResearchItem(String key, String category, AspectList tags, int col, int row, int complex, Object... icon) - { - super(key, category, tags, col, row, complex, icon); - } - - @Override - @SideOnly(Side.CLIENT) - public String getName() - { - return StatCollector.translateToLocal("bloodmagic.research_name." + this.key); - } - - @Override - @SideOnly(Side.CLIENT) - public String getText() - { - return StatCollector.translateToLocal("bloodmagic.research_text." + this.key); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/CompatibilityWaila.java b/src/main/java/WayofTime/bloodmagic/compat/waila/CompatibilityWaila.java deleted file mode 100644 index 22a5cbdd..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/CompatibilityWaila.java +++ /dev/null @@ -1,26 +0,0 @@ -package WayofTime.bloodmagic.compat.waila; - -import net.minecraftforge.fml.common.event.FMLInterModComms; -import WayofTime.bloodmagic.compat.ICompatibility; - -public class CompatibilityWaila implements ICompatibility -{ - @Override - public void loadCompatibility(InitializationPhase phase) - { - if (phase == InitializationPhase.INIT) - FMLInterModComms.sendMessage(getModId(), "register", "WayofTime.bloodmagic.compat.waila.WailaCallbackHandler.callbackRegister"); - } - - @Override - public String getModId() - { - return "Waila"; - } - - @Override - public boolean enableCompat() - { - return true; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/WailaCallbackHandler.java b/src/main/java/WayofTime/bloodmagic/compat/waila/WailaCallbackHandler.java deleted file mode 100644 index ec7e2a59..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/WailaCallbackHandler.java +++ /dev/null @@ -1,30 +0,0 @@ -package WayofTime.bloodmagic.compat.waila; - -import mcp.mobius.waila.api.IWailaRegistrar; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.block.BlockAlchemyArray; -import WayofTime.bloodmagic.block.BlockAltar; -import WayofTime.bloodmagic.block.BlockRitualController; -import WayofTime.bloodmagic.block.BlockTeleposer; -import WayofTime.bloodmagic.compat.waila.provider.DataProviderAlchemyArray; -import WayofTime.bloodmagic.compat.waila.provider.DataProviderBloodAltar; -import WayofTime.bloodmagic.compat.waila.provider.DataProviderRitualController; -import WayofTime.bloodmagic.compat.waila.provider.DataProviderTeleposer; - -public class WailaCallbackHandler -{ - public static void callbackRegister(IWailaRegistrar registrar) - { - registrar.registerBodyProvider(new DataProviderBloodAltar(), BlockAltar.class); - registrar.registerBodyProvider(new DataProviderTeleposer(), BlockTeleposer.class); - registrar.registerBodyProvider(new DataProviderRitualController(), BlockRitualController.class); - registrar.registerBodyProvider(new DataProviderAlchemyArray(), BlockAlchemyArray.class); - registrar.registerStackProvider(new DataProviderAlchemyArray(), BlockAlchemyArray.class); - - registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK, false); - registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_ALTAR, true); - registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_TELEPOSER, true); - registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_RITUAL, true); - registrar.addConfig(Constants.Mod.MODID, Constants.Compat.WAILA_CONFIG_ARRAY, true); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java deleted file mode 100644 index 62a0a1b5..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java +++ /dev/null @@ -1,71 +0,0 @@ -package WayofTime.bloodmagic.compat.waila.provider; - -import java.util.List; - -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.registry.ModBlocks; -import WayofTime.bloodmagic.registry.ModItems; -import WayofTime.bloodmagic.tile.TileAlchemyArray; -import WayofTime.bloodmagic.util.helper.TextHelper; - -public class DataProviderAlchemyArray implements IWailaDataProvider -{ - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) - { - return new ItemStack(ModItems.arcaneAshes).setStackDisplayName(TextHelper.getFormattedText(ModBlocks.alchemyArray.getLocalizedName())); - } - - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - return null; - } - - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - if (!config.getConfig(Constants.Compat.WAILA_CONFIG_ARRAY)) - return currenttip; - - if (accessor.getPlayer().isSneaking() || config.getConfig(Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK)) - { - TileEntity tile = accessor.getTileEntity(); - if (tile instanceof TileAlchemyArray) - { - TileAlchemyArray tileArray = (TileAlchemyArray) tile; - if (tileArray.getStackInSlot(0) != null) - currenttip.add(TextHelper.localize("waila.BloodMagic.array.reagent", tileArray.getStackInSlot(0).getDisplayName())); - - if (tileArray.getStackInSlot(1) != null) - currenttip.add(TextHelper.localize("waila.BloodMagic.array.catalyst", tileArray.getStackInSlot(1).getDisplayName())); - } - } else - { - currenttip.add(TextHelper.localizeEffect("waila.BloodMagic.sneak")); - } - - return currenttip; - } - - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - return null; - } - - @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) - { - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java deleted file mode 100644 index 7c36a33c..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java +++ /dev/null @@ -1,122 +0,0 @@ -package WayofTime.bloodmagic.compat.waila.provider; - -import java.util.List; - -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.block.BlockAltar; -import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; -import WayofTime.bloodmagic.item.sigil.ItemSigilSeer; -import WayofTime.bloodmagic.registry.ModItems; -import WayofTime.bloodmagic.tile.TileAltar; -import WayofTime.bloodmagic.util.helper.TextHelper; - -/** - * Integrated from WailaPlugins by tterrag1098. Originally implemented - * in ImLookingAtBlood by Pokefenn. - */ -public class DataProviderBloodAltar implements IWailaDataProvider -{ - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) - { - return null; - } - - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - return null; - } - - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - if (!config.getConfig(Constants.Compat.WAILA_CONFIG_ALTAR)) - return currenttip; - - boolean hasSigil = false; - boolean hasSeer = false; - - switch (ConfigHandler.wailaAltarDisplayMode) - { - case 0: - { - hasSigil = hasSeer = true; - break; - } - case 1: - { - hasSeer = accessor.getPlayer().getHeldItem() != null && accessor.getPlayer().getHeldItem().getItem() instanceof ItemSigilSeer; - hasSigil = hasSeer || accessor.getPlayer().getHeldItem() != null && accessor.getPlayer().getHeldItem().getItem() instanceof ItemSigilDivination; - break; - } - case 2: - { - hasSeer = hasStack(new ItemStack(ModItems.sigilSeer), accessor.getPlayer()); - hasSigil = hasSeer || hasStack(new ItemStack(ModItems.sigilDivination), accessor.getPlayer()); - break; - } - default: - { - break; - } - } - - if (!hasSeer && !hasSigil) - return currenttip; - - if (accessor.getPlayer().isSneaking() || config.getConfig(Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK)) - { - if (accessor.getBlock() instanceof BlockAltar && accessor.getTileEntity() instanceof TileAltar) - { - TileAltar altar = (TileAltar) accessor.getTileEntity(); - currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.sigil.seer.currentAltarTier", altar.getTier().toInt())); - currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.sigil.seer.currentAltarCapacity", altar.getCapacity())); - currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.sigil.seer.currentEssence", altar.getCurrentBlood())); - - if (hasSeer) - { - currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.sigil.seer.currentAltarProgress.percent", ((int) ((double) altar.getProgress() / (double) altar.getLiquidRequired() * 100)) + "%")); - } - } - } else - { - currenttip.add(TextHelper.localizeEffect("waila.BloodMagic.sneak")); - } - - return currenttip; - } - - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - return null; - } - - @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) - { - return null; - } - - public static boolean hasStack(ItemStack stack, EntityPlayer player) - { - for (ItemStack inventoryStack : player.inventory.mainInventory) - if (inventoryStack != null && inventoryStack.isItemEqual(stack)) - return true; - - return false; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java deleted file mode 100644 index 142f937d..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java +++ /dev/null @@ -1,103 +0,0 @@ -package WayofTime.bloodmagic.compat.waila.provider; - -import java.util.List; - -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; -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.block.BlockRitualController; -import WayofTime.bloodmagic.tile.TileImperfectRitualStone; -import WayofTime.bloodmagic.tile.TileMasterRitualStone; -import WayofTime.bloodmagic.util.helper.TextHelper; - -public class DataProviderRitualController implements IWailaDataProvider -{ - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) - { - return null; - } - - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - return null; - } - - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - if (!config.getConfig(Constants.Compat.WAILA_CONFIG_RITUAL)) - return currenttip; - - if (accessor.getPlayer().isSneaking() || config.getConfig(Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK)) - { - if (accessor.getBlock() instanceof BlockRitualController) - { - if (accessor.getBlock().getMetaFromState(accessor.getBlockState()) == 0 && accessor.getTileEntity() instanceof TileMasterRitualStone) - { - TileMasterRitualStone mrs = (TileMasterRitualStone) accessor.getTileEntity(); - - if (mrs.getCurrentRitual() != null) - { - currenttip.add(TextHelper.localizeEffect(mrs.getCurrentRitual().getUnlocalizedName())); - currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.currentOwner", PlayerHelper.getUsernameFromUUID(mrs.getOwner()))); - if (!RitualRegistry.ritualEnabled(mrs.getCurrentRitual())) - currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.config.disabled")); - } else - { - currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.deactivated")); - } - } - - if (accessor.getBlock().getMetaFromState(accessor.getBlockState()) == 1 && accessor.getTileEntity() instanceof TileImperfectRitualStone) - { - if (accessor.getWorld().getBlockState(accessor.getPosition().up()).getBlock() != null) - { - Block up = accessor.getWorld().getBlockState(accessor.getPosition().up()).getBlock(); - int meta = up.getMetaFromState(accessor.getWorld().getBlockState(accessor.getPosition().up())); - BlockStack blockStack = new BlockStack(up, meta); - ImperfectRitual ritual = ImperfectRitualRegistry.getRitualForBlock(blockStack); - - if (ritual != null) - { - currenttip.add(TextHelper.localizeEffect(ritual.getUnlocalizedName())); - if (!ImperfectRitualRegistry.ritualEnabled(ritual)) - currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.config.disabled")); - } - } - } - } - } else - { - currenttip.add(TextHelper.localizeEffect("waila.BloodMagic.sneak")); - } - - return currenttip; - } - - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - return null; - } - - @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) - { - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java deleted file mode 100644 index 6378c2f9..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java +++ /dev/null @@ -1,74 +0,0 @@ -package WayofTime.bloodmagic.compat.waila.provider; - -import java.util.List; - -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.block.BlockTeleposer; -import WayofTime.bloodmagic.item.ItemTelepositionFocus; -import WayofTime.bloodmagic.tile.TileTeleposer; -import WayofTime.bloodmagic.util.helper.TextHelper; - -public class DataProviderTeleposer implements IWailaDataProvider -{ - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) - { - return null; - } - - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - return null; - } - - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - if (!config.getConfig(Constants.Compat.WAILA_CONFIG_TELEPOSER)) - return currenttip; - - if (accessor.getPlayer().isSneaking() || config.getConfig(Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK)) - { - if (accessor.getBlock() instanceof BlockTeleposer && accessor.getTileEntity() instanceof TileTeleposer) - { - TileTeleposer teleposer = (TileTeleposer) accessor.getTileEntity(); - if (teleposer.getStackInSlot(0) != null) - { - ItemStack contained = teleposer.getStackInSlot(0); - BlockPos toPos = ((ItemTelepositionFocus) contained.getItem()).getBlockPos(contained); - int dimensionID = contained.getTagCompound().getInteger(Constants.NBT.DIMENSION_ID); - - currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.telepositionFocus.coords", toPos.getX(), toPos.getY(), toPos.getZ())); - currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.telepositionFocus.dimension", dimensionID)); - } - } - } else - { - currenttip.add(TextHelper.localizeEffect("waila.BloodMagic.sneak")); - } - - return currenttip; - } - - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - return null; - } - - @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) - { - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java index 786403a1..5a04209c 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compress/AdvancedCompressionHandler.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.compress; +import WayofTime.bloodmagic.api.compress.CompressionHandler; +import WayofTime.bloodmagic.api.compress.CompressionRegistry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.compress.CompressionHandler; -import WayofTime.bloodmagic.api.compress.CompressionRegistry; public class AdvancedCompressionHandler extends CompressionHandler { diff --git a/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java b/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java index 5ff566cd..7eba6bb3 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compress/BaseCompressionHandler.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.compress; +import WayofTime.bloodmagic.api.compress.CompressionHandler; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.compress.CompressionHandler; public class BaseCompressionHandler extends CompressionHandler { diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java index a281cdec..21b6357b 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java +++ b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java @@ -1,8 +1,7 @@ package WayofTime.bloodmagic.compress; -import java.util.LinkedList; -import java.util.List; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.compress.CompressionRegistry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; @@ -10,8 +9,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.compress.CompressionRegistry; + +import java.util.LinkedList; +import java.util.List; public class StorageBlockCraftingManager { diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java index fbc0a322..221ff5c2 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java +++ b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java @@ -1,12 +1,6 @@ package WayofTime.bloodmagic.compress; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; - +import WayofTime.bloodmagic.BloodMagic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; @@ -19,7 +13,8 @@ import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -import WayofTime.bloodmagic.BloodMagic; + +import java.util.*; public class StorageBlockCraftingRecipeAssimilator { diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/PosXY.java b/src/main/java/WayofTime/bloodmagic/demonAura/PosXY.java index b3971dd7..309090b8 100644 --- a/src/main/java/WayofTime/bloodmagic/demonAura/PosXY.java +++ b/src/main/java/WayofTime/bloodmagic/demonAura/PosXY.java @@ -1,10 +1,6 @@ package WayofTime.bloodmagic.demonAura; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; +import lombok.*; @EqualsAndHashCode @ToString diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java b/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java index abe0617b..37f31156 100644 --- a/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java +++ b/src/main/java/WayofTime/bloodmagic/demonAura/WillChunk.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.demonAura; -import java.lang.ref.WeakReference; - +import WayofTime.bloodmagic.api.soul.DemonWillHolder; import lombok.Getter; import lombok.Setter; import net.minecraft.world.chunk.Chunk; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; + +import java.lang.ref.WeakReference; @Getter @Setter diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WillWorld.java b/src/main/java/WayofTime/bloodmagic/demonAura/WillWorld.java index c932b363..e66411a8 100644 --- a/src/main/java/WayofTime/bloodmagic/demonAura/WillWorld.java +++ b/src/main/java/WayofTime/bloodmagic/demonAura/WillWorld.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.demonAura; -import java.util.concurrent.ConcurrentHashMap; - import lombok.Getter; import lombok.Setter; +import java.util.concurrent.ConcurrentHashMap; + public class WillWorld { int dim; diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java index 8a7afc33..ab3812de 100644 --- a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.demonAura; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; - -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; import WayofTime.bloodmagic.api.BloodMagicAPI; import WayofTime.bloodmagic.api.soul.DemonWillHolder; import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; + +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; public class WorldDemonWillHandler { @@ -103,7 +103,7 @@ public class WorldDemonWillHandler } drain = currentWill.drainWill(type, drain); - markChunkAsDirty(willChunk, world.provider.getDimensionId()); + markChunkAsDirty(willChunk, world.provider.getDimension()); return drain; } @@ -120,7 +120,7 @@ public class WorldDemonWillHandler } fill = currentWill.addWill(type, amount, max); - markChunkAsDirty(willChunk, world.provider.getDimensionId()); + markChunkAsDirty(willChunk, world.provider.getDimension()); return fill; } @@ -136,20 +136,20 @@ public class WorldDemonWillHandler } currentWill.addWill(type, amount); - markChunkAsDirty(willChunk, world.provider.getDimensionId()); + markChunkAsDirty(willChunk, world.provider.getDimension()); return amount; } public static WillChunk getWillChunk(World world, BlockPos pos) { - WillChunk willChunk = getWillChunk(world.provider.getDimensionId(), pos.getX() >> 4, pos.getZ() >> 4); + WillChunk willChunk = getWillChunk(world.provider.getDimension(), pos.getX() >> 4, pos.getZ() >> 4); if (willChunk == null) { Chunk chunk = world.getChunkFromBlockCoords(pos); generateWill(chunk); - willChunk = getWillChunk(world.provider.getDimensionId(), pos.getX() >> 4, pos.getZ() >> 4); + willChunk = getWillChunk(world.provider.getDimension(), pos.getX() >> 4, pos.getZ() >> 4); } return willChunk; @@ -183,6 +183,6 @@ public class WorldDemonWillHandler public static void generateWill(Chunk chunk) { - addWillChunk(chunk.getWorld().provider.getDimensionId(), chunk, (short) 1, new DemonWillHolder()); + addWillChunk(chunk.getWorld().provider.getDimension(), chunk, (short) 1, new DemonWillHolder()); } } diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java index cc942417..9852e83d 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java @@ -1,21 +1,20 @@ package WayofTime.bloodmagic.entity.projectile; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.registry.ModBlocks; import io.netty.buffer.ByteBuf; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; import net.minecraftforge.fml.common.registry.IThrowableEntity; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.registry.ModBlocks; public class EntityBloodLight extends EntityThrowable implements IThrowableEntity, IEntityAdditionalSpawnData { @@ -59,12 +58,6 @@ public class EntityBloodLight extends EntityThrowable implements IThrowableEntit return 0F; } - @Override - protected float getVelocity() - { - return 1F; - } - @Override public void setThrowableHeading(double var1, double var3, double var5, float var7, float var8) { @@ -97,9 +90,9 @@ public class EntityBloodLight extends EntityThrowable implements IThrowableEntit } @Override - protected void onImpact(MovingObjectPosition mop) + protected void onImpact(RayTraceResult mop) { - if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY && mop.entityHit != null) + if (mop.typeOfHit == RayTraceResult.Type.ENTITY && mop.entityHit != null) { if (mop.entityHit == shootingEntity) { @@ -107,7 +100,7 @@ public class EntityBloodLight extends EntityThrowable implements IThrowableEntit } this.onImpact(mop.entityHit); - } else if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) + } else if (mop.typeOfHit == RayTraceResult.Type.BLOCK) { EnumFacing sideHit = mop.sideHit; BlockPos blockPos = mop.getBlockPos().offset(sideHit); diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java index 07e17da2..34a5483f 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.entity.projectile; +import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; public class EntitySentientArrow extends EntityArrow { diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java index dc07e7b6..5cf8042f 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.entity.projectile; +import WayofTime.bloodmagic.registry.ModPotions; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.potion.PotionEffect; @@ -7,7 +8,6 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import WayofTime.bloodmagic.registry.ModPotions; public class EntitySoulSnare extends EntityThrowable { diff --git a/src/main/java/WayofTime/bloodmagic/incense/CropTranquilityHandler.java b/src/main/java/WayofTime/bloodmagic/incense/CropTranquilityHandler.java index b37a93d7..f2c2f6a7 100644 --- a/src/main/java/WayofTime/bloodmagic/incense/CropTranquilityHandler.java +++ b/src/main/java/WayofTime/bloodmagic/incense/CropTranquilityHandler.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.incense; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.incense.EnumTranquilityType; import WayofTime.bloodmagic.api.incense.TranquilityHandler; import WayofTime.bloodmagic.api.incense.TranquilityStack; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class CropTranquilityHandler extends TranquilityHandler { diff --git a/src/main/java/WayofTime/bloodmagic/incense/EarthTranquilityHandler.java b/src/main/java/WayofTime/bloodmagic/incense/EarthTranquilityHandler.java index 98a99ffc..5b6def6e 100644 --- a/src/main/java/WayofTime/bloodmagic/incense/EarthTranquilityHandler.java +++ b/src/main/java/WayofTime/bloodmagic/incense/EarthTranquilityHandler.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.incense; +import WayofTime.bloodmagic.api.incense.EnumTranquilityType; +import WayofTime.bloodmagic.api.incense.TranquilityHandler; +import WayofTime.bloodmagic.api.incense.TranquilityStack; import net.minecraft.block.Block; import net.minecraft.block.BlockGrass; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.incense.EnumTranquilityType; -import WayofTime.bloodmagic.api.incense.TranquilityHandler; -import WayofTime.bloodmagic.api.incense.TranquilityStack; public class EarthTranquilityHandler extends TranquilityHandler { diff --git a/src/main/java/WayofTime/bloodmagic/incense/FireTranquilityHandler.java b/src/main/java/WayofTime/bloodmagic/incense/FireTranquilityHandler.java index fe7bbd26..602c3e88 100644 --- a/src/main/java/WayofTime/bloodmagic/incense/FireTranquilityHandler.java +++ b/src/main/java/WayofTime/bloodmagic/incense/FireTranquilityHandler.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.incense; +import WayofTime.bloodmagic.api.incense.EnumTranquilityType; +import WayofTime.bloodmagic.api.incense.TranquilityHandler; +import WayofTime.bloodmagic.api.incense.TranquilityStack; import net.minecraft.block.Block; import net.minecraft.block.BlockFire; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.incense.EnumTranquilityType; -import WayofTime.bloodmagic.api.incense.TranquilityHandler; -import WayofTime.bloodmagic.api.incense.TranquilityStack; public class FireTranquilityHandler extends TranquilityHandler { diff --git a/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarComponent.java b/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarComponent.java index 0a6bdde3..9c72bff4 100644 --- a/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarComponent.java +++ b/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarComponent.java @@ -2,8 +2,8 @@ package WayofTime.bloodmagic.incense; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; public class IncenseAltarComponent { diff --git a/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarHandler.java b/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarHandler.java index 9448e0ae..ca874d2b 100644 --- a/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarHandler.java +++ b/src/main/java/WayofTime/bloodmagic/incense/IncenseAltarHandler.java @@ -1,16 +1,16 @@ package WayofTime.bloodmagic.incense; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.TreeMap; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; - public class IncenseAltarHandler { public static Map> incenseComponentMap = new TreeMap>(); diff --git a/src/main/java/WayofTime/bloodmagic/incense/LavaTranquilityHandler.java b/src/main/java/WayofTime/bloodmagic/incense/LavaTranquilityHandler.java index b3066c07..d2cd8f5a 100644 --- a/src/main/java/WayofTime/bloodmagic/incense/LavaTranquilityHandler.java +++ b/src/main/java/WayofTime/bloodmagic/incense/LavaTranquilityHandler.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.incense; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.incense.EnumTranquilityType; import WayofTime.bloodmagic.api.incense.TranquilityHandler; import WayofTime.bloodmagic.api.incense.TranquilityStack; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class LavaTranquilityHandler extends TranquilityHandler { diff --git a/src/main/java/WayofTime/bloodmagic/incense/PlantTranquilityHandler.java b/src/main/java/WayofTime/bloodmagic/incense/PlantTranquilityHandler.java index b8f976fe..e34324e6 100644 --- a/src/main/java/WayofTime/bloodmagic/incense/PlantTranquilityHandler.java +++ b/src/main/java/WayofTime/bloodmagic/incense/PlantTranquilityHandler.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.incense; -import net.minecraft.block.Block; -import net.minecraft.block.BlockLeaves; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.incense.EnumTranquilityType; import WayofTime.bloodmagic.api.incense.TranquilityHandler; import WayofTime.bloodmagic.api.incense.TranquilityStack; +import net.minecraft.block.Block; +import net.minecraft.block.BlockLeaves; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class PlantTranquilityHandler extends TranquilityHandler { diff --git a/src/main/java/WayofTime/bloodmagic/incense/TreeTranquilityHandler.java b/src/main/java/WayofTime/bloodmagic/incense/TreeTranquilityHandler.java index dd95b555..2eeb7a71 100644 --- a/src/main/java/WayofTime/bloodmagic/incense/TreeTranquilityHandler.java +++ b/src/main/java/WayofTime/bloodmagic/incense/TreeTranquilityHandler.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.incense; -import net.minecraft.block.Block; -import net.minecraft.block.BlockLog; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.incense.EnumTranquilityType; import WayofTime.bloodmagic.api.incense.TranquilityHandler; import WayofTime.bloodmagic.api.incense.TranquilityStack; +import net.minecraft.block.Block; +import net.minecraft.block.BlockLog; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class TreeTranquilityHandler extends TranquilityHandler { diff --git a/src/main/java/WayofTime/bloodmagic/incense/WaterTranquilityHandler.java b/src/main/java/WayofTime/bloodmagic/incense/WaterTranquilityHandler.java index 26058708..aea5f573 100644 --- a/src/main/java/WayofTime/bloodmagic/incense/WaterTranquilityHandler.java +++ b/src/main/java/WayofTime/bloodmagic/incense/WaterTranquilityHandler.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.incense; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.incense.EnumTranquilityType; import WayofTime.bloodmagic.api.incense.TranquilityHandler; import WayofTime.bloodmagic.api.incense.TranquilityStack; import WayofTime.bloodmagic.registry.ModBlocks; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class WaterTranquilityHandler extends TranquilityHandler { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java index 3c30b12d..3f1ea5db 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java @@ -1,20 +1,20 @@ package WayofTime.bloodmagic.item; -import java.util.ArrayList; -import java.util.List; - +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.util.helper.TextHelper; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.List; + public class ItemActivationCrystal extends ItemBindable implements IVariantProvider { public static String[] names = { "weak", "awakened", "creative" }; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java index bcc3535d..74e00052 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java @@ -1,18 +1,5 @@ package WayofTime.bloodmagic.item; -import java.util.ArrayList; -import java.util.List; - -import WayofTime.bloodmagic.client.IVariantProvider; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.altar.BloodAltar; import WayofTime.bloodmagic.api.Constants; @@ -22,12 +9,25 @@ import WayofTime.bloodmagic.api.altar.IAltarManipulator; import WayofTime.bloodmagic.api.altar.IBloodAltar; import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.block.BlockAltar; +import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.Utils; import WayofTime.bloodmagic.util.helper.TextHelper; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.List; + public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantProvider { private EnumAltarTier tierToBuild = EnumAltarTier.ONE; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java index ed8ad09e..5249a262 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java @@ -1,9 +1,10 @@ package WayofTime.bloodmagic.item; -import java.util.ArrayList; -import java.util.List; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.registry.ModBlocks; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -12,13 +13,12 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.registry.ModBlocks; -import WayofTime.bloodmagic.util.helper.TextHelper; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.List; + public class ItemArcaneAshes extends Item implements IVariantProvider { public ItemArcaneAshes() diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBindable.java b/src/main/java/WayofTime/bloodmagic/item/ItemBindable.java index 2e1f2370..82260376 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBindable.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBindable.java @@ -1,12 +1,5 @@ package WayofTime.bloodmagic.item; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.BloodMagicAPI; import WayofTime.bloodmagic.api.Constants; @@ -16,8 +9,14 @@ import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.helper.TextHelper; - import com.google.common.base.Strings; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.List; public class ItemBindable extends Item implements IBindable { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java index 04971629..f5463c2b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java @@ -1,14 +1,5 @@ package WayofTime.bloodmagic.item; -import java.util.List; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.iface.IBindable; import WayofTime.bloodmagic.api.orb.BloodOrb; @@ -17,8 +8,16 @@ import WayofTime.bloodmagic.api.registry.OrbRegistry; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.helper.TextHelper; - import com.google.common.base.Strings; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.List; public class ItemBloodOrb extends ItemBindable implements IBloodOrb, IBindable { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java index a1b86f00..9ca6c43b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java @@ -1,19 +1,19 @@ package WayofTime.bloodmagic.item; -import java.util.ArrayList; -import java.util.List; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.List; + public class ItemBloodShard extends Item implements IVariantProvider { public String[] names = { "weak", "demon" }; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java index 91be4147..222b85e0 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundAxe.java @@ -1,15 +1,16 @@ package WayofTime.bloodmagic.item; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - +import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.ItemStackWrapper; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; +import com.google.common.collect.HashMultiset; +import com.google.common.collect.Multimap; +import com.google.common.collect.Sets; import net.minecraft.block.Block; import net.minecraft.block.BlockLeavesBase; -import net.minecraft.block.material.Material; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; @@ -23,16 +24,13 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.Event; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.ItemStackWrapper; - -import com.google.common.collect.HashMultiset; -import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + public class ItemBoundAxe extends ItemBoundTool implements IMeshProvider { private static final Set EFFECTIVE_ON = Sets.newHashSet(Blocks.planks, Blocks.bookshelf, Blocks.log, Blocks.log2, Blocks.chest, Blocks.pumpkin, Blocks.lit_pumpkin, Blocks.melon_block, Blocks.ladder); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java index ae60f7cd..e323ee44 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundPickaxe.java @@ -1,12 +1,14 @@ package WayofTime.bloodmagic.item; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - +import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.ItemStackWrapper; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; +import com.google.common.collect.HashMultiset; +import com.google.common.collect.Multimap; +import com.google.common.collect.Sets; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.ItemMeshDefinition; @@ -22,16 +24,13 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.Event; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.ItemStackWrapper; - -import com.google.common.collect.HashMultiset; -import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + public class ItemBoundPickaxe extends ItemBoundTool implements IMeshProvider { private static final Set EFFECTIVE_ON = Sets.newHashSet(Blocks.activator_rail, Blocks.coal_ore, Blocks.cobblestone, Blocks.detector_rail, Blocks.diamond_block, Blocks.diamond_ore, Blocks.double_stone_slab, Blocks.golden_rail, Blocks.gold_block, Blocks.gold_ore, Blocks.ice, Blocks.iron_block, Blocks.iron_ore, Blocks.lapis_block, Blocks.lapis_ore, Blocks.lit_redstone_ore, Blocks.mossy_cobblestone, Blocks.netherrack, Blocks.packed_ice, Blocks.rail, Blocks.redstone_ore, Blocks.sandstone, Blocks.red_sandstone, Blocks.stone, Blocks.stone_slab); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java index c54f418a..bff22e31 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundShovel.java @@ -1,12 +1,14 @@ package WayofTime.bloodmagic.item; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - +import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.ItemStackWrapper; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; +import com.google.common.collect.HashMultiset; +import com.google.common.collect.Multimap; +import com.google.common.collect.Sets; import net.minecraft.block.Block; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.enchantment.EnchantmentHelper; @@ -21,16 +23,13 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.Event; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.ItemStackWrapper; - -import com.google.common.collect.HashMultiset; -import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + public class ItemBoundShovel extends ItemBoundTool implements IMeshProvider { private static final Set EFFECTIVE_ON = Sets.newHashSet(Blocks.clay, Blocks.dirt, Blocks.farmland, Blocks.grass, Blocks.gravel, Blocks.mycelium, Blocks.sand, Blocks.snow, Blocks.snow_layer, Blocks.soul_sand); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java index add53b53..6e0dc093 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java @@ -1,10 +1,18 @@ package WayofTime.bloodmagic.item; -import java.util.ArrayList; -import java.util.List; - +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.PlayerHelper; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; +import WayofTime.bloodmagic.registry.ModItems; +import WayofTime.bloodmagic.util.helper.TextHelper; +import com.google.common.base.Strings; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; import net.minecraft.block.Block; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.entity.EntityLivingBase; @@ -18,18 +26,9 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -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.PlayerHelper; -import WayofTime.bloodmagic.registry.ModItems; -import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.base.Strings; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; +import java.util.ArrayList; +import java.util.List; public class ItemBoundSword extends ItemSword implements IBindable, IActivatable, IMeshProvider { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java index 76cfce5b..ca37abdf 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java @@ -1,13 +1,16 @@ package WayofTime.bloodmagic.item; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - +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.registry.ModItems; +import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Multimap; +import com.google.common.collect.Multiset; import lombok.Getter; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -20,21 +23,16 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -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.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.collect.Multimap; -import com.google.common.collect.Multiset; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; @Getter public class ItemBoundTool extends ItemTool implements IBindable, IActivatable diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java b/src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java index 51ad36ee..b9928454 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBucketEssence.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item; -import net.minecraft.init.Items; -import net.minecraft.item.ItemBucket; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.registry.ModBlocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemBucket; public class ItemBucketEssence extends ItemBucket { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java index fb37b2f1..65fda864 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java @@ -1,21 +1,21 @@ package WayofTime.bloodmagic.item; -import java.util.ArrayList; -import java.util.List; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.registry.ModItems; import lombok.Getter; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.registry.ModItems; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.List; + public class ItemComponent extends Item implements IVariantProvider { @Getter diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java index 2209405d..b6a973f3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java @@ -1,5 +1,11 @@ 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.DamageSourceBloodMagic; +import WayofTime.bloodmagic.api.altar.IBloodAltar; import WayofTime.bloodmagic.client.IVariantProvider; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.boss.IBossDisplayData; @@ -10,12 +16,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.DamageSourceBloodMagic; -import WayofTime.bloodmagic.api.altar.IBloodAltar; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java index f0ab87bd..c24285b2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonCrystal.java @@ -1,9 +1,11 @@ package WayofTime.bloodmagic.item; -import java.util.ArrayList; -import java.util.List; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.registry.ModItems; import lombok.Getter; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -11,14 +13,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDiscreteDemonWill; -import WayofTime.bloodmagic.registry.ModItems; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.List; + public class ItemDemonCrystal extends Item implements IDiscreteDemonWill, IVariantProvider { @Getter diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java index 390b5bf1..fac74212 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java @@ -1,10 +1,11 @@ package WayofTime.bloodmagic.item; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.ritual.EnumRuneType; +import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.block.BlockRitualStone; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -15,14 +16,13 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.ritual.EnumRuneType; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.block.BlockRitualStone; -import WayofTime.bloodmagic.util.helper.TextHelper; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class ItemInscriptionTool extends ItemBindable implements IVariantProvider { public ItemInscriptionTool() diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index 08bc84b9..0dbb95b4 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -1,16 +1,15 @@ package WayofTime.bloodmagic.item; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.IVariantProvider; +import com.google.common.base.Strings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraftforge.fml.common.IFuelHandler; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; - -import com.google.common.base.Strings; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index 551e5dc2..e472cbf4 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -1,9 +1,17 @@ package WayofTime.bloodmagic.item; -import java.util.ArrayList; -import java.util.List; - +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.util.helper.RitualHelper; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.registry.ModBlocks; +import WayofTime.bloodmagic.tile.TileMasterRitualStone; +import WayofTime.bloodmagic.util.ChatUtil; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -20,22 +28,12 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; - import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.input.Keyboard; -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.util.helper.RitualHelper; -import WayofTime.bloodmagic.registry.ModBlocks; -import WayofTime.bloodmagic.tile.TileMasterRitualStone; -import WayofTime.bloodmagic.util.ChatUtil; -import WayofTime.bloodmagic.util.helper.TextHelper; +import java.util.ArrayList; +import java.util.List; public class ItemRitualDiviner extends Item implements IVariantProvider { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index 60c80876..a4a1aebb 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -1,11 +1,16 @@ package WayofTime.bloodmagic.item; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.BloodMagicAPI; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.altar.IBloodAltar; +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.client.IVariantProvider; import WayofTime.bloodmagic.tile.TileAltar; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -20,18 +25,13 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.altar.IBloodAltar; -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.util.helper.TextHelper; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class ItemSacrificialDagger extends Item implements IVariantProvider { public static String[] names = { "normal", "creative" }; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java b/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java index ffdff2f3..25e51c55 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java @@ -1,22 +1,22 @@ package WayofTime.bloodmagic.item; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.util.helper.TextHelper; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class ItemSlate extends Item implements IVariantProvider { public String[] names = { "blank", "reinforced", "imbued", "demonic", "ethereal" }; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java index 8c449885..7957f2a7 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java @@ -1,28 +1,31 @@ package WayofTime.bloodmagic.item; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class ItemTelepositionFocus extends ItemBindable implements IVariantProvider { public static String[] names = { "weak", "enhanced", "reinforced", "demonic" }; @@ -53,19 +56,19 @@ public class ItemTelepositionFocus extends ItemBindable implements IVariantProvi } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) + public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if (player.isSneaking()) { - MovingObjectPosition mop = getMovingObjectPositionFromPlayer(world, player, false); + RayTraceResult mop = getMovingObjectPositionFromPlayer(world, player, false); - if (mop != null && mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) + if (mop != null && mop.typeOfHit == RayTraceResult.Type.BLOCK) { setBlockPos(stack, world, mop.getBlockPos()); } } - return stack; + return ActionResult.newResult(EnumActionResult.FAIL, stack); } @Override @@ -117,7 +120,7 @@ public class ItemTelepositionFocus extends ItemBindable implements IVariantProvi itemTag.setInteger(Constants.NBT.X_COORD, pos.getX()); itemTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); itemTag.setInteger(Constants.NBT.Z_COORD, pos.getZ()); - itemTag.setInteger(Constants.NBT.DIMENSION_ID, world.provider.getDimensionId()); + itemTag.setInteger(Constants.NBT.DIMENSION_ID, world.provider.getDimension()); return stack; } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java index 6d7939c8..0cbc0f3c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java @@ -1,10 +1,14 @@ package WayofTime.bloodmagic.item; -import java.util.ArrayList; -import java.util.List; -import java.util.Map.Entry; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.item.armour.ItemLivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -13,17 +17,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.item.armour.ItemLivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.util.helper.TextHelper; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.List; +import java.util.Map.Entry; + public class ItemUpgradeTome extends Item implements IVariantProvider { public ItemUpgradeTome() diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java index 6db2b6fe..dc7ba1fa 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java @@ -1,10 +1,13 @@ package WayofTime.bloodmagic.item; -import java.util.ArrayList; -import java.util.List; -import java.util.Map.Entry; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.iface.IUpgradeTrainer; +import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; +import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -12,16 +15,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IUpgradeTrainer; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.List; +import java.util.Map.Entry; + public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVariantProvider { public ItemUpgradeTrainer() diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index 07f83561..1f8e81bc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -1,10 +1,13 @@ package WayofTime.bloodmagic.item.armour; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.registry.ModItems; +import WayofTime.bloodmagic.util.helper.TextHelper; +import com.google.common.collect.Multimap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -21,15 +24,11 @@ import net.minecraftforge.fml.relauncher.SideOnly; import thaumcraft.api.items.IGoggles; import thaumcraft.api.items.IRevealer; import thaumcraft.api.items.IRunicArmor; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.registry.ModItems; -import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.collect.Multimap; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; @Optional.InterfaceList({ @Optional.Interface(iface = "thaumcraft.api.items.IRevealer", modid = "Thaumcraft"), @Optional.Interface(iface = "thaumcraft.api.items.IGoggles", modid = "Thaumcraft"), @Optional.Interface(iface = "thaumcraft.api.items.IRunicArmor", modid = "Thaumcraft") }) public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IRevealer, IGoggles, IRunicArmor diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java index 1be4123b..044746b3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java @@ -1,8 +1,11 @@ package WayofTime.bloodmagic.item.armour; -import java.util.List; -import java.util.Map; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.registry.ModItems; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -15,12 +18,9 @@ import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.registry.ModItems; + +import java.util.List; +import java.util.Map; public class ItemSentientArmour extends ItemArmor implements ISpecialArmor { diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodRune.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodRune.java index 6f96416c..4af5c8d9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodRune.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodRune.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.item.block; +import WayofTime.bloodmagic.block.BlockBloodRune; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import WayofTime.bloodmagic.block.BlockBloodRune; public class ItemBlockBloodRune extends ItemBlock { diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodStoneBrick.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodStoneBrick.java index 7bc343c6..549c01e2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodStoneBrick.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodStoneBrick.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.item.block; +import WayofTime.bloodmagic.block.BlockBloodStoneBrick; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import WayofTime.bloodmagic.block.BlockBloodStoneBrick; public class ItemBlockBloodStoneBrick extends ItemBlock { diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java index b8cbd5bd..29bce32c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java @@ -1,7 +1,6 @@ package WayofTime.bloodmagic.item.block; -import java.util.List; - +import WayofTime.bloodmagic.tile.TileBloodTank; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -10,7 +9,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; -import WayofTime.bloodmagic.tile.TileBloodTank; + +import java.util.List; public class ItemBlockBloodTank extends ItemBlock implements IFluidContainerItem { diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockCrystal.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockCrystal.java index 24ac58db..c037b3b8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockCrystal.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.item.block; +import WayofTime.bloodmagic.block.BlockCrystal; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import WayofTime.bloodmagic.block.BlockCrystal; public class ItemBlockCrystal extends ItemBlock { diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java index 064996fa..d9e7a60b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java @@ -1,5 +1,7 @@ package WayofTime.bloodmagic.item.block; +import WayofTime.bloodmagic.api.soul.EnumDemonWillType; +import WayofTime.bloodmagic.tile.TileDemonCrystal; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -9,8 +11,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.tile.TileDemonCrystal; public class ItemBlockDemonCrystal extends ItemBlock { diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockPath.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockPath.java index a2e8c966..dcd834b7 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockPath.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockPath.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.item.block; +import WayofTime.bloodmagic.block.BlockPath; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import WayofTime.bloodmagic.block.BlockPath; public class ItemBlockPath extends ItemBlock { diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockPedestal.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockPedestal.java index efcfa7a9..033173c9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockPedestal.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockPedestal.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.item.block; +import WayofTime.bloodmagic.block.BlockPedestal; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import WayofTime.bloodmagic.block.BlockPedestal; public class ItemBlockPedestal extends ItemBlock { diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualController.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualController.java index 96ed2e76..e57d9616 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualController.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.item.block; +import WayofTime.bloodmagic.block.BlockRitualController; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import WayofTime.bloodmagic.block.BlockRitualController; public class ItemBlockRitualController extends ItemBlock { diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualStone.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualStone.java index 0a63294e..6162250b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockRitualStone.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.item.block; +import WayofTime.bloodmagic.block.BlockRitualStone; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import WayofTime.bloodmagic.block.BlockRitualStone; public class ItemBlockRitualStone extends ItemBlock { diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java index ae42df46..aa3ee5d4 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java @@ -1,9 +1,12 @@ package WayofTime.bloodmagic.item.gear; -import java.util.ArrayList; -import java.util.List; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.altar.IAltarManipulator; +import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.tile.TileAltar; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; @@ -11,15 +14,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.altar.IAltarManipulator; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.tile.TileAltar; -import WayofTime.bloodmagic.util.helper.TextHelper; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.List; + public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator, IVariantProvider { public final int CAPACITY = 10000; // Max LP storage diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java index d1ceedcb..58c50753 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java @@ -1,9 +1,13 @@ package WayofTime.bloodmagic.item.gear; -import java.util.ArrayList; -import java.util.List; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.altar.IAltarManipulator; +import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.tile.TileAltar; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; @@ -11,16 +15,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.altar.IAltarManipulator; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.tile.TileAltar; -import WayofTime.bloodmagic.util.helper.TextHelper; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.List; + public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulator, IVariantProvider { /** How much LP per half heart */ diff --git a/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java b/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java index 007961a1..e682ba99 100644 --- a/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java +++ b/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java @@ -1,5 +1,7 @@ package WayofTime.bloodmagic.item.inventory; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.util.helper.NBTHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -7,8 +9,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.ChatComponentText; import net.minecraft.util.IChatComponent; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; public class ItemInventory implements IInventory { diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/IItemFilterProvider.java b/src/main/java/WayofTime/bloodmagic/item/routing/IItemFilterProvider.java index 2d1510e7..70869151 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/IItemFilterProvider.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/IItemFilterProvider.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.item.routing; +import WayofTime.bloodmagic.routing.IItemFilter; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import WayofTime.bloodmagic.routing.IItemFilter; public interface IItemFilterProvider { diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java index 3753ed02..e1f2cfbd 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java @@ -1,11 +1,14 @@ package WayofTime.bloodmagic.item.routing; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - +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.client.IVariantProvider; +import WayofTime.bloodmagic.routing.IMasterRoutingNode; +import WayofTime.bloodmagic.routing.IRoutingNode; +import WayofTime.bloodmagic.util.ChatUtil; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -16,16 +19,13 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.routing.IMasterRoutingNode; -import WayofTime.bloodmagic.routing.IRoutingNode; -import WayofTime.bloodmagic.util.ChatUtil; -import WayofTime.bloodmagic.util.helper.TextHelper; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvider { public ItemNodeRouter() diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java index d80d8439..fd4091e7 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java @@ -1,9 +1,12 @@ package WayofTime.bloodmagic.item.routing; -import java.util.ArrayList; -import java.util.List; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.item.inventory.ItemInventory; +import WayofTime.bloodmagic.routing.*; +import WayofTime.bloodmagic.util.GhostItemHelper; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -12,20 +15,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.item.inventory.ItemInventory; -import WayofTime.bloodmagic.routing.DefaultItemFilter; -import WayofTime.bloodmagic.routing.IItemFilter; -import WayofTime.bloodmagic.routing.IgnoreNBTItemFilter; -import WayofTime.bloodmagic.routing.ModIdItemFilter; -import WayofTime.bloodmagic.routing.OreDictItemFilter; -import WayofTime.bloodmagic.routing.TestItemFilter; -import WayofTime.bloodmagic.util.GhostItemHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.List; + public class ItemRouterFilter extends Item implements IItemFilterProvider, IVariantProvider { public static String[] names = { "exact", "ignoreNBT", "modItems", "oreDict" }; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java index e164a922..0350fd84 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.Constants; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; public class ItemSigilAir extends ItemSigilBase { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java index 80230c4d..95481cce 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java @@ -1,10 +1,11 @@ package WayofTime.bloodmagic.item.sigil; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.iface.ISigil; +import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.item.ItemBindable; +import WayofTime.bloodmagic.util.helper.TextHelper; import lombok.Getter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -12,14 +13,13 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.ISigil; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.item.ItemBindable; -import WayofTime.bloodmagic.util.helper.TextHelper; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + @Getter public class ItemSigilBase extends ItemBindable implements ISigil, IVariantProvider { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java index 91610dbe..73dd0044 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java @@ -1,16 +1,16 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; +import WayofTime.bloodmagic.registry.ModBlocks; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; -import WayofTime.bloodmagic.registry.ModBlocks; public class ItemSigilBloodLight extends ItemSigilBase { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java index 0ead230c..d74cb249 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.compress.CompressionRegistry; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.compress.CompressionRegistry; public class ItemSigilCompression extends ItemSigilToggleable { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java index 2cc95474..ad281c2c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilDivination.java @@ -1,15 +1,5 @@ package WayofTime.bloodmagic.item.sigil; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.altar.IBloodAltar; import WayofTime.bloodmagic.api.iface.IAltarReader; @@ -18,6 +8,16 @@ import WayofTime.bloodmagic.api.util.helper.PlayerHelper; import WayofTime.bloodmagic.tile.TileIncenseAltar; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.TextHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.IChatComponent; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; + +import java.util.ArrayList; +import java.util.List; public class ItemSigilDivination extends ItemSigilBase implements IAltarReader { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java index 725cf628..5545519a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilElementalAffinity.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; public class ItemSigilElementalAffinity extends ItemSigilToggleable { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java index bcc340f7..e424e29c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item.sigil; -import java.util.List; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.registry.ModPotions; import net.minecraft.entity.Entity; import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.player.EntityPlayer; @@ -9,8 +9,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.registry.ModPotions; + +import java.util.List; public class ItemSigilEnderSeverance extends ItemSigilToggleable { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java index 9da4ed63..9142e565 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; public class ItemSigilFastMiner extends ItemSigilToggleable { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java index 2d228f7e..7cf23ed2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilGreenGrove.java @@ -1,5 +1,7 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.BloodMagicAPI; +import WayofTime.bloodmagic.api.Constants; import net.minecraft.block.Block; import net.minecraft.block.IGrowable; import net.minecraft.block.state.IBlockState; @@ -9,8 +11,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.Constants; public class ItemSigilGreenGrove extends ItemSigilToggleable { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java index c153de67..695aeb9f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.registry.ModPotions; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.registry.ModPotions; public class ItemSigilHaste extends ItemSigilToggleable { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java index 71968272..37b77d8f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilLava.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -13,7 +14,6 @@ import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; -import WayofTime.bloodmagic.api.Constants; public class ItemSigilLava extends ItemSigilBase { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java index c54d217b..2a200a43 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilMagnetism.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.item.sigil; -import java.util.List; - +import WayofTime.bloodmagic.api.Constants; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; + +import java.util.List; public class ItemSigilMagnetism extends ItemSigilToggleable { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java index 3fcd38d1..947f2bd6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilPhantomBridge.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.registry.ModBlocks; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.registry.ModBlocks; public class ItemSigilPhantomBridge extends ItemSigilToggleable { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java index 8bde2790..28c5261d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSeer.java @@ -1,12 +1,5 @@ package WayofTime.bloodmagic.item.sigil; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.altar.IBloodAltar; import WayofTime.bloodmagic.api.iface.IAltarReader; @@ -14,6 +7,13 @@ import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.tile.TileIncenseAltar; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.TextHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; public class ItemSigilSeer extends ItemSigilBase implements IAltarReader { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java index 8becf161..f3ac476e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilSuppression.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.tile.TileSpectralBlock; +import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.tile.TileSpectralBlock; -import WayofTime.bloodmagic.util.Utils; public class ItemSigilSuppression extends ItemSigilToggleable { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java index 00fbfa18..f0030fb7 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java @@ -1,7 +1,11 @@ package WayofTime.bloodmagic.item.sigil; -import java.util.List; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.teleport.TeleportQueue; +import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import WayofTime.bloodmagic.ritual.portal.Teleports; +import WayofTime.bloodmagic.tile.TileTeleposer; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -10,12 +14,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.teleport.TeleportQueue; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.ritual.portal.Teleports; -import WayofTime.bloodmagic.tile.TileTeleposer; -import WayofTime.bloodmagic.util.helper.TextHelper; + +import java.util.List; public class ItemSigilTeleposition extends ItemSigilBase { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java index 72e6bb04..540b4022 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java @@ -1,8 +1,7 @@ package WayofTime.bloodmagic.item.sigil; -import java.util.ArrayList; -import java.util.List; - +import WayofTime.bloodmagic.item.ItemBindable; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -12,11 +11,12 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.item.ItemBindable; -import WayofTime.bloodmagic.util.helper.TextHelper; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.List; + public class ItemSigilToggleable extends ItemSigilBase { public ItemSigilToggleable(String name, int lpUsed) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java index 0289e749..ffce3971 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java @@ -1,7 +1,9 @@ package WayofTime.bloodmagic.item.sigil; -import java.util.List; - +import WayofTime.bloodmagic.ConfigHandler; +import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.util.helper.NBTHelper; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.effect.EntityLightningBolt; @@ -14,10 +16,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; + +import java.util.List; public class ItemSigilTransposition extends ItemSigilBase { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java index 77a8faaf..13b63ad7 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilVoid.java @@ -1,16 +1,17 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.IFluidHandler; -import WayofTime.bloodmagic.api.Constants; public class ItemSigilVoid extends ItemSigilBase { @@ -25,15 +26,15 @@ public class ItemSigilVoid extends ItemSigilBase { if (!world.isRemote && !isUnusable(stack)) { - MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(world, player, true); + RayTraceResult movingobjectposition = this.getMovingObjectPositionFromPlayer(world, player, true); if (movingobjectposition != null) { - ItemStack ret = net.minecraftforge.event.ForgeEventFactory.onBucketUse(player, world, stack, movingobjectposition); + ItemStack ret = ForgeEventFactory.onBucketUse(player, world, stack, movingobjectposition); if (ret != null) return ret; - if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) + if (movingobjectposition.typeOfHit == RayTraceResult.Type.BLOCK) { BlockPos blockpos = movingobjectposition.getBlockPos(); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java index c2da4450..10e51956 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWater.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; import net.minecraft.block.BlockCauldron; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -14,7 +15,6 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; -import WayofTime.bloodmagic.api.Constants; public class ItemSigilWater extends ItemSigilBase { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java index f926cfc5..a2cefbdc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.item.sigil; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.registry.ModPotions; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.registry.ModPotions; public class ItemSigilWhirlwind extends ItemSigilToggleable { diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java index 1a6f89be..8b3ab311 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java @@ -1,9 +1,11 @@ package WayofTime.bloodmagic.item.soul; -import java.util.ArrayList; -import java.util.List; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.soul.IDemonWill; +import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -11,14 +13,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.soul.IDemonWill; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.List; + public class ItemMonsterSoul extends Item implements IDemonWill, IVariantProvider { public static String[] names = { "base" }; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java index bafcc97f..a9a5ab9f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java @@ -1,5 +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.PlayerDemonWillHandler; +import WayofTime.bloodmagic.item.armour.ItemSentientArmour; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -7,11 +12,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.item.armour.ItemSentientArmour; public class ItemSentientArmourGem extends Item { diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index 21b97305..b0f0c366 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java @@ -1,5 +1,8 @@ package WayofTime.bloodmagic.item.soul; +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; @@ -13,9 +16,6 @@ import net.minecraft.stats.StatList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; public class ItemSentientBow extends ItemBow { diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java index 8089f8f7..e485fde3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java @@ -1,13 +1,20 @@ package WayofTime.bloodmagic.item.soul; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.iface.IActivatable; +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.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; +import WayofTime.bloodmagic.registry.ModItems; +import WayofTime.bloodmagic.util.helper.TextHelper; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -17,23 +24,13 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IActivatable; -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.registry.ModItems; -import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IActivatable, IMeshProvider { diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java index 98b3e2d5..fbd35b1f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java @@ -1,9 +1,14 @@ package WayofTime.bloodmagic.item.soul; -import java.util.ArrayList; -import java.util.List; - +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.soul.IDemonWillGem; +import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; +import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -12,17 +17,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -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.soul.IDemonWillGem; -import WayofTime.bloodmagic.api.soul.PlayerDemonWillHandler; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.util.helper.TextHelper; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.List; + public class ItemSoulGem extends Item implements IDemonWillGem, IVariantProvider { public static String[] names = { "petty", "lesser", "common", "greater", "grand" }; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java index 4674a8c7..bf28c433 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.item.soul; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - +import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.client.IVariantProvider; +import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -12,13 +12,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import WayofTime.bloodmagic.BloodMagic; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; -import WayofTime.bloodmagic.util.helper.TextHelper; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class ItemSoulSnare extends Item implements IVariantProvider { public static String[] names = { "base" }; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java index e2052775..6f227bb6 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java @@ -1,17 +1,5 @@ package WayofTime.bloodmagic.livingArmour; -import java.lang.reflect.Constructor; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map.Entry; - -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.iface.IUpgradeTrainer; import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; @@ -20,9 +8,20 @@ import WayofTime.bloodmagic.api.livingArmour.StatTracker; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.TextHelper; - import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.world.World; + +import java.lang.reflect.Constructor; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map.Entry; public class LivingArmour implements ILivingArmour { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java index ab4e3cee..f48a1549 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java @@ -1,17 +1,17 @@ package WayofTime.bloodmagic.livingArmour.tracker; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.api.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeArrowShot; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; public class StatTrackerArrowShot extends StatTracker { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java index e46e6ddc..c8060634 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java @@ -1,17 +1,17 @@ package WayofTime.bloodmagic.livingArmour.tracker; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.api.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeDigging; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; public class StatTrackerDigging extends StatTracker { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java index 81096c35..44074180 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java @@ -1,18 +1,18 @@ package WayofTime.bloodmagic.livingArmour.tracker; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.api.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeKnockbackResist; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class StatTrackerFood extends StatTracker { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java index bec3f1ba..0d0e6093 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java @@ -1,17 +1,17 @@ package WayofTime.bloodmagic.livingArmour.tracker; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.api.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeGrimReaperSprint; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; public class StatTrackerGrimReaperSprint extends StatTracker { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java index 72066533..85922a65 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java @@ -1,17 +1,17 @@ package WayofTime.bloodmagic.livingArmour.tracker; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.api.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeHealthboost; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; public class StatTrackerHealthboost extends StatTracker { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java index 4eba64d6..3a1961d9 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java @@ -1,17 +1,17 @@ package WayofTime.bloodmagic.livingArmour.tracker; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.api.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeMeleeDamage; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; public class StatTrackerMeleeDamage extends StatTracker { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java index c11e14df..7e637d13 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java @@ -1,18 +1,18 @@ package WayofTime.bloodmagic.livingArmour.tracker; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.api.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSpeed; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class StatTrackerMovement extends StatTracker { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java index 34853e94..fcc0c9fb 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java @@ -1,17 +1,17 @@ package WayofTime.bloodmagic.livingArmour.tracker; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.api.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePhysicalProtect; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; public class StatTrackerPhysicalProtect extends StatTracker { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java index 6dbbfbf9..57ab91b7 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java @@ -1,17 +1,17 @@ package WayofTime.bloodmagic.livingArmour.tracker; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.api.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePoisonResist; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.Potion; +import net.minecraft.world.World; + +import java.util.ArrayList; +import java.util.List; public class StatTrackerPoison extends StatTracker { @@ -46,7 +46,7 @@ public class StatTrackerPoison extends StatTracker @Override public boolean onTick(World world, EntityPlayer player, LivingArmour livingArmour) { - if (player.isPotionActive(Potion.poison)) + if (player.isPotionActive(Potion.getPotionFromResourceLocation("poison"))) { totalPoisonTicks++; this.markDirty(); diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java index 5601877f..36d87ff5 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java @@ -1,17 +1,17 @@ package WayofTime.bloodmagic.livingArmour.tracker; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.api.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; public class StatTrackerSelfSacrifice extends StatTracker { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java index 3c0c5b75..a047869a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java @@ -1,17 +1,17 @@ package WayofTime.bloodmagic.livingArmour.tracker; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.api.livingArmour.StatTracker; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSolarPowered; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; public class StatTrackerSolarPowered extends StatTracker { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java index c405b3f3..c85e6d05 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.livingArmour.upgrade; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; public class LivingArmourUpgradeArrowShot extends LivingArmourUpgrade { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java index f9efba67..ac744824 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java @@ -1,16 +1,16 @@ package WayofTime.bloodmagic.livingArmour.upgrade; -import java.util.HashMap; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.livingArmour.LivingArmour; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.livingArmour.LivingArmour; + +import java.util.HashMap; public class LivingArmourUpgradeDigging extends LivingArmourUpgrade { @@ -39,10 +39,10 @@ public class LivingArmourUpgradeDigging extends LivingArmourUpgrade { changeMap.put(livingArmour, false); - player.addPotionEffect(new PotionEffect(Potion.digSpeed.id, digHasteTime[this.level], digHasteLevel[this.level], false, false)); + player.addPotionEffect(new PotionEffect(Potion.getPotionFromResourceLocation("digSpeed"), digHasteTime[this.level], digHasteLevel[this.level], false, false)); if (digSpeedTime[this.level] > 0) { - player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, digSpeedTime[this.level], digSpeedLevel[this.level], false, false)); + player.addPotionEffect(new PotionEffect(Potion.getPotionFromResourceLocation("moveSpeed"), digSpeedTime[this.level], digSpeedLevel[this.level], false, false)); } } } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java index 33cea2ef..7d0b0896 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.livingArmour.upgrade; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.TextHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; public class LivingArmourUpgradeGrimReaperSprint extends LivingArmourUpgrade { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java index a1322403..b593da5a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java @@ -1,18 +1,17 @@ package WayofTime.bloodmagic.livingArmour.upgrade; -import java.util.UUID; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; +import java.util.UUID; public class LivingArmourUpgradeHealthboost extends LivingArmourUpgrade { @@ -35,7 +34,7 @@ public class LivingArmourUpgradeHealthboost extends LivingArmourUpgrade { Multimap modifierMap = HashMultimap.create(); - modifierMap.put(SharedMonsterAttributes.maxHealth.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(9423688, 1), "Health modifier" + 1, healthModifier[this.level], 0)); + modifierMap.put(SharedMonsterAttributes.MAX_HEALTH.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(9423688, 1), "Health modifier" + 1, healthModifier[this.level], 0)); return modifierMap; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java index e895f9a5..078aa21f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java @@ -1,15 +1,14 @@ package WayofTime.bloodmagic.livingArmour.upgrade; -import java.util.UUID; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.nbt.NBTTagCompound; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; +import java.util.UUID; public class LivingArmourUpgradeKnockbackResist extends LivingArmourUpgrade { @@ -27,11 +26,11 @@ public class LivingArmourUpgradeKnockbackResist extends LivingArmourUpgrade { Multimap modifierMap = HashMultimap.create(); - modifierMap.put(SharedMonsterAttributes.knockbackResistance.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(895132, 1), "Knockback modifier" + 1, kbModifier[this.level], 0)); + modifierMap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(895132, 1), "Knockback modifier" + 1, kbModifier[this.level], 0)); if (healthModifier[this.level] > 0) { - modifierMap.put(SharedMonsterAttributes.maxHealth.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(952142, 1), "Health modifier" + 1, healthModifier[this.level], 0)); + modifierMap.put(SharedMonsterAttributes.MAX_HEALTH.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(952142, 1), "Health modifier" + 1, healthModifier[this.level], 0)); } return modifierMap; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java index 9b6d9cc1..228404de 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java @@ -1,18 +1,17 @@ package WayofTime.bloodmagic.livingArmour.upgrade; -import java.util.UUID; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; +import java.util.UUID; public class LivingArmourUpgradeMeleeDamage extends LivingArmourUpgrade { @@ -35,7 +34,7 @@ public class LivingArmourUpgradeMeleeDamage extends LivingArmourUpgrade { Multimap modifierMap = HashMultimap.create(); - modifierMap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(9423688, 1), "damage modifier" + 1, meleeDamage[this.level], 0)); + modifierMap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(9423688, 1), "damage modifier" + 1, meleeDamage[this.level], 0)); return modifierMap; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java index 2444031b..395b1054 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.livingArmour.upgrade; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; public class LivingArmourUpgradePhysicalProtect extends LivingArmourUpgrade { diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java index 3f966c0a..ea572e22 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java @@ -1,15 +1,15 @@ package WayofTime.bloodmagic.livingArmour.upgrade; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.TextHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.world.World; public class LivingArmourUpgradePoisonResist extends LivingArmourUpgrade { @@ -27,12 +27,12 @@ public class LivingArmourUpgradePoisonResist extends LivingArmourUpgrade @Override public void onTick(World world, EntityPlayer player, ILivingArmour livingArmour) { - if (player.isPotionActive(Potion.poison) && poisonCooldown <= 0) + if (player.isPotionActive(Potion.getPotionFromResourceLocation("poison")) && poisonCooldown <= 0) { - PotionEffect eff = player.getActivePotionEffect(Potion.poison); + PotionEffect eff = player.getActivePotionEffect(Potion.getPotionFromResourceLocation("poison")); if (eff.getAmplifier() <= poisonMaxCure[this.level]) { - player.removePotionEffect(Potion.poison.id); + player.removePotionEffect(Potion.getPotionFromResourceLocation("poison")); poisonCooldown = poisonCooldownTime[this.level]; ChatUtil.sendNoSpam(player, TextHelper.localize(chatBase + "poisonRemove")); diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java index e45cf683..c711a537 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; -import net.minecraft.nbt.NBTTagCompound; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.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 c291f849..dec022be 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java @@ -1,5 +1,8 @@ package WayofTime.bloodmagic.livingArmour.upgrade; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -7,9 +10,6 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; public class LivingArmourUpgradeSolarPowered extends LivingArmourUpgrade { @@ -50,7 +50,7 @@ public class LivingArmourUpgradeSolarPowered extends LivingArmourUpgrade if (fireResistTime[this.level] != 0 && counter % fireResistCooldown[this.level] == 0) { - player.addPotionEffect(new PotionEffect(Potion.fireResistance.id, fireResistTime[this.level], 0, false, false)); + player.addPotionEffect(new PotionEffect(Potion.getPotionFromResourceLocation("fireResistance"), fireResistTime[this.level], 0, false, false)); } } } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java index d783c48d..608f125a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java @@ -1,7 +1,10 @@ package WayofTime.bloodmagic.livingArmour.upgrade; -import java.util.UUID; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; +import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; @@ -9,12 +12,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.ILivingArmour; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; +import java.util.UUID; public class LivingArmourUpgradeSpeed extends LivingArmourUpgrade { @@ -42,12 +41,12 @@ public class LivingArmourUpgradeSpeed extends LivingArmourUpgrade { if (sprintSpeedTime[this.level] > 0) { - player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, sprintSpeedTime[this.level], sprintSpeedLevel[this.level], false, false)); + player.addPotionEffect(new PotionEffect(Potion.getPotionFromResourceLocation("moveSpeed"), sprintSpeedTime[this.level], sprintSpeedLevel[this.level], false, false)); } - if (sprintRegenTime[this.level] > 0 && !player.isPotionActive(Potion.regeneration)) + if (sprintRegenTime[this.level] > 0 && !player.isPotionActive(Potion.getPotionFromResourceLocation("regeneration"))) { - player.addPotionEffect(new PotionEffect(Potion.regeneration.id, sprintRegenTime[this.level], 0, false, false)); + player.addPotionEffect(new PotionEffect(Potion.getPotionFromResourceLocation("regeneration"), sprintRegenTime[this.level], 0, false, false)); } } } @@ -61,7 +60,7 @@ public class LivingArmourUpgradeSpeed extends LivingArmourUpgrade if (healthModifier[this.level] > 0) { - modifierMap.put(SharedMonsterAttributes.maxHealth.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(952142, 1), "Health modifier" + 1, healthModifier[this.level], 0)); + modifierMap.put(SharedMonsterAttributes.MAX_HEALTH.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(952142, 1), "Health modifier" + 1, healthModifier[this.level], 0)); } return modifierMap; diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java index 37d64bfc..13e1648d 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 net.minecraft.nbt.NBTTagCompound; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import net.minecraft.nbt.NBTTagCompound; public class LivingArmourUpgradeStepAssist extends LivingArmourUpgrade { diff --git a/src/main/java/WayofTime/bloodmagic/network/BloodMagicPacketHandler.java b/src/main/java/WayofTime/bloodmagic/network/BloodMagicPacketHandler.java index 7107c6ec..2452abee 100644 --- a/src/main/java/WayofTime/bloodmagic/network/BloodMagicPacketHandler.java +++ b/src/main/java/WayofTime/bloodmagic/network/BloodMagicPacketHandler.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.network; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.util.ChatUtil; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; import net.minecraftforge.fml.relauncher.Side; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.util.ChatUtil; public class BloodMagicPacketHandler { @@ -21,7 +21,7 @@ public class BloodMagicPacketHandler public static void sendToAllAround(IMessage message, TileEntity te, int range) { - INSTANCE.sendToAllAround(message, new NetworkRegistry.TargetPoint(te.getWorld().provider.getDimensionId(), te.getPos().getX(), te.getPos().getY(), te.getPos().getZ(), range)); + INSTANCE.sendToAllAround(message, new NetworkRegistry.TargetPoint(te.getWorld().provider.getDimension(), te.getPos().getX(), te.getPos().getY(), te.getPos().getZ(), range)); } public static void sendToAllAround(IMessage message, TileEntity te) diff --git a/src/main/java/WayofTime/bloodmagic/network/ItemRouterButtonPacketProcessor.java b/src/main/java/WayofTime/bloodmagic/network/ItemRouterButtonPacketProcessor.java index 91432b2b..d3b3dcf8 100644 --- a/src/main/java/WayofTime/bloodmagic/network/ItemRouterButtonPacketProcessor.java +++ b/src/main/java/WayofTime/bloodmagic/network/ItemRouterButtonPacketProcessor.java @@ -1,16 +1,16 @@ package WayofTime.bloodmagic.network; +import WayofTime.bloodmagic.tile.routing.TileFilteredRoutingNode; import io.netty.buffer.ByteBuf; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.fml.relauncher.Side; -import WayofTime.bloodmagic.tile.routing.TileFilteredRoutingNode; public class ItemRouterButtonPacketProcessor implements IMessage, IMessageHandler { @@ -27,7 +27,7 @@ public class ItemRouterButtonPacketProcessor implements IMessage, IMessageHandle { this.buttonPress = buttonPress; this.pos = pos; - this.dimension = world.provider.getDimensionId(); + this.dimension = world.provider.getDimension(); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java index caf27690..ba7d057c 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java @@ -1,19 +1,19 @@ package WayofTime.bloodmagic.potion; -import java.util.List; - +import WayofTime.bloodmagic.registry.ModPotions; import net.minecraft.entity.Entity; import net.minecraft.entity.IProjectile; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.EnderTeleportEvent; import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import WayofTime.bloodmagic.registry.ModPotions; + +import java.util.List; public class PotionEventHandlers { @@ -58,7 +58,7 @@ public class PotionEventHandlers if (event.entityLiving.isPotionActive(ModPotions.whirlwind)) { int d0 = 3; - AxisAlignedBB axisAlignedBB = AxisAlignedBB.fromBounds(event.entityLiving.posX - 0.5, event.entityLiving.posY - 0.5, event.entityLiving.posZ - 0.5, event.entityLiving.posX + 0.5, event.entityLiving.posY + 0.5, event.entityLiving.posZ + 0.5).expand(d0, d0, d0); + AxisAlignedBB axisAlignedBB = new AxisAlignedBB(event.entityLiving.posX - 0.5, event.entityLiving.posY - 0.5, event.entityLiving.posZ - 0.5, event.entityLiving.posX + 0.5, event.entityLiving.posY + 0.5, event.entityLiving.posZ + 0.5).expand(d0, d0, d0); List entityList = event.entityLiving.worldObj.getEntitiesWithinAABB(Entity.class, axisAlignedBB); for (Object thing : entityList) diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index 67a203ce..29df43de 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -1,17 +1,8 @@ package WayofTime.bloodmagic.proxy; +import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.IVariantProvider; -import net.minecraft.block.Block; -import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.item.Item; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.client.model.obj.OBJLoader; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.client.registry.ClientRegistry; -import net.minecraftforge.fml.client.registry.RenderingRegistry; -import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.client.helper.ShaderHelper; import WayofTime.bloodmagic.client.render.RenderAlchemyArray; import WayofTime.bloodmagic.client.render.RenderAltar; @@ -32,6 +23,15 @@ import WayofTime.bloodmagic.tile.routing.TileRoutingNode; import WayofTime.bloodmagic.util.handler.ClientEventHandler; import WayofTime.bloodmagic.util.helper.InventoryRenderHelper; import WayofTime.bloodmagic.util.helper.InventoryRenderHelperV2; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.client.model.obj.OBJLoader; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.client.registry.ClientRegistry; +import net.minecraftforge.fml.client.registry.RenderingRegistry; import org.apache.commons.lang3.tuple.Pair; public class ClientProxy extends CommonProxy diff --git a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java index 7bafe129..2670849a 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java @@ -1,16 +1,16 @@ package WayofTime.bloodmagic.proxy; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.capabilities.CapabilityManager; import WayofTime.bloodmagic.api.ritual.CapabilityRuneType; import WayofTime.bloodmagic.api.ritual.IRitualStone; import WayofTime.bloodmagic.api.teleport.TeleportQueue; import WayofTime.bloodmagic.util.handler.EventHandler; import WayofTime.bloodmagic.util.helper.InventoryRenderHelper; import WayofTime.bloodmagic.util.helper.InventoryRenderHelperV2; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.capabilities.CapabilityManager; public class CommonProxy { diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java index d04ad6ab..05c65aca 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModArmourTrackers.java @@ -1,29 +1,8 @@ package WayofTime.bloodmagic.registry; import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerArrowShot; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerDigging; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerFood; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerGrimReaperSprint; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerHealthboost; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerMeleeDamage; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerMovement; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerPhysicalProtect; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerPoison; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSelfSacrifice; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSolarPowered; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeArrowShot; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeDigging; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeGrimReaperSprint; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeHealthboost; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeKnockbackResist; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeMeleeDamage; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePhysicalProtect; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradePoisonResist; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSolarPowered; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSpeed; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeStepAssist; +import WayofTime.bloodmagic.livingArmour.tracker.*; +import WayofTime.bloodmagic.livingArmour.upgrade.*; public class ModArmourTrackers { diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java index 00547d53..65388a64 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java @@ -1,62 +1,22 @@ package WayofTime.bloodmagic.registry; -import WayofTime.bloodmagic.item.block.*; -import net.minecraft.block.Block; -import net.minecraft.item.ItemBlock; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fml.common.registry.GameRegistry; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.BloodMagicAPI; import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.block.BlockAlchemyArray; -import WayofTime.bloodmagic.block.BlockAltar; -import WayofTime.bloodmagic.block.BlockBloodLight; -import WayofTime.bloodmagic.block.BlockBloodRune; -import WayofTime.bloodmagic.block.BlockBloodStoneBrick; -import WayofTime.bloodmagic.block.BlockBloodTank; -import WayofTime.bloodmagic.block.BlockCrystal; -import WayofTime.bloodmagic.block.BlockDemonCrucible; -import WayofTime.bloodmagic.block.BlockDemonCrystal; -import WayofTime.bloodmagic.block.BlockDemonCrystallizer; -import WayofTime.bloodmagic.block.BlockDemonPylon; -import WayofTime.bloodmagic.block.BlockDimensionalPortal; -import WayofTime.bloodmagic.block.BlockIncenseAltar; -import WayofTime.bloodmagic.block.BlockInputRoutingNode; -import WayofTime.bloodmagic.block.BlockItemRoutingNode; -import WayofTime.bloodmagic.block.BlockLifeEssence; -import WayofTime.bloodmagic.block.BlockMasterRoutingNode; -import WayofTime.bloodmagic.block.BlockOutputRoutingNode; -import WayofTime.bloodmagic.block.BlockPath; -import WayofTime.bloodmagic.block.BlockPedestal; -import WayofTime.bloodmagic.block.BlockPhantom; -import WayofTime.bloodmagic.block.BlockRitualController; -import WayofTime.bloodmagic.block.BlockRitualStone; -import WayofTime.bloodmagic.block.BlockSoulForge; -import WayofTime.bloodmagic.block.BlockSpectral; -import WayofTime.bloodmagic.block.BlockTeleposer; -import WayofTime.bloodmagic.tile.TileAlchemyArray; -import WayofTime.bloodmagic.tile.TileAltar; -import WayofTime.bloodmagic.tile.TileBloodTank; -import WayofTime.bloodmagic.tile.TileDemonCrucible; -import WayofTime.bloodmagic.tile.TileDemonCrystal; -import WayofTime.bloodmagic.tile.TileDemonCrystallizer; -import WayofTime.bloodmagic.tile.TileDemonPylon; -import WayofTime.bloodmagic.tile.TileDimensionalPortal; -import WayofTime.bloodmagic.tile.TileImperfectRitualStone; -import WayofTime.bloodmagic.tile.TileIncenseAltar; -import WayofTime.bloodmagic.tile.TileMasterRitualStone; -import WayofTime.bloodmagic.tile.TilePhantomBlock; -import WayofTime.bloodmagic.tile.TilePlinth; -import WayofTime.bloodmagic.tile.TileSoulForge; -import WayofTime.bloodmagic.tile.TileSpectralBlock; -import WayofTime.bloodmagic.tile.TileTeleposer; +import WayofTime.bloodmagic.block.*; +import WayofTime.bloodmagic.item.block.*; +import WayofTime.bloodmagic.tile.*; import WayofTime.bloodmagic.tile.routing.TileInputRoutingNode; import WayofTime.bloodmagic.tile.routing.TileItemRoutingNode; import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode; import WayofTime.bloodmagic.tile.routing.TileOutputRoutingNode; import WayofTime.bloodmagic.util.helper.InventoryRenderHelper; import WayofTime.bloodmagic.util.helper.InventoryRenderHelperV2; +import net.minecraft.block.Block; +import net.minecraft.item.ItemBlock; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; public class ModBlocks { diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModCompatibility.java b/src/main/java/WayofTime/bloodmagic/registry/ModCompatibility.java index 23b58eab..0ccf3a59 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModCompatibility.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModCompatibility.java @@ -1,13 +1,9 @@ package WayofTime.bloodmagic.registry; -import java.util.ArrayList; - -import WayofTime.bloodmagic.compat.guideapi.CompatibilityGuideAPI; -import net.minecraftforge.fml.common.Loader; import WayofTime.bloodmagic.compat.ICompatibility; -import WayofTime.bloodmagic.compat.jei.CompatibilityJustEnoughItems; -import WayofTime.bloodmagic.compat.thaumcraft.CompatibilityThaumcraft; -import WayofTime.bloodmagic.compat.waila.CompatibilityWaila; +import net.minecraftforge.fml.common.Loader; + +import java.util.ArrayList; public class ModCompatibility { @@ -15,10 +11,10 @@ public class ModCompatibility public static void registerModCompat() { - compatibilities.add(new CompatibilityJustEnoughItems()); - compatibilities.add(new CompatibilityWaila()); - compatibilities.add(new CompatibilityThaumcraft()); - compatibilities.add(new CompatibilityGuideAPI()); +// compatibilities.add(new CompatibilityJustEnoughItems()); +// compatibilities.add(new CompatibilityWaila()); +// compatibilities.add(new CompatibilityThaumcraft()); +// compatibilities.add(new CompatibilityGuideAPI()); } public static void loadCompat(ICompatibility.InitializationPhase phase) diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModEntities.java b/src/main/java/WayofTime/bloodmagic/registry/ModEntities.java index 12667fef..663e0312 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModEntities.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModEntities.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.registry; -import net.minecraftforge.fml.common.registry.EntityRegistry; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; +import net.minecraftforge.fml.common.registry.EntityRegistry; public class ModEntities { diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java index d7691fc0..2576231c 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java @@ -1,69 +1,25 @@ package WayofTime.bloodmagic.registry; -import net.minecraft.item.Item; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.util.EnumHelper; -import net.minecraftforge.fml.common.registry.GameRegistry; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.orb.BloodOrb; import WayofTime.bloodmagic.api.registry.OrbRegistry; -import WayofTime.bloodmagic.api.ritual.EnumRuneType; -import WayofTime.bloodmagic.item.ItemActivationCrystal; -import WayofTime.bloodmagic.item.ItemAltarMaker; -import WayofTime.bloodmagic.item.ItemArcaneAshes; -import WayofTime.bloodmagic.item.ItemBloodOrb; -import WayofTime.bloodmagic.item.ItemBloodShard; -import WayofTime.bloodmagic.item.ItemBoundAxe; -import WayofTime.bloodmagic.item.ItemBoundPickaxe; -import WayofTime.bloodmagic.item.ItemBoundShovel; -import WayofTime.bloodmagic.item.ItemBoundSword; -import WayofTime.bloodmagic.item.ItemBucketEssence; -import WayofTime.bloodmagic.item.ItemComponent; -import WayofTime.bloodmagic.item.ItemDaggerOfSacrifice; -import WayofTime.bloodmagic.item.ItemDemonCrystal; -import WayofTime.bloodmagic.item.ItemInscriptionTool; -import WayofTime.bloodmagic.item.ItemLavaCrystal; -import WayofTime.bloodmagic.item.ItemRitualDiviner; -import WayofTime.bloodmagic.item.ItemSacrificialDagger; -import WayofTime.bloodmagic.item.ItemSlate; -import WayofTime.bloodmagic.item.ItemTelepositionFocus; -import WayofTime.bloodmagic.item.ItemUpgradeTome; -import WayofTime.bloodmagic.item.ItemUpgradeTrainer; +import WayofTime.bloodmagic.item.*; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.item.armour.ItemSentientArmour; import WayofTime.bloodmagic.item.gear.ItemPackSacrifice; import WayofTime.bloodmagic.item.gear.ItemPackSelfSacrifice; import WayofTime.bloodmagic.item.routing.ItemNodeRouter; import WayofTime.bloodmagic.item.routing.ItemRouterFilter; -import WayofTime.bloodmagic.item.sigil.ItemSigilAir; -import WayofTime.bloodmagic.item.sigil.ItemSigilBloodLight; -import WayofTime.bloodmagic.item.sigil.ItemSigilCompression; -import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; -import WayofTime.bloodmagic.item.sigil.ItemSigilElementalAffinity; -import WayofTime.bloodmagic.item.sigil.ItemSigilEnderSeverance; -import WayofTime.bloodmagic.item.sigil.ItemSigilFastMiner; -import WayofTime.bloodmagic.item.sigil.ItemSigilGreenGrove; -import WayofTime.bloodmagic.item.sigil.ItemSigilHaste; -import WayofTime.bloodmagic.item.sigil.ItemSigilLava; -import WayofTime.bloodmagic.item.sigil.ItemSigilMagnetism; -import WayofTime.bloodmagic.item.sigil.ItemSigilPhantomBridge; -import WayofTime.bloodmagic.item.sigil.ItemSigilSeer; -import WayofTime.bloodmagic.item.sigil.ItemSigilSuppression; -import WayofTime.bloodmagic.item.sigil.ItemSigilTeleposition; -import WayofTime.bloodmagic.item.sigil.ItemSigilTransposition; -import WayofTime.bloodmagic.item.sigil.ItemSigilVoid; -import WayofTime.bloodmagic.item.sigil.ItemSigilWater; -import WayofTime.bloodmagic.item.sigil.ItemSigilWhirlwind; -import WayofTime.bloodmagic.item.soul.ItemMonsterSoul; -import WayofTime.bloodmagic.item.soul.ItemSentientArmourGem; -import WayofTime.bloodmagic.item.soul.ItemSentientBow; -import WayofTime.bloodmagic.item.soul.ItemSentientSword; -import WayofTime.bloodmagic.item.soul.ItemSoulGem; -import WayofTime.bloodmagic.item.soul.ItemSoulSnare; +import WayofTime.bloodmagic.item.sigil.*; +import WayofTime.bloodmagic.item.soul.*; import WayofTime.bloodmagic.util.helper.InventoryRenderHelper; import WayofTime.bloodmagic.util.helper.InventoryRenderHelperV2; +import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.util.EnumHelper; +import net.minecraftforge.fml.common.registry.GameRegistry; public class ModItems { diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModPotions.java b/src/main/java/WayofTime/bloodmagic/registry/ModPotions.java index 2f63b90f..5922c9a8 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModPotions.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModPotions.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.registry; -import net.minecraft.potion.Potion; -import net.minecraft.util.ResourceLocation; import WayofTime.bloodmagic.api.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.potion.PotionBloodMagic; import WayofTime.bloodmagic.potion.PotionEventHandlers; +import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; public class ModPotions { diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index ee079ba1..82cd9bae 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -1,13 +1,5 @@ package WayofTime.bloodmagic.registry; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; import WayofTime.bloodmagic.alchemyArray.AlchemyArrayEffectBinding; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.altar.EnumAltarTier; @@ -26,6 +18,14 @@ import WayofTime.bloodmagic.compress.BaseCompressionHandler; import WayofTime.bloodmagic.compress.StorageBlockCraftingManager; import WayofTime.bloodmagic.item.ItemComponent; import WayofTime.bloodmagic.item.ItemDemonCrystal; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.oredict.RecipeSorter; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; public class ModRecipes { diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java index ac1c6e49..8d1ebd7a 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic.registry; -import net.minecraft.init.Blocks; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.BlockStack; import WayofTime.bloodmagic.api.registry.HarvestRegistry; @@ -8,32 +7,7 @@ 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.ritual.RitualAltarBuilder; -import WayofTime.bloodmagic.ritual.RitualAnimalGrowth; -import WayofTime.bloodmagic.ritual.RitualArmourEvolve; -import WayofTime.bloodmagic.ritual.RitualCobblestone; -import WayofTime.bloodmagic.ritual.RitualContainment; -import WayofTime.bloodmagic.ritual.RitualCrushing; -import WayofTime.bloodmagic.ritual.RitualExpulsion; -import WayofTime.bloodmagic.ritual.RitualFeatheredKnife; -import WayofTime.bloodmagic.ritual.RitualFelling; -import WayofTime.bloodmagic.ritual.RitualFullStomach; -import WayofTime.bloodmagic.ritual.RitualGreenGrove; -import WayofTime.bloodmagic.ritual.RitualHarvest; -import WayofTime.bloodmagic.ritual.RitualInterdiction; -import WayofTime.bloodmagic.ritual.RitualJumping; -import WayofTime.bloodmagic.ritual.RitualLava; -import WayofTime.bloodmagic.ritual.RitualMagnetic; -import WayofTime.bloodmagic.ritual.RitualPlacer; -import WayofTime.bloodmagic.ritual.RitualPortal; -import WayofTime.bloodmagic.ritual.RitualPump; -import WayofTime.bloodmagic.ritual.RitualRegeneration; -import WayofTime.bloodmagic.ritual.RitualSpeed; -import WayofTime.bloodmagic.ritual.RitualSuppression; -import WayofTime.bloodmagic.ritual.RitualUpgradeRemove; -import WayofTime.bloodmagic.ritual.RitualWater; -import WayofTime.bloodmagic.ritual.RitualWellOfSuffering; -import WayofTime.bloodmagic.ritual.RitualZephyr; +import WayofTime.bloodmagic.ritual.*; import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerPlantable; import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerStem; import WayofTime.bloodmagic.ritual.harvest.HarvestHandlerTall; @@ -41,6 +15,7 @@ import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualNight; import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualRain; import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualResistance; import WayofTime.bloodmagic.ritual.imperfect.ImperfectRitualZombie; +import net.minecraft.init.Blocks; public class ModRituals { diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java b/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java index 66c95964..1aa5dda9 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java @@ -1,13 +1,7 @@ package WayofTime.bloodmagic.registry; import WayofTime.bloodmagic.api.incense.IncenseTranquilityRegistry; -import WayofTime.bloodmagic.incense.CropTranquilityHandler; -import WayofTime.bloodmagic.incense.EarthTranquilityHandler; -import WayofTime.bloodmagic.incense.FireTranquilityHandler; -import WayofTime.bloodmagic.incense.LavaTranquilityHandler; -import WayofTime.bloodmagic.incense.PlantTranquilityHandler; -import WayofTime.bloodmagic.incense.TreeTranquilityHandler; -import WayofTime.bloodmagic.incense.WaterTranquilityHandler; +import WayofTime.bloodmagic.incense.*; public class ModTranquilityHandlers { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java index 947e3481..cbd93f9f 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java @@ -1,20 +1,5 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; -import java.util.Iterator; - -import net.minecraft.block.Block; -import net.minecraft.entity.effect.EntityLightningBolt; -import net.minecraft.init.Blocks; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; import WayofTime.bloodmagic.api.BlockStack; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.altar.AltarComponent; @@ -29,6 +14,21 @@ import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.block.BlockBloodRune; import WayofTime.bloodmagic.registry.ModBlocks; import WayofTime.bloodmagic.util.Utils; +import net.minecraft.block.Block; +import net.minecraft.entity.effect.EntityLightningBolt; +import net.minecraft.init.Blocks; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; + +import java.util.ArrayList; +import java.util.Iterator; public class RitualAltarBuilder extends Ritual { @@ -189,7 +189,7 @@ public class RitualAltarBuilder extends Ritual public void lightning(World world, BlockPos blockPos) { - world.addWeatherEffect(new EntityLightningBolt(world, blockPos.getX(), blockPos.getY(), blockPos.getZ())); + world.addWeatherEffect(new EntityLightningBolt(world, blockPos.getX(), blockPos.getY(), blockPos.getZ(), true)); } /* diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java index 1f9bdfcc..c2aad145 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java @@ -1,21 +1,17 @@ package WayofTime.bloodmagic.ritual; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.network.SoulNetwork; +import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import net.minecraft.entity.EntityAgeable; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import java.util.ArrayList; import java.util.List; -import net.minecraft.entity.EntityAgeable; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.util.helper.NetworkHelper; - public class RitualAnimalGrowth extends Ritual { public static final String GROWTH_RANGE = "growing"; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java index 06063819..576c36a4 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualArmourEvolve.java @@ -1,21 +1,18 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; -import java.util.List; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.item.armour.ItemLivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmour; +import com.google.common.collect.Iterables; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.item.armour.ItemLivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmour; + +import java.util.ArrayList; +import java.util.List; public class RitualArmourEvolve extends Ritual { @@ -47,7 +44,7 @@ public class RitualArmourEvolve extends Ritual { if (LivingArmour.hasFullSet(player)) { - ItemStack chestStack = player.getCurrentArmor(2); + ItemStack chestStack = Iterables.toArray(player.getArmorInventoryList(), ItemStack.class)[2]; LivingArmour armour = ItemLivingArmour.armourMap.get(chestStack); if (armour != null) { @@ -58,7 +55,7 @@ public class RitualArmourEvolve extends Ritual masterRitualStone.setActive(false); - world.spawnEntityInWorld(new EntityLightningBolt(world, pos.getX(), pos.getY() - 1, pos.getZ())); + world.spawnEntityInWorld(new EntityLightningBolt(world, pos.getX(), pos.getY() - 1, pos.getZ(), true)); } } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java index 3300d909..11c41129 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCobblestone.java @@ -1,22 +1,18 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; - -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.ritual.*; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.item.ItemComponent; import WayofTime.bloodmagic.tile.TileAlchemyArray; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import java.util.ArrayList; public class RitualCobblestone extends Ritual { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java index c189e0a5..a7f0af68 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualContainment.java @@ -1,20 +1,16 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.ritual.*; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import java.util.ArrayList; public class RitualContainment extends Ritual { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java index d971e645..dd65e5e2 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualCrushing.java @@ -1,27 +1,23 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; -import java.util.List; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.network.SoulNetwork; +import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.registry.ModBlocks; +import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.util.helper.NetworkHelper; -import WayofTime.bloodmagic.registry.ModBlocks; -import WayofTime.bloodmagic.util.Utils; + +import java.util.ArrayList; +import java.util.List; public class RitualCrushing extends Ritual { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java index 4c432b14..2c221354 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualExpulsion.java @@ -1,33 +1,29 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.iface.IBindable; +import WayofTime.bloodmagic.api.network.SoulNetwork; +import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import com.google.common.base.Strings; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.EnderTeleportEvent; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.iface.IBindable; -import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.util.helper.NetworkHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import com.google.common.base.Strings; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; public class RitualExpulsion extends Ritual { @@ -139,9 +135,9 @@ public class RitualExpulsion extends Ritual while (!flag1 && j > 0) { - Block block = entityLiving.worldObj.getBlockState(new BlockPos(i, j - 1, k)).getBlock(); + IBlockState state = entityLiving.worldObj.getBlockState(new BlockPos(i, j - 1, k)); - if (block != null && block.getMaterial().blocksMovement()) + if (state != null && state.getMaterial().blocksMovement()) { flag1 = true; } else @@ -155,7 +151,7 @@ public class RitualExpulsion extends Ritual { moveEntityViaTeleport(entityLiving, entityLiving.posX, entityLiving.posY, entityLiving.posZ); - if (entityLiving.worldObj.getCollidingBoundingBoxes(entityLiving, entityLiving.getEntityBoundingBox()).isEmpty() && !entityLiving.worldObj.isAnyLiquid(entityLiving.getEntityBoundingBox())) + if (!entityLiving.isCollided && !entityLiving.worldObj.isAnyLiquid(entityLiving.getEntityBoundingBox())) { flag = true; } @@ -200,7 +196,7 @@ public class RitualExpulsion extends Ritual { if (entityLiving.isRiding()) { - entityLiving.mountEntity(null); + entityplayermp.mountEntityAndWakeUp(); } entityLiving.setPositionAndUpdate(event.targetX, event.targetY, event.targetZ); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java index 5ba0f104..e69a6652 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java @@ -1,23 +1,19 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; -import java.util.List; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.network.SoulNetwork; +import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.tile.TileAltar; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.util.helper.NetworkHelper; -import WayofTime.bloodmagic.tile.TileAltar; + +import java.util.ArrayList; +import java.util.List; public class RitualFeatheredKnife extends Ritual { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java index 2647ae4a..f1d4361c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFelling.java @@ -1,25 +1,21 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; -import java.util.Iterator; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.network.SoulNetwork; +import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.Utils; + +import java.util.ArrayList; +import java.util.Iterator; public class RitualFelling extends Ritual { @@ -58,7 +54,7 @@ public class RitualFelling extends Ritual for (BlockPos blockPos : getBlockRange(FELLING_RANGE).getContainedPositions(masterRitualStone.getBlockPos())) { if (!treePartsCache.contains(blockPos)) - if (!world.isAirBlock(blockPos) && (world.getBlockState(blockPos).getBlock().isWood(world, blockPos) || world.getBlockState(blockPos).getBlock().isLeaves(world, blockPos))) + if (!world.isAirBlock(blockPos) && (world.getBlockState(blockPos).getBlock().isWood(world, blockPos) || world.getBlockState(blockPos).getBlock().isLeaves(world.getBlockState(blockPos), world, blockPos))) { treePartsCache.add(blockPos); } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java index e2eaad30..cbfdb759 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFullStomach.java @@ -1,25 +1,21 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; -import java.util.List; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.network.SoulNetwork; +import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.FoodStats; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.util.helper.NetworkHelper; + +import java.util.ArrayList; +import java.util.List; public class RitualFullStomach extends Ritual { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java index a9e2846f..dfb6f70b 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualGreenGrove.java @@ -1,23 +1,19 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.block.IGrowable; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.common.IPlantable; import WayofTime.bloodmagic.api.BloodMagicAPI; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.ritual.*; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import net.minecraft.block.Block; +import net.minecraft.block.IGrowable; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.common.IPlantable; + +import java.util.ArrayList; +import java.util.Random; public class RitualGreenGrove extends Ritual { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java index 3ef3b138..4fe9d9a3 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualHarvest.java @@ -1,20 +1,16 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; - -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.BlockStack; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.iface.IHarvestHandler; import WayofTime.bloodmagic.api.network.SoulNetwork; import WayofTime.bloodmagic.api.registry.HarvestRegistry; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.ritual.*; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import java.util.ArrayList; /** * This ritual uses registered {@link IHarvestHandler}'s to harvest blocks. diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java index 04ab6f0c..0c6bbc38 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualInterdiction.java @@ -1,20 +1,16 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.ritual.*; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import java.util.ArrayList; public class RitualInterdiction extends Ritual { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java index 97db4701..999397a3 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualJumping.java @@ -1,21 +1,17 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; -import java.util.List; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.network.SoulNetwork; +import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.util.helper.NetworkHelper; + +import java.util.ArrayList; +import java.util.List; public class RitualJumping extends Ritual { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java index e818d335..d08d9ad8 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java @@ -1,18 +1,14 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; - -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.ritual.*; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import java.util.ArrayList; public class RitualLava extends Ritual { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java index bb993062..2b8b4ddc 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java @@ -1,9 +1,11 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - +import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.network.SoulNetwork; +import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.tile.TileTeleposer; import net.minecraft.block.Block; import net.minecraft.block.BlockOre; import net.minecraft.block.BlockRedstoneOre; @@ -11,19 +13,13 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.util.helper.NetworkHelper; -import WayofTime.bloodmagic.tile.TileTeleposer; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; public class RitualMagnetic extends Ritual { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java index bb3e3cc1..4e126f63 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPlacer.java @@ -1,24 +1,20 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.network.SoulNetwork; +import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import net.minecraft.block.Block; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemBlock; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.util.helper.NetworkHelper; + +import java.util.ArrayList; public class RitualPlacer extends Ritual { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java index 51fd2ff2..48792e6e 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPortal.java @@ -1,14 +1,5 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; - -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.ritual.EnumRuneType; import WayofTime.bloodmagic.api.ritual.IMasterRitualStone; @@ -18,6 +9,15 @@ import WayofTime.bloodmagic.api.teleport.PortalLocation; import WayofTime.bloodmagic.registry.ModBlocks; import WayofTime.bloodmagic.ritual.portal.LocationsHandler; import WayofTime.bloodmagic.tile.TileDimensionalPortal; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; + +import java.util.ArrayList; public class RitualPortal extends Ritual { @@ -111,7 +111,7 @@ public class RitualPortal extends Ritual if (LocationsHandler.getLocationsHandler() != null) { - if (LocationsHandler.getLocationsHandler().addLocation(name, new PortalLocation(x, y + 1, z, world.provider.getDimensionId()))) + if (LocationsHandler.getLocationsHandler().addLocation(name, new PortalLocation(x, y + 1, z, world.provider.getDimension()))) { portalRitualTag.setString(PORTAL_ID_TAG, name); return true; @@ -193,7 +193,7 @@ public class RitualPortal extends Ritual if (LocationsHandler.getLocationsHandler() != null) { - LocationsHandler.getLocationsHandler().removeLocation(portalRitualTag.getString(PORTAL_ID_TAG), new PortalLocation(x, y + 1, z, world.provider.getDimensionId())); + LocationsHandler.getLocationsHandler().removeLocation(portalRitualTag.getString(PORTAL_ID_TAG), new PortalLocation(x, y + 1, z, world.provider.getDimension())); } if (direction == EnumFacing.NORTH || direction == EnumFacing.SOUTH) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java index 098cd327..df54d306 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualPump.java @@ -1,24 +1,20 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; -import java.util.Iterator; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.network.SoulNetwork; +import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import net.minecraft.block.BlockLiquid; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.util.helper.NetworkHelper; + +import java.util.ArrayList; +import java.util.Iterator; public class RitualPump extends Ritual { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java index fe7199fc..5ac6a8d5 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualRegeneration.java @@ -1,23 +1,19 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; -import java.util.List; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.network.SoulNetwork; +import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.util.helper.NetworkHelper; + +import java.util.ArrayList; +import java.util.List; public class RitualRegeneration extends Ritual { @@ -59,7 +55,7 @@ public class RitualRegeneration extends Ritual float health = player.getHealth(); if (health <= player.getMaxHealth() - 1) { - player.addPotionEffect(new PotionEffect(Potion.regeneration.id, 50, 0, false, false)); + player.addPotionEffect(new PotionEffect(Potion.getPotionFromResourceLocation("regeneration"), 50, 0, false, false)); totalEffects++; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java index 19f4bdcb..82b9b7b8 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualSpeed.java @@ -1,19 +1,15 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.ritual.*; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.World; + +import java.util.ArrayList; public class RitualSpeed extends Ritual { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java index 2e30c538..b5c129b6 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualSuppression.java @@ -1,21 +1,18 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; - -import net.minecraft.block.Block; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.ritual.*; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.tile.TileSpectralBlock; import WayofTime.bloodmagic.util.Utils; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import java.util.ArrayList; public class RitualSuppression extends Ritual { @@ -45,9 +42,9 @@ public class RitualSuppression extends Ritual for (BlockPos blockPos : suppressionRange.getContainedPositions(masterRitualStone.getBlockPos())) { - Block block = world.getBlockState(blockPos).getBlock(); + IBlockState state = world.getBlockState(blockPos); - if (Utils.isBlockLiquid(block) && world.getTileEntity(blockPos) == null) + if (Utils.isBlockLiquid(state) && world.getTileEntity(blockPos) == null) TileSpectralBlock.createSpectralBlock(world, blockPos, refresh); else { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java index b034133b..ab525d4e 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java @@ -1,29 +1,26 @@ package WayofTime.bloodmagic.ritual; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; +import WayofTime.bloodmagic.api.livingArmour.StatTracker; +import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.item.ItemUpgradeTome; +import WayofTime.bloodmagic.item.armour.ItemLivingArmour; +import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.registry.ModItems; +import com.google.common.collect.Iterables; +import net.minecraft.entity.effect.EntityLightningBolt; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map.Entry; -import net.minecraft.entity.effect.EntityLightningBolt; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.livingArmour.StatTracker; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.item.ItemUpgradeTome; -import WayofTime.bloodmagic.item.armour.ItemLivingArmour; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.registry.ModItems; - public class RitualUpgradeRemove extends Ritual { public static final String CHECK_RANGE = "fillRange"; @@ -56,7 +53,7 @@ public class RitualUpgradeRemove extends Ritual { boolean removedUpgrade = false; - ItemStack chestStack = player.getCurrentArmor(2); + ItemStack chestStack = Iterables.toArray(player.getArmorInventoryList(), ItemStack.class)[2]; LivingArmour armour = ItemLivingArmour.armourMap.get(chestStack); if (armour != null) { @@ -98,7 +95,7 @@ public class RitualUpgradeRemove extends Ritual masterRitualStone.setActive(false); - world.spawnEntityInWorld(new EntityLightningBolt(world, pos.getX(), pos.getY() - 1, pos.getZ())); + world.spawnEntityInWorld(new EntityLightningBolt(world, pos.getX(), pos.getY() - 1, pos.getZ(), true)); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java index 92981a03..9593bade 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualWater.java @@ -1,18 +1,14 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; - -import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.ritual.*; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import java.util.ArrayList; public class RitualWater extends Ritual { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java index 2c406ce3..26130b6e 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java @@ -1,25 +1,21 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.DamageSource; -import net.minecraft.world.World; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.ritual.*; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.tile.TileAltar; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.DamageSource; +import net.minecraft.world.World; + +import java.util.ArrayList; +import java.util.List; public class RitualWellOfSuffering extends Ritual { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java index d0d9fc81..94809b9d 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualZephyr.java @@ -1,24 +1,20 @@ package WayofTime.bloodmagic.ritual; -import java.util.ArrayList; -import java.util.List; - +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.network.SoulNetwork; +import WayofTime.bloodmagic.api.ritual.*; +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.item.EntityItem; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.ritual.AreaDescriptor; -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.util.helper.NetworkHelper; -import WayofTime.bloodmagic.util.Utils; + +import java.util.ArrayList; +import java.util.List; public class RitualZephyr extends Ritual { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java index 09002a7f..2422b0cb 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerPlantable.java @@ -1,17 +1,17 @@ package WayofTime.bloodmagic.ritual.harvest; -import java.util.List; - +import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.api.iface.IHarvestHandler; +import WayofTime.bloodmagic.api.registry.HarvestRegistry; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.iface.IHarvestHandler; -import WayofTime.bloodmagic.api.registry.HarvestRegistry; + +import java.util.List; /** * Harvest handler for standard plantable crops such as Wheat, Potatoes, and diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java index 5826337b..1b706989 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerStem.java @@ -1,19 +1,19 @@ package WayofTime.bloodmagic.ritual.harvest; -import java.util.ArrayList; -import java.util.List; - +import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.api.iface.IHarvestHandler; +import WayofTime.bloodmagic.api.registry.HarvestRegistry; import net.minecraft.block.BlockStem; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.iface.IHarvestHandler; -import WayofTime.bloodmagic.api.registry.HarvestRegistry; + +import java.util.ArrayList; +import java.util.List; /** * Harvest handler for crops with stems such as Pumpkins and Melons. diff --git a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java index 7971b6ae..3c19d78f 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/harvest/HarvestHandlerTall.java @@ -1,16 +1,16 @@ package WayofTime.bloodmagic.ritual.harvest; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.entity.item.EntityItem; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; import WayofTime.bloodmagic.api.BlockStack; import WayofTime.bloodmagic.api.iface.IHarvestHandler; import WayofTime.bloodmagic.api.registry.HarvestRegistry; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +import java.util.ArrayList; +import java.util.List; /** * Harvest handler for crops that grow vertically such as Sugar Cane and Cactus.
diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java index 982429fc..29df1d44 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualDay.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.ritual.imperfect; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import WayofTime.bloodmagic.api.BlockStack; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; public class ImperfectRitualDay extends ImperfectRitual { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java index da31f53b..d5c529d0 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualNight.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.ritual.imperfect; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import WayofTime.bloodmagic.api.BlockStack; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; public class ImperfectRitualNight extends ImperfectRitual { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java index 9df28ff9..afac587e 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualRain.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.ritual.imperfect; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import WayofTime.bloodmagic.api.BlockStack; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; public class ImperfectRitualRain extends ImperfectRitual { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java index e6bf2c35..4552be32 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualResistance.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.ritual.imperfect; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; import WayofTime.bloodmagic.api.BlockStack; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; public class ImperfectRitualResistance extends ImperfectRitual { @@ -20,7 +20,7 @@ public class ImperfectRitualResistance extends ImperfectRitual public boolean onActivate(IImperfectRitualStone imperfectRitualStone, EntityPlayer player) { - player.addPotionEffect(new PotionEffect(Potion.resistance.id, 1200, 1)); + player.addPotionEffect(new PotionEffect(Potion.getPotionFromResourceLocation("resistance"), 1200, 1)); return true; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java index 6221ca6f..e00b5a7e 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitualZombie.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.ritual.imperfect; +import WayofTime.bloodmagic.api.BlockStack; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; +import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import WayofTime.bloodmagic.api.BlockStack; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.ritual.imperfect.IImperfectRitualStone; -import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; public class ImperfectRitualZombie extends ImperfectRitual { @@ -22,9 +22,9 @@ public class ImperfectRitualZombie extends ImperfectRitual { EntityZombie zombie = new EntityZombie(imperfectRitualStone.getRitualWorld()); zombie.setPosition(imperfectRitualStone.getRitualPos().getX() + 0.5, imperfectRitualStone.getRitualPos().getY() + 2.1, imperfectRitualStone.getRitualPos().getZ() + 0.5); - zombie.addPotionEffect(new PotionEffect(Potion.fireResistance.getId(), 2000)); - zombie.addPotionEffect(new PotionEffect(Potion.damageBoost.getId(), 20000, 7)); - zombie.addPotionEffect(new PotionEffect(Potion.resistance.getId(), 20000, 3)); + zombie.addPotionEffect(new PotionEffect(Potion.getPotionFromResourceLocation("fireResistance"), 2000)); + zombie.addPotionEffect(new PotionEffect(Potion.getPotionFromResourceLocation("damageBoost"), 20000, 7)); + zombie.addPotionEffect(new PotionEffect(Potion.getPotionFromResourceLocation("resistance"), 20000, 3)); if (!imperfectRitualStone.getRitualWorld().isRemote) imperfectRitualStone.getRitualWorld().spawnEntityInWorld(zombie); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java index 138ec4f2..18ee3ad0 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java @@ -1,19 +1,13 @@ package WayofTime.bloodmagic.ritual.portal; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashMap; - -import net.minecraftforge.common.DimensionManager; import WayofTime.bloodmagic.api.BloodMagicAPI; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.teleport.PortalLocation; +import net.minecraftforge.common.DimensionManager; + +import java.io.*; +import java.util.ArrayList; +import java.util.HashMap; public class LocationsHandler implements Serializable { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java index 1d67a2d9..ee80d725 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/portal/Teleports.java @@ -1,21 +1,24 @@ package WayofTime.bloodmagic.ritual.portal; +import WayofTime.bloodmagic.api.network.SoulNetwork; +import WayofTime.bloodmagic.api.teleport.Teleport; +import WayofTime.bloodmagic.api.teleport.TeleporterBloodMagic; +import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import lombok.Getter; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.SoundEvents; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.play.server.S06PacketUpdateHealth; +import net.minecraft.network.play.server.SPacketUpdateHealth; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.WorldServer; -import WayofTime.bloodmagic.api.network.SoulNetwork; -import WayofTime.bloodmagic.api.teleport.Teleport; -import WayofTime.bloodmagic.api.teleport.TeleporterBloodMagic; -import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import net.minecraftforge.fml.common.FMLCommonHandler; public class Teleports { @@ -53,10 +56,10 @@ public class Teleports player.setPositionAndUpdate(x + 0.5, y + 0.5, z + 0.5); player.worldObj.updateEntityWithOptionalForce(player, false); - player.playerNetServerHandler.sendPacket(new S06PacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel())); + player.playerNetServerHandler.sendPacket(new SPacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel())); player.timeUntilPortal = 150; - player.worldObj.playSoundEffect(x, y, z, "mob.endermen.portal", 1.0F, 1.0F); + player.worldObj.playSound(x, y, z, SoundEvents.entity_endermen_teleport, SoundCategory.AMBIENT, 1.0F, 1.0F, false); } else { SoulNetwork network = NetworkHelper.getSoulNetwork(networkToDrain); @@ -72,7 +75,7 @@ public class Teleports entity.timeUntilPortal = 150; world.resetUpdateEntityTick(); - entity.worldObj.playSoundEffect(x, y, z, "mob.endermen.portal", 1.0F, 1.0F); + entity.worldObj.playSound(x, y, z, SoundEvents.entity_endermen_teleport, SoundCategory.AMBIENT, 1.0F, 1.0F, false); } } } @@ -113,7 +116,7 @@ public class Teleports { if (entity.timeUntilPortal <= 0) { - MinecraftServer server = MinecraftServer.getServer(); + MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); WorldServer oldWorldServer = server.worldServerForDimension(entity.dimension); WorldServer newWorldServer = server.worldServerForDimension(newWorldID); @@ -133,7 +136,7 @@ public class Teleports server.getConfigurationManager().transferPlayerToDimension(player, newWorldID, new TeleporterBloodMagic(newWorldServer)); player.setPositionAndUpdate(x + 0.5, y + 0.5, z + 0.5); player.worldObj.updateEntityWithOptionalForce(player, false); - player.playerNetServerHandler.sendPacket(new S06PacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel())); + player.playerNetServerHandler.sendPacket(new SPacketUpdateHealth(player.getHealth(), player.getFoodStats().getFoodLevel(), player.getFoodStats().getSaturationLevel())); } } else if (!entity.worldObj.isRemote) @@ -149,7 +152,7 @@ public class Teleports entity.writeToNBTOptional(tag); entity.setDead(); - oldWorld.playSoundEffect(entity.posX, entity.posY, entity.posZ, "mob.endermen.portal", 1.0F, 1.0F); + oldWorld.playSound(entity.posX, entity.posY, entity.posZ, SoundEvents.entity_endermen_teleport, SoundCategory.AMBIENT, 1.0F, 1.0F, false); Entity teleportedEntity = EntityList.createEntityFromNBT(tag, newWorldServer); if (teleportedEntity != null) @@ -165,7 +168,7 @@ public class Teleports newWorldServer.resetUpdateEntityTick(); } entity.timeUntilPortal = entity instanceof EntityLiving ? 150 : 20; - newWorldServer.playSoundEffect(x, y, z, "mob.endermen.portal", 1.0F, 1.0F); + newWorldServer.playSound(x, y, z, SoundEvents.entity_endermen_teleport, SoundCategory.AMBIENT, 1.0F, 1.0F, false); } } } diff --git a/src/main/java/WayofTime/bloodmagic/routing/DefaultItemFilter.java b/src/main/java/WayofTime/bloodmagic/routing/DefaultItemFilter.java index 706255a9..9d51c743 100644 --- a/src/main/java/WayofTime/bloodmagic/routing/DefaultItemFilter.java +++ b/src/main/java/WayofTime/bloodmagic/routing/DefaultItemFilter.java @@ -1,15 +1,15 @@ package WayofTime.bloodmagic.routing; -import java.util.List; - +import WayofTime.bloodmagic.util.Utils; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import WayofTime.bloodmagic.util.Utils; + +import java.util.List; /** * This particular implementation of IItemFilter allows any item to be drained @@ -79,7 +79,6 @@ public class DefaultItemFilter implements IItemFilter TileEntity tile = (TileEntity) accessedInventory; World world = tile.getWorld(); BlockPos pos = tile.getPos(); - world.markBlockForUpdate(pos); return testStack; } @@ -136,7 +135,6 @@ public class DefaultItemFilter implements IItemFilter TileEntity tile = (TileEntity) accessedInventory; World world = tile.getWorld(); BlockPos pos = tile.getPos(); - world.markBlockForUpdate(pos); inputStack.stackSize -= changeAmount; maxTransfer -= changeAmount; diff --git a/src/main/java/WayofTime/bloodmagic/routing/IItemFilter.java b/src/main/java/WayofTime/bloodmagic/routing/IItemFilter.java index ffe1d9f7..94ab0c2b 100644 --- a/src/main/java/WayofTime/bloodmagic/routing/IItemFilter.java +++ b/src/main/java/WayofTime/bloodmagic/routing/IItemFilter.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.routing; -import java.util.List; - import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import java.util.List; + public interface IItemFilter { void initializeFilter(List filteredList, IInventory inventory, EnumFacing side, boolean isFilterOutput); diff --git a/src/main/java/WayofTime/bloodmagic/routing/IMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/routing/IMasterRoutingNode.java index 0adcd53e..d3f825b1 100644 --- a/src/main/java/WayofTime/bloodmagic/routing/IMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/routing/IMasterRoutingNode.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.routing; -import java.util.List; +import net.minecraft.util.math.BlockPos; -import net.minecraft.util.BlockPos; +import java.util.List; public interface IMasterRoutingNode extends IRoutingNode { diff --git a/src/main/java/WayofTime/bloodmagic/routing/IRoutingNode.java b/src/main/java/WayofTime/bloodmagic/routing/IRoutingNode.java index 8a8df054..4fe9e038 100644 --- a/src/main/java/WayofTime/bloodmagic/routing/IRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/routing/IRoutingNode.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.routing; -import java.util.List; - -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import java.util.List; + public interface IRoutingNode { void connectMasterToRemainingNode(World world, List alreadyChecked, IMasterRoutingNode master); diff --git a/src/main/java/WayofTime/bloodmagic/routing/NodeHelper.java b/src/main/java/WayofTime/bloodmagic/routing/NodeHelper.java index f64a4785..82bbc283 100644 --- a/src/main/java/WayofTime/bloodmagic/routing/NodeHelper.java +++ b/src/main/java/WayofTime/bloodmagic/routing/NodeHelper.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.routing; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class NodeHelper diff --git a/src/main/java/WayofTime/bloodmagic/routing/TestItemFilter.java b/src/main/java/WayofTime/bloodmagic/routing/TestItemFilter.java index 1758ca68..93472ffb 100644 --- a/src/main/java/WayofTime/bloodmagic/routing/TestItemFilter.java +++ b/src/main/java/WayofTime/bloodmagic/routing/TestItemFilter.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.routing; -import java.util.Iterator; -import java.util.List; - +import WayofTime.bloodmagic.util.Utils; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import WayofTime.bloodmagic.util.Utils; + +import java.util.Iterator; +import java.util.List; /** * This particular implementation of IItemFilter checks to make sure that a) as diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java index 87597bec..06dc3d69 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.tile; +import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; +import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.util.ITickable; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffect; -import WayofTime.bloodmagic.api.registry.AlchemyArrayRecipeRegistry; public class TileAlchemyArray extends TileInventory implements ITickable { @@ -78,11 +78,11 @@ public class TileAlchemyArray extends TileInventory implements ITickable { NBTTagCompound nbttagcompound = new NBTTagCompound(); writeToNBT(nbttagcompound); - return new S35PacketUpdateTileEntity(pos, this.getBlockMetadata(), nbttagcompound); + return new SPacketUpdateTileEntity(pos, this.getBlockMetadata(), nbttagcompound); } @Override - public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity packet) + public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { super.onDataPacket(net, packet); readFromNBT(packet.getNbtCompound()); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java index 45d62fed..64137723 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java @@ -1,5 +1,8 @@ package WayofTime.bloodmagic.tile; +import WayofTime.bloodmagic.altar.BloodAltar; +import WayofTime.bloodmagic.api.altar.EnumAltarTier; +import WayofTime.bloodmagic.api.altar.IBloodAltar; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; @@ -8,9 +11,6 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import WayofTime.bloodmagic.altar.BloodAltar; -import WayofTime.bloodmagic.api.altar.EnumAltarTier; -import WayofTime.bloodmagic.api.altar.IBloodAltar; public class TileAltar extends TileInventory implements IBloodAltar, ITickable, IFluidHandler { diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java b/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java index b588af34..21dd4248 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java @@ -3,12 +3,7 @@ package WayofTime.bloodmagic.tile; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; -import net.minecraftforge.fluids.FluidTankInfo; -import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.*; public class TileBloodTank extends TileEntity implements IFluidHandler { diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java index 328d6d00..0e4ce5ca 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java @@ -1,18 +1,18 @@ package WayofTime.bloodmagic.tile; -import java.util.HashMap; -import java.util.Map.Entry; - -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ITickable; 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.demonAura.WorldDemonWillHandler; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; + +import java.util.HashMap; +import java.util.Map.Entry; public class TileDemonCrucible extends TileInventory implements ITickable, IDemonWillConduit, ISidedInventory { diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java index 88175049..563352fa 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java @@ -1,5 +1,10 @@ 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.block.BlockDemonCrystal; +import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import lombok.Getter; import lombok.Setter; import net.minecraft.block.state.IBlockState; @@ -8,18 +13,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; -import WayofTime.bloodmagic.api.soul.EnumDemonWillType; -import WayofTime.bloodmagic.api.soul.IDemonWillConduit; -import WayofTime.bloodmagic.block.BlockDemonCrystal; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; public class TileDemonCrystal extends TileEntity implements ITickable, IDemonWillConduit { @@ -88,7 +88,7 @@ public class TileDemonCrystal extends TileEntity implements ITickable, IDemonWil { progressToNextCrystal--; crystalCount++; - worldObj.markBlockForUpdate(pos); + markDirty(); } } @@ -225,11 +225,11 @@ public class TileDemonCrystal extends TileEntity implements ITickable, IDemonWil { NBTTagCompound nbt = new NBTTagCompound(); writeToNBT(nbt); - return new S35PacketUpdateTileEntity(getPos(), -999, nbt); + return new SPacketUpdateTileEntity(getPos(), -999, nbt); } @Override - public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) + public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity pkt) { super.onDataPacket(net, pkt); readFromNBT(pkt.getNbtCompound()); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java index 4a35f849..4d6a1bfc 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java @@ -1,15 +1,15 @@ package WayofTime.bloodmagic.tile; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ITickable; import WayofTime.bloodmagic.api.soul.DemonWillHolder; import WayofTime.bloodmagic.api.soul.EnumDemonWillType; import WayofTime.bloodmagic.api.soul.IDemonWillConduit; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.registry.ModBlocks; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; +import net.minecraft.util.math.BlockPos; public class TileDemonCrystallizer extends TileEntity implements ITickable, IDemonWillConduit { diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java index 73722bc4..e6dc0f93 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.tile; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ITickable; import WayofTime.bloodmagic.api.soul.DemonWillHolder; import WayofTime.bloodmagic.api.soul.EnumDemonWillType; import WayofTime.bloodmagic.api.soul.IDemonWillConduit; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; +import net.minecraft.util.math.BlockPos; public class TileDemonPylon extends TileEntity implements ITickable, IDemonWillConduit { diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java index 821f9758..e8ab0246 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java @@ -1,11 +1,10 @@ package WayofTime.bloodmagic.tile; +import WayofTime.bloodmagic.ritual.RitualPortal; +import com.google.common.base.Strings; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import WayofTime.bloodmagic.ritual.RitualPortal; - -import com.google.common.base.Strings; +import net.minecraft.util.math.BlockPos; public class TileDimensionalPortal extends TileEntity { diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java index f3eaaa54..2baef3b9 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileImperfectRitualStone.java @@ -1,16 +1,16 @@ package WayofTime.bloodmagic.tile; -import lombok.NoArgsConstructor; -import net.minecraft.entity.effect.EntityLightningBolt; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.world.World; 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 lombok.NoArgsConstructor; +import net.minecraft.entity.effect.EntityLightningBolt; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; @NoArgsConstructor public class TileImperfectRitualStone extends TileEntity implements IImperfectRitualStone @@ -28,7 +28,7 @@ public class TileImperfectRitualStone extends TileEntity implements IImperfectRi if (imperfectRitual.onActivate(this, player)) { if (imperfectRitual.isLightshow()) - getWorld().addWeatherEffect(new EntityLightningBolt(getWorld(), getPos().getX(), getPos().getY() + 2, getPos().getZ())); + getWorld().addWeatherEffect(new EntityLightningBolt(getWorld(), getPos().getX(), getPos().getY() + 2, getPos().getZ(), true)); return true; } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java index 3dbd2be2..dd62d8c3 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java @@ -1,20 +1,5 @@ package WayofTime.bloodmagic.tile; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.ITickable; -import net.minecraft.world.WorldServer; import WayofTime.bloodmagic.api.incense.EnumTranquilityType; import WayofTime.bloodmagic.api.incense.IIncensePath; import WayofTime.bloodmagic.api.incense.IncenseTranquilityRegistry; @@ -22,6 +7,21 @@ import WayofTime.bloodmagic.api.incense.TranquilityStack; import WayofTime.bloodmagic.api.ritual.AreaDescriptor; import WayofTime.bloodmagic.api.util.helper.PlayerSacrificeHelper; import WayofTime.bloodmagic.incense.IncenseAltarHandler; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.ITickable; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.WorldServer; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; public class TileIncenseAltar extends TileInventory implements ITickable { diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java b/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java index efaeb807..af0910b8 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java @@ -1,5 +1,6 @@ package WayofTime.bloodmagic.tile; +import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -9,13 +10,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; -import WayofTime.bloodmagic.util.helper.TextHelper; public class TileInventory extends TileEntity implements IInventory { @@ -90,11 +90,11 @@ public class TileInventory extends TileEntity implements IInventory { NBTTagCompound nbt = new NBTTagCompound(); writeToNBT(nbt); - return new S35PacketUpdateTileEntity(getPos(), -999, nbt); + return new SPacketUpdateTileEntity(getPos(), -999, nbt); } @Override - public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) + public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity pkt) { super.onDataPacket(net, pkt); readFromNBT(pkt.getNbtCompound()); @@ -130,9 +130,6 @@ public class TileInventory extends TileEntity implements IInventory { if (inventory[index] != null) { - if (!worldObj.isRemote) - worldObj.markBlockForUpdate(this.pos); - if (inventory[index].stackSize <= count) { ItemStack itemStack = inventory[index]; @@ -171,8 +168,6 @@ public class TileInventory extends TileEntity implements IInventory if (stack != null && stack.stackSize > getInventoryStackLimit()) stack.stackSize = getInventoryStackLimit(); markDirty(); - if (!worldObj.isRemote) - worldObj.markBlockForUpdate(this.pos); } @Override @@ -244,8 +239,8 @@ public class TileInventory extends TileEntity implements IInventory } @Override - public IChatComponent getDisplayName() + public ITextComponent getDisplayName() { - return new ChatComponentText(getName()); + return new TextComponentString(getName()); } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index db384a5b..ac42cfa4 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -1,21 +1,5 @@ package WayofTime.bloodmagic.tile; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ITickable; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.Event; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.event.RitualEvent; import WayofTime.bloodmagic.api.network.SoulNetwork; @@ -29,8 +13,23 @@ import WayofTime.bloodmagic.api.util.helper.RitualHelper; import WayofTime.bloodmagic.item.ItemActivationCrystal; import WayofTime.bloodmagic.registry.ModItems; import WayofTime.bloodmagic.util.ChatUtil; - import com.google.common.base.Strings; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.eventhandler.Event; @Getter @NoArgsConstructor @@ -272,11 +271,11 @@ public class TileMasterRitualStone extends TileEntity implements IMasterRitualSt { NBTTagCompound nbttagcompound = new NBTTagCompound(); writeToNBT(nbttagcompound); - return new S35PacketUpdateTileEntity(pos, this.getBlockMetadata(), nbttagcompound); + return new SPacketUpdateTileEntity(pos, this.getBlockMetadata(), nbttagcompound); } @Override - public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity packet) + public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { super.onDataPacket(net, packet); readFromNBT(packet.getNbtCompound()); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java index 2118e337..0c93c4fb 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java @@ -1,16 +1,16 @@ package WayofTime.bloodmagic.tile; +import WayofTime.bloodmagic.api.Constants; import lombok.NoArgsConstructor; import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.ITickable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; @NoArgsConstructor public class TilePhantomBlock extends TileEntity implements ITickable @@ -53,11 +53,11 @@ public class TilePhantomBlock extends TileEntity implements ITickable { NBTTagCompound nbt = new NBTTagCompound(); writeToNBT(nbt); - return new S35PacketUpdateTileEntity(getPos(), -999, nbt); + return new SPacketUpdateTileEntity(getPos(), -999, nbt); } @Override - public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) + public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity pkt) { super.onDataPacket(net, pkt); readFromNBT(pkt.getNbtCompound()); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java index b2d882e1..2e4310a9 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java @@ -1,11 +1,5 @@ package WayofTime.bloodmagic.tile; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.recipe.TartaricForgeRecipe; import WayofTime.bloodmagic.api.registry.TartaricForgeRecipeRegistry; @@ -14,6 +8,12 @@ import WayofTime.bloodmagic.api.soul.IDemonWill; import WayofTime.bloodmagic.api.soul.IDemonWillConduit; import WayofTime.bloodmagic.api.soul.IDemonWillGem; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ITickable; + +import java.util.ArrayList; +import java.util.List; public class TileSoulForge extends TileInventory implements ITickable, IDemonWillConduit { diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java index b5bd6aff..0d29e231 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java @@ -1,16 +1,15 @@ package WayofTime.bloodmagic.tile; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.registry.ModBlocks; +import com.google.common.base.Strings; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.ITickable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.registry.ModBlocks; - -import com.google.common.base.Strings; public class TileSpectralBlock extends TileEntity implements ITickable { @@ -76,7 +75,7 @@ public class TileSpectralBlock extends TileEntity implements ITickable block = Block.getBlockFromName(containedBlockName); if (block != null && worldObj.setBlockState(pos, block.getStateFromMeta(containedBlockMeta))) - worldObj.markBlockForUpdate(pos); + markDirty(); } public static void createSpectralBlock(World world, BlockPos blockPos, int duration) diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java index 4b93599a..7ab0d913 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java @@ -1,20 +1,5 @@ package WayofTime.bloodmagic.tile; -import java.util.List; - -import net.minecraft.block.BlockMobSpawner; -import net.minecraft.block.BlockPortal; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.Entity; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ITickable; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; import WayofTime.bloodmagic.api.BlockStack; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.event.TeleposeEvent; @@ -25,8 +10,24 @@ import WayofTime.bloodmagic.block.BlockTeleposer; import WayofTime.bloodmagic.item.ItemBindable; import WayofTime.bloodmagic.item.ItemTelepositionFocus; import WayofTime.bloodmagic.ritual.portal.Teleports; - import com.google.common.base.Strings; +import net.minecraft.block.BlockPortal; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.Entity; +import net.minecraft.init.Blocks; +import net.minecraft.init.SoundEvents; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ITickable; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.FMLCommonHandler; + +import java.util.List; public class TileTeleposer extends TileInventory implements ITickable { @@ -108,9 +109,9 @@ public class TileTeleposer extends TileInventory implements ITickable List originalWorldEntities; List focusWorldEntities; - AxisAlignedBB originalArea = AxisAlignedBB.fromBounds(pos.getX(), pos.getY() + 1, pos.getZ(), pos.getX() + 1, Math.min(focusWorld.getHeight(), pos.getY() + 2 * focusLevel), pos.getZ() + 1).expand(focusLevel - 1, 0, focusLevel - 1); + AxisAlignedBB originalArea = new AxisAlignedBB(pos.getX(), pos.getY() + 1, pos.getZ(), pos.getX() + 1, Math.min(focusWorld.getHeight(), pos.getY() + 2 * focusLevel), pos.getZ() + 1).expand(focusLevel - 1, 0, focusLevel - 1); originalWorldEntities = worldObj.getEntitiesWithinAABB(Entity.class, originalArea); - AxisAlignedBB focusArea = AxisAlignedBB.fromBounds(focusPos.getX(), focusPos.getY() + 1, focusPos.getZ(), focusPos.getX() + 1, Math.min(focusWorld.getHeight(), focusPos.getY() + 2 * focusLevel), focusPos.getZ() + 1).expand(focusLevel - 1, 0, focusLevel - 1); + AxisAlignedBB focusArea = new AxisAlignedBB(focusPos.getX(), focusPos.getY() + 1, focusPos.getZ(), focusPos.getX() + 1, Math.min(focusWorld.getHeight(), focusPos.getY() + 2 * focusLevel), focusPos.getZ() + 1).expand(focusLevel - 1, 0, focusLevel - 1); focusWorldEntities = focusWorld.getEntitiesWithinAABB(Entity.class, focusArea); if (focusWorld.equals(worldObj)) @@ -136,7 +137,7 @@ public class TileTeleposer extends TileInventory implements ITickable { for (Entity entity : originalWorldEntities) { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, focusStack.getTagCompound().getString(Constants.NBT.OWNER_UUID), worldObj, focusWorld.provider.getDimensionId())); + TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, focusStack.getTagCompound().getString(Constants.NBT.OWNER_UUID), worldObj, focusWorld.provider.getDimension())); } } @@ -144,7 +145,7 @@ public class TileTeleposer extends TileInventory implements ITickable { for (Entity entity : focusWorldEntities) { - TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, focusStack.getTagCompound().getString(Constants.NBT.OWNER_UUID), focusWorld, worldObj.provider.getDimensionId())); + TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(new BlockPos(entity.posX - pos.getX() + focusPos.getX(), entity.posY - pos.getY() + focusPos.getY(), entity.posZ - pos.getZ() + focusPos.getZ()), entity, focusStack.getTagCompound().getString(Constants.NBT.OWNER_UUID), focusWorld, worldObj.provider.getDimension())); } } } @@ -181,8 +182,8 @@ public class TileTeleposer extends TileInventory implements ITickable if (MinecraftForge.EVENT_BUS.post(event)) return false; - initialWorld.playSoundEffect(initialPos.getX(), initialPos.getY(), initialPos.getZ(), "mob.endermen.portal", 1.0F, 1.0F); - finalWorld.playSoundEffect(finalPos.getX(), finalPos.getY(), finalPos.getZ(), "mob.endermen.portal", 1.0F, 1.0F); + initialWorld.playSound(initialPos.getX(), initialPos.getY(), initialPos.getZ(), SoundEvents.entity_endermen_teleport, SoundCategory.AMBIENT, 1.0F, 1.0F, false); + finalWorld.playSound(finalPos.getX(), finalPos.getY(), finalPos.getZ(), SoundEvents.entity_endermen_teleport, SoundCategory.AMBIENT, 1.0F, 1.0F, false); //Finally, we get to do something! (CLEARING TILES) if (finalStack.getBlock() != null) @@ -197,7 +198,7 @@ public class TileTeleposer extends TileInventory implements ITickable if (initialTile != null) { - TileEntity newTileInitial = TileEntity.createAndLoadEntity(initialTag); + TileEntity newTileInitial = TileEntity.createTileEntity(FMLCommonHandler.instance().getMinecraftServerInstance(), initialTag); //TODO FUTURE FMP STUFF HERE @@ -209,7 +210,7 @@ public class TileTeleposer extends TileInventory implements ITickable if (finalTile != null) { - TileEntity newTileFinal = TileEntity.createAndLoadEntity(finalTag); + TileEntity newTileFinal = TileEntity.createTileEntity(FMLCommonHandler.instance().getMinecraftServerInstance(), finalTag); //TODO FUTURE FMP STUFF HERE diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java index e90c2370..8a219721 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java @@ -1,15 +1,15 @@ package WayofTime.bloodmagic.tile.container; +import WayofTime.bloodmagic.item.inventory.ItemInventory; +import WayofTime.bloodmagic.item.routing.IItemFilterProvider; +import WayofTime.bloodmagic.util.GhostItemHelper; +import WayofTime.bloodmagic.util.Utils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import WayofTime.bloodmagic.item.inventory.ItemInventory; -import WayofTime.bloodmagic.item.routing.IItemFilterProvider; -import WayofTime.bloodmagic.util.GhostItemHelper; -import WayofTime.bloodmagic.util.Utils; public class ContainerItemRoutingNode extends Container { diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java index 4fe6411d..85497373 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerSoulForge.java @@ -1,14 +1,14 @@ package WayofTime.bloodmagic.tile.container; +import WayofTime.bloodmagic.api.soul.IDemonWill; +import WayofTime.bloodmagic.api.soul.IDemonWillGem; +import WayofTime.bloodmagic.tile.TileSoulForge; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import WayofTime.bloodmagic.api.soul.IDemonWill; -import WayofTime.bloodmagic.api.soul.IDemonWillGem; -import WayofTime.bloodmagic.tile.TileSoulForge; public class ContainerSoulForge extends Container { diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerTeleposer.java index faaab107..2b3e93eb 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerTeleposer.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.tile.container; +import WayofTime.bloodmagic.item.ItemTelepositionFocus; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import WayofTime.bloodmagic.item.ItemTelepositionFocus; public class ContainerTeleposer extends Container { diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java index 57c8c486..b764bd40 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java @@ -1,10 +1,10 @@ package WayofTime.bloodmagic.tile.routing; +import WayofTime.bloodmagic.api.Constants; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import WayofTime.bloodmagic.api.Constants; public class TileFilteredRoutingNode extends TileRoutingNode implements ISidedInventory { diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileInputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileInputRoutingNode.java index 4c78cc64..dc69cc1b 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileInputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileInputRoutingNode.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.tile.routing; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; import WayofTime.bloodmagic.item.routing.IItemFilterProvider; import WayofTime.bloodmagic.routing.DefaultItemFilter; import WayofTime.bloodmagic.routing.IInputItemRoutingNode; import WayofTime.bloodmagic.routing.IItemFilter; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; public class TileInputRoutingNode extends TileFilteredRoutingNode implements IInputItemRoutingNode { diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java index f1afc5f6..1d8ea81d 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java @@ -1,27 +1,22 @@ package WayofTime.bloodmagic.tile.routing; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.routing.*; +import WayofTime.bloodmagic.tile.TileInventory; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ITickable; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.TreeMap; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ITickable; -import net.minecraft.world.World; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.routing.IInputItemRoutingNode; -import WayofTime.bloodmagic.routing.IItemFilter; -import WayofTime.bloodmagic.routing.IMasterRoutingNode; -import WayofTime.bloodmagic.routing.IOutputItemRoutingNode; -import WayofTime.bloodmagic.routing.IRoutingNode; -import WayofTime.bloodmagic.routing.NodeHelper; -import WayofTime.bloodmagic.tile.TileInventory; - public class TileMasterRoutingNode extends TileInventory implements IMasterRoutingNode, ITickable { public TileMasterRoutingNode() diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileOutputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileOutputRoutingNode.java index f109c783..b4548574 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileOutputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileOutputRoutingNode.java @@ -1,13 +1,13 @@ package WayofTime.bloodmagic.tile.routing; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; import WayofTime.bloodmagic.item.routing.IItemFilterProvider; import WayofTime.bloodmagic.routing.DefaultItemFilter; import WayofTime.bloodmagic.routing.IItemFilter; import WayofTime.bloodmagic.routing.IOutputItemRoutingNode; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; public class TileOutputRoutingNode extends TileFilteredRoutingNode implements IOutputItemRoutingNode { diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java index bbdd42c2..1f50dc34 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java @@ -1,21 +1,21 @@ package WayofTime.bloodmagic.tile.routing; -import java.util.LinkedList; -import java.util.List; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.routing.IItemRoutingNode; import WayofTime.bloodmagic.routing.IMasterRoutingNode; import WayofTime.bloodmagic.routing.IRoutingNode; import WayofTime.bloodmagic.tile.TileInventory; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.LinkedList; +import java.util.List; public class TileRoutingNode extends TileInventory implements IRoutingNode, IItemRoutingNode { @@ -80,7 +80,7 @@ public class TileRoutingNode extends TileInventory implements IRoutingNode, IIte if (tile instanceof IRoutingNode) { ((IRoutingNode) tile).removeConnection(pos); - worldObj.markBlockForUpdate(testPos); + markDirty(); } } @@ -156,7 +156,7 @@ public class TileRoutingNode extends TileInventory implements IRoutingNode, IIte { if (!connectionList.contains(pos1)) { - worldObj.markBlockForUpdate(this.pos); + markDirty(); connectionList.add(pos1); } } @@ -167,7 +167,7 @@ public class TileRoutingNode extends TileInventory implements IRoutingNode, IIte if (connectionList.contains(pos1)) { connectionList.remove(pos1); - worldObj.markBlockForUpdate(pos); + markDirty(); } } diff --git a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java index 93346fa9..46d37941 100644 --- a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java +++ b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java @@ -1,26 +1,26 @@ package WayofTime.bloodmagic.util; +import WayofTime.bloodmagic.network.BloodMagicPacketHandler; +import WayofTime.bloodmagic.util.helper.TextHelper; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiNewChat; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import WayofTime.bloodmagic.network.BloodMagicPacketHandler; -import WayofTime.bloodmagic.util.helper.TextHelper; public class ChatUtil { private static final int DELETION_ID = 2525277; private static int lastAdded; - private static void sendNoSpamMessages(IChatComponent[] messages) + private static void sendNoSpamMessages(ITextComponent[] messages) { GuiNewChat chat = Minecraft.getMinecraft().ingameGUI.getChatGUI(); for (int i = DELETION_ID + messages.length - 1; i <= lastAdded; i++) @@ -35,25 +35,25 @@ public class ChatUtil } /** - * Returns a standard {@link ChatComponentText} for the given {@link String} + * Returns a standard {@link TextComponentString} for the given {@link String} * . * * @param s * The string to wrap. * - * @return An {@link IChatComponent} containing the string. + * @return An {@link ITextComponent} containing the string. */ - public static IChatComponent wrap(String s) + public static ITextComponent wrap(String s) { - return new ChatComponentText(s); + return new TextComponentString(s); } /** * @see #wrap(String) */ - public static IChatComponent[] wrap(String... s) + public static ITextComponent[] wrap(String... s) { - IChatComponent[] ret = new IChatComponent[s.length]; + ITextComponent[] ret = new ITextComponent[s.length]; for (int i = 0; i < ret.length; i++) { ret[i] = wrap(s[i]); @@ -70,9 +70,9 @@ public class ChatUtil * @param args * The args to apply to the format */ - public static IChatComponent wrapFormatted(String s, Object... args) + public static ITextComponent wrapFormatted(String s, Object... args) { - return new ChatComponentTranslation(s, args); + return new TextComponentTranslation(s, args); } /** @@ -104,11 +104,11 @@ public class ChatUtil * @param player * The player to send the chat lines to. * @param lines - * The {@link IChatComponent chat components} to send.yes + * The {@link ITextComponent chat components} to send.yes */ - public static void sendChat(EntityPlayer player, IChatComponent... lines) + public static void sendChat(EntityPlayer player, ITextComponent... lines) { - for (IChatComponent c : lines) + for (ITextComponent c : lines) { player.addChatComponentMessage(c); } @@ -125,7 +125,7 @@ public class ChatUtil } /** - * Same as {@link #sendNoSpamClient(IChatComponent...)}, but wraps the + * Same as {@link #sendNoSpamClient(ITextComponent...)}, but wraps the * Strings automatically. * * @param lines @@ -141,9 +141,9 @@ public class ChatUtil /** * Skips the packet sending, unsafe to call on servers. * - * @see #sendNoSpam(EntityPlayerMP, IChatComponent...) + * @see #sendNoSpam(EntityPlayerMP, ITextComponent...) */ - public static void sendNoSpamClient(IChatComponent... lines) + public static void sendNoSpamClient(ITextComponent... lines) { sendNoSpamMessages(lines); } @@ -160,7 +160,7 @@ public class ChatUtil /** * @see #wrap(String) - * @see #sendNoSpam(EntityPlayer, IChatComponent...) + * @see #sendNoSpam(EntityPlayer, ITextComponent...) */ public static void sendNoSpam(EntityPlayer player, String... lines) { @@ -171,9 +171,9 @@ public class ChatUtil * First checks if the player is instanceof {@link EntityPlayerMP} before * casting. * - * @see #sendNoSpam(EntityPlayerMP, IChatComponent...) + * @see #sendNoSpam(EntityPlayerMP, ITextComponent...) */ - public static void sendNoSpam(EntityPlayer player, IChatComponent... lines) + public static void sendNoSpam(EntityPlayer player, ITextComponent... lines) { if (player instanceof EntityPlayerMP) { @@ -193,7 +193,7 @@ public class ChatUtil /** * @see #wrap(String) - * @see #sendNoSpam(EntityPlayerMP, IChatComponent...) + * @see #sendNoSpam(EntityPlayerMP, ITextComponent...) */ public static void sendNoSpam(EntityPlayerMP player, String... lines) { @@ -211,7 +211,7 @@ public class ChatUtil * @param lines * The chat lines to send. */ - public static void sendNoSpam(EntityPlayerMP player, IChatComponent... lines) + public static void sendNoSpam(EntityPlayerMP player, ITextComponent... lines) { if (lines.length > 0) BloodMagicPacketHandler.INSTANCE.sendTo(new PacketNoSpamChat(lines), player); @@ -225,14 +225,14 @@ public class ChatUtil public static class PacketNoSpamChat implements IMessage { - private IChatComponent[] chatLines; + private ITextComponent[] chatLines; public PacketNoSpamChat() { - chatLines = new IChatComponent[0]; + chatLines = new ITextComponent[0]; } - private PacketNoSpamChat(IChatComponent... lines) + private PacketNoSpamChat(ITextComponent... lines) { // this is guaranteed to be >1 length by accessing methods this.chatLines = lines; @@ -242,19 +242,19 @@ public class ChatUtil public void toBytes(ByteBuf buf) { buf.writeInt(chatLines.length); - for (IChatComponent c : chatLines) + for (ITextComponent c : chatLines) { - ByteBufUtils.writeUTF8String(buf, IChatComponent.Serializer.componentToJson(c)); + ByteBufUtils.writeUTF8String(buf, ITextComponent.Serializer.componentToJson(c)); } } @Override public void fromBytes(ByteBuf buf) { - chatLines = new IChatComponent[buf.readInt()]; + chatLines = new ITextComponent[buf.readInt()]; for (int i = 0; i < chatLines.length; i++) { - chatLines[i] = IChatComponent.Serializer.jsonToComponent(ByteBufUtils.readUTF8String(buf)); + chatLines[i] = ITextComponent.Serializer.jsonToComponent(ByteBufUtils.readUTF8String(buf)); } } diff --git a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java b/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java index a56067da..4b899b49 100644 --- a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.util; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.util.helper.NBTHelper; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; public class GhostItemHelper { diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index 93004b1c..d0fcf104 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -1,8 +1,11 @@ package WayofTime.bloodmagic.util; -import java.util.ArrayList; - +import WayofTime.bloodmagic.api.altar.EnumAltarComponent; +import WayofTime.bloodmagic.registry.ModBlocks; +import WayofTime.bloodmagic.tile.TileInventory; +import com.google.common.collect.Iterables; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -17,6 +20,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.common.ISpecialArmor.ArmorProperties; @@ -24,9 +28,8 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.IFluidHandler; -import WayofTime.bloodmagic.api.altar.EnumAltarComponent; -import WayofTime.bloodmagic.registry.ModBlocks; -import WayofTime.bloodmagic.tile.TileInventory; + +import java.util.ArrayList; public class Utils { @@ -91,14 +94,14 @@ public class Utils */ public static boolean insertItemToTile(TileInventory tile, EntityPlayer player, int slot) { - if (tile.getStackInSlot(slot) == null && player.getHeldItem() != null) + if (tile.getStackInSlot(slot) == null && player.getHeldItemMainhand() != null) { - ItemStack input = player.getHeldItem().copy(); + ItemStack input = player.getHeldItemMainhand().copy(); input.stackSize = 1; - player.getHeldItem().stackSize--; + player.getHeldItemMainhand().stackSize--; tile.setInventorySlotContents(slot, input); return true; - } else if (tile.getStackInSlot(slot) != null && player.getHeldItem() == null) + } else if (tile.getStackInSlot(slot) != null && player.getHeldItemMainhand() == null) { if (!tile.getWorld().isRemote) { @@ -147,7 +150,7 @@ public class Utils if (amount <= 0) return 0; - amount = applyArmor(attackedEntity, attackedEntity.getInventory(), source, amount); + amount = applyArmor(attackedEntity, Iterables.toArray(attackedEntity.getEquipmentAndArmor(), ItemStack.class), source, amount); if (amount <= 0) return 0; amount = applyPotionDamageCalculations(attackedEntity, source, amount); @@ -209,14 +212,16 @@ public class Utils public static float applyPotionDamageCalculations(EntityLivingBase attackedEntity, DamageSource source, float damage) { + Potion resistance = Potion.getPotionFromResourceLocation("resistance"); + if (source.isDamageAbsolute()) { return damage; } else { - if (attackedEntity.isPotionActive(Potion.resistance) && source != DamageSource.outOfWorld) + if (attackedEntity.isPotionActive(resistance) && source != DamageSource.outOfWorld) { - int i = (attackedEntity.getActivePotionEffect(Potion.resistance).getAmplifier() + 1) * 5; + int i = (attackedEntity.getActivePotionEffect(resistance).getAmplifier() + 1) * 5; int j = 25 - i; float f = damage * (float) j; damage = f / 25.0F; @@ -227,7 +232,7 @@ public class Utils return 0.0F; } else { - int k = EnchantmentHelper.getEnchantmentModifierDamage(attackedEntity.getInventory(), source); + int k = EnchantmentHelper.getEnchantmentModifierDamage(attackedEntity.getArmorInventoryList(), source); if (k > 20) { @@ -543,15 +548,15 @@ public class Utils return stack; } - public static boolean isBlockLiquid(Block block) + public static boolean isBlockLiquid(IBlockState state) { - return (block instanceof IFluidBlock || block.getMaterial().isLiquid()); + return (state instanceof IFluidBlock || state.getMaterial().isLiquid()); } //Shamelessly ripped off of CoFH Lib public static boolean fillContainerFromHandler(World world, IFluidHandler handler, EntityPlayer player, FluidStack tankFluid) { - ItemStack container = player.getCurrentEquippedItem(); + ItemStack container = player.getHeldItemMainhand(); if (FluidContainerRegistry.isEmptyContainer(container)) { ItemStack returnStack = FluidContainerRegistry.fillFluidContainer(tankFluid, container); @@ -588,7 +593,7 @@ public class Utils //Shamelessly ripped off of CoFH Lib public static boolean fillHandlerWithContainer(World world, IFluidHandler handler, EntityPlayer player) { - ItemStack container = player.getCurrentEquippedItem(); + ItemStack container = player.getHeldItemMainhand(); FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(container); if (fluid != null) { diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/ClientEventHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/ClientEventHandler.java index a3399286..ec07aa87 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/ClientEventHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/ClientEventHandler.java @@ -1,25 +1,5 @@ package WayofTime.bloodmagic.util.handler; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityPlayerSP; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; -import net.minecraftforge.client.event.RenderWorldLastEvent; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.event.entity.player.ItemTooltipEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -import org.lwjgl.opengl.GL11; - import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.registry.RitualRegistry; import WayofTime.bloodmagic.api.ritual.IMasterRitualStone; @@ -28,6 +8,22 @@ import WayofTime.bloodmagic.api.ritual.RitualComponent; import WayofTime.bloodmagic.client.render.RenderFakeBlocks; import WayofTime.bloodmagic.item.ItemRitualDiviner; import WayofTime.bloodmagic.util.GhostItemHelper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.EntityPlayerSP; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.World; +import net.minecraftforge.client.event.RenderWorldLastEvent; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.lwjgl.opengl.GL11; public class ClientEventHandler { @@ -79,7 +75,7 @@ public class ClientEventHandler EntityPlayerSP player = minecraft.thePlayer; World world = player.worldObj; - if (minecraft.objectMouseOver == null || minecraft.objectMouseOver.typeOfHit != MovingObjectPosition.MovingObjectType.BLOCK) + if (minecraft.objectMouseOver == null || minecraft.objectMouseOver.typeOfHit != RayTraceResult.Type.BLOCK) { return; } @@ -103,19 +99,19 @@ public class ClientEventHandler GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - Vec3 vec3 = new Vec3(minecraft.objectMouseOver.getBlockPos().getX(), minecraft.objectMouseOver.getBlockPos().getY(), minecraft.objectMouseOver.getBlockPos().getZ()); + BlockPos vec3 = new BlockPos(minecraft.objectMouseOver.getBlockPos().getX(), minecraft.objectMouseOver.getBlockPos().getY(), minecraft.objectMouseOver.getBlockPos().getZ()); double posX = player.lastTickPosX + (player.posX - player.lastTickPosX) * event.partialTicks; double posY = player.lastTickPosY + (player.posY - player.lastTickPosY) * event.partialTicks; double posZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * event.partialTicks; for (RitualComponent ritualComponent : ritual.getComponents()) { - Vec3 vX = vec3.add(new Vec3(ritualComponent.getX(direction), ritualComponent.getY(), ritualComponent.getZ(direction))); - double minX = vX.xCoord - posX; - double minY = vX.yCoord - posY; - double minZ = vX.zCoord - posZ; + BlockPos vX = vec3.add(new BlockPos(ritualComponent.getX(direction), ritualComponent.getY(), ritualComponent.getZ(direction))); + double minX = vX.getX() - posX; + double minY = vX.getY() - posY; + double minZ = vX.getZ() - posZ; - if (!world.getBlockState(new BlockPos(vX.xCoord, vX.yCoord, vX.zCoord)).getBlock().isOpaqueCube()) + if (!world.getBlockState(vX).isOpaqueCube()) { TextureAtlasSprite texture = null; diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java index 5ecefdc9..f30c0255 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java @@ -1,14 +1,42 @@ package WayofTime.bloodmagic.util.handler; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Random; -import java.util.concurrent.CopyOnWriteArrayList; - +import WayofTime.bloodmagic.ConfigHandler; +import WayofTime.bloodmagic.api.BloodMagicAPI; +import WayofTime.bloodmagic.api.Constants; +import WayofTime.bloodmagic.api.event.AltarCraftedEvent; +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.IUpgradeTrainer; +import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.api.network.SoulNetwork; import WayofTime.bloodmagic.api.orb.IBloodOrb; +import WayofTime.bloodmagic.api.soul.*; +import WayofTime.bloodmagic.api.util.helper.BindableHelper; +import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; +import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.block.BlockAltar; +import WayofTime.bloodmagic.demonAura.PosXY; +import WayofTime.bloodmagic.demonAura.WillChunk; +import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; +import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; +import WayofTime.bloodmagic.item.ItemAltarMaker; +import WayofTime.bloodmagic.item.ItemInscriptionTool; +import WayofTime.bloodmagic.item.ItemUpgradeTome; +import WayofTime.bloodmagic.item.armour.ItemLivingArmour; +import WayofTime.bloodmagic.item.gear.ItemPackSacrifice; +import WayofTime.bloodmagic.livingArmour.LivingArmour; +import WayofTime.bloodmagic.livingArmour.tracker.*; +import WayofTime.bloodmagic.livingArmour.upgrade.*; +import WayofTime.bloodmagic.registry.ModBlocks; +import WayofTime.bloodmagic.registry.ModItems; +import WayofTime.bloodmagic.registry.ModPotions; +import WayofTime.bloodmagic.util.ChatUtil; +import WayofTime.bloodmagic.util.Utils; +import WayofTime.bloodmagic.util.helper.TextHelper; +import com.google.common.base.Strings; import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; @@ -29,17 +57,8 @@ import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.AnvilUpdateEvent; -import net.minecraftforge.event.entity.living.LivingAttackEvent; -import net.minecraftforge.event.entity.living.LivingDeathEvent; -import net.minecraftforge.event.entity.living.LivingDropsEvent; -import net.minecraftforge.event.entity.living.LivingEvent; -import net.minecraftforge.event.entity.living.LivingHealEvent; -import net.minecraftforge.event.entity.living.LivingHurtEvent; -import net.minecraftforge.event.entity.player.ArrowLooseEvent; -import net.minecraftforge.event.entity.player.EntityItemPickupEvent; -import net.minecraftforge.event.entity.player.FillBucketEvent; -import net.minecraftforge.event.entity.player.PlayerEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.entity.living.*; +import net.minecraftforge.event.entity.player.*; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.event.world.ChunkDataEvent; import net.minecraftforge.fml.client.event.ConfigChangedEvent; @@ -49,57 +68,12 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.relauncher.Side; -import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.api.Constants; -import WayofTime.bloodmagic.api.event.AltarCraftedEvent; -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.IUpgradeTrainer; -import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; -import WayofTime.bloodmagic.api.soul.DemonWillHolder; -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.BindableHelper; -import WayofTime.bloodmagic.api.util.helper.NBTHelper; -import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.block.BlockAltar; -import WayofTime.bloodmagic.demonAura.PosXY; -import WayofTime.bloodmagic.demonAura.WillChunk; -import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; -import WayofTime.bloodmagic.item.ItemAltarMaker; -import WayofTime.bloodmagic.item.ItemInscriptionTool; -import WayofTime.bloodmagic.item.ItemUpgradeTome; -import WayofTime.bloodmagic.item.armour.ItemLivingArmour; -import WayofTime.bloodmagic.item.gear.ItemPackSacrifice; -import WayofTime.bloodmagic.livingArmour.LivingArmour; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerArrowShot; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerDigging; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerGrimReaperSprint; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerHealthboost; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerMeleeDamage; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerPhysicalProtect; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSelfSacrifice; -import WayofTime.bloodmagic.livingArmour.tracker.StatTrackerSolarPowered; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeArrowShot; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeDigging; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeGrimReaperSprint; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSpeed; -import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeStepAssist; -import WayofTime.bloodmagic.registry.ModBlocks; -import WayofTime.bloodmagic.registry.ModItems; -import WayofTime.bloodmagic.registry.ModPotions; -import WayofTime.bloodmagic.util.ChatUtil; -import WayofTime.bloodmagic.util.Utils; -import WayofTime.bloodmagic.util.helper.TextHelper; -import com.google.common.base.Strings; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Random; +import java.util.concurrent.CopyOnWriteArrayList; public class EventHandler { diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/IMCHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/IMCHandler.java index d57c846e..908d9e27 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/IMCHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/IMCHandler.java @@ -1,12 +1,12 @@ package WayofTime.bloodmagic.util.handler; +import WayofTime.bloodmagic.api.BloodMagicAPI; +import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.event.FMLInterModComms; import net.minecraftforge.fml.common.registry.GameRegistry; -import WayofTime.bloodmagic.api.BloodMagicAPI; -import WayofTime.bloodmagic.util.Utils; public class IMCHandler { diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelper.java index aa4a2969..226c79aa 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelper.java @@ -1,17 +1,17 @@ package WayofTime.bloodmagic.util.helper; +import WayofTime.bloodmagic.api.Constants; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.model.ModelBakery; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMapperBase; -import net.minecraft.client.resources.model.ModelBakery; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; -import WayofTime.bloodmagic.api.Constants; /** * @author TehNut diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelperV2.java b/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelperV2.java index 85241294..1d1b8ae5 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelperV2.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelperV2.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.util.helper; import net.minecraft.block.Block; import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java index d4cf831a..509e954c 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/TextHelper.java @@ -1,12 +1,11 @@ package WayofTime.bloodmagic.util.helper; +import net.minecraft.util.text.translation.I18n; +import org.apache.commons.lang3.text.WordUtils; + import java.util.ArrayList; import java.util.List; -import net.minecraft.util.StatCollector; - -import org.apache.commons.lang3.text.WordUtils; - public class TextHelper { public static String getFormattedText(String string) @@ -16,7 +15,7 @@ public class TextHelper public static String localize(String input, Object... format) { - return StatCollector.translateToLocalFormatted(input, format); + return I18n.translateToLocalFormatted(input, format); } public static String localizeEffect(String input, Object... format)