From 348fee1e2a7fe7e09a1e8ad1de5a0c3215da058b Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 15 Aug 2017 20:21:54 -0700 Subject: [PATCH] It compiles. Somehow. --- .../AlchemyArrayEffectAttractor.java | 24 +- .../AlchemyArrayEffectSkeletonTurret.java | 20 +- .../WayofTime/bloodmagic/api/Constants.java | 160 ----- .../bloodmagic/api/ItemStackWrapper.java | 32 +- .../AlchemyArrayEffectCrafting.java | 2 - .../AlchemyCircleRenderer.java | 4 +- .../bloodmagic/api/impl/ItemBindable.java | 4 +- .../api/livingArmour/LivingArmourHandler.java | 2 +- .../api/recipe/ShapedBloodOrbRecipe.java | 305 ---------- .../api/recipe/ShapelessBloodOrbRecipe.java | 201 ------- .../registry/AlchemyArrayRecipeRegistry.java | 49 +- .../api/registry/ImperfectRitualRegistry.java | 4 +- .../api/registry/RitualRegistry.java | 8 +- .../bloodmagic/api/ritual/EnumRuneType.java | 9 +- .../api/teleport/ChunkPairSerializable.java | 38 -- .../api/teleport/PortalLocation.java | 23 +- .../bloodmagic/api/teleport/Teleport.java | 54 +- .../api/util/helper/NetworkHelper.java | 9 +- .../util/helper/PlayerSacrificeHelper.java | 4 +- .../bloodmagic/block/BlockAltar.java | 7 +- .../bloodmagic/block/BlockSpectral.java | 2 +- .../bloodmagic/block/base/BlockInteger.java | 12 + .../client/gui/GuiAlchemyTable.java | 4 +- .../bloodmagic/client/gui/GuiHolding.java | 2 +- .../client/gui/GuiItemRoutingNode.java | 8 +- .../bloodmagic/client/gui/GuiSoulForge.java | 4 +- .../bloodmagic/client/gui/GuiTeleposer.java | 4 +- .../client/gui/config/ConfigGui.java | 18 +- .../client/gui/config/ConfigGuiFactory.java | 17 +- .../bloodmagic/client/hud/HUDElement.java | 9 +- .../client/hud/HUDElementDemonWillAura.java | 3 +- .../client/hud/HUDElementHolding.java | 2 +- .../mesh/CustomMeshDefinitionActivatable.java | 2 +- .../mesh/CustomMeshDefinitionMultiWill.java | 2 +- .../mesh/CustomMeshDefinitionWillGem.java | 2 +- .../AttractorAlchemyCircleRenderer.java | 4 +- .../BindingAlchemyCircleRenderer.java | 4 +- .../DualAlchemyCircleRenderer.java | 4 +- .../SingleAlchemyCircleRenderer.java | 4 +- .../StaticAlchemyCircleRenderer.java | 4 +- .../render/block/RenderAlchemyArray.java | 2 +- .../client/render/block/RenderAltar.java | 14 +- .../client/render/block/RenderBloodTank.java | 6 +- .../render/block/RenderDemonCrucible.java | 8 +- .../client/render/block/RenderFakeBlocks.java | 5 +- .../render/block/RenderItemRoutingNode.java | 8 +- .../client/render/block/RenderMimic.java | 4 +- .../entity/RenderEntitySentientArrow.java | 4 +- .../render/entity/RenderSentientSpecter.java | 56 +- .../entity/layer/LayerAlchemyCircle.java | 4 +- .../layer/LayerCorruptedSpiderEyes.java | 4 +- .../bloodmagic/compat/guideapi/BookUtils.java | 12 - .../compat/guideapi/GuideBloodMagic.java | 2 +- .../guideapi/book/CategoryArchitect.java | 9 +- .../ShapedBloodOrbRecipeRenderer.java | 79 --- .../ShapelessBloodOrbRecipeRenderer.java | 92 --- .../compat/jei/BloodMagicPlugin.java | 54 +- .../AlchemyArrayCraftingCategory.java | 6 + .../AlchemyArrayCraftingRecipeMaker.java | 2 +- .../AlchemyTableRecipeCategory.java | 6 + .../alchemyTable/AlchemyTableRecipeJEI.java | 6 +- .../compat/jei/altar/AltarRecipeCategory.java | 6 + .../compat/jei/altar/AltarRecipeJEI.java | 4 +- .../ArmourDowngradeRecipeCategory.java | 6 + .../ArmourDowngradeRecipeJEI.java | 6 +- .../jei/binding/BindingRecipeCategory.java | 6 + .../jei/binding/BindingRecipeMaker.java | 2 +- .../forge/TartaricForgeRecipeCategory.java | 6 + .../jei/forge/TartaricForgeRecipeJEI.java | 11 +- .../jei/orb/ShapedOrbRecipeHandler.java | 40 -- .../compat/jei/orb/ShapedOrbRecipeJEI.java | 68 --- .../jei/orb/ShapelessOrbRecipeHandler.java | 38 -- .../compat/jei/orb/ShapelessOrbRecipeJEI.java | 58 -- .../compress/StorageBlockCraftingManager.java | 2 +- ...StorageBlockCraftingRecipeAssimilator.java | 562 +++++++++--------- .../core/RegistrarBloodMagicItems.java | 4 +- .../entity/projectile/EntitySoulSnare.java | 4 +- .../bloodmagic/fakePlayer/FakePlayerBM.java | 1 + .../bloodmagic/fuel/FuelHandler.java | 2 +- .../item/ItemActivationCrystal.java | 13 +- .../bloodmagic/item/ItemAltarMaker.java | 3 +- .../bloodmagic/item/ItemArcaneAshes.java | 3 +- .../bloodmagic/item/ItemBindableBase.java | 4 +- .../bloodmagic/item/ItemBloodOrb.java | 7 +- .../bloodmagic/item/ItemBloodShard.java | 7 +- .../bloodmagic/item/ItemBoundSword.java | 10 +- .../bloodmagic/item/ItemBoundTool.java | 41 +- .../bloodmagic/item/ItemComponent.java | 15 +- .../bloodmagic/item/ItemDemonWillGauge.java | 3 +- .../bloodmagic/item/ItemExperienceBook.java | 3 +- .../bloodmagic/item/ItemInscriptionTool.java | 12 +- .../bloodmagic/item/ItemLavaCrystal.java | 3 + .../bloodmagic/item/ItemPotionFlask.java | 18 +- .../bloodmagic/item/ItemRitualDiviner.java | 10 +- .../bloodmagic/item/ItemRitualReader.java | 5 +- .../item/ItemSacrificialDagger.java | 14 +- .../bloodmagic/item/ItemSanguineBook.java | 3 +- .../WayofTime/bloodmagic/item/ItemSlate.java | 11 +- .../item/ItemTelepositionFocus.java | 12 +- .../bloodmagic/item/ItemUpgradeTome.java | 9 +- .../bloodmagic/item/ItemUpgradeTrainer.java | 9 +- .../item/alchemy/ItemCuttingFluid.java | 18 +- .../ItemLivingArmourPointsUpgrade.java | 16 +- .../item/armour/ItemLivingArmour.java | 5 +- .../item/armour/ItemSentientArmour.java | 4 +- .../item/block/ItemBlockBloodTank.java | 10 +- .../item/gear/ItemPackSacrifice.java | 3 +- .../item/gear/ItemPackSelfSacrifice.java | 3 +- .../item/routing/ItemFluidRouterFilter.java | 13 +- .../item/routing/ItemNodeRouter.java | 3 +- .../item/routing/ItemRouterFilter.java | 13 +- .../bloodmagic/item/sigil/ItemSigilAir.java | 6 +- .../bloodmagic/item/sigil/ItemSigilBase.java | 16 +- .../item/sigil/ItemSigilBounce.java | 4 +- .../bloodmagic/item/sigil/ItemSigilClaw.java | 4 +- .../item/sigil/ItemSigilCompression.java | 3 + .../item/sigil/ItemSigilEnderSeverance.java | 4 +- .../item/sigil/ItemSigilFastMiner.java | 4 +- .../bloodmagic/item/sigil/ItemSigilHaste.java | 4 +- .../item/sigil/ItemSigilHolding.java | 5 +- .../item/sigil/ItemSigilTeleposition.java | 5 +- .../item/sigil/ItemSigilToggleableBase.java | 6 +- .../item/sigil/ItemSigilTransposition.java | 19 +- .../item/sigil/ItemSigilWhirlwind.java | 4 +- .../bloodmagic/item/soul/ItemMonsterSoul.java | 14 +- .../bloodmagic/item/soul/ItemSentientAxe.java | 3 +- .../item/soul/ItemSentientPickaxe.java | 3 +- .../item/soul/ItemSentientShovel.java | 3 +- .../item/soul/ItemSentientSword.java | 3 +- .../bloodmagic/item/soul/ItemSoulGem.java | 11 +- .../bloodmagic/item/soul/ItemSoulSnare.java | 12 +- .../bloodmagic/livingArmour/LivingArmour.java | 10 +- .../bloodmagic/proxy/ClientProxy.java | 70 +-- .../bloodmagic/proxy/CommonProxy.java | 13 - .../bloodmagic/registry/ModRecipes.java | 2 +- .../bloodmagic/ritual/RitualAltarBuilder.java | 6 +- .../bloodmagic/ritual/RitualAnimalGrowth.java | 6 +- .../ritual/RitualFeatheredKnife.java | 6 +- .../bloodmagic/ritual/RitualLava.java | 6 +- .../bloodmagic/tile/TileAlchemyTable.java | 4 +- .../java/WayofTime/bloodmagic/util/Utils.java | 2 +- .../bloodmagic/util/handler/IMCHandler.java | 103 ++-- .../util/handler/event/ClientHandler.java | 4 +- .../handler/event/LivingArmourHandler.java | 8 +- .../util/handler/event/WillHandler.java | 6 +- .../util/helper/InventoryRenderHelper.java | 181 ------ .../util/helper/InventoryRenderHelperV2.java | 64 -- src/main/resources/Guide-API-Version.info | 1 - src/main/resources/mcmod.info | 6 +- src/main/resources/todo.txt | 2 - 150 files changed, 1029 insertions(+), 2186 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/api/recipe/ShapedBloodOrbRecipe.java delete mode 100644 src/main/java/WayofTime/bloodmagic/api/recipe/ShapelessBloodOrbRecipe.java delete mode 100644 src/main/java/WayofTime/bloodmagic/api/teleport/ChunkPairSerializable.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/ShapedBloodOrbRecipeRenderer.java delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/ShapelessBloodOrbRecipeRenderer.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/util/helper/InventoryRenderHelper.java delete mode 100644 src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelperV2.java delete mode 100644 src/main/resources/Guide-API-Version.info delete mode 100644 src/main/resources/todo.txt diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java index 6ea52f66..7ac8a57f 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectAttractor.java @@ -235,7 +235,7 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect { EntityMob mod = (EntityMob) ent; mod.faceEntity(getTarget(ent.getEntityWorld(), pos), 180, 0); - mod.moveEntityWithHeading(0, 0.3f); + mod.getMoveHelper().strafe(0, 0.3f); if (mod.posY < pos.getY()) { mod.setJumping(true); @@ -313,7 +313,7 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect if (entry.action instanceof AttractTask) { AttractTask at = (AttractTask) entry.action; - if (at.coord.equals(pos) || !at.continueExecuting()) + if (at.coord.equals(pos) || !at.shouldExecute()) { remove = entry.action; } else @@ -423,19 +423,6 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect @Override public boolean shouldExecute() - { - return continueExecuting(); - } - - @Override - public void resetTask() - { - started = false; - updatesSincePathing = 0; - } - - @Override - public boolean continueExecuting() { boolean res = false; //TODO: @@ -448,6 +435,13 @@ public class AlchemyArrayEffectAttractor extends AlchemyArrayEffect return res; } + @Override + public void resetTask() + { + started = false; + updatesSincePathing = 0; + } + @Override public boolean isInterruptible() { diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java index 3577178b..8396bec4 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectSkeletonTurret.java @@ -154,19 +154,6 @@ public class AlchemyArrayEffectSkeletonTurret extends AlchemyArrayEffect @Override public boolean shouldExecute() - { - return continueExecuting(); - } - - @Override - public void resetTask() - { - started = false; - updatesSincePathing = 0; - } - - @Override - public boolean continueExecuting() { boolean res = false; //TODO: @@ -179,6 +166,13 @@ public class AlchemyArrayEffectSkeletonTurret extends AlchemyArrayEffect return res; } + @Override + public void resetTask() + { + started = false; + updatesSincePathing = 0; + } + @Override public boolean isInterruptible() { diff --git a/src/main/java/WayofTime/bloodmagic/api/Constants.java b/src/main/java/WayofTime/bloodmagic/api/Constants.java index 3cc3c3ff..92f8b7a6 100644 --- a/src/main/java/WayofTime/bloodmagic/api/Constants.java +++ b/src/main/java/WayofTime/bloodmagic/api/Constants.java @@ -3,7 +3,6 @@ package WayofTime.bloodmagic.api; import java.util.Locale; import WayofTime.bloodmagic.BloodMagic; -import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.ForgeRegistries; @@ -171,163 +170,4 @@ public class Constants public static final int NIGHT_VISION_CONSTANT_BEGIN = 30002; public static final int NIGHT_VISION_CONSTANT_END = 30000; } - - public enum BloodMagicItem - { - ACTIVATION_CRYSTAL("ItemActivationCrystal"), - ALTAR_MAKER("ItemAltarMaker"), - ARCANE_ASHES("ItemArcaneAshes"), - BLOOD_ORB("ItemBloodOrb"), - BOUND_AXE("ItemBoundAxe"), - BLOOD_SHARD("ItemBloodShard"), - BOUND_PICKAXE("ItemBoundPickaxe"), - BOUND_SHOVEL("ItemBoundShovel"), - BOUND_SWORD("ItemBoundSword"), - COMPONENT("ItemComponent"), - CUTTING_FLUID("ItemCuttingFluid"), - DEMON_CRYSTAL("ItemDemonCrystal"), - DAGGER_OF_SACRIFICE("ItemDaggerOfSacrifice"), - INSCRIPTION_TOOL("ItemInscriptionTool"), - LAVA_CRYSTAL("ItemLavaCrystal"), - LIVING_ARMOR_HELMET("ItemLivingArmourHelmet"), - LIVING_ARMOR_CHEST("ItemLivingArmourChest"), - LIVING_ARMOR_LEGS("ItemLivingArmourLegs"), - LIVING_ARMOR_BOOTS("ItemLivingArmourBoots"), - MONSTER_SOUL("ItemMonsterSoul"), - NODE_ROUTER("ItemNodeRouter"), - RITUAL_DIVINER("ItemRitualDiviner"), - ROUTER_FILTER("ItemRouterFilter"), - FLUID_ROUTER_FILTER("ItemFluidRouterFilter"), - SACRIFICIAL_DAGGER("ItemSacrificialDagger"), - SACRIFICE_PACK("ItemPackSacrifice"), - SELF_SACRIFICE_PACK("ItemPackSelfSacrifice"), - SENTIENT_ARMOR_HELMET("ItemSentientArmourHelmet"), - SENTIENT_ARMOR_CHEST("ItemSentientArmourChest"), - SENTIENT_ARMOR_LEGS("ItemSentientArmourLegs"), - SENTIENT_ARMOR_BOOTS("ItemSentientArmourBoots"), - SENTIENT_ARMOR_GEM("ItemSentientArmourGem"), - SENTIENT_AXE("ItemSentientAxe"), - SENTIENT_BOW("ItemSentientBow"), - SENTIENT_PICKAXE("ItemSentientPickaxe"), - SENTIENT_SHOVEL("ItemSentientShovel"), - SENTIENT_SWORD("ItemSentientSword"), - SOUL_GEM("ItemSoulGem"), - SOUL_SNARE("ItemSoulSnare"), - SIGIL_AIR("ItemSigilAir"), - SIGIL_BLOOD_LIGHT("ItemSigilBloodLight"), - SIGIL_COMPRESSION("ItemSigilCompression"), - SIGIL_DIVINATION("ItemSigilDivination"), - SIGIL_ELEMENTAL_AFFINITY("ItemSigilElementalAffinity"), - SIGIL_ENDER_SEVERANCE("ItemSigilEnderSeverance"), - SIGIL_FAST_MINER("ItemSigilFastMiner"), - SIGIL_GREEN_GROVE("ItemSigilGreenGrove"), - SIGIL_HASTE("ItemSigilHaste"), - SIGIL_LAVA("ItemSigilLava"), - SIGIL_MAGNETISM("ItemSigilMagnetism"), - SIGIL_PHANTOM_BRIDGE("ItemSigilPhantomBridge"), - SIGIL_SEER("ItemSigilSeer"), - SIGIL_SUPPRESION("ItemSigilSuppression"), - SIGIL_VOID("ItemSigilVoid"), - SIGIL_WATER("ItemSigilWater"), - SIGIL_WHIRLWIND("ItemSigilWhirlwind"), - SLATE("ItemSlate"), - TELEPOSITION_FOCUS("ItemTelepositionFocus"), - UPGRADE_TOME("ItemUpgradeTome"), - UPGRADE_TRAINER("ItemUpgradeTrainer"), - SIGIL_TELEPOSITION("ItemSigilTeleposition"), - EXPERIENCE_TOME("ItemExperienceBook"), - SIGIL_TRANSPOSITION("ItemSigilTransposition"), - RITUAL_READER("ItemRitualReader"), - SANGUINE_BOOK("ItemSanguineBook"), - SIGIL_HOLDING("ItemSigilHolding"), - ARMOUR_POINTS_UPGRADE("ItemLivingArmourPointsUpgrade"), - DEMON_WILL_GAUGE("ItemDemonWillGauge"), - POTION_FLASK("ItemPotionFlask"), - SIGIL_CLAW("ItemSigilClaw"), - SIGIL_BOUNCE("ItemSigilBounce"), - SIGIL_FROST("ItemSigilFrost"); - - private final String regName; - - BloodMagicItem(String regName) - { - this.regName = regName; - } - - public Item getItem() - { - return BloodMagicAPI.getItem(regName); - } - - public String getRegName() - { - return regName; - } - } - - public enum BloodMagicBlock - { - ALCHEMY_ARRAY("BlockAlchemyArray"), - ALTAR("BlockAltar"), - BLOOD_LIGHT("BlockBloodLight"), - BLOOD_RUNE("BlockBloodRune"), - BLOOD_STONE("BlockBloodStoneBrick"), - CRYSTAL("BlockCrystal"), - INPUT_ROUTING_NODE("BlockInputRoutingNode"), - ITEM_ROUTING_NODE("BlockItemRoutingNode"), - LIFE_ESSENCE("BlockLifeEssence"), - MASTER_ROUTING_NODE("BlockMasterRoutingNode"), - OUTPUT_ROUTING_NODE("BlockOutputRoutingNode"), - @Deprecated - PEDESTAL("BlockPedestal"), - /** No longer included in the mod. */ - PHANTOM("BlockPhantom"), - RITUAL_CONTROLLER("BlockRitualController"), - RITUAL_STONE("BlockRitualStone"), - SOUL_FORGE("BlockSoulForge"), - SPECTRAL("BlockSpectral"), - TELEPOSER("BlockTeleposer"), - INCENSE_ALTAR("BlockIncenseAltar"), - PATH("BlockPath"), - DEMON_CRUCIBLE("BlockDemonCrucible"), - DEMON_PYLON("BlockDemonPylon"), - DEMON_CRYSTALLIZER("BlockDemonCrystallizer"), - DEMON_CRYSTAL("BlockDemonCrystal"), - DIMENSIONAL_PORTAL("BlockDimensionalPortal"), - BLOOD_TANK("BlockBloodTank"), - MIMIC("BlockMimic"), - ALCHEMY_TABLE("BlockAlchemyTable"), - DEMON_BRICK_1("BlockDemonBricks1"), - DEMON_BRICK_2("BlockDemonBricks2"), - DEMON_BLOCK_EXTRA("BlockDemonExtra"), - DEMON_PILLAR_1("BlockPillar1"), - DEMON_PILLAR_2("BlockPillar2"), - DEMON_PILLAR_CAP_1("BlockPillarCap1"), - DEMON_PILLAR_CAP_2("BlockPillarCap2"), - DEMON_PILLAR_CAP_3("BlockPillarCap3"), - DEMON_WALL_1("BlockWall1"), - DEMON_STAIRS_1("BlockStairs1"), - DEMON_STAIRS_2("BlockStairs2"), - DEMON_STAIRS_3("BlockStairs3"), - DEMON_LIGHT("BlockDemonLight"), - INVERSION_PILLAR("BlockInversionPillar"), - INVERSION_PILLAR_END("BlockInversionPillarEnd"); - - private final String regName; - - BloodMagicBlock(String regName) - { - this.regName = regName; - } - - public Block getBlock() - { - return BloodMagicAPI.getBlock(regName); - } - - public String getRegName() - { - return regName; - } - } } diff --git a/src/main/java/WayofTime/bloodmagic/api/ItemStackWrapper.java b/src/main/java/WayofTime/bloodmagic/api/ItemStackWrapper.java index dd9c53bb..fc1258d3 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ItemStackWrapper.java +++ b/src/main/java/WayofTime/bloodmagic/api/ItemStackWrapper.java @@ -1,8 +1,5 @@ package WayofTime.bloodmagic.api; -import lombok.EqualsAndHashCode; -import lombok.RequiredArgsConstructor; -import lombok.Setter; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -12,16 +9,19 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; -@RequiredArgsConstructor -@EqualsAndHashCode public class ItemStackWrapper { public final Item item; public final int stackSize; public final int meta; - @Setter public NBTTagCompound nbtTag; + public ItemStackWrapper(Item item, int stackSize, int meta) { + this.item = item; + this.stackSize = stackSize; + this.meta = meta; + } + public ItemStackWrapper(Item item, int stackSize) { this(item, stackSize, 0); @@ -103,4 +103,24 @@ public class ItemStackWrapper return stackList; } + + public Item getItem() { + return item; + } + + public int getStackSize() { + return stackSize; + } + + public int getMeta() { + return meta; + } + + public NBTTagCompound getNbtTag() { + return nbtTag; + } + + public void setNbtTag(NBTTagCompound nbtTag) { + this.nbtTag = nbtTag; + } } diff --git a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffectCrafting.java b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffectCrafting.java index 56badd4f..a3a17109 100644 --- a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffectCrafting.java +++ b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyArrayEffectCrafting.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic.api.alchemyCrafting; -import lombok.Getter; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -9,7 +8,6 @@ import net.minecraft.util.math.BlockPos; public class AlchemyArrayEffectCrafting extends AlchemyArrayEffect { - @Getter public final ItemStack outputStack; public int tickLimit; diff --git a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java index 6a505119..37dd53d0 100644 --- a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.api.alchemyCrafting; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -81,7 +81,7 @@ public class AlchemyCircleRenderer TileAlchemyArray tileArray = (TileAlchemyArray) tile; Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer wr = tessellator.getBuffer(); + BufferBuilder wr = tessellator.getBuffer(); GlStateManager.pushMatrix(); // float rot = (float)(this.worldObj.provider.getWorldTime() % (360 / diff --git a/src/main/java/WayofTime/bloodmagic/api/impl/ItemBindable.java b/src/main/java/WayofTime/bloodmagic/api/impl/ItemBindable.java index 0fd8c86e..034655d1 100644 --- a/src/main/java/WayofTime/bloodmagic/api/impl/ItemBindable.java +++ b/src/main/java/WayofTime/bloodmagic/api/impl/ItemBindable.java @@ -30,12 +30,12 @@ public class ItemBindable extends Item implements IBindable @Override public String getOwnerName(ItemStack stack) { - return stack != null ? NBTHelper.checkNBT(stack).getTagCompound().getString(Constants.NBT.OWNER_NAME) : null; + return !stack.isEmpty() ? stack.getTagCompound().getString(Constants.NBT.OWNER_NAME) : null; } @Override public String getOwnerUUID(ItemStack stack) { - return stack != null ? NBTHelper.checkNBT(stack).getTagCompound().getString(Constants.NBT.OWNER_UUID) : null; + return !stack.isEmpty() ? stack.getTagCompound().getString(Constants.NBT.OWNER_UUID) : null; } } diff --git a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourHandler.java index c320559b..0d3c652e 100644 --- a/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/api/livingArmour/LivingArmourHandler.java @@ -36,7 +36,7 @@ public class LivingArmourHandler Constructor ctor = clazz.getConstructor(int.class); if (ctor == null) { - BloodMagicAPI.getLogger().error("Error adding living armour upgrade {} as it doesn't have a valid constructor.", upgrade.getUniqueIdentifier()); + BloodMagicAPI.logger.error("Error adding living armour upgrade {} as it doesn't have a valid constructor.", upgrade.getUniqueIdentifier()); } else { upgradeConstructorMap.put(upgrade.getUniqueIdentifier(), ctor); diff --git a/src/main/java/WayofTime/bloodmagic/api/recipe/ShapedBloodOrbRecipe.java b/src/main/java/WayofTime/bloodmagic/api/recipe/ShapedBloodOrbRecipe.java deleted file mode 100644 index 798965e4..00000000 --- a/src/main/java/WayofTime/bloodmagic/api/recipe/ShapedBloodOrbRecipe.java +++ /dev/null @@ -1,305 +0,0 @@ -package WayofTime.bloodmagic.api.recipe; - -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import net.minecraft.block.Block; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.ShapedRecipes; -import net.minecraft.util.NonNullList; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.oredict.OreDictionary; - -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 * - */ -public class ShapedBloodOrbRecipe implements IRecipe -{ - private static final int MAX_CRAFT_GRID_WIDTH = 3; - private static final int MAX_CRAFT_GRID_HEIGHT = 3; - - private ItemStack output = null; - private Object[] input = null; - public int width = 0; - public int height = 0; - private int tier; - private boolean mirrored = true; - - public ShapedBloodOrbRecipe(Block result, Object... recipe) - { - this(new ItemStack(result), recipe); - } - - public ShapedBloodOrbRecipe(Item result, Object... recipe) - { - this(new ItemStack(result), recipe); - } - - public ShapedBloodOrbRecipe(ItemStack result, Object... recipe) - { - output = result.copy(); - - String shape = ""; - int idx = 0; - - if (recipe[idx] instanceof Boolean) - { - mirrored = (Boolean) recipe[idx]; - if (recipe[idx + 1] instanceof Object[]) - { - recipe = (Object[]) recipe[idx + 1]; - } else - { - idx = 1; - } - } - - if (recipe[idx] instanceof String[]) - { - String[] parts = ((String[]) recipe[idx++]); - - for (String s : parts) - { - width = s.length(); - shape += s; - } - - height = parts.length; - } else - { - while (recipe[idx] instanceof String) - { - String s = (String) recipe[idx++]; - shape += s; - width = s.length(); - height++; - } - } - - if (width * height != shape.length()) - { - String ret = "Invalid shaped ore recipe: "; - for (Object tmp : recipe) - { - ret += tmp + ", "; - } - ret += output; - throw new RuntimeException(ret); - } - - HashMap itemMap = new HashMap(); - - for (; idx < recipe.length; idx += 2) - { - Character chr = (Character) recipe[idx]; - Object in = recipe[idx + 1]; - - if (in instanceof IBloodOrb || (in instanceof ItemStack && ((ItemStack) in).getItem() instanceof IBloodOrb)) - { - // If the item is an instanceof IBloodOrb then save the level of - // the orb. - if (in instanceof ItemStack) - { - ItemStack inStack = (ItemStack) in; - tier = ((IBloodOrb) inStack.getItem()).getOrbLevel(inStack.getItemDamage()); - itemMap.put(chr, tier); - } else - { - tier = ((IBloodOrb) in).getOrbLevel(0); - itemMap.put(chr, tier); - } - } else if (in instanceof ItemStack) - { - itemMap.put(chr, ((ItemStack) in).copy()); - } else if (in instanceof Item) - { - itemMap.put(chr, new ItemStack((Item) in)); - } else if (in instanceof Block) - { - itemMap.put(chr, new ItemStack((Block) in, 1, OreDictionary.WILDCARD_VALUE)); - } else if (in instanceof String) - { - itemMap.put(chr, OreDictionary.getOres((String) in)); - } else - { - String ret = "Invalid shaped orb recipe: "; - for (Object tmp : recipe) - { - ret += tmp + ", "; - } - ret += output; - throw new RuntimeException(ret); - } - } - - input = new Object[width * height]; - int x = 0; - for (char chr : shape.toCharArray()) - { - input[x++] = itemMap.get(chr); - } - } - - ShapedBloodOrbRecipe(ShapedRecipes recipe, Map replacements) - { - output = recipe.getRecipeOutput(); - width = recipe.recipeWidth; - height = recipe.recipeHeight; - - input = new Object[recipe.recipeItems.length]; - - for (int i = 0; i < input.length; i++) - { - ItemStack ingred = recipe.recipeItems[i]; - - if (ingred == null) - continue; - - input[i] = recipe.recipeItems[i]; - - for (Entry replace : replacements.entrySet()) - { - if (OreDictionary.itemMatches(replace.getKey(), ingred, true)) - { - input[i] = OreDictionary.getOres(replace.getValue()); - break; - } - } - } - } - - @Override - public ItemStack getCraftingResult(InventoryCrafting var1) - { - return output.copy(); - } - - @Override - public int getRecipeSize() - { - return input.length; - } - - @Override - public ItemStack getRecipeOutput() - { - return output; - } - - @Override - public boolean matches(InventoryCrafting inv, World world) - { - for (int x = 0; x <= MAX_CRAFT_GRID_WIDTH - width; x++) - { - for (int y = 0; y <= MAX_CRAFT_GRID_HEIGHT - height; ++y) - { - if (checkMatch(inv, x, y, false)) - { - return true; - } - - if (mirrored && checkMatch(inv, x, y, true)) - { - return true; - } - } - } - - return false; - } - - @SuppressWarnings("unchecked") - private boolean checkMatch(InventoryCrafting inv, int startX, int startY, boolean mirror) - { - for (int x = 0; x < MAX_CRAFT_GRID_WIDTH; x++) - { - for (int y = 0; y < MAX_CRAFT_GRID_HEIGHT; y++) - { - int subX = x - startX; - int subY = y - startY; - Object target = null; - - if (subX >= 0 && subY >= 0 && subX < width && subY < height) - { - if (mirror) - { - target = input[width - subX - 1 + subY * width]; - } else - { - target = input[subX + subY * width]; - } - } - - ItemStack slot = inv.getStackInRowAndColumn(x, y); - // If target is integer, then we should be check the blood orb - // value of the item instead - if (target instanceof Integer) - { - if (!slot.isEmpty() && slot.getItem() instanceof IBloodOrb) - { - IBloodOrb orb = (IBloodOrb) slot.getItem(); - if (orb.getOrbLevel(slot.getItemDamage()) < (Integer) target) - { - return false; - } - } else - return false; - } else if (target instanceof ItemStack) - { - if (!OreDictionary.itemMatches((ItemStack) target, slot, false)) - { - return false; - } - } else if (target instanceof List) - { - boolean matched = false; - - Iterator itr = ((List) target).iterator(); - while (itr.hasNext() && !matched) - { - matched = OreDictionary.itemMatches(itr.next(), slot, false); - } - - if (!matched) - { - return false; - } - } else if (target == null && !slot.isEmpty()) - { - return false; - } - } - } - - return true; - } - - public ShapedBloodOrbRecipe setMirrored(boolean mirror) - { - mirrored = mirror; - return this; - } - - public Object[] getInput() - { - return this.input; - } - - public NonNullList getRemainingItems(InventoryCrafting inv) - { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); - } - - public int getTier() - { - return tier; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/recipe/ShapelessBloodOrbRecipe.java b/src/main/java/WayofTime/bloodmagic/api/recipe/ShapelessBloodOrbRecipe.java deleted file mode 100644 index abbc1643..00000000 --- a/src/main/java/WayofTime/bloodmagic/api/recipe/ShapelessBloodOrbRecipe.java +++ /dev/null @@ -1,201 +0,0 @@ -package WayofTime.bloodmagic.api.recipe; - -import WayofTime.bloodmagic.api.orb.IBloodOrb; -import net.minecraft.block.Block; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.ShapelessRecipes; -import net.minecraft.util.NonNullList; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.oredict.OreDictionary; - -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 * - */ -public class ShapelessBloodOrbRecipe implements IRecipe -{ - private ItemStack output = null; - private ArrayList input = new ArrayList(); - private int tier; - - public ShapelessBloodOrbRecipe(Block result, Object... recipe) - { - this(new ItemStack(result), recipe); - } - - public ShapelessBloodOrbRecipe(Item result, Object... recipe) - { - this(new ItemStack(result), recipe); - } - - public ShapelessBloodOrbRecipe(ItemStack result, Object... recipe) - { - output = result.copy(); - for (Object in : recipe) - { - if (in instanceof IBloodOrb || (in instanceof ItemStack && ((ItemStack) in).getItem() instanceof IBloodOrb)) - { - // If the item is an instanceof IBloodOrb then save the level of - // the orb. - if (in instanceof ItemStack) - { - ItemStack inStack = (ItemStack) in; - tier = ((IBloodOrb) inStack.getItem()).getOrbLevel(inStack.getItemDamage()); - input.add(tier); - } else - { - tier = ((IBloodOrb) in).getOrbLevel(0); - input.add(tier); - } - } else if (in instanceof ItemStack) - { - input.add(((ItemStack) in).copy()); - } else if (in instanceof Item) - { - input.add(new ItemStack((Item) in)); - } else if (in instanceof Block) - { - input.add(new ItemStack((Block) in)); - } else if (in instanceof String) - { - input.add(OreDictionary.getOres((String) in)); - } else - { - String ret = "Invalid shapeless ore recipe: "; - for (Object tmp : recipe) - { - ret += tmp + ", "; - } - ret += output; - throw new RuntimeException(ret); - } - } - } - - ShapelessBloodOrbRecipe(ShapelessRecipes recipe, Map replacements) - { - output = recipe.getRecipeOutput(); - - for (ItemStack ingred : recipe.recipeItems) - { - Object finalObj = ingred; - for (Entry replace : replacements.entrySet()) - { - if (OreDictionary.itemMatches(replace.getKey(), ingred, false)) - { - finalObj = OreDictionary.getOres(replace.getValue()); - break; - } - } - input.add(finalObj); - } - } - - @Override - public int getRecipeSize() - { - return input.size(); - } - - @Override - public ItemStack getRecipeOutput() - { - return output; - } - - @Override - public ItemStack getCraftingResult(InventoryCrafting var1) - { - return output.copy(); - } - - @SuppressWarnings("unchecked") - @Override - public boolean matches(InventoryCrafting var1, World world) - { - ArrayList required = new ArrayList(input); - - for (int x = 0; x < var1.getSizeInventory(); x++) - { - ItemStack slot = var1.getStackInSlot(x); - - if (!slot.isEmpty()) - { - boolean inRecipe = false; - Iterator req = required.iterator(); - - while (req.hasNext()) - { - boolean match = false; - - Object next = req.next(); - - // If target is integer, then we should be check the blood - // orb value of the item instead - if (next instanceof Integer) - { - if (slot.getItem() instanceof IBloodOrb) - { - IBloodOrb orb = (IBloodOrb) slot.getItem(); - if (orb.getOrbLevel(slot.getItemDamage()) < (Integer) next) - { - return false; - } - } else - return false; - match = true; - } else if (next instanceof ItemStack) - { - match = OreDictionary.itemMatches((ItemStack) next, slot, false); - } else if (next instanceof List) - { - Iterator itr = ((List) next).iterator(); - while (itr.hasNext() && !match) - { - match = OreDictionary.itemMatches(itr.next(), slot, false); - } - } - - if (match) - { - inRecipe = true; - required.remove(next); - break; - } - } - - if (!inRecipe) - { - return false; - } - } - } - - return required.isEmpty(); - } - - public ArrayList getInput() - { - return this.input; - } - - @Override - public NonNullList getRemainingItems(InventoryCrafting inv) - { - return ForgeHooks.defaultRecipeGetRemainingItems(inv); - } - - public int getTier() - { - return tier; - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java index a90b6139..a94370cf 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/AlchemyArrayRecipeRegistry.java @@ -7,9 +7,6 @@ import java.util.Map.Entry; import javax.annotation.Nullable; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.ToString; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.oredict.OreDictionary; @@ -128,8 +125,8 @@ public class AlchemyArrayRecipeRegistry if (effectEntry.getValue() instanceof AlchemyArrayEffectCrafting) { AlchemyArrayEffectCrafting craftingEffect = (AlchemyArrayEffectCrafting) effectEntry.getValue(); - ItemStack resultStack = craftingEffect.getOutputStack(); - if (resultStack != null && resultStack.getItem() != null) + ItemStack resultStack = craftingEffect.outputStack; + if (!resultStack.isEmpty()) { if (resultStack.getItem() == stack.getItem() && resultStack.getItemDamage() == stack.getItemDamage()) { @@ -291,9 +288,6 @@ public class AlchemyArrayRecipeRegistry return getAlchemyCircleRenderer(Collections.singletonList(itemStack), catalystStack); } - @Getter - @ToString - @EqualsAndHashCode public static class AlchemyArrayRecipe { public AlchemyCircleRenderer defaultCircleRenderer; @@ -384,6 +378,45 @@ public class AlchemyArrayRecipeRegistry return defaultCircleRenderer; } + + public AlchemyCircleRenderer getDefaultCircleRenderer() { + return defaultCircleRenderer; + } + + public List getInput() { + return input; + } + + public BiMap getCatalystMap() { + return catalystMap; + } + + public BiMap getCircleMap() { + return circleMap; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof AlchemyArrayRecipe)) return false; + + AlchemyArrayRecipe that = (AlchemyArrayRecipe) o; + + if (defaultCircleRenderer != null ? !defaultCircleRenderer.equals(that.defaultCircleRenderer) : that.defaultCircleRenderer != null) + return false; + if (input != null ? !input.equals(that.input) : that.input != null) return false; + if (catalystMap != null ? !catalystMap.equals(that.catalystMap) : that.catalystMap != null) return false; + return circleMap != null ? circleMap.equals(that.circleMap) : that.circleMap == null; + } + + @Override + public int hashCode() { + int result = defaultCircleRenderer != null ? defaultCircleRenderer.hashCode() : 0; + result = 31 * result + (input != null ? input.hashCode() : 0); + result = 31 * result + (catalystMap != null ? catalystMap.hashCode() : 0); + result = 31 * result + (circleMap != null ? circleMap.hashCode() : 0); + return result; + } } public static BiMap, AlchemyArrayRecipe> getRecipes() diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java index 36456448..247a2f6e 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java @@ -28,7 +28,7 @@ public class ImperfectRitualRegistry if (imperfectRitual != null) { if (registry.containsKey(id)) - BloodMagicAPI.getLogger().error("Duplicate imperfect ritual id: %s", id); + BloodMagicAPI.logger.error("Duplicate imperfect ritual id: %s", id); else { registry.put(id, imperfectRitual); @@ -88,7 +88,7 @@ public class ImperfectRitualRegistry return enabledRituals.get(imperfectRitual); } catch (NullPointerException e) { - BloodMagicAPI.getLogger().error("Invalid Imperfect Ritual was called"); + BloodMagicAPI.logger.error("Invalid Imperfect Ritual was called"); return false; } } diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java index cd389d37..4b090f4c 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java @@ -33,15 +33,15 @@ public class RitualRegistry { if (locked) { - BloodMagicAPI.getLogger().error("This registry has been locked. Please register your ritual earlier."); - BloodMagicAPI.getLogger().error("If you reflect this, I will hunt you down. - TehNut"); + BloodMagicAPI.logger.error("This registry has been locked. Please register your ritual earlier."); + BloodMagicAPI.logger.error("If you reflect this, I will hunt you down. - TehNut"); return; } if (ritual != null) { if (registry.containsKey(id)) - BloodMagicAPI.getLogger().error("Duplicate ritual id: %s", id); + BloodMagicAPI.logger.error("Duplicate ritual id: %s", id); else { registry.put(id, ritual); @@ -95,7 +95,7 @@ public class RitualRegistry return enabledRituals.get(ritual); } catch (NullPointerException e) { - BloodMagicAPI.getLogger().error("Invalid Ritual was called"); + BloodMagicAPI.logger.error("Invalid Ritual was called"); return false; } } diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java b/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java index 9be20395..eceeb97f 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java @@ -1,9 +1,11 @@ package WayofTime.bloodmagic.api.ritual; -import WayofTime.bloodmagic.api.Constants; +import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IStringSerializable; import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.fml.common.registry.GameRegistry; import java.util.Locale; @@ -17,6 +19,9 @@ public enum EnumRuneType implements IStringSerializable DUSK(TextFormatting.DARK_GRAY), DAWN(TextFormatting.GOLD); + @GameRegistry.ObjectHolder("bloodmagic:inscription_tool") + public static final Item INSCRIPTION_TOOL = Items.AIR; + public final TextFormatting colorCode; EnumRuneType(TextFormatting colorCode) @@ -34,7 +39,7 @@ public enum EnumRuneType implements IStringSerializable public ItemStack getScribeStack() { - return new ItemStack(Constants.BloodMagicItem.INSCRIPTION_TOOL.getItem(), 1, ordinal()); + return new ItemStack(INSCRIPTION_TOOL, 1, ordinal()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/api/teleport/ChunkPairSerializable.java b/src/main/java/WayofTime/bloodmagic/api/teleport/ChunkPairSerializable.java deleted file mode 100644 index 1ff58db1..00000000 --- a/src/main/java/WayofTime/bloodmagic/api/teleport/ChunkPairSerializable.java +++ /dev/null @@ -1,38 +0,0 @@ -package WayofTime.bloodmagic.api.teleport; - -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.ToString; -import net.minecraft.util.math.BlockPos; - -import java.io.Serializable; - -@ToString -@EqualsAndHashCode -@Getter -public class ChunkPairSerializable implements Serializable -{ - private int chunkXPos; - private int chunkZPos; - - public ChunkPairSerializable(int chunkXPos, int chunkZPos) - { - this.chunkXPos = chunkXPos; - this.chunkZPos = chunkZPos; - } - - public ChunkPairSerializable(BlockPos blockPos) - { - this(blockPos.getX() >> 4, blockPos.getZ() >> 4); - } - - public BlockPos getChunkCenter(int y) - { - return new BlockPos((chunkXPos << 4) + 8, y, (chunkZPos << 4) + 8); - } - - public BlockPos getChunkCenter() - { - return getChunkCenter(64); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/api/teleport/PortalLocation.java b/src/main/java/WayofTime/bloodmagic/api/teleport/PortalLocation.java index 644b4ffd..d4c2e9ce 100644 --- a/src/main/java/WayofTime/bloodmagic/api/teleport/PortalLocation.java +++ b/src/main/java/WayofTime/bloodmagic/api/teleport/PortalLocation.java @@ -1,23 +1,16 @@ package WayofTime.bloodmagic.api.teleport; import WayofTime.bloodmagic.api.Constants; -import lombok.Getter; -import lombok.ToString; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; import java.io.Serializable; -@ToString public class PortalLocation implements Serializable { - @Getter private int x; - @Getter private int y; - @Getter private int z; - @Getter private int dimension; public PortalLocation(int x, int y, int z, int dimension) @@ -87,4 +80,20 @@ public class PortalLocation implements Serializable result = 31 * result + z; return result; } + + public int getX() { + return x; + } + + public int getY() { + return y; + } + + public int getZ() { + return z; + } + + public int getDimension() { + return dimension; + } } diff --git a/src/main/java/WayofTime/bloodmagic/api/teleport/Teleport.java b/src/main/java/WayofTime/bloodmagic/api/teleport/Teleport.java index 8b0d470c..d2535574 100644 --- a/src/main/java/WayofTime/bloodmagic/api/teleport/Teleport.java +++ b/src/main/java/WayofTime/bloodmagic/api/teleport/Teleport.java @@ -1,24 +1,14 @@ package WayofTime.bloodmagic.api.teleport; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.ToString; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; -@ToString -@EqualsAndHashCode public abstract class Teleport implements ITeleport { - @Getter protected int x; - @Getter protected int y; - @Getter protected int z; - @Getter protected Entity entity; - @Getter protected String networkToDrain; public Teleport(int x, int y, int z, Entity entity, String networkToDrain) @@ -34,4 +24,48 @@ public abstract class Teleport implements ITeleport { this(blockPos.getX(), blockPos.getY(), blockPos.getZ(), entity, networkToDrain); } + + public int getX() { + return x; + } + + public int getY() { + return y; + } + + public int getZ() { + return z; + } + + public Entity getEntity() { + return entity; + } + + public String getNetworkToDrain() { + return networkToDrain; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof Teleport)) return false; + + Teleport teleport = (Teleport) o; + + if (x != teleport.x) return false; + if (y != teleport.y) return false; + if (z != teleport.z) return false; + if (entity != null ? !entity.equals(teleport.entity) : teleport.entity != null) return false; + return networkToDrain != null ? networkToDrain.equals(teleport.networkToDrain) : teleport.networkToDrain == null; + } + + @Override + public int hashCode() { + int result = x; + result = 31 * result + y; + result = 31 * result + z; + result = 31 * result + (entity != null ? entity.hashCode() : 0); + result = 31 * result + (networkToDrain != null ? networkToDrain.hashCode() : 0); + return result; + } } 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 d2841ae3..8b1396d6 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.api.util.helper; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.event.SoulNetworkEvent; +import WayofTime.bloodmagic.api.orb.BloodOrb; import WayofTime.bloodmagic.api.orb.IBloodOrb; import WayofTime.bloodmagic.api.registry.OrbRegistry; import WayofTime.bloodmagic.api.saving.BMWorldSavedData; @@ -87,9 +88,11 @@ public class NetworkHelper if (tier > OrbRegistry.getTierMap().size() || tier < 0) return ret; - for (ItemStack orbStack : OrbRegistry.getOrbsForTier(tier)) - if (((IBloodOrb) orbStack.getItem()).getMaxEssence(orbStack.getItemDamage()) > ret) - ret = ((IBloodOrb) orbStack.getItem()).getMaxEssence(orbStack.getItemDamage()); + for (ItemStack orbStack : OrbRegistry.getOrbsForTier(tier)) { + BloodOrb orb = ((IBloodOrb) orbStack.getItem()).getOrb(orbStack); + if (orb.getCapacity() > ret) + ret = orb.getCapacity(); + } return ret; } 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 6379902f..aa0702b7 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java @@ -3,7 +3,7 @@ package WayofTime.bloodmagic.api.util.helper; import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.api.altar.IBloodAltar; import WayofTime.bloodmagic.api.event.SacrificeKnifeUsedEvent; -import WayofTime.bloodmagic.registry.ModPotions; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; @@ -82,7 +82,7 @@ public class PlayerSacrificeHelper { player.setHealth(maxHealth / 10.0f); setPlayerIncense(player, 0); - player.addPotionEffect(new PotionEffect(ModPotions.soulFray, soulFrayDuration)); + player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.SOUL_FRAY, soulFrayDuration)); return true; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index 2c1ed34c..32106390 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -7,6 +7,7 @@ import WayofTime.bloodmagic.altar.BloodAltar; import WayofTime.bloodmagic.api.altar.EnumAltarComponent; import WayofTime.bloodmagic.api.altar.IBloodAltar; import WayofTime.bloodmagic.api.iface.IDocumentedBlock; +import WayofTime.bloodmagic.api.orb.BloodOrb; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -76,13 +77,13 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl { if (orbStack.getItem() instanceof IBloodOrb && orbStack.getItem() instanceof IBindable) { - IBloodOrb bloodOrb = (IBloodOrb) orbStack.getItem(); + BloodOrb orb = ((IBloodOrb) orbStack.getItem()).getOrb(orbStack); IBindable bindable = (IBindable) orbStack.getItem(); - if (!Strings.isNullOrEmpty(bindable.getOwnerUUID(orbStack))) + if (orb != null && !Strings.isNullOrEmpty(bindable.getOwnerUUID(orbStack))) { SoulNetwork soulNetwork = NetworkHelper.getSoulNetwork(bindable.getOwnerUUID(orbStack)); - int maxEssence = bloodOrb.getMaxEssence(orbStack.getItemDamage()); + int maxEssence = orb.getCapacity(); int currentEssence = soulNetwork.getCurrentEssence(); int level = currentEssence * 15 / maxEssence; return Math.min(15, level) % 16; diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java index c11a4365..6f70bee1 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java @@ -91,7 +91,7 @@ public class BlockSpectral extends Block implements IVariantProvider } @Override - public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB mask, List list, Entity collidingEntity) + public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB mask, List list, Entity collidingEntity, boolean bool) { } diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java index 3bf70c91..1e3fcd0e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java @@ -72,4 +72,16 @@ public class BlockInteger extends Block protected BlockStateContainer createStateContainer() { return new BlockStateContainer.Builder(this).add(property).build(); } + + public int getMaxMeta() { + return maxMeta; + } + + public PropertyInteger getProperty() { + return property; + } + + public BlockStateContainer getRealStateContainer() { + return realStateContainer; + } } diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java index 5794d1e6..4c0d214f 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiAlchemyTable.java @@ -29,8 +29,8 @@ public class GuiAlchemyTable extends GuiContainer @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - this.fontRendererObj.drawString(TextHelper.localize("tile.bloodmagic.alchemyTable.name"), 8, 5, 4210752); - this.fontRendererObj.drawString(TextHelper.localize("container.inventory"), 8, 111, 4210752); + this.fontRenderer.drawString(TextHelper.localize("tile.bloodmagic.alchemyTable.name"), 8, 5, 4210752); + this.fontRenderer.drawString(TextHelper.localize("container.inventory"), 8, 111, 4210752); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java index 8a21e4e2..f68ef440 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiHolding.java @@ -31,7 +31,7 @@ public class GuiHolding extends GuiContainer protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { //the parameters for drawString are: string, x, y, color - fontRendererObj.drawString(TextHelper.localize("item.bloodmagic.sigil.holding.name"), 53, 4, 4210752); + fontRenderer.drawString(TextHelper.localize("item.bloodmagic.sigil.holding.name"), 53, 4, 4210752); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java index 049a8fdf..1f4d9a13 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java @@ -80,7 +80,7 @@ public class GuiItemRoutingNode extends GuiContainer this.buttonList.add(this.decrementButton = new GuiButton(7, left + 132, top + 50, 10, 18, "<")); disableDirectionalButton(inventory.currentActiveSlot); - this.textBox = new GuiTextField(0, this.fontRendererObj, left + 94, top + 37, 70, 12); + this.textBox = new GuiTextField(0, this.fontRenderer, left + 94, top + 37, 70, 12); this.textBox.setEnableBackgroundDrawing(false); this.textBox.setText(""); } @@ -155,7 +155,7 @@ public class GuiItemRoutingNode extends GuiContainer { super.drawScreen(mouseX, mouseY, partialTicks); - Minecraft.getMinecraft().fontRendererObj.drawString(inventory.getName(), xSize, ySize / 4, 4210752); + Minecraft.getMinecraft().fontRenderer.drawString(inventory.getName(), xSize, ySize / 4, 4210752); } /** @@ -193,7 +193,7 @@ public class GuiItemRoutingNode extends GuiContainer @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - this.fontRendererObj.drawString("" + getCurrentActiveSlotPriority(), 143 + 5, 51 + 4, 0xFFFFFF); + this.fontRenderer.drawString("" + getCurrentActiveSlotPriority(), 143 + 5, 51 + 4, 0xFFFFFF); String s = ""; if (container.lastGhostSlotClicked != -1) { @@ -204,7 +204,7 @@ public class GuiItemRoutingNode extends GuiContainer } } - this.fontRendererObj.drawStringWithShadow(s.substring(0, Math.min(16, s.length())), 81, 19, 0xFFFFFF); + this.fontRenderer.drawStringWithShadow(s.substring(0, Math.min(16, s.length())), 81, 19, 0xFFFFFF); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java index 6dc01ad4..a383f96d 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiSoulForge.java @@ -28,8 +28,8 @@ public class GuiSoulForge extends GuiContainer @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - this.fontRendererObj.drawString(TextHelper.localize("tile.bloodmagic.soulForge.name"), 8, 5, 4210752); - this.fontRendererObj.drawString(TextHelper.localize("container.inventory"), 8, 111, 4210752); + this.fontRenderer.drawString(TextHelper.localize("tile.bloodmagic.soulForge.name"), 8, 5, 4210752); + this.fontRenderer.drawString(TextHelper.localize("container.inventory"), 8, 111, 4210752); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java index 74729451..2220e04b 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiTeleposer.java @@ -22,8 +22,8 @@ public class GuiTeleposer extends GuiContainer @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - this.fontRendererObj.drawString(TextHelper.localize("tile.bloodmagic.teleposer.name"), 64, 23, 4210752); - this.fontRendererObj.drawString(TextHelper.localize("container.inventory"), 8, 47, 4210752); + this.fontRenderer.drawString(TextHelper.localize("tile.bloodmagic.teleposer.name"), 64, 23, 4210752); + this.fontRenderer.drawString(TextHelper.localize("container.inventory"), 8, 47, 4210752); } @Override 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 910bba94..c535ebd0 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGui.java @@ -25,15 +25,15 @@ public class ConfigGui extends GuiConfig // adds sections declared in ConfigHandler. toLowerCase() is used // because the configuration class automatically does this, so must we. - list.add(new ConfigElement(ConfigHandler.getConfig().getCategory("Potions".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.getConfig().getCategory("Client".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.getConfig().getCategory("Compatibility".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.getConfig().getCategory("Teleposer Blacklist".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.getConfig().getCategory("Well of Suffering Blacklist".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.getConfig().getCategory("Item/Block Blacklisting".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.getConfig().getCategory("General".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.getConfig().getCategory("Rituals".toLowerCase()))); - list.add(new ConfigElement(ConfigHandler.getConfig().getCategory("Blood Altar Sacrificial Values".toLowerCase()))); + list.add(new ConfigElement(ConfigHandler.config.getCategory("Potions".toLowerCase()))); + list.add(new ConfigElement(ConfigHandler.config.getCategory("Client".toLowerCase()))); + list.add(new ConfigElement(ConfigHandler.config.getCategory("Compatibility".toLowerCase()))); + list.add(new ConfigElement(ConfigHandler.config.getCategory("Teleposer Blacklist".toLowerCase()))); + list.add(new ConfigElement(ConfigHandler.config.getCategory("Well of Suffering Blacklist".toLowerCase()))); + list.add(new ConfigElement(ConfigHandler.config.getCategory("Item/Block Blacklisting".toLowerCase()))); + list.add(new ConfigElement(ConfigHandler.config.getCategory("General".toLowerCase()))); + list.add(new ConfigElement(ConfigHandler.config.getCategory("Rituals".toLowerCase()))); + list.add(new ConfigElement(ConfigHandler.config.getCategory("Blood Altar Sacrificial Values".toLowerCase()))); return list; } 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 05c72094..8b2e4598 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGuiFactory.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/config/ConfigGuiFactory.java @@ -8,28 +8,23 @@ import java.util.Set; public class ConfigGuiFactory implements IModGuiFactory { - @Override - public void initialize(Minecraft minecraftInstance) - { + public void initialize(Minecraft minecraftInstance) { } @Override - public Class mainConfigGuiClass() - { - return ConfigGui.class; + public boolean hasConfigGui() { + return false; } @Override - public Set runtimeGuiCategories() - { - return null; + public GuiScreen createConfigGui(GuiScreen parentScreen) { + return new ConfigGui(parentScreen); } @Override - public RuntimeOptionGuiHandler getHandlerFor(IModGuiFactory.RuntimeOptionCategoryElement element) - { + public Set runtimeGuiCategories() { return null; } } diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElement.java b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElement.java index ea91517c..7aea273b 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElement.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElement.java @@ -10,7 +10,6 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent; public abstract class HUDElement { - private int xOffset; private int yOffset; private final int xOffsetDefault; @@ -57,19 +56,19 @@ public abstract class HUDElement tessellator.draw(); } - public int getxOffset() { + public int getXOffset() { return xOffset; } - public int getyOffset() { + public int getYOffset() { return yOffset; } - public int getxOffsetDefault() { + public int getXOffsetDefault() { return xOffsetDefault; } - public int getyOffsetDefault() { + public int getYOffsetDefault() { return yOffsetDefault; } diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java index 45d8ce3e..f7f195e0 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementDemonWillAura.java @@ -7,7 +7,6 @@ import WayofTime.bloodmagic.BloodMagic; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderGameOverlayEvent; @@ -74,7 +73,7 @@ public class HUDElementDemonWillAura extends HUDElement String value = "" + (int) amount; GlStateManager.translate(x - 2 * textureXOffset - value.length() * 0 + 70, (y - 1), 0); GlStateManager.scale(0.5, 0.5, 1); - minecraft.fontRendererObj.drawStringWithShadow("" + (int) amount, 0, 2, 0xffffff); + minecraft.fontRenderer.drawStringWithShadow("" + (int) amount, 0, 2, 0xffffff); GlStateManager.popMatrix(); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementHolding.java b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementHolding.java index 227b832c..9914bbf1 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementHolding.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/HUDElementHolding.java @@ -80,7 +80,7 @@ public class HUDElementHolding extends HUDElement if (animation > 0.0F) GlStateManager.popMatrix(); - Minecraft.getMinecraft().getRenderItem().renderItemOverlays(Minecraft.getMinecraft().fontRendererObj, stack, x, y); + Minecraft.getMinecraft().getRenderItem().renderItemOverlays(Minecraft.getMinecraft().fontRenderer, stack, x, y); } } } diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java index 2ba73161..add94841 100644 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java +++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionActivatable.java @@ -19,7 +19,7 @@ public class CustomMeshDefinitionActivatable implements ItemMeshDefinition @Override public ModelResourceLocation getModelLocation(ItemStack stack) { - if (stack != null && stack.getItem() instanceof IActivatable) + if (!stack.isEmpty() && stack.getItem() instanceof IActivatable) if (((IActivatable) stack.getItem()).getActivated(stack)) return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, "item/" + name), "active=true"); diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java index 0edb0e0c..283f5358 100644 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java +++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionMultiWill.java @@ -20,7 +20,7 @@ public class CustomMeshDefinitionMultiWill implements ItemMeshDefinition @Override public ModelResourceLocation getModelLocation(ItemStack stack) { - if (stack != null && stack.getItem() instanceof IMultiWillTool) + if (!stack.isEmpty() && stack.getItem() instanceof IMultiWillTool) { EnumDemonWillType type = ((IMultiWillTool) stack.getItem()).getCurrentType(stack); return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, "item/" + name), "type=" + type.getName().toLowerCase()); diff --git a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java index dc2c6825..45e4af99 100644 --- a/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java +++ b/src/main/java/WayofTime/bloodmagic/client/mesh/CustomMeshDefinitionWillGem.java @@ -21,7 +21,7 @@ public class CustomMeshDefinitionWillGem implements ItemMeshDefinition @Override public ModelResourceLocation getModelLocation(ItemStack stack) { - if (stack != null && stack.getItem() == RegistrarBloodMagicItems.SOUL_GEM) + if (!stack.isEmpty() && stack.getItem() == RegistrarBloodMagicItems.SOUL_GEM) { EnumDemonWillType type = ((ItemSoulGem) stack.getItem()).getCurrentType(stack); return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, "item/" + name), "type=" + ItemSoulGem.names[stack.getItemDamage()] + "_" + type.getName().toLowerCase()); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java index 2318d142..b8af70c5 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.client.render.alchemyArray; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -71,7 +71,7 @@ public class AttractorAlchemyCircleRenderer extends AlchemyCircleRenderer TileAlchemyArray tileArray = (TileAlchemyArray) tile; Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer wr = tessellator.getBuffer(); + BufferBuilder wr = tessellator.getBuffer(); GlStateManager.pushMatrix(); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java index 0ef9593e..208ca594 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.client.render.alchemyArray; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -168,7 +168,7 @@ public class BindingAlchemyCircleRenderer extends AlchemyCircleRenderer public void renderAt(TileEntity tile, double x, double y, double z, float craftTime) { Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer wr = tessellator.getBuffer(); + BufferBuilder wr = tessellator.getBuffer(); GlStateManager.pushMatrix(); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java index bb7248da..f9d62120 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.client.render.alchemyArray; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -56,7 +56,7 @@ public class DualAlchemyCircleRenderer extends AlchemyCircleRenderer TileAlchemyArray tileArray = (TileAlchemyArray) tile; Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer wr = tessellator.getBuffer(); + BufferBuilder wr = tessellator.getBuffer(); GlStateManager.pushMatrix(); // float rot = (float)(this.worldObj.provider.getWorldTime() % (360 / diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java index fe71a314..b4c2059c 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.client.render.alchemyArray; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -54,7 +54,7 @@ public class SingleAlchemyCircleRenderer extends AlchemyCircleRenderer TileAlchemyArray tileArray = (TileAlchemyArray) tile; Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer wr = tessellator.getBuffer(); + BufferBuilder wr = tessellator.getBuffer(); GlStateManager.pushMatrix(); // float rot = (float)(this.worldObj.provider.getWorldTime() % (360 / diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java index 3de40f39..ea243639 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.client.render.alchemyArray; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -58,7 +58,7 @@ public class StaticAlchemyCircleRenderer extends AlchemyCircleRenderer TileAlchemyArray tileArray = (TileAlchemyArray) tile; Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer wr = tessellator.getBuffer(); + BufferBuilder wr = tessellator.getBuffer(); GlStateManager.pushMatrix(); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java index bd8913c3..61e4d563 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAlchemyArray.java @@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack; public class RenderAlchemyArray extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileAlchemyArray alchemyArray, double x, double y, double z, float partialTicks, int destroyStage) + public void render(TileAlchemyArray alchemyArray, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { ItemStack inputStack = alchemyArray.getStackInSlot(0); ItemStack catalystStack = alchemyArray.getStackInSlot(1); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java index 5192a0a2..e51545d7 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java @@ -30,7 +30,7 @@ public class RenderAltar extends TileEntitySpecialRenderer public static float maxHeight = 0.745f; @Override - public void renderTileEntityAt(TileAltar tileAltar, double x, double y, double z, float partialTicks, int destroyStage) + public void render(TileAltar tileAltar, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { ItemStack inputStack = tileAltar.getStackInSlot(0); @@ -40,7 +40,7 @@ public class RenderAltar extends TileEntitySpecialRenderer GlStateManager.translate(x, y, z); if (level > 0) this.renderFluid(getWorld(), level); - this.renderItem(tileAltar.getWorld(), inputStack, partialTicks); + this.renderItem(tileAltar.getWorld(), inputStack); GlStateManager.popMatrix(); if (tileAltar.getCurrentTierDisplayed() != EnumAltarTier.ONE) @@ -59,7 +59,7 @@ public class RenderAltar extends TileEntitySpecialRenderer GlStateManager.translate(0.5, minHeight + (fluidLevel) * (maxHeight - minHeight), 0.5); Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer wr = tessellator.getBuffer(); + BufferBuilder wr = tessellator.getBuffer(); float size = 0.8f; @@ -95,14 +95,14 @@ public class RenderAltar extends TileEntitySpecialRenderer GlStateManager.color(red, green, blue, 1.0F); } - private void renderItem(World world, ItemStack stack, float partialTicks) + private void renderItem(World world, ItemStack stack) { RenderItem itemRenderer = mc.getRenderItem(); - if (stack != null) + if (!stack.isEmpty()) { GlStateManager.translate(0.5, 1, 0.5); EntityItem entityitem = new EntityItem(world, 0.0D, 0.0D, 0.0D, stack); - entityitem.getEntityItem().setCount(1); + entityitem.getItem().setCount(1); entityitem.hoverStart = 0.0F; GlStateManager.pushMatrix(); GlStateManager.disableLighting(); @@ -113,7 +113,7 @@ public class RenderAltar extends TileEntitySpecialRenderer GlStateManager.scale(0.5F, 0.5F, 0.5F); GlStateManager.pushAttrib(); RenderHelper.enableStandardItemLighting(); - itemRenderer.renderItem(entityitem.getEntityItem(), ItemCameraTransforms.TransformType.FIXED); + itemRenderer.renderItem(entityitem.getItem(), ItemCameraTransforms.TransformType.FIXED); RenderHelper.disableStandardItemLighting(); GlStateManager.popAttrib(); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java index 73da5b03..844d41ce 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java @@ -2,10 +2,10 @@ package WayofTime.bloodmagic.client.render.block; import WayofTime.bloodmagic.tile.TileBloodTank; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; -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.tileentity.TileEntitySpecialRenderer; @@ -21,7 +21,7 @@ public class RenderBloodTank extends TileEntitySpecialRenderer private static final Minecraft mc = Minecraft.getMinecraft(); @Override - public void renderTileEntityAt(TileBloodTank bloodTank, double x, double y, double z, float partialTicks, int destroyStage) + public void render(TileBloodTank bloodTank, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { if (bloodTank == null) return; @@ -50,7 +50,7 @@ public class RenderBloodTank extends TileEntitySpecialRenderer GlStateManager.disableBlend(); Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer buffer = tessellator.getBuffer(); + BufferBuilder buffer = tessellator.getBuffer(); TextureAtlasSprite fluid = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(renderFluid.getStill().toString()); fluid = fluid == null ? mc.getTextureMapBlocks().getMissingSprite() : fluid; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java index 875e5254..9b7ed869 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java @@ -20,7 +20,7 @@ public class RenderDemonCrucible extends TileEntitySpecialRenderer { - public void renderTileEntityAt(TileMimic mimic, double x, double y, double z, float partialTicks, int destroyStage) + public void render(TileMimic mimic, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { if (mimic.getStackInSlot(0) != null) { TileEntity testTile = mimic.mimicedTile; if (mimic != null) { - TileEntityRendererDispatcher.instance.renderTileEntityAt(testTile, x, y, z, partialTicks, destroyStage); + TileEntityRendererDispatcher.instance.render(testTile, x, y, z, partialTicks, destroyStage); } } } 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 ee35fc89..7667e9f5 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java @@ -1,8 +1,8 @@ package WayofTime.bloodmagic.client.render.entity; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; @@ -38,7 +38,7 @@ public class RenderEntitySentientArrow extends Render GlStateManager.rotate(entity.prevRotationYaw + (entity.rotationYaw - entity.prevRotationYaw) * partialTicks - 90.0F, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * partialTicks, 0.0F, 0.0F, 1.0F); Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer worldrenderer = tessellator.getBuffer(); + BufferBuilder worldrenderer = tessellator.getBuffer(); int i = 0; float f = 0.0F; float f1 = 0.5F; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderSentientSpecter.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderSentientSpecter.java index 38416f92..2dc7df63 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderSentientSpecter.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderSentientSpecter.java @@ -40,18 +40,8 @@ public class RenderSentientSpecter extends RenderBiped */ public void doRender(EntitySentientSpecter entity, double x, double y, double z, float entityYaw, float partialTicks) { -// if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.RenderPlayerEvent.Pre(entity, this, partialTicks, x, y, z))) -// return; -// if (!entity.isUser() || this.renderManager.renderViewEntity == entity) - { - double d0 = y; - - this.setModelVisibilities(entity); -// GlStateManager.enableBlendProfile(GlStateManager.Profile.PLAYER_SKIN); - super.doRender(entity, x, d0, z, entityYaw, partialTicks); -// GlStateManager.disableBlendProfile(GlStateManager.Profile.PLAYER_SKIN); - } -// net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.client.event.RenderPlayerEvent.Post(entity, this, partialTicks, x, y, z)); + this.setModelVisibilities(entity); + super.doRender(entity, x, y, z, entityYaw, partialTicks); } private void setModelVisibilities(EntitySentientSpecter clientPlayer) @@ -60,13 +50,13 @@ public class RenderSentientSpecter extends RenderBiped ItemStack itemstack = clientPlayer.getHeldItemMainhand(); ItemStack itemstack1 = clientPlayer.getHeldItemOffhand(); - modelplayer.setInvisible(true); + modelplayer.setVisible(false); modelplayer.isSneak = clientPlayer.isSneaking(); ModelBiped.ArmPose modelbiped$armpose = ModelBiped.ArmPose.EMPTY; ModelBiped.ArmPose modelbiped$armpose1 = ModelBiped.ArmPose.EMPTY; - if (itemstack != null) + if (!itemstack.isEmpty()) { modelbiped$armpose = ModelBiped.ArmPose.ITEM; @@ -84,7 +74,7 @@ public class RenderSentientSpecter extends RenderBiped } } - if (itemstack1 != null) + if (!itemstack1.isEmpty()) { modelbiped$armpose1 = ModelBiped.ArmPose.ITEM; @@ -134,40 +124,4 @@ public class RenderSentientSpecter extends RenderBiped float f = 0.9375F; GlStateManager.scale(0.9375F, 0.9375F, 0.9375F); } - -// public void renderRightArm(EntitySentientSpecter clientPlayer) -// { -// float f = 1.0F; -// GlStateManager.color(1.0F, 1.0F, 1.0F); -// float f1 = 0.0625F; -// ModelBiped modelplayer = this.getMainModel(); -// this.setModelVisibilities(clientPlayer); -// GlStateManager.enableBlend(); -// modelplayer.swingProgress = 0.0F; -// modelplayer.isSneak = false; -// modelplayer.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, clientPlayer); -// modelplayer.bipedRightArm.rotateAngleX = 0.0F; -// modelplayer.bipedRightArm.render(0.0625F); -// modelplayer.bipedRightArmwear.rotateAngleX = 0.0F; -// modelplayer.bipedRightArmwear.render(0.0625F); -// GlStateManager.disableBlend(); -// } -// -// public void renderLeftArm(EntitySentientSpecter clientPlayer) -// { -// float f = 1.0F; -// GlStateManager.color(1.0F, 1.0F, 1.0F); -// float f1 = 0.0625F; -// ModelBiped modelplayer = this.getMainModel(); -// this.setModelVisibilities(clientPlayer); -// GlStateManager.enableBlend(); -// modelplayer.isSneak = false; -// modelplayer.swingProgress = 0.0F; -// modelplayer.setRotationAngles(0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, clientPlayer); -// modelplayer.bipedLeftArm.rotateAngleX = 0.0F; -// modelplayer.bipedLeftArm.render(0.0625F); -// modelplayer.bipedLeftArmwear.rotateAngleX = 0.0F; -// modelplayer.bipedLeftArmwear.render(0.0625F); -// GlStateManager.disableBlend(); -// } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerAlchemyCircle.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerAlchemyCircle.java index 454a71fa..26d3fdc9 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerAlchemyCircle.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerAlchemyCircle.java @@ -1,9 +1,9 @@ package WayofTime.bloodmagic.client.render.entity.layer; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.entity.layers.LayerRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; @@ -32,7 +32,7 @@ public class LayerAlchemyCircle implements Layer } Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer wr = tessellator.getBuffer(); + BufferBuilder wr = tessellator.getBuffer(); GlStateManager.pushMatrix(); float rot = this.rotationspeed * (partialTicks + demon.ticksExisted); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSpiderEyes.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSpiderEyes.java index 2101fae7..f2ba759d 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSpiderEyes.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/layer/LayerCorruptedSpiderEyes.java @@ -41,11 +41,11 @@ public class LayerCorruptedSpiderEyes implements LayerRenderer weakorbPages = new ArrayList(); weakorbPages.addAll(PageHelper.pagesForLongText(TextHelper.localize(keyBase + "weakorb" + ".info.1"), 370)); - AltarRecipe weakorbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_WEAK)); + AltarRecipe weakorbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK)); if (weakorbRecipe != null) { weakorbPages.add(new PageAltarRecipe(weakorbRecipe)); @@ -196,7 +197,7 @@ public class CategoryArchitect List apprenticeorbPages = new ArrayList(); - AltarRecipe apprenticeorbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_APPRENTICE)); + AltarRecipe apprenticeorbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_APPRENTICE)); if (apprenticeorbRecipe != null) { apprenticeorbPages.add(new PageAltarRecipe(apprenticeorbRecipe)); @@ -342,7 +343,7 @@ public class CategoryArchitect List magicianOrbPages = new ArrayList(); - AltarRecipe magicianOrbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MAGICIAN)); + AltarRecipe magicianOrbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MAGICIAN)); if (magicianOrbRecipe != null) { magicianOrbPages.add(new PageAltarRecipe(magicianOrbRecipe)); @@ -538,7 +539,7 @@ public class CategoryArchitect List masterOrbPages = new ArrayList(); - AltarRecipe masterOrbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagicItems.ORB_MASTER)); + AltarRecipe masterOrbRecipe = RecipeHelper.getAltarRecipeForOutput(OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_MASTER)); if (magicianOrbRecipe != null) { masterOrbPages.add(new PageAltarRecipe(masterOrbRecipe)); diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/ShapedBloodOrbRecipeRenderer.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/ShapedBloodOrbRecipeRenderer.java deleted file mode 100644 index e142a2f0..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/ShapedBloodOrbRecipeRenderer.java +++ /dev/null @@ -1,79 +0,0 @@ -package WayofTime.bloodmagic.compat.guideapi.page.recipeRenderer; - -import java.util.List; - -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import WayofTime.bloodmagic.api.recipe.ShapedBloodOrbRecipe; -import WayofTime.bloodmagic.api.registry.OrbRegistry; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; -import amerifrance.guideapi.gui.GuiBase; -import amerifrance.guideapi.page.reciperenderer.BasicRecipeRenderer; - -// TODO: Fix rendering of recipe -public class ShapedBloodOrbRecipeRenderer extends BasicRecipeRenderer -{ - public ShapedBloodOrbRecipeRenderer(ShapedBloodOrbRecipe recipe) - { - super(recipe); - } - - @SuppressWarnings("unchecked") - @Override - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) - { - super.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); - for (int y = 0; y < recipe.height; y++) - { - for (int x = 0; x < recipe.width; x++) - { - int stackX = (x + 1) * 17 + (guiLeft + 29); - int stackY = (y + 1) * 17 + (guiTop + 40); - Object component = recipe.getInput()[y * recipe.width + x]; - if (component != null) - { - if (component instanceof ItemStack) - { - ItemStack input = (ItemStack) component; - if (input.getItemDamage() == OreDictionary.WILDCARD_VALUE) - input.setItemDamage(0); - - GuiHelper.drawItemStack((ItemStack) component, stackX, stackY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) - { - tooltips = GuiHelper.getTooltip((ItemStack) component); - } - } else if (component instanceof Integer) - { - List list = OrbRegistry.getOrbsDownToTier((Integer) component); - if (!list.isEmpty()) - { - ItemStack stack = list.get(getRandomizedCycle(x + (y * 3), list.size())); - GuiHelper.drawItemStack(stack, stackX, stackY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) - { - tooltips = GuiHelper.getTooltip(stack); - } - } - } else - { - List list = (List) component; - if (!list.isEmpty()) - { - ItemStack stack = list.get(getRandomizedCycle(x + (y * 3), list.size())); - GuiHelper.drawItemStack(stack, stackX, stackY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) - { - tooltips = GuiHelper.getTooltip(stack); - } - } - } - } - } - } - } -} \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/ShapelessBloodOrbRecipeRenderer.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/ShapelessBloodOrbRecipeRenderer.java deleted file mode 100644 index 85684219..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/recipeRenderer/ShapelessBloodOrbRecipeRenderer.java +++ /dev/null @@ -1,92 +0,0 @@ -package WayofTime.bloodmagic.compat.guideapi.page.recipeRenderer; - -import java.util.List; - -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import WayofTime.bloodmagic.api.recipe.ShapelessBloodOrbRecipe; -import WayofTime.bloodmagic.api.registry.OrbRegistry; -import amerifrance.guideapi.api.impl.Book; -import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract; -import amerifrance.guideapi.api.impl.abstraction.EntryAbstract; -import amerifrance.guideapi.api.util.GuiHelper; -import amerifrance.guideapi.api.util.TextHelper; -import amerifrance.guideapi.gui.GuiBase; -import amerifrance.guideapi.page.reciperenderer.BasicRecipeRenderer; - -public class ShapelessBloodOrbRecipeRenderer extends BasicRecipeRenderer -{ - - public ShapelessBloodOrbRecipeRenderer(ShapelessBloodOrbRecipe recipe) - { - super(recipe); - } - - @SuppressWarnings("unchecked") - @Override - public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) - { - super.draw(book, category, entry, guiLeft, guiTop, mouseX, mouseY, guiBase, fontRendererObj); - for (int y = 0; y < 3; y++) - { - for (int x = 0; x < 3; x++) - { - int i = 3 * y + x; - if (i >= recipe.getRecipeSize()) - { - } else - { - int stackX = (x + 1) * 17 + (guiLeft + 29); - int stackY = (y + 1) * 17 + (guiTop + 40); - Object component = recipe.getInput().get(i); - if (component != null) - { - if (component instanceof ItemStack) - { - ItemStack input = (ItemStack) component; - if (input.getItemDamage() == OreDictionary.WILDCARD_VALUE) - input.setItemDamage(0); - - GuiHelper.drawItemStack((ItemStack) component, stackX, stackY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) - { - tooltips = GuiHelper.getTooltip((ItemStack) component); - } - } else if (component instanceof Integer) - { - List list = OrbRegistry.getOrbsDownToTier((Integer) component); - if (!list.isEmpty()) - { - ItemStack stack = list.get(getRandomizedCycle(x + (y * 3), list.size())); - GuiHelper.drawItemStack(stack, stackX, stackY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) - { - tooltips = GuiHelper.getTooltip(stack); - } - } - } else - { - List list = (List) component; - if (!list.isEmpty()) - { - ItemStack stack = list.get(getRandomizedCycle(x + (y * 3), list.size())); - GuiHelper.drawItemStack(stack, stackX, stackY); - if (GuiHelper.isMouseBetween(mouseX, mouseY, stackX, stackY, 15, 15)) - { - tooltips = GuiHelper.getTooltip(stack); - } - } - } - } - } - } - } - } - - @Override - protected String getRecipeName() - { - return TextHelper.localizeEffect("text.shapeless.crafting"); - } -} \ 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 index aa1bcb3e..1a1de334 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java @@ -5,8 +5,8 @@ import java.util.Map; import javax.annotation.Nonnull; import mezz.jei.api.*; +import mezz.jei.api.recipe.IRecipeCategoryRegistration; import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades; @@ -29,8 +29,6 @@ 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.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; @@ -44,9 +42,14 @@ public class BloodMagicPlugin extends BlankModPlugin { jeiHelper = registry.getJeiHelpers(); - registry.addRecipeCategories(new AltarRecipeCategory(), new BindingRecipeCategory(), new AlchemyArrayCraftingCategory(), new TartaricForgeRecipeCategory(), new AlchemyTableRecipeCategory(), new ArmourDowngradeRecipeCategory()); - - registry.addRecipeHandlers(new AltarRecipeHandler(), new BindingRecipeHandler(), new AlchemyArrayCraftingRecipeHandler(), new TartaricForgeRecipeHandler(), new AlchemyTableRecipeHandler(), new ArmourDowngradeRecipeHandler(), new ShapedOrbRecipeHandler(), new ShapelessOrbRecipeHandler()); + registry.addRecipeHandlers( + new AltarRecipeHandler(), + new BindingRecipeHandler(), + new AlchemyArrayCraftingRecipeHandler(), + new TartaricForgeRecipeHandler(), + new AlchemyTableRecipeHandler(), + new ArmourDowngradeRecipeHandler() + ); registry.addRecipes(AltarRecipeMaker.getRecipes()); registry.addRecipes(BindingRecipeMaker.getRecipes()); @@ -55,14 +58,8 @@ public class BloodMagicPlugin extends BlankModPlugin registry.addRecipes(AlchemyTableRecipeMaker.getRecipes()); registry.addRecipes(ArmourDowngradeRecipeMaker.getRecipes()); - registry.addDescription(new ItemStack(RegistrarBloodMagicItems.ALTAR_MAKER), "jei.bloodmagic.desc.altarBuilder"); - registry.addDescription(new ItemStack(RegistrarBloodMagicItems.MONSTER_SOUL), "jei.bloodmagic.desc.demonicWill"); - - jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(RegistrarBloodMagicBlocks.BLOOD_LIGHT)); - jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(RegistrarBloodMagicBlocks.SPECTRAL)); - jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(RegistrarBloodMagicBlocks.PHANTOM)); - jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(RegistrarBloodMagicBlocks.ALCHEMY_ARRAY)); - jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(RegistrarBloodMagicBlocks.DIMENSIONAL_PORTAL, 1, OreDictionary.WILDCARD_VALUE)); + registry.addIngredientInfo(new ItemStack(RegistrarBloodMagicItems.ALTAR_MAKER), ItemStack.class, "jei.bloodmagic.desc.altarBuilder"); + registry.addIngredientInfo(new ItemStack(RegistrarBloodMagicItems.MONSTER_SOUL), ItemStack.class, "jei.bloodmagic.desc.demonicWill"); for (Map.Entry entry : LivingArmourHandler.upgradeMaxLevelMap.entrySet()) { @@ -73,22 +70,37 @@ public class BloodMagicPlugin extends BlankModPlugin ItemStack stack = new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME); LivingUpgrades.setKey(stack, key); LivingUpgrades.setLevel(stack, i); - jeiHelper.getItemBlacklist().addItemToBlacklist(stack); + jeiHelper.getIngredientBlacklist().addIngredientToBlacklist(stack); } } registry.addRecipeClickArea(GuiSoulForge.class, 115, 15, 16, 88, Constants.Compat.JEI_CATEGORY_SOULFORGE); - registry.addRecipeCategoryCraftingItem(new ItemStack(RegistrarBloodMagicBlocks.ALTAR), Constants.Compat.JEI_CATEGORY_ALTAR); - registry.addRecipeCategoryCraftingItem(new ItemStack(RegistrarBloodMagicBlocks.SOUL_FORGE), Constants.Compat.JEI_CATEGORY_SOULFORGE); - registry.addRecipeCategoryCraftingItem(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES), Constants.Compat.JEI_CATEGORY_ALCHEMYARRAY); - registry.addRecipeCategoryCraftingItem(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES), Constants.Compat.JEI_CATEGORY_BINDING); - registry.addRecipeCategoryCraftingItem(new ItemStack(RegistrarBloodMagicBlocks.ALCHEMY_TABLE), Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE); - registry.addRecipeCategoryCraftingItem(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER), Constants.Compat.JEI_CATEGORY_ARMOURDOWNGRADE); + registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicBlocks.ALTAR), Constants.Compat.JEI_CATEGORY_ALTAR); + registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicBlocks.SOUL_FORGE), Constants.Compat.JEI_CATEGORY_SOULFORGE); + registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES), Constants.Compat.JEI_CATEGORY_ALCHEMYARRAY); + registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicItems.ARCANE_ASHES), Constants.Compat.JEI_CATEGORY_BINDING); + registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicBlocks.ALCHEMY_TABLE), Constants.Compat.JEI_CATEGORY_ALCHEMYTABLE); + registry.addRecipeCatalyst(new ItemStack(RegistrarBloodMagicBlocks.RITUAL_CONTROLLER), Constants.Compat.JEI_CATEGORY_ARMOURDOWNGRADE); } @Override public void registerItemSubtypes(ISubtypeRegistry subtypeRegistry) { subtypeRegistry.useNbtForSubtypes(RegistrarBloodMagicItems.UPGRADE_TOME); } + + @Override + public void registerCategories(IRecipeCategoryRegistration registry) { + if (jeiHelper == null) + jeiHelper = registry.getJeiHelpers(); + + registry.addRecipeCategories( + new AltarRecipeCategory(), + new BindingRecipeCategory(), + new AlchemyArrayCraftingCategory(), + new TartaricForgeRecipeCategory(), + new AlchemyTableRecipeCategory(), + new ArmourDowngradeRecipeCategory() + ); + } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java index 9635c043..dbafede6 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.compat.jei.alchemyArray; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import WayofTime.bloodmagic.BloodMagic; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; @@ -74,4 +75,9 @@ public class AlchemyArrayCraftingCategory implements IRecipeCategory recipeLayout.getItemStacks().set(OUTPUT_SLOT, ingredients.getOutputs(ItemStack.class).get(0)); } } + + @Override + public String getModName() { + return BloodMagic.NAME; + } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java index ad94d56e..80490fc7 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java @@ -33,7 +33,7 @@ public class AlchemyArrayCraftingRecipeMaker ItemStack catalyst = entry.getKey().toStack(); if (AlchemyArrayRecipeRegistry.getAlchemyArrayEffect(input, catalyst) instanceof AlchemyArrayEffectCrafting) { - ItemStack output = ((AlchemyArrayEffectCrafting) itemStackAlchemyArrayRecipeEntry.getValue().getAlchemyArrayEffectForCatalyst(catalyst)).getOutputStack(); + ItemStack output = ((AlchemyArrayEffectCrafting) itemStackAlchemyArrayRecipeEntry.getValue().getAlchemyArrayEffectForCatalyst(catalyst)).outputStack; AlchemyArrayCraftingRecipeJEI recipe = new AlchemyArrayCraftingRecipeJEI(input, catalyst, output); recipes.add(recipe); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java index d8306508..de1ceca0 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyTable/AlchemyTableRecipeCategory.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.compat.jei.alchemyTable; import javax.annotation.Nonnull; +import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.registry.OrbRegistry; import mezz.jei.api.gui.ICraftingGridHelper; import mezz.jei.api.gui.IDrawable; @@ -75,4 +76,9 @@ public class AlchemyTableRecipeCategory extends BlankRecipeCategory validGems = new ArrayList(); public TartaricForgeRecipeJEI(TartaricForgeRecipe recipe) @@ -70,4 +67,12 @@ public class TartaricForgeRecipeJEI extends BlankRecipeWrapper this.minSouls = minSouls; } } + + public TartaricForgeRecipe getRecipe() { + return recipe; + } + + public List getValidGems() { + return validGems; + } } 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 e869ea63..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapedOrbRecipeHandler.java +++ /dev/null @@ -1,40 +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 - public String getRecipeCategoryUid(@Nonnull ShapedBloodOrbRecipe recipe) - { - 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 acb6d5fe..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapedOrbRecipeJEI.java +++ /dev/null @@ -1,68 +0,0 @@ -package WayofTime.bloodmagic.compat.jei.orb; - -import java.awt.Color; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - -import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; -import WayofTime.bloodmagic.util.helper.NumeralHelper; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; -import mezz.jei.api.recipe.wrapper.IShapedCraftingRecipeWrapper; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import WayofTime.bloodmagic.api.registry.OrbRegistry; -import WayofTime.bloodmagic.util.helper.TextHelper; - -public class ShapedOrbRecipeJEI extends BlankRecipeWrapper 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); - - for (Object object : inputList) - if (object instanceof Integer) - inputList.set(inputList.indexOf(object), OrbRegistry.getOrbsDownToTier((Integer) object)); - - this.inputs = inputList; - this.tier = tier; - this.output = output; - } - - @Override - public int getWidth() - { - return 3; - } - - @Override - public int getHeight() - { - return 3; - } - - @Override - public void getIngredients(IIngredients ingredients) { - List> expanded = BloodMagicPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(inputs); - ingredients.setInputLists(ItemStack.class, expanded); - ingredients.setOutput(ItemStack.class, output); - } - - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { - String draw = TextHelper.localize("jei.bloodmagic.recipe.requiredTier", NumeralHelper.toRoman(tier)); - minecraft.fontRendererObj.drawString(draw, 72 - minecraft.fontRendererObj.getStringWidth(draw) / 2, 10, Color.gray.getRGB()); - } -} \ No newline at end of file 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 1e59b30d..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapelessOrbRecipeHandler.java +++ /dev/null @@ -1,38 +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; - } - - @Override - public String getRecipeCategoryUid(@Nonnull ShapelessBloodOrbRecipe recipe) - { - 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 dd9eccc5..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/orb/ShapelessOrbRecipeJEI.java +++ /dev/null @@ -1,58 +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 WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; -import WayofTime.bloodmagic.util.helper.NumeralHelper; -import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; -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 extends BlankRecipeWrapper 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); - - for (Object object : inputList) - if (object instanceof Integer) - inputList.set(inputList.indexOf(object), OrbRegistry.getOrbsDownToTier((Integer) object)); - - this.inputs = inputList; - this.tier = tier; - this.output = output; - } - - @Override - public void getIngredients(IIngredients ingredients) { - List> expanded = BloodMagicPlugin.jeiHelper.getStackHelper().expandRecipeItemStackInputs(inputs); - ingredients.setInputLists(ItemStack.class, expanded); - ingredients.setOutput(ItemStack.class, output); - } - - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) - { - String draw = TextHelper.localize("jei.bloodmagic.recipe.requiredTier", NumeralHelper.toRoman(tier)); - minecraft.fontRendererObj.drawString(draw, 72 - minecraft.fontRendererObj.getStringWidth(draw) / 2, 10, Color.gray.getRGB()); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java index 61561423..46730d7b 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java +++ b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingManager.java @@ -25,7 +25,7 @@ public class StorageBlockCraftingManager public void addStorageBlockRecipes() { - this.recipes = new StorageBlockCraftingRecipeAssimilator().getPackingRecipes(); +// this.recipes = new StorageBlockCraftingRecipeAssimilator().getPackingRecipes(); BloodMagic.instance.logger.info("Total number of compression recipes: " + this.recipes.size()); } diff --git a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java index 7841cab2..f119e102 100644 --- a/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java +++ b/src/main/java/WayofTime/bloodmagic/compress/StorageBlockCraftingRecipeAssimilator.java @@ -16,285 +16,285 @@ import java.util.*; public class StorageBlockCraftingRecipeAssimilator { - public static final List ignore = new ArrayList(); - - public List getPackingRecipes() - { - // grab all recipes potentially suitable for packing or unpacking - - List packingRecipes = new LinkedList(); - List unpackingRecipes = new ArrayList(); - - for (IRecipe recipe : getCraftingRecipes()) - { - if (ignore.contains(recipe.getClass())) - continue; - - ItemStack output = recipe.getRecipeOutput(); - if (output.isEmpty()) - continue; - - if (output.getCount() == 1) - { - PackingRecipe packingRecipe = getPackingRecipe(recipe); - - if (packingRecipe != null) - { - packingRecipes.add(packingRecipe); - } - } else if ((output.getCount() == 4 || output.getCount() == 9) && recipe.canFit(1, 1)) - { - unpackingRecipes.add(recipe); - } - } - - // grab all packing recipes which accept the output of any of the - // unpacking recipes - - Container container = makeDummyContainer(); - InventoryCrafting inventoryUnpack = new InventoryCrafting(container, 2, 2); - InventoryCrafting inventory2x2 = new InventoryCrafting(container, 2, 2); - InventoryCrafting inventory3x3 = new InventoryCrafting(container, 3, 3); - World world = null; // TODO: use a proper dummy world? - - List ret = new ArrayList(); - - for (IRecipe recipeUnpack : unpackingRecipes) - { - if (ignore.contains(recipeUnpack.getClass())) - continue; - - ItemStack unpacked = recipeUnpack.getRecipeOutput(); - InventoryCrafting inventory = null; - - for (Iterator it = packingRecipes.iterator(); it.hasNext();) - { - PackingRecipe recipePack = it.next(); - - // check if the packing recipe accepts the unpacking recipe's output - - boolean matched = false; - - if (recipePack.possibleInputs != null) - { - // the recipe could be parsed, use its inputs directly since that's faster verify recipe size - - if (recipePack.inputCount != unpacked.getCount()) - continue; - - // check if any of the input options matches the unpacked - // item stack - - for (ItemStack stack : recipePack.possibleInputs) - { - if (areInputsIdentical(unpacked, stack)) - { - matched = true; - break; - } - } - } else - { - // unknown IRecipe, check through the recipe conventionally verify recipe size for 3x3 to skip anything smaller quickly - - if (unpacked.getCount() == 9 && recipePack.recipe.getIngredients().size() < 9) - continue; - - // initialize inventory late, but only once per unpack recipe - - if (inventory == null) - { - if (unpacked.getCount() == 4) - { - inventory = inventory2x2; - } else - { - inventory = inventory3x3; - } - - for (int i = 0; i < unpacked.getCount(); i++) - { - inventory.setInventorySlotContents(i, unpacked.copy()); - } - } - - // check if the packing recipe accepts the unpacked item - // stack - - matched = recipePack.recipe.matches(inventory, world); - } - - if (matched) - { - // check if the unpacking recipe accepts the packing - // recipe's output - - ItemStack packOutput = recipePack.recipe.getRecipeOutput(); - inventoryUnpack.setInventorySlotContents(0, packOutput.copy()); - - if (recipeUnpack.matches(inventoryUnpack, world)) - { - ret.add(recipePack.recipe); - it.remove(); - } - } - } - } - - return ret; - } - - @SuppressWarnings("unchecked") - private List getCraftingRecipes() - { - return ForgeRegistries.RECIPES.getValues(); - } - - private Container makeDummyContainer() - { - return new Container() - { - @Override - public boolean canInteractWith(EntityPlayer player) - { - return true; - } - }; - } - - private PackingRecipe getPackingRecipe(IRecipe recipe) - { - if (recipe.getIngredients().size() < 4) - return null; - - List inputs = recipe.getIngredients(); - - // check if the recipe inputs are size 4 or 9 - - int count = 0; - - for (Object o : inputs) - { - if (o != null) - count++; - } - - if (count != 4 && count != 9) - return null; - - // grab identical inputs - - List identicalInputs = getIdenticalInputs(inputs); - if (identicalInputs == null) - return null; - - return new PackingRecipe(recipe, identicalInputs, count); - } - - /** - * Determine the item stacks from the provided inputs which are suitable for - * every input element. - * - * @param inputs - * List of all inputs, null elements are being ignored. - * @return List List of all options. - */ - @SuppressWarnings("unchecked") - private List getIdenticalInputs(List inputs) - { - List options = null; - - for (Ingredient input : inputs) - { - if (input == null) - continue; - - List offers; - - if (input. instanceof ItemStack) - { - offers = Collections.singletonList((ItemStack) input); - } else if (input instanceof List) - { - offers = (List) input; - - if (offers.isEmpty()) - return null; - } else - { - throw new RuntimeException("invalid input: " + input.getClass()); - } - - if (options == null) - { - options = new ArrayList(offers); - continue; - } - - for (Iterator it = options.iterator(); it.hasNext();) - { - ItemStack stackReq = it.next(); - boolean found = false; - - for (ItemStack stackCmp : offers) - { - if (areInputsIdentical(stackReq, stackCmp)) - { - found = true; - break; - } - } - - if (!found) - { - it.remove(); - - if (options.isEmpty()) - return null; - } - } - } - - return options; - } - - private boolean areInputsIdentical(ItemStack a, ItemStack b) - { - - try - { - if (a.getItem() != b.getItem()) - return false; - - int dmgA = a.getItemDamage(); - int dmgB = b.getItemDamage(); - - return dmgA == dmgB || dmgA == OreDictionary.WILDCARD_VALUE || dmgB == OreDictionary.WILDCARD_VALUE; - } catch (NullPointerException e) - { - - BloodMagic.instance.getLogger().error("A mod in this instance has registered an item with a null input. Known problem mods are:"); - - // String err = ""; - // for (String problem : problemMods) - // err += (err.length() > 0 ? ", " : "") + problem; - // BloodMagic.instance.getLogger().error(err); - - return false; - } - } - - private static class PackingRecipe - { - PackingRecipe(IRecipe recipe, List possibleInputs, int inputCount) - { - this.recipe = recipe; - this.possibleInputs = possibleInputs; - this.inputCount = inputCount; - } - - final IRecipe recipe; - final List possibleInputs; - final int inputCount; - } +// public static final List ignore = new ArrayList(); +// +// public List getPackingRecipes() +// { +// // grab all recipes potentially suitable for packing or unpacking +// +// List packingRecipes = new LinkedList(); +// List unpackingRecipes = new ArrayList(); +// +// for (IRecipe recipe : getCraftingRecipes()) +// { +// if (ignore.contains(recipe.getClass())) +// continue; +// +// ItemStack output = recipe.getRecipeOutput(); +// if (output.isEmpty()) +// continue; +// +// if (output.getCount() == 1) +// { +// PackingRecipe packingRecipe = getPackingRecipe(recipe); +// +// if (packingRecipe != null) +// { +// packingRecipes.add(packingRecipe); +// } +// } else if ((output.getCount() == 4 || output.getCount() == 9) && recipe.canFit(1, 1)) +// { +// unpackingRecipes.add(recipe); +// } +// } +// +// // grab all packing recipes which accept the output of any of the +// // unpacking recipes +// +// Container container = makeDummyContainer(); +// InventoryCrafting inventoryUnpack = new InventoryCrafting(container, 2, 2); +// InventoryCrafting inventory2x2 = new InventoryCrafting(container, 2, 2); +// InventoryCrafting inventory3x3 = new InventoryCrafting(container, 3, 3); +// World world = null; // TODO: use a proper dummy world? +// +// List ret = new ArrayList(); +// +// for (IRecipe recipeUnpack : unpackingRecipes) +// { +// if (ignore.contains(recipeUnpack.getClass())) +// continue; +// +// ItemStack unpacked = recipeUnpack.getRecipeOutput(); +// InventoryCrafting inventory = null; +// +// for (Iterator it = packingRecipes.iterator(); it.hasNext();) +// { +// PackingRecipe recipePack = it.next(); +// +// // check if the packing recipe accepts the unpacking recipe's output +// +// boolean matched = false; +// +// if (recipePack.possibleInputs != null) +// { +// // the recipe could be parsed, use its inputs directly since that's faster verify recipe size +// +// if (recipePack.inputCount != unpacked.getCount()) +// continue; +// +// // check if any of the input options matches the unpacked +// // item stack +// +// for (ItemStack stack : recipePack.possibleInputs) +// { +// if (areInputsIdentical(unpacked, stack)) +// { +// matched = true; +// break; +// } +// } +// } else +// { +// // unknown IRecipe, check through the recipe conventionally verify recipe size for 3x3 to skip anything smaller quickly +// +// if (unpacked.getCount() == 9 && recipePack.recipe.getIngredients().size() < 9) +// continue; +// +// // initialize inventory late, but only once per unpack recipe +// +// if (inventory == null) +// { +// if (unpacked.getCount() == 4) +// { +// inventory = inventory2x2; +// } else +// { +// inventory = inventory3x3; +// } +// +// for (int i = 0; i < unpacked.getCount(); i++) +// { +// inventory.setInventorySlotContents(i, unpacked.copy()); +// } +// } +// +// // check if the packing recipe accepts the unpacked item +// // stack +// +// matched = recipePack.recipe.matches(inventory, world); +// } +// +// if (matched) +// { +// // check if the unpacking recipe accepts the packing +// // recipe's output +// +// ItemStack packOutput = recipePack.recipe.getRecipeOutput(); +// inventoryUnpack.setInventorySlotContents(0, packOutput.copy()); +// +// if (recipeUnpack.matches(inventoryUnpack, world)) +// { +// ret.add(recipePack.recipe); +// it.remove(); +// } +// } +// } +// } +// +// return ret; +// } +// +// @SuppressWarnings("unchecked") +// private List getCraftingRecipes() +// { +// return ForgeRegistries.RECIPES.getValues(); +// } +// +// private Container makeDummyContainer() +// { +// return new Container() +// { +// @Override +// public boolean canInteractWith(EntityPlayer player) +// { +// return true; +// } +// }; +// } +// +// private PackingRecipe getPackingRecipe(IRecipe recipe) +// { +// if (recipe.getIngredients().size() < 4) +// return null; +// +// List inputs = recipe.getIngredients(); +// +// // check if the recipe inputs are size 4 or 9 +// +// int count = 0; +// +// for (Object o : inputs) +// { +// if (o != null) +// count++; +// } +// +// if (count != 4 && count != 9) +// return null; +// +// // grab identical inputs +// +// List identicalInputs = getIdenticalInputs(inputs); +// if (identicalInputs == null) +// return null; +// +// return new PackingRecipe(recipe, identicalInputs, count); +// } +// +// /** +// * Determine the item stacks from the provided inputs which are suitable for +// * every input element. +// * +// * @param inputs +// * List of all inputs, null elements are being ignored. +// * @return List List of all options. +// */ +// @SuppressWarnings("unchecked") +// private List getIdenticalInputs(List inputs) +// { +// List options = null; +// +// for (Ingredient input : inputs) +// { +// if (input == null) +// continue; +// +// List offers; +// +// if (input. instanceof ItemStack) +// { +// offers = Collections.singletonList((ItemStack) input); +// } else if (input instanceof List) +// { +// offers = (List) input; +// +// if (offers.isEmpty()) +// return null; +// } else +// { +// throw new RuntimeException("invalid input: " + input.getClass()); +// } +// +// if (options == null) +// { +// options = new ArrayList(offers); +// continue; +// } +// +// for (Iterator it = options.iterator(); it.hasNext();) +// { +// ItemStack stackReq = it.next(); +// boolean found = false; +// +// for (ItemStack stackCmp : offers) +// { +// if (areInputsIdentical(stackReq, stackCmp)) +// { +// found = true; +// break; +// } +// } +// +// if (!found) +// { +// it.remove(); +// +// if (options.isEmpty()) +// return null; +// } +// } +// } +// +// return options; +// } +// +// private boolean areInputsIdentical(ItemStack a, ItemStack b) +// { +// +// try +// { +// if (a.getItem() != b.getItem()) +// return false; +// +// int dmgA = a.getItemDamage(); +// int dmgB = b.getItemDamage(); +// +// return dmgA == dmgB || dmgA == OreDictionary.WILDCARD_VALUE || dmgB == OreDictionary.WILDCARD_VALUE; +// } catch (NullPointerException e) +// { +// +// BloodMagic.instance.getLogger().error("A mod in this instance has registered an item with a null input. Known problem mods are:"); +// +// // String err = ""; +// // for (String problem : problemMods) +// // err += (err.length() > 0 ? ", " : "") + problem; +// // BloodMagic.instance.getLogger().error(err); +// +// return false; +// } +// } +// +// private static class PackingRecipe +// { +// PackingRecipe(IRecipe recipe, List possibleInputs, int inputCount) +// { +// this.recipe = recipe; +// this.possibleInputs = possibleInputs; +// this.inputCount = inputCount; +// } +// +// final IRecipe recipe; +// final List possibleInputs; +// final int inputCount; +// } } diff --git a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java index d6385a0a..8af50e57 100644 --- a/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java +++ b/src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicItems.java @@ -77,7 +77,7 @@ public class RegistrarBloodMagicItems public static final Item SIGIL_CLAW = Items.AIR; public static final Item SIGIL_BOUNCE = Items.AIR; public static final Item SIGIL_FROST = Items.AIR; - public static final Item ITEM_COMPONENT = Items.AIR; + public static final Item COMPONENT = Items.AIR; public static final Item ITEM_DEMON_CRYSTAL = Items.AIR; public static final Item TELEPOSITION_FOCUS = Items.AIR; public static final Item EXPERIENCE_TOME = Items.AIR; @@ -160,7 +160,7 @@ public class RegistrarBloodMagicItems new ItemSigilBounce().setRegistryName("sigil_bounce"), new ItemSigilFrost().setRegistryName("sigil_frost"), new ItemComponent().setRegistryName("component"), - new ItemDemonCrystal().setRegistryName("demon_crystal"), + new ItemDemonCrystal().setRegistryName("item_demon_crystal"), new ItemTelepositionFocus().setRegistryName("teleposition_focus"), new ItemExperienceBook().setRegistryName("experience_book"), new ItemBloodShard().setRegistryName("blood_shard"), diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySoulSnare.java index ee30ed6d..efbfb5c4 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.core.RegistrarBloodMagic; 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.math.RayTraceResult; import net.minecraft.world.World; -import WayofTime.bloodmagic.registry.ModPotions; public class EntitySoulSnare extends EntityThrowable { @@ -41,7 +41,7 @@ public class EntitySoulSnare extends EntityThrowable { if (result.entityHit instanceof EntityLivingBase && result.entityHit.getEntityWorld().rand.nextDouble() < 0.25) { - ((EntityLivingBase) result.entityHit).addPotionEffect(new PotionEffect(ModPotions.soulSnare, 300, 0)); + ((EntityLivingBase) result.entityHit).addPotionEffect(new PotionEffect(RegistrarBloodMagic.SOUL_SNARE, 300, 0)); } result.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), (float) 0); diff --git a/src/main/java/WayofTime/bloodmagic/fakePlayer/FakePlayerBM.java b/src/main/java/WayofTime/bloodmagic/fakePlayer/FakePlayerBM.java index cd1b41b8..dfe50f3c 100644 --- a/src/main/java/WayofTime/bloodmagic/fakePlayer/FakePlayerBM.java +++ b/src/main/java/WayofTime/bloodmagic/fakePlayer/FakePlayerBM.java @@ -18,6 +18,7 @@ import com.mojang.authlib.GameProfile; @SuppressWarnings("EntityConstructor") public class FakePlayerBM extends FakePlayer { + public FakePlayerBM(WorldServer world, GameProfile name) { super(world, name); } diff --git a/src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java b/src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java index ff3288c8..feca5d39 100644 --- a/src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java +++ b/src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java @@ -10,7 +10,7 @@ public class FuelHandler implements IFuelHandler @Override public int getBurnTime(ItemStack fuel) { - if (fuel != null && fuel.getItem() == RegistrarBloodMagicItems.ITEM_COMPONENT && fuel.getMetadata() == ItemComponent.getStack(ItemComponent.SAND_COAL).getMetadata()) + if (fuel != null && fuel.getItem() == RegistrarBloodMagicItems.COMPONENT && fuel.getMetadata() == ItemComponent.getStack(ItemComponent.SAND_COAL).getMetadata()) { return 1600; } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java index c2f2fe97..2bb80bde 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemActivationCrystal.java @@ -3,11 +3,13 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.commons.lang3.tuple.ImmutablePair; @@ -36,19 +38,22 @@ public class ItemActivationCrystal extends ItemBindableBase implements IVariantP @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList list) + public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + if (!isInCreativeTab(creativeTab)) + return; + for (int i = 0; i < names.length; i++) - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(this, 1, i)); } @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { tooltip.add(TextHelper.localize("tooltip.bloodmagic.activationCrystal." + names[stack.getItemDamage()])); - super.addInformation(stack, player, tooltip, advanced); + super.addInformation(stack, world, tooltip, flag); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java index 239f3365..ebbc7239 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java @@ -6,6 +6,7 @@ import java.util.List; import WayofTime.bloodmagic.util.helper.NumeralHelper; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -49,7 +50,7 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { if (!stack.hasTagCompound()) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java index 8f66d4b2..c83f0634 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.item; import java.util.ArrayList; import java.util.List; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -36,7 +37,7 @@ public class ItemArcaneAshes extends Item implements IVariantProvider @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.arcaneAshes")); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java b/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java index 8f8c07e8..1aa5d370 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBindableBase.java @@ -5,8 +5,10 @@ import WayofTime.bloodmagic.api.impl.ItemBindable; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.base.Strings; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -23,7 +25,7 @@ public class ItemBindableBase extends ItemBindable @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { if (!stack.hasTagCompound()) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java index 2a23f3cd..d071fbc4 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java @@ -4,6 +4,7 @@ import java.util.List; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagic; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; @@ -96,15 +97,15 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IBindab @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.orb.desc")); BloodOrb orb = getOrb(stack); - if (advanced && orb != null) + if (flag.isAdvanced() && orb != null) tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.orb.owner", orb.getRegistryName())); - super.addInformation(stack, player, tooltip, advanced); + super.addInformation(stack, world, tooltip, flag); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java index 303b5c87..bf9f9f78 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodShard.java @@ -29,10 +29,13 @@ public class ItemBloodShard extends Item implements IVariantProvider @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList list) + public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + if (!isInCreativeTab(creativeTab)) + return; + for (int i = 0; i < names.length; i++) - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(this, 1, i)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java index 802c36cd..056afef8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java @@ -9,6 +9,7 @@ import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.util.Utils; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -104,14 +105,17 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item itemIn, CreativeTabs tab, NonNullList subItems) + public void getSubItems(CreativeTabs tab, NonNullList subItems) { - subItems.add(Utils.setUnbreakable(new ItemStack(itemIn))); + if (!isInCreativeTab(tab)) + return; + + subItems.add(Utils.setUnbreakable(new ItemStack(this))); } @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { if (!stack.hasTagCompound()) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java index 950ce1bb..d5ea23b5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java @@ -12,9 +12,9 @@ import WayofTime.bloodmagic.util.Utils; import com.google.common.base.Strings; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; -import lombok.Getter; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -47,7 +47,6 @@ import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multiset; -@Getter public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { protected final String tooltipBase; @@ -72,7 +71,7 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable @Override public float getStrVsBlock(ItemStack stack, IBlockState state) { - return getActivated(stack) ? getToolMaterial().getEfficiencyOnProperMaterial() : 1.0F; + return getActivated(stack) ? toolMaterial.getEfficiencyOnProperMaterial() : 1.0F; } @Override @@ -82,10 +81,12 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable } @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item itemIn, CreativeTabs tab, NonNullList subItems) + public void getSubItems(CreativeTabs tab, NonNullList subItems) { - subItems.add(Utils.setUnbreakable(new ItemStack(itemIn))); + if (isInCreativeTab(tab)) + return; + + subItems.add(Utils.setUnbreakable(new ItemStack(this))); } @Override @@ -146,10 +147,10 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { BoundToolEvent.Charge event = new BoundToolEvent.Charge(player, stack); if (MinecraftForge.EVENT_BUS.post(event)) - return new ActionResult(EnumActionResult.FAIL, event.result); + return new ActionResult<>(EnumActionResult.FAIL, event.result); player.setActiveHand(hand); - return new ActionResult(EnumActionResult.SUCCESS, stack); + return new ActionResult<>(EnumActionResult.SUCCESS, stack); } return super.onItemRightClick(world, player, hand); @@ -207,7 +208,7 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { if (TextHelper.canTranslate(tooltipBase + "desc")) tooltip.add(TextHelper.localizeEffect(tooltipBase + "desc")); @@ -220,7 +221,7 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable if (!Strings.isNullOrEmpty(getOwnerUUID(stack))) tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentOwner", PlayerHelper.getUsernameFromStack(stack))); - super.addInformation(stack, player, tooltip, advanced); + super.addInformation(stack, world, tooltip, flag); } @Override @@ -304,4 +305,24 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable return null; } + + public String getTooltipBase() { + return tooltipBase; + } + + public String getName() { + return name; + } + + public Map getHeldDownMap() { + return heldDownMap; + } + + public Map getHeldDownCountMap() { + return heldDownCountMap; + } + + public int getChargeTime() { + return chargeTime; + } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java index c82e49ac..eee18546 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java @@ -3,7 +3,6 @@ package WayofTime.bloodmagic.item; import java.util.ArrayList; import java.util.List; -import lombok.Getter; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -20,7 +19,6 @@ import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; public class ItemComponent extends Item implements IVariantProvider { - @Getter private static ArrayList names = new ArrayList(); public static final String REAGENT_WATER = "reagentWater"; @@ -113,15 +111,18 @@ public class ItemComponent extends Item implements IVariantProvider @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList list) + public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + if (!isInCreativeTab(creativeTab)) + return; + for (int i = 0; i < names.size(); i++) - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(this, 1, i)); } public static ItemStack getStack(String name) { - return new ItemStack(RegistrarBloodMagicItems.ITEM_COMPONENT, 1, names.indexOf(name)); + return new ItemStack(RegistrarBloodMagicItems.COMPONENT, 1, names.indexOf(name)); } @Override @@ -140,4 +141,8 @@ public class ItemComponent extends Item implements IVariantProvider return stack; } + + public static ArrayList getNames() { + return names; + } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java index c5490674..c46debd1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -30,7 +31,7 @@ public class ItemDemonWillGauge extends Item implements IVariantProvider, IDemon @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.willGauge")))); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java index 5d236668..17282fd5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.item; import java.util.ArrayList; import java.util.List; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; @@ -41,7 +42,7 @@ public class ItemExperienceBook extends Item implements IVariantProvider @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.experienceTome")); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java index 609c71a5..b39f8814 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java @@ -6,6 +6,7 @@ import java.util.List; import WayofTime.bloodmagic.BloodMagic; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -48,11 +49,14 @@ public class ItemInscriptionTool extends ItemBindableBase implements IVariantPro @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList list) + public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + if (!isInCreativeTab(creativeTab)) + return; + for (int i = 1; i < EnumRuneType.values().length; i++) { - ItemStack stack = NBTHelper.checkNBT(new ItemStack(id, 1, i)); + ItemStack stack = NBTHelper.checkNBT(new ItemStack(this, 1, i)); stack.getTagCompound().setInteger(Constants.NBT.USES, 10); list.add(stack); } @@ -106,10 +110,10 @@ public class ItemInscriptionTool extends ItemBindableBase implements IVariantPro @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advanced) + public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flag) { list.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.inscriber.desc")))); - super.addInformation(stack, player, list, advanced); + super.addInformation(stack, world, list, flag); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index 64ff93d6..f31b92e2 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -41,6 +41,9 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide @Override public int getItemBurnTime(ItemStack stack) { + if (!stack.hasTagCompound()) + return -1; + if (getOwnerUUID(stack) == null) return -1; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java index c5ab320a..7e14e342 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java @@ -9,6 +9,7 @@ import com.google.common.collect.Lists; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; @@ -117,7 +118,7 @@ public class ItemPotionFlask extends Item implements IMeshProvider @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { PotionUtils.addPotionTooltip(stack, tooltip, 1.0F); tooltip.add(""); @@ -139,16 +140,11 @@ public class ItemPotionFlask extends Item implements IMeshProvider @Override public ItemMeshDefinition getMeshDefinition() { - return new ItemMeshDefinition() - { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - boolean full = true; - if (stack.hasTagCompound() && stack.getTagCompound().hasKey("empty")) - full = false; - return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, "item/" + getRegistryName().getResourcePath()), "full=" + (full ? "true" : "false")); - } + return stack -> { + boolean full = true; + if (stack.hasTagCompound() && stack.getTagCompound().hasKey("empty")) + full = false; + return new ModelResourceLocation(new ResourceLocation(BloodMagic.MODID, "item/" + getRegistryName().getResourcePath()), "full=" + (full ? "true" : "false")); }; } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index 99da587c..5417cf22 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -7,6 +7,7 @@ import java.util.List; import com.google.common.base.Strings; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -78,10 +79,13 @@ public class ItemRitualDiviner extends Item implements IVariantProvider @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList list) + public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + if (!isInCreativeTab(creativeTab)) + return; + for (int i = 0; i < names.length; i++) - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(this, 1, i)); } @Override @@ -236,7 +240,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { if (!stack.hasTagCompound()) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java index 29cbb7a6..17f457dd 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java @@ -5,6 +5,7 @@ import java.util.Arrays; import java.util.List; import WayofTime.bloodmagic.BloodMagic; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -45,7 +46,7 @@ public class ItemRitualReader extends Item implements IVariantProvider @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag tooltipFlag) { if (!stack.hasTagCompound()) return; @@ -65,7 +66,7 @@ public class ItemRitualReader extends Item implements IVariantProvider tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.extraInfo")); } - super.addInformation(stack, player, tooltip, advanced); + super.addInformation(stack, world, tooltip, tooltipFlag); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index a1584cb6..72991095 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -8,6 +8,7 @@ import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.client.IMeshProvider; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -59,14 +60,17 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList list) + public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + if (!isInCreativeTab(creativeTab)) + return; + for (int i = 0; i < names.length; i++) - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(this, 1, i)); } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advanced) + public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flag) { list.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.sacrificialDagger.desc")))); @@ -126,11 +130,11 @@ public class ItemSacrificialDagger extends Item implements IMeshProvider if (evt.shouldDrainHealth) { player.hurtResistantTime = 0; - player.attackEntityFrom(BloodMagicAPI.getDamageSource(), 0.001F); + player.attackEntityFrom(BloodMagicAPI.damageSource, 0.001F); player.setHealth(Math.max(player.getHealth() - ConfigHandler.sacrificialDaggerDamage, 0.0001f)); if (player.getHealth() <= 0.001f) { - player.onDeath(BloodMagicAPI.getDamageSource()); + player.onDeath(BloodMagicAPI.damageSource); player.setHealth(0); } // player.attackEntityFrom(BloodMagicAPI.getDamageSource(), 2.0F); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java index 6470657e..f1e84cfd 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java @@ -12,6 +12,7 @@ import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.NumeralHelper; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -107,7 +108,7 @@ public class ItemSanguineBook extends Item implements IVariantProvider, IAltarMa @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { if (!stack.hasTagCompound()) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java b/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java index 2a394754..4d746432 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSlate.java @@ -3,11 +3,13 @@ package WayofTime.bloodmagic.item; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.commons.lang3.tuple.ImmutablePair; @@ -32,10 +34,13 @@ public class ItemSlate extends Item implements IVariantProvider @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList list) + public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + if (!isInCreativeTab(creativeTab)) + return; + for (int i = 0; i < names.length; i++) - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(this, 1, i)); } @Override @@ -46,7 +51,7 @@ public class ItemSlate extends Item implements IVariantProvider @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advanced) + public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flag) { list.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.slate.desc")))); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java index 1b781ac4..e141b65c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java @@ -5,6 +5,7 @@ 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.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -48,10 +49,13 @@ public class ItemTelepositionFocus extends ItemBindableBase implements IVariantP @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList list) + public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + if (!isInCreativeTab(creativeTab)) + return; + for (int i = 0; i < names.length; i++) - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(this, 1, i)); } @Override @@ -72,11 +76,11 @@ public class ItemTelepositionFocus extends ItemBindableBase implements IVariantP @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localize("tooltip.bloodmagic.telepositionFocus." + names[stack.getItemDamage()])))); - super.addInformation(stack, player, tooltip, advanced); + super.addInformation(stack, world, tooltip, flag); if (!stack.hasTagCompound()) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java index 0ed7fdaa..f0de73dc 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; @@ -88,8 +89,11 @@ public class ItemUpgradeTome extends Item implements IVariantProvider @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList list) + public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + if (!isInCreativeTab(creativeTab)) + return; + for (Entry entry : LivingArmourHandler.upgradeMaxLevelMap.entrySet()) { String key = entry.getKey(); @@ -114,9 +118,8 @@ public class ItemUpgradeTome extends Item implements IVariantProvider @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { -// tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.livingArmour")))); if (!stack.hasTagCompound()) return; LivingArmourUpgrade upgrade = LivingUpgrades.getUpgrade(stack); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java index 7f451541..6198c6f5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java @@ -7,11 +7,13 @@ import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.commons.lang3.tuple.ImmutablePair; @@ -35,8 +37,11 @@ public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVarian @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList list) + public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + if (!isInCreativeTab(creativeTab)) + return; + list.add(new ItemStack(this)); for (Entry entry : LivingArmourHandler.upgradeMaxLevelMap.entrySet()) { @@ -49,7 +54,7 @@ public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVarian @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { // tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.livingArmour")))); if (!stack.hasTagCompound()) diff --git a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java index fbaede56..d7cc1ebf 100644 --- a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java +++ b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java @@ -3,13 +3,13 @@ package WayofTime.bloodmagic.item.alchemy; import java.util.ArrayList; import java.util.List; -import lombok.Getter; +import net.minecraft.client.util.ITooltipFlag; 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.NonNullList; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -25,7 +25,6 @@ import WayofTime.bloodmagic.util.helper.TextHelper; public class ItemCuttingFluid extends Item implements IVariantProvider, ICustomAlchemyConsumable { - @Getter private static ArrayList names = new ArrayList(); public static final String BASIC = "basicCuttingFluid"; @@ -45,7 +44,7 @@ public class ItemCuttingFluid extends Item implements IVariantProvider, ICustomA @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { if (!stack.hasTagCompound()) return; @@ -67,10 +66,13 @@ public class ItemCuttingFluid extends Item implements IVariantProvider, ICustomA @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList list) + public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + if (!isInCreativeTab(creativeTab)) + return; + for (int i = 0; i < names.size(); i++) - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(this, 1, i)); } public static ItemStack getStack(String name) @@ -139,4 +141,8 @@ public class ItemCuttingFluid extends Item implements IVariantProvider, ICustomA return stack; } + + public static ArrayList getNames() { + return names; + } } diff --git a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java index c701e1df..4bbd166c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemLivingArmourPointsUpgrade.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import lombok.Getter; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -35,7 +35,6 @@ import com.google.common.collect.Iterables; public class ItemLivingArmourPointsUpgrade extends Item implements IVariantProvider { - @Getter private static ArrayList names = new ArrayList(); public static final String DRAFT_ANGELUS = "draftAngelus"; @@ -53,7 +52,7 @@ public class ItemLivingArmourPointsUpgrade extends Item implements IVariantProvi @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { if (!stack.hasTagCompound()) return; @@ -128,10 +127,13 @@ public class ItemLivingArmourPointsUpgrade extends Item implements IVariantProvi @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList list) + public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + if (!isInCreativeTab(creativeTab)) + return; + for (int i = 0; i < names.size(); i++) - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(this, 1, i)); } public static ItemStack getStack(String name) @@ -155,4 +157,8 @@ public class ItemLivingArmourPointsUpgrade extends Item implements IVariantProvi return stack; } + + public static ArrayList getNames() { + return names; + } } diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index 1cca89be..9aa6c545 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -11,6 +11,7 @@ import java.util.UUID; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -281,7 +282,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { if (!stack.hasTagCompound()) return; @@ -325,7 +326,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP } } - super.addInformation(stack, player, tooltip, advanced); + super.addInformation(stack, world, tooltip, flag); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java index 064389f8..dc11df71 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java @@ -129,9 +129,9 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes public void onPlayerAttacked(ItemStack stack, DamageSource source, EntityPlayer attackedPlayer) { - if (source.getEntity() instanceof EntityLivingBase) + if (source.getTrueSource() instanceof EntityLivingBase) { - EntityLivingBase attacker = (EntityLivingBase) source.getEntity(); + EntityLivingBase attacker = (EntityLivingBase) source.getTrueSource(); EnumDemonWillType type = this.getCurrentType(stack); switch (type) { diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java index f270cdda..8d3d0fb4 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.block.BlockBloodTank; import WayofTime.bloodmagic.tile.TileBloodTank; import WayofTime.bloodmagic.util.helper.TextHelper; import net.minecraft.block.Block; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -12,6 +13,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fluids.*; import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStack; @@ -50,7 +52,7 @@ public class ItemBlockBloodTank extends ItemBlock } @Override - public void addInformation(ItemStack stack, EntityPlayer entityPlayer, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.tier", stack.getItemDamage() + 1)); tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.fluid.capacity", getCapacity(stack))); @@ -68,10 +70,12 @@ public class ItemBlockBloodTank extends ItemBlock @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList list) + public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + if (!isInCreativeTab(creativeTab)) + for (int i = 0; i < TileBloodTank.CAPACITIES.length; i++) - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(this, 1, i)); } public int getCapacity(ItemStack container) diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java index ead9db6f..9bc0d2be 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java @@ -9,6 +9,7 @@ import WayofTime.bloodmagic.api.util.helper.ItemHelper.LPContainer; import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemArmor; @@ -73,7 +74,7 @@ public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator, I } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advanced) + public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flag) { if (!stack.hasTagCompound()) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java index 93368f20..35761c12 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java @@ -10,6 +10,7 @@ import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemArmor; @@ -100,7 +101,7 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advanced) + public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flag) { if (!stack.hasTagCompound()) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java index df290575..ab7347cd 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java @@ -3,12 +3,14 @@ package WayofTime.bloodmagic.item.routing; import java.util.ArrayList; import java.util.List; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; +import net.minecraft.world.World; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -45,19 +47,22 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider, @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList list) + public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + if (!isInCreativeTab(creativeTab)) + return; + for (int i = 0; i < names.length; i++) - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(this, 1, i)); } @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { tooltip.add(TextHelper.localize("tooltip.BloodMagic.fluidFilter." + names[stack.getItemDamage()])); - super.addInformation(stack, player, tooltip, advanced); + super.addInformation(stack, world, tooltip, flag); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java index 7e565530..9d7629bf 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java @@ -8,6 +8,7 @@ import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.routing.IMasterRoutingNode; import WayofTime.bloodmagic.routing.IRoutingNode; import WayofTime.bloodmagic.util.helper.TextHelper; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -39,7 +40,7 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { if (!stack.hasTagCompound()) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java index be5eaef0..4c3c8b6a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java @@ -3,12 +3,14 @@ package WayofTime.bloodmagic.item.routing; import java.util.ArrayList; import java.util.List; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandler; @@ -49,19 +51,22 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList list) + public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + if (!isInCreativeTab(creativeTab)) + return; + for (int i = 0; i < names.length; i++) - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(this, 1, i)); } @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { tooltip.add(TextHelper.localize("tooltip.bloodmagic.itemFilter." + names[stack.getItemDamage()])); - super.addInformation(stack, player, tooltip, advanced); + super.addInformation(stack, world, tooltip, flag); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java index c924da7d..4b34e4e3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilAir.java @@ -2,6 +2,7 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.api.iface.ISigil; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; @@ -17,7 +18,6 @@ import net.minecraft.world.World; import WayofTime.bloodmagic.api.iface.ISentientSwordEffectProvider; import WayofTime.bloodmagic.api.soul.EnumDemonWillType; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; -import WayofTime.bloodmagic.registry.ModPotions; public class ItemSigilAir extends ItemSigilBase implements ISentientSwordEffectProvider { @@ -42,9 +42,9 @@ public class ItemSigilAir extends ItemSigilBase implements ISentientSwordEffectP double wantedVelocity = 1.7; // TODO - Revisit after potions - if (player.isPotionActive(ModPotions.boost)) + if (player.isPotionActive(RegistrarBloodMagic.BOOST)) { - int amplifier = player.getActivePotionEffect(ModPotions.boost).getAmplifier(); + int amplifier = player.getActivePotionEffect(RegistrarBloodMagic.BOOST).getAmplifier(); wantedVelocity += (1 + amplifier) * (0.35); } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java index 8bc97fda..7726a655 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java @@ -8,19 +8,17 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.api.impl.ItemSigil; 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.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; +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 WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.util.helper.TextHelper; -@Getter public class ItemSigilBase extends ItemSigil implements IVariantProvider { protected final String tooltipBase; @@ -44,7 +42,7 @@ public class ItemSigilBase extends ItemSigil implements IVariantProvider @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { if (TextHelper.canTranslate(tooltipBase + "desc")) tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect(tooltipBase + "desc")))); @@ -55,14 +53,18 @@ public class ItemSigilBase extends ItemSigil implements IVariantProvider if (!Strings.isNullOrEmpty(getOwnerName(stack))) tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentOwner", PlayerHelper.getUsernameFromStack(stack))); - super.addInformation(stack, player, tooltip, advanced); + super.addInformation(stack, world, tooltip, flag); } @Override public List> getVariants() { List> ret = new ArrayList>(); - ret.add(new ImmutablePair(0, "type=normal")); + ret.add(Pair.of(0, "type=normal")); return ret; } + + public String getName() { + return name; + } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java index 997f79f1..eb6c17db 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBounce.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -import WayofTime.bloodmagic.registry.ModPotions; public class ItemSigilBounce extends ItemSigilToggleableBase { @@ -20,6 +20,6 @@ public class ItemSigilBounce extends ItemSigilToggleableBase if (PlayerHelper.isFakePlayer(player)) return; - player.addPotionEffect(new PotionEffect(ModPotions.bounce, 2, 0, true, false)); + player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.BOUNCE, 2, 0, true, false)); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java index e2778691..2003d907 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilClaw.java @@ -1,11 +1,11 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -import WayofTime.bloodmagic.registry.ModPotions; public class ItemSigilClaw extends ItemSigilToggleableBase { @@ -20,6 +20,6 @@ public class ItemSigilClaw extends ItemSigilToggleableBase if (PlayerHelper.isFakePlayer(player)) return; - player.addPotionEffect(new PotionEffect(ModPotions.cling, 2, 0, true, false)); + player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.CLING, 2, 0, true, false)); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java index 640a450c..72c97d11 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilCompression.java @@ -20,6 +20,9 @@ public class ItemSigilCompression extends ItemSigilToggleableBase @Override public void onSigilUpdate(ItemStack stack, World world, EntityPlayer player, int itemSlot, boolean isSelected) { + if (true) + return; // TODO - Rewrite compression system + if (PlayerHelper.isFakePlayer(player)) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java index cad5d7f9..99c82aa4 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilEnderSeverance.java @@ -3,13 +3,13 @@ package WayofTime.bloodmagic.item.sigil; import java.util.List; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.Entity; import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -import WayofTime.bloodmagic.registry.ModPotions; public class ItemSigilEnderSeverance extends ItemSigilToggleableBase { @@ -28,7 +28,7 @@ public class ItemSigilEnderSeverance extends ItemSigilToggleableBase for (Entity entity : entityList) { if (entity instanceof EntityEnderman) - ((EntityEnderman) entity).addPotionEffect(new PotionEffect(ModPotions.planarBinding, 40, 0)); + ((EntityEnderman) entity).addPotionEffect(new PotionEffect(RegistrarBloodMagic.PLANAR_BINDING, 40, 0)); } } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java index 6b99eb6d..a9add918 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilFastMiner.java @@ -34,7 +34,7 @@ public class ItemSigilFastMiner extends ItemSigilToggleableBase int ticks = 600; int potionPotency = 2; - AxisAlignedBB bb = new AxisAlignedBB(pos).expandXyz(radius); + AxisAlignedBB bb = new AxisAlignedBB(pos).grow(radius); List playerList = world.getEntitiesWithinAABB(EntityPlayer.class, bb); for (EntityPlayer player : playerList) { @@ -44,7 +44,7 @@ public class ItemSigilFastMiner extends ItemSigilToggleableBase if (!player.capabilities.isCreativeMode) { player.hurtResistantTime = 0; - player.attackEntityFrom(BloodMagicAPI.getDamageSource(), 1.0F); + player.attackEntityFrom(BloodMagicAPI.damageSource, 1.0F); } } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java index 4ad3fb96..b14742cd 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHaste.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.registry.ModPotions; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; @@ -20,6 +20,6 @@ public class ItemSigilHaste extends ItemSigilToggleableBase if (PlayerHelper.isFakePlayer(player)) return; - player.addPotionEffect(new PotionEffect(ModPotions.boost, 2, 0, true, false)); + player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.BOOST, 2, 0, true, false)); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java index a1318abc..63fdd009 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java @@ -6,6 +6,7 @@ import java.util.List; import WayofTime.bloodmagic.api.iface.ISigil; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; import WayofTime.bloodmagic.client.key.KeyBindings; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -67,9 +68,9 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, player, tooltip, advanced); + super.addInformation(stack, world, tooltip, flag); tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.holding.press", KeyBindings.OPEN_HOLDING.getKey().getDisplayName())); if (!stack.hasTagCompound()) diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java index 7b07b258..8230fd19 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java @@ -4,6 +4,7 @@ import java.util.List; import WayofTime.bloodmagic.api.iface.ISigil; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -31,9 +32,9 @@ public class ItemSigilTeleposition extends ItemSigilBase @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, player, tooltip, advanced); + super.addInformation(stack, world, tooltip, flag); if (!stack.hasTagCompound()) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java index 286ff886..859af83f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java @@ -10,9 +10,11 @@ import WayofTime.bloodmagic.client.IMeshProvider; import WayofTime.bloodmagic.client.mesh.CustomMeshDefinitionActivatable; import com.google.common.base.Strings; import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -39,9 +41,9 @@ public class ItemSigilToggleableBase extends ItemSigilToggleable implements IMes @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, player, tooltip, advanced); + super.addInformation(stack, world, tooltip, flag); if (!stack.hasTagCompound()) return; tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic." + (getActivated(stack) ? "activated" : "deactivated"))); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java index 3e042a4a..f60574b5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java @@ -4,8 +4,10 @@ import java.util.List; import WayofTime.bloodmagic.api.iface.ISigil; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; +import WayofTime.bloodmagic.api_impl.BloodMagicAPI; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -16,9 +18,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.ForgeRegistries; 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.BloodMagicAPI; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.util.helper.NBTHelper; import WayofTime.bloodmagic.api.util.helper.NetworkHelper; @@ -32,9 +32,9 @@ public class ItemSigilTransposition extends ItemSigilBase @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - super.addInformation(stack, player, tooltip, advanced); + super.addInformation(stack, world, tooltip, flag); if (!stack.hasTagCompound()) return; @@ -80,19 +80,18 @@ public class ItemSigilTransposition extends ItemSigilBase IBlockState state = world.getBlockState(blockPos); if (!world.isRemote) { - BlockStack rightClickedBlock = BlockStack.getStackFromPos(world, blockPos); - if (BloodMagicAPI.getTranspositionBlacklist().contains(rightClickedBlock)) + if (BloodMagicAPI.INSTANCE.getBlacklist().getTransposition().contains(state)) return EnumActionResult.FAIL; - if (!ConfigHandler.transpositionBlacklist.contains(rightClickedBlock) && player.isSneaking() && (!stack.getTagCompound().hasKey(Constants.NBT.CONTAINED_BLOCK_NAME) || !stack.getTagCompound().hasKey(Constants.NBT.CONTAINED_BLOCK_META))) + if (player.isSneaking() && (!stack.getTagCompound().hasKey(Constants.NBT.CONTAINED_BLOCK_NAME) || !stack.getTagCompound().hasKey(Constants.NBT.CONTAINED_BLOCK_META))) { - if (rightClickedBlock.getState().getPlayerRelativeBlockHardness(player, world, blockPos) >= 0 && rightClickedBlock.getState().getBlockHardness(world, blockPos) >= 0) + if (state.getPlayerRelativeBlockHardness(player, world, blockPos) >= 0 && state.getBlockHardness(world, blockPos) >= 0) { int cost = getLpUsed(); NBTTagCompound tileNBTTag = new NBTTagCompound(); - String blockName = rightClickedBlock.getBlock().getRegistryName().toString(); - byte metadata = (byte) rightClickedBlock.getMeta(); + String blockName = state.getBlock().getRegistryName().toString(); + byte metadata = (byte) state.getBlock().getMetaFromState(state); if (world.getTileEntity(blockPos) != null) { diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java index 9b051e70..fe06e950 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilWhirlwind.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.item.sigil; import WayofTime.bloodmagic.api.util.helper.PlayerHelper; -import WayofTime.bloodmagic.registry.ModPotions; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; @@ -20,6 +20,6 @@ public class ItemSigilWhirlwind extends ItemSigilToggleableBase if (PlayerHelper.isFakePlayer(player)) return; - player.addPotionEffect(new PotionEffect(ModPotions.whirlwind, 2, 0, true, false)); + player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.WHIRLWIND, 2, 0, true, false)); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java index 117b3f17..ea1eb7fe 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java @@ -7,12 +7,14 @@ 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.client.util.ITooltipFlag; 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.NonNullList; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -43,22 +45,24 @@ public class ItemMonsterSoul extends Item implements IDemonWill, IVariantProvide } @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList list) + public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + if (!isInCreativeTab(creativeTab)) + return; + for (int i = 0; i < names.length; i++) - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(this, 1, i)); } @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { if (!stack.hasTagCompound()) return; tooltip.add(TextHelper.localize("tooltip.bloodmagic.will", getWill(getType(stack), stack))); - super.addInformation(stack, player, tooltip, advanced); + super.addInformation(stack, world, tooltip, flag); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java index 3eec1f87..77bc1027 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java @@ -6,6 +6,7 @@ import javax.annotation.Nullable; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -302,7 +303,7 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { if (!stack.hasTagCompound()) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java index a7e70b1d..2904fa35 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java @@ -6,6 +6,7 @@ import javax.annotation.Nullable; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -301,7 +302,7 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { if (!stack.hasTagCompound()) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java index b7caaec3..4c140cb8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java @@ -6,6 +6,7 @@ import javax.annotation.Nullable; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -302,7 +303,7 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { if (!stack.hasTagCompound()) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java index eb7e8a1a..80fc39ca 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java @@ -5,6 +5,7 @@ import java.util.*; import javax.annotation.Nullable; import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -273,7 +274,7 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { if (!stack.hasTagCompound()) return; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java index e065e8b2..8a9af1d8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java @@ -7,6 +7,7 @@ import java.util.Locale; import javax.annotation.Nullable; import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -93,9 +94,11 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I } @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList list) + public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + if (!isInCreativeTab(creativeTab)) + return; + for (int i = 0; i < names.length; i++) { ItemStack emptyStack = new ItemStack(this, 1, i); @@ -115,7 +118,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { if (!stack.hasTagCompound()) return; @@ -125,7 +128,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I tooltip.add(TextHelper.localize("tooltip.bloodmagic.will", getWill(type, stack))); tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.currentType." + getCurrentType(stack).getName().toLowerCase())); - super.addInformation(stack, player, tooltip, advanced); + super.addInformation(stack, world, tooltip, flag); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java index 4fa4a6af..d96f1973 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java @@ -4,6 +4,7 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; import WayofTime.bloodmagic.util.helper.TextHelper; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; @@ -64,19 +65,22 @@ public class ItemSoulSnare extends Item implements IVariantProvider @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item id, CreativeTabs creativeTab, NonNullList list) + public void getSubItems(CreativeTabs creativeTab, NonNullList list) { + if (!isInCreativeTab(creativeTab)) + return; + for (int i = 0; i < names.length; i++) - list.add(new ItemStack(id, 1, i)); + list.add(new ItemStack(this, 1, i)); } @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.soulSnare.desc")))); - super.addInformation(stack, player, tooltip, advanced); + super.addInformation(stack, world, tooltip, flag); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java index 1986b435..da0a84b1 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java @@ -21,8 +21,6 @@ import WayofTime.bloodmagic.api.livingArmour.LivingArmourHandler; import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import WayofTime.bloodmagic.api.livingArmour.StatTracker; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; -import WayofTime.bloodmagic.registry.ModPotions; -import WayofTime.bloodmagic.util.ChatUtil; import WayofTime.bloodmagic.util.helper.TextHelper; import com.google.common.collect.HashMultimap; @@ -39,13 +37,7 @@ public class LivingArmour implements ILivingArmour public StatTracker getTracker(String key) { - if (trackerMap.containsKey(key)) - { - return trackerMap.get(key); - } else - { - return null; - } + return trackerMap.get(key); } public double getAdditionalDamageOnHit(double damage, EntityPlayer wearer, EntityLivingBase hitEntity, ItemStack weapon) diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index d65d42cd..9b474376 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.proxy; import java.awt.Color; +import java.util.Map; import WayofTime.bloodmagic.client.key.KeyBindings; import WayofTime.bloodmagic.client.render.block.*; @@ -8,11 +9,9 @@ import WayofTime.bloodmagic.tile.*; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionUtils; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; @@ -57,11 +56,8 @@ import WayofTime.bloodmagic.entity.projectile.EntityBloodLight; import WayofTime.bloodmagic.entity.projectile.EntityMeteor; import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; import WayofTime.bloodmagic.entity.projectile.EntitySoulSnare; -import WayofTime.bloodmagic.core.RegistrarBloodMagicBlocks; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.tile.routing.TileRoutingNode; -import WayofTime.bloodmagic.util.helper.InventoryRenderHelper; -import WayofTime.bloodmagic.util.helper.InventoryRenderHelperV2; import com.google.common.collect.ImmutableMap; @@ -69,34 +65,13 @@ public class ClientProxy extends CommonProxy { public static DemonWillHolder currentAura = new DemonWillHolder(); - private InventoryRenderHelper renderHelper; - private InventoryRenderHelperV2 renderHelperV2; - - @Override - public InventoryRenderHelper getRenderHelper() - { - return renderHelper; - } - - @Override - public InventoryRenderHelperV2 getRenderHelperV2() - { - return renderHelperV2; - } - @Override public void preInit() { super.preInit(); - renderHelper = new InventoryRenderHelper(Constants.Mod.DOMAIN); - renderHelperV2 = new InventoryRenderHelperV2(Constants.Mod.DOMAIN); - OBJLoader.INSTANCE.addDomain(BloodMagic.MODID); - RegistrarBloodMagicBlocks.initRenders(); - RegistrarBloodMagicItems.initRenders(); - ClientRegistry.bindTileEntitySpecialRenderer(TileInversionPillar.class, new AnimationTESR() { @Override @@ -139,36 +114,26 @@ public class ClientProxy extends CommonProxy public void init() { super.init(); - Minecraft.getMinecraft().getItemColors().registerItemColorHandler(new IItemColor() - { - @Override - public int getColorFromItemstack(ItemStack stack, int tintIndex) + Minecraft.getMinecraft().getItemColors().registerItemColorHandler((stack, tintIndex) -> { + try + { + if (stack.hasTagCompound() && stack.getTagCompound().hasKey(Constants.NBT.COLOR)) + if (tintIndex == 1) + return Color.decode(stack.getTagCompound().getString(Constants.NBT.COLOR)).getRGB(); + } catch (NumberFormatException e) { - try - { - if (stack.hasTagCompound() && stack.getTagCompound().hasKey(Constants.NBT.COLOR)) - if (tintIndex == 1) - return Color.decode(stack.getTagCompound().getString(Constants.NBT.COLOR)).getRGB(); - } catch (NumberFormatException e) - { - return -1; - } return -1; } + return -1; }, RegistrarBloodMagicItems.SIGIL_HOLDING); - Minecraft.getMinecraft().getItemColors().registerItemColorHandler(new IItemColor() - { - @Override - public int getColorFromItemstack(ItemStack stack, int tintIndex) - { - if (tintIndex != 0 && tintIndex != 2) - return -1; + Minecraft.getMinecraft().getItemColors().registerItemColorHandler((stack, tintIndex) -> { + if (tintIndex != 0 && tintIndex != 2) + return -1; - if (stack.hasTagCompound() && stack.getTagCompound().hasKey("empty")) - return -1; + if (stack.hasTagCompound() && stack.getTagCompound().hasKey("empty")) + return -1; - return PotionUtils.getPotionColorFromEffectList(PotionUtils.getEffectsFromStack(stack)); - } + return PotionUtils.getPotionColorFromEffectList(PotionUtils.getEffectsFromStack(stack)); }, RegistrarBloodMagicItems.POTION_FLASK); addElytraLayer(); @@ -217,8 +182,9 @@ public class ClientProxy extends CommonProxy RenderManager renderManager = Minecraft.getMinecraft().getRenderManager(); try { - RenderPlayer renderPlayer = ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, renderManager, "playerRenderer", "field_178637_m"); - renderPlayer.addLayer(new LayerBloodElytra(renderPlayer)); + Map skinMap = ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, renderManager, "skinMap", "field_178636_l"); + skinMap.get("default").addLayer(new LayerBloodElytra(skinMap.get("default"))); + skinMap.get("slim").addLayer(new LayerBloodElytra(skinMap.get("slim"))); BloodMagic.instance.logger.info("Elytra layer added"); } catch (Exception e) { diff --git a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java index c178e638..4449daeb 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java @@ -13,24 +13,11 @@ import WayofTime.bloodmagic.api.ritual.CapabilityRuneType; import WayofTime.bloodmagic.api.ritual.IRitualStone; import WayofTime.bloodmagic.api.teleport.TeleportQueue; import WayofTime.bloodmagic.fuel.FuelHandler; -import WayofTime.bloodmagic.util.helper.InventoryRenderHelper; -import WayofTime.bloodmagic.util.helper.InventoryRenderHelperV2; import com.google.common.collect.ImmutableMap; public class CommonProxy { - @Deprecated - public InventoryRenderHelper getRenderHelper() - { - return null; - } - - public InventoryRenderHelperV2 getRenderHelperV2() - { - return null; - } - public void preInit() { MinecraftForge.EVENT_BUS.register(TeleportQueue.getInstance()); diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index ac80d534..446d1472 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -89,7 +89,7 @@ public class ModRecipes { initOreDict(); addFurnaceRecipes(); - addCraftingRecipes(); +// addCraftingRecipes(); addAltarRecipes(); addAlchemyArrayRecipes(); addSoulForgeRecipes(); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java index 6b7a905b..c765a6ca 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualAltarBuilder.java @@ -287,10 +287,10 @@ public class RitualAltarBuilder extends Ritual for (int i = 0; i < itemHandler.getSlots(); i++) { - if (!itemHandler.getStackInSlot(i).isEmpty() && itemHandler.getStackInSlot(i).getItem() instanceof ItemBlock && !(Block.getBlockFromItem(itemHandler.getStackInSlot(i).getItem()) instanceof BlockBloodRune) && itemHandler.extractItem(i, 1, true) != null) + if (!itemHandler.getStackInSlot(i).isEmpty() && itemHandler.getStackInSlot(i).getItem() instanceof ItemBlock && !(Block.getBlockFromItem(itemHandler.getStackInSlot(i).getItem()) instanceof BlockBloodRune) && !itemHandler.extractItem(i, 1, true).isEmpty()) { Block block = Block.getBlockFromItem(itemHandler.getStackInSlot(i).getItem()); - if (block != null && block != Blocks.GLOWSTONE && block != RegistrarBloodMagicBlocks.DECORATIVE_BRICK && block != RegistrarBloodMagicBlocks.CRYSTAL) + if (block != Blocks.AIR && block != Blocks.GLOWSTONE && block != RegistrarBloodMagicBlocks.DECORATIVE_BRICK) { BlockStack blockStack = new BlockStack(block, itemHandler.getStackInSlot(i).getItemDamage()); itemHandler.extractItem(i, 1, false); @@ -306,7 +306,7 @@ public class RitualAltarBuilder extends Ritual if (!inv.getStackInSlot(i).isEmpty() && inv.getStackInSlot(i).getItem() instanceof ItemBlock && !(Block.getBlockFromItem(inv.getStackInSlot(i).getItem()) instanceof BlockBloodRune)) { Block block = Block.getBlockFromItem(inv.getStackInSlot(i).getItem()); - if (block != Blocks.GLOWSTONE && block != RegistrarBloodMagicBlocks.DECORATIVE_BRICK && block != RegistrarBloodMagicBlocks.CRYSTAL) + if (block != Blocks.GLOWSTONE && block != RegistrarBloodMagicBlocks.DECORATIVE_BRICK) { BlockStack blockStack = new BlockStack(block, inv.getStackInSlot(i).getItemDamage()); inv.decrStackSize(i, 1); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java index f6c2b484..2cecd2b5 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualAnimalGrowth.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -22,7 +23,6 @@ import WayofTime.bloodmagic.api.ritual.Ritual; import WayofTime.bloodmagic.api.ritual.RitualComponent; import WayofTime.bloodmagic.api.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.registry.ModPotions; import WayofTime.bloodmagic.util.Utils; public class RitualAnimalGrowth extends Ritual @@ -126,9 +126,9 @@ public class RitualAnimalGrowth extends Ritual { if (destructiveWill >= destructiveWillDrain) { - if (!animal.isPotionActive(ModPotions.sacrificialLamb)) + if (!animal.isPotionActive(RegistrarBloodMagic.SACRIFICIAL_LAMB)) { - animal.addPotionEffect(new PotionEffect(ModPotions.sacrificialLamb, 1200)); + animal.addPotionEffect(new PotionEffect(RegistrarBloodMagic.SACRIFICIAL_LAMB, 1200)); destructiveDrain += destructiveWillDrain; destructiveWill -= destructiveWillDrain; performedEffect = true; diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java index 774a77c7..82b330e3 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualFeatheredKnife.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; @@ -28,7 +29,6 @@ import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.item.armour.ItemLivingArmour; import WayofTime.bloodmagic.livingArmour.LivingArmour; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSelfSacrifice; -import WayofTime.bloodmagic.registry.ModPotions; public class RitualFeatheredKnife extends Ritual { @@ -135,7 +135,7 @@ public class RitualFeatheredKnife extends Ritual float sacrificedHealth = 1; double lpModifier = 1; - if ((health / player.getMaxHealth() > healthThreshold) && (!useIncense || !player.isPotionActive(ModPotions.soulFray))) + if ((health / player.getMaxHealth() > healthThreshold) && (!useIncense || !player.isPotionActive(RegistrarBloodMagic.SOUL_FRAY))) { if (useIncense) { @@ -145,7 +145,7 @@ public class RitualFeatheredKnife extends Ritual lpModifier *= PlayerSacrificeHelper.getModifier(incenseAmount); PlayerSacrificeHelper.setPlayerIncense(player, 0); - player.addPotionEffect(new PotionEffect(ModPotions.soulFray, PlayerSacrificeHelper.soulFrayDuration)); + player.addPotionEffect(new PotionEffect(RegistrarBloodMagic.SOUL_FRAY, PlayerSacrificeHelper.soulFrayDuration)); } if (destructiveWill >= destructiveWillDrain * sacrificedHealth) diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java index 2dbd107e..3a8e82e0 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualLava.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -29,7 +30,6 @@ import WayofTime.bloodmagic.api.ritual.RitualComponent; import WayofTime.bloodmagic.api.soul.DemonWillHolder; import WayofTime.bloodmagic.api.soul.EnumDemonWillType; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; -import WayofTime.bloodmagic.registry.ModPotions; import WayofTime.bloodmagic.util.Utils; public class RitualLava extends Ritual @@ -166,9 +166,9 @@ public class RitualLava extends Ritual continue; } - if (!entity.isPotionActive(ModPotions.fireFuse)) + if (!entity.isPotionActive(RegistrarBloodMagic.FIRE_FUSE)) { - entity.addPotionEffect(new PotionEffect(ModPotions.fireFuse, 100, 0)); + entity.addPotionEffect(new PotionEffect(RegistrarBloodMagic.FIRE_FUSE, 100, 0)); vengefulDrained += vengefulWillDrain; vengefulWill -= vengefulWillDrain; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java index e5849e20..c0d9086e 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java @@ -3,6 +3,7 @@ package WayofTime.bloodmagic.tile; import java.util.ArrayList; import java.util.List; +import WayofTime.bloodmagic.api.orb.BloodOrb; import net.minecraft.block.state.IBlockState; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; @@ -307,7 +308,8 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, { if (orbStack.getItem() instanceof IBloodOrb) { - return ((IBloodOrb) orbStack.getItem()).getOrbLevel(orbStack.getMetadata()); + BloodOrb orb = ((IBloodOrb) orbStack.getItem()).getOrb(orbStack); + return orb == null ? 0 : orb.getTier(); } } diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index e252640b..9c4dbd68 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -410,7 +410,7 @@ public class Utils case BLOODRUNE: return RegistrarBloodMagicBlocks.BLOOD_RUNE; case CRYSTAL: - return RegistrarBloodMagicBlocks.CRYSTAL; + return RegistrarBloodMagicBlocks.BLOOD_RUNE; case NOTAIR: return Blocks.STONEBRICK; default: diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/IMCHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/IMCHandler.java index 4f2de729..15bbf802 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/IMCHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/IMCHandler.java @@ -16,56 +16,57 @@ public class IMCHandler public static void handleIMC(FMLInterModComms.IMCEvent event) { - for (FMLInterModComms.IMCMessage message : event.getMessages()) - { - if (message.key.equals("teleposerBlacklist") && message.isItemStackMessage()) - { - ItemStack stack = message.getItemStackValue(); - if (stack.getItem() instanceof ItemBlock) - { - Block block = Block.getBlockFromItem(stack.getItem()); - BloodMagicAPI.addToTeleposerBlacklist(block, stack.getItemDamage()); - } - } - - if (message.key.equals("transpositionBlacklist") && message.isItemStackMessage()) - { - ItemStack stack = message.getItemStackValue(); - if (stack.getItem() instanceof ItemBlock) - { - Block block = Block.getBlockFromItem(stack.getItem()); - BloodMagicAPI.addToTranspositionBlacklist(block, stack.getItemDamage()); - } - } - - if (message.key.equals("sacrificeValue") && message.isStringMessage()) - { - String[] splitInfo = message.getStringValue().split(";"); - if (splitInfo.length == 2 && Utils.isInteger(splitInfo[1])) - BloodMagicAPI.setEntitySacrificeValue(splitInfo[0], Integer.parseInt(splitInfo[1])); - } - - if (message.key.equals("greenGroveBlacklist") && message.isStringMessage()) - { - String[] splitInfo = message.getStringValue().split(":"); - if (splitInfo.length == 2) - { - Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(splitInfo[0], splitInfo[1])); - if (block != null) - BloodMagicAPI.blacklistFromGreenGrove(block); - } - } - - if (message.key.equals("altarComponent") && message.isStringMessage()) - { - String[] splitInfo = message.getStringValue().split(":"); - if (splitInfo.length == 4) - { - Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(splitInfo[0], splitInfo[1])); - if (block != null) - BloodMagicAPI.addAltarComponent(block.getStateFromMeta(Integer.parseInt(splitInfo[2])), EnumAltarComponent.valueOf(splitInfo[3])); - } - } - } + // TODO +// for (FMLInterModComms.IMCMessage message : event.getMessages()) +// { +// if (message.key.equals("teleposerBlacklist") && message.isItemStackMessage()) +// { +// ItemStack stack = message.getItemStackValue(); +// if (stack.getItem() instanceof ItemBlock) +// { +// Block block = Block.getBlockFromItem(stack.getItem()); +// BloodMagicAPI.addToTeleposerBlacklist(block, stack.getItemDamage()); +// } +// } +// +// if (message.key.equals("transpositionBlacklist") && message.isItemStackMessage()) +// { +// ItemStack stack = message.getItemStackValue(); +// if (stack.getItem() instanceof ItemBlock) +// { +// Block block = Block.getBlockFromItem(stack.getItem()); +// BloodMagicAPI.addToTranspositionBlacklist(block, stack.getItemDamage()); +// } +// } +// +// if (message.key.equals("sacrificeValue") && message.isStringMessage()) +// { +// String[] splitInfo = message.getStringValue().split(";"); +// if (splitInfo.length == 2 && Utils.isInteger(splitInfo[1])) +// BloodMagicAPI.setEntitySacrificeValue(splitInfo[0], Integer.parseInt(splitInfo[1])); +// } +// +// if (message.key.equals("greenGroveBlacklist") && message.isStringMessage()) +// { +// String[] splitInfo = message.getStringValue().split(":"); +// if (splitInfo.length == 2) +// { +// Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(splitInfo[0], splitInfo[1])); +// if (block != null) +// BloodMagicAPI.blacklistFromGreenGrove(block); +// } +// } +// +// if (message.key.equals("altarComponent") && message.isStringMessage()) +// { +// String[] splitInfo = message.getStringValue().split(":"); +// if (splitInfo.length == 4) +// { +// Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(splitInfo[0], splitInfo[1])); +// if (block != null) +// BloodMagicAPI.addAltarComponent(block.getStateFromMeta(Integer.parseInt(splitInfo[2])), EnumAltarComponent.valueOf(splitInfo[3])); +// } +// } +// } } } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index 348fbbd8..1ef6e22f 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -7,6 +7,7 @@ import java.util.Map; import java.util.Set; import WayofTime.bloodmagic.client.key.KeyBindings; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.renderer.GlStateManager; @@ -53,7 +54,6 @@ import WayofTime.bloodmagic.item.ItemRitualDiviner; import WayofTime.bloodmagic.item.sigil.ItemSigilHolding; import WayofTime.bloodmagic.network.BloodMagicPacketHandler; import WayofTime.bloodmagic.network.SigilHoldingPacketProcessor; -import WayofTime.bloodmagic.registry.ModPotions; import WayofTime.bloodmagic.tile.TileMasterRitualStone; import WayofTime.bloodmagic.util.GhostItemHelper; import WayofTime.bloodmagic.util.helper.TextHelper; @@ -117,7 +117,7 @@ public class ClientHandler public void onSoundEvent(PlaySoundEvent event) { EntityPlayer player = Minecraft.getMinecraft().player; - if (player != null && player.isPotionActive(ModPotions.deafness)) + if (player != null && player.isPotionActive(RegistrarBloodMagic.DEAFNESS)) { event.setResultSound(null); } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java index a6f32d17..059c840d 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/LivingArmourHandler.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.util.handler.event; import WayofTime.bloodmagic.BloodMagic; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -41,7 +42,6 @@ import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeGrimReaperSp import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeJump; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeSpeed; import WayofTime.bloodmagic.livingArmour.upgrade.LivingArmourUpgradeStepAssist; -import WayofTime.bloodmagic.registry.ModPotions; @Handler public class LivingArmourHandler @@ -246,7 +246,7 @@ public class LivingArmourHandler { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); boolean hasAssist = false; - if (event.getEntityLiving().isPotionActive(ModPotions.boost)) + if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.BOOST)) { hasAssist = true; player.stepHeight = Constants.Misc.ALTERED_STEP_HEIGHT; @@ -289,9 +289,9 @@ public class LivingArmourHandler } } - if (event.getEntityLiving().isPotionActive(ModPotions.boost)) + if (event.getEntityLiving().isPotionActive(RegistrarBloodMagic.BOOST)) { - int i = event.getEntityLiving().getActivePotionEffect(ModPotions.boost).getAmplifier(); + int i = event.getEntityLiving().getActivePotionEffect(RegistrarBloodMagic.BOOST).getAmplifier(); { percentIncrease += (i + 1) * 0.05f; } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java index 23da80b0..6c72690d 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; +import WayofTime.bloodmagic.core.RegistrarBloodMagic; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -35,7 +36,6 @@ import WayofTime.bloodmagic.demonAura.WillChunk; import WayofTime.bloodmagic.demonAura.WorldDemonWillHandler; import WayofTime.bloodmagic.entity.projectile.EntitySentientArrow; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; -import WayofTime.bloodmagic.registry.ModPotions; @Handler public class WillHandler @@ -84,9 +84,9 @@ public class WillHandler DamageSource source = event.getSource(); Entity entity = source.getTrueSource(); - if (attackedEntity.isPotionActive(ModPotions.soulSnare) && (attackedEntity instanceof EntityMob || attackedEntity.getEntityWorld().getDifficulty() == EnumDifficulty.PEACEFUL)) + if (attackedEntity.isPotionActive(RegistrarBloodMagic.SOUL_SNARE) && (attackedEntity instanceof EntityMob || attackedEntity.getEntityWorld().getDifficulty() == EnumDifficulty.PEACEFUL)) { - PotionEffect eff = attackedEntity.getActivePotionEffect(ModPotions.soulSnare); + PotionEffect eff = attackedEntity.getActivePotionEffect(RegistrarBloodMagic.SOUL_SNARE); int lvl = eff.getAmplifier(); double amountOfSouls = attackedEntity.getEntityWorld().rand.nextDouble() * (lvl + 1) * (lvl + 1) * 5; diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelper.java deleted file mode 100644 index 28b769ad..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelper.java +++ /dev/null @@ -1,181 +0,0 @@ -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.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.ModelLoader; - -/** - * @author TehNut - * - * The goal of this class is to make registering the inventory renders - * for your Items/Blocks a much simpler and easier process. - * - * You must call this at the post initialization stage on the clientside - * only. - * - * If you pass a Block through here that uses the default ItemBlock, you - * should specify a custom name. - * - * @deprecated in favor of {@link InventoryRenderHelperV2} - */ -@Deprecated -public class InventoryRenderHelper -{ - /** - * This is the base string for your resources. It will usually be your modid - * in all lowercase with a colon at the end. - */ - private final String domain; - - public InventoryRenderHelper(String domain) - { - this.domain = domain; - } - - /** - * Registers a Model for the given Item and meta. - * - * @param item - * - Item to register Model for - * @param meta - * - Meta of Item - * @param name - * - Name of the model JSON - */ - public void itemRender(Item item, int meta, String name) - { - ResourceLocation resName = new ResourceLocation(domain + name); - - ModelBakery.registerItemVariants(item, resName); - ModelLoader.setCustomModelResourceLocation(item, meta, new ModelResourceLocation(resName, "inventory")); - } - - /** - * Registers a Model for the given Item and meta. This does not call - * setCustomModelResourceLocation, to allow the implementation of - * ItemMeshDefinition. - * - * @param item - * - Item to register Model for - * @param meta - * - Meta of Item - * @param name - * - Name of the model JSON - */ - public void customItemRender(Item item, int meta, String name) - { - ResourceLocation resName = new ResourceLocation(domain + name); - - ModelBakery.registerItemVariants(item, resName); - } - - /** - * Shorthand of {@code itemRender(Item, int, String)} - * - * @param item - * - Item to register Model for - * @param meta - * - Meta of Item - */ - public void itemRender(Item item, int meta) - { - itemRender(item, meta, getClassName(item) + meta); - } - - public void customItemRender(Item item, int meta) - { - customItemRender(item, meta, getClassName(item) + meta); - } - - public void itemRender(Item item, String name) - { - itemRender(item, 0, name); - } - - /** - * Shorthand of {@code itemRender(Item, int)} - * - * @param item - * - Item to register Model for - */ - public void itemRender(Item item) - { - itemRender(item, 0, getClassName(item)); - } - - /** - * Registers a model for the item across all Meta's that get used for the - * item - * - * @param item - * - Item to register Model for - */ - public void itemRenderAll(Item item) - { - final Item toRender = item; - - ModelLoader.setCustomMeshDefinition(item, new ItemMeshDefinition() - { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - return new ModelResourceLocation(domain + getClassName(toRender), "inventory"); - } - }); - } - - public void fluidRender(Block block) - { - - final Block toRender = block; - - ModelBakery.registerItemVariants(InventoryRenderHelper.getItemFromBlock(block)); - ModelLoader.setCustomMeshDefinition(InventoryRenderHelper.getItemFromBlock(block), new ItemMeshDefinition() - { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - return new ModelResourceLocation(Constants.Mod.DOMAIN + toRender.getClass().getSimpleName(), "fluid"); - } - }); - ModelLoader.setCustomStateMapper(block, new StateMapperBase() - { - @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) - { - return new ModelResourceLocation(domain + toRender.getClass().getSimpleName(), "fluid"); - } - }); - } - - /** - * @param block - * - Block to get Item of - * - * @return - The ItemBlock that corresponds to the Block. - */ - public static Item getItemFromBlock(Block block) - { - return Item.getItemFromBlock(block); - } - - /** - * Finds the class name of the given Item. If handed an ItemBlock, it will - * use the class name of the contained Block. - * - * @return The class name of the given Item - */ - public static String getClassName(Item item) - { - return item instanceof ItemBlock ? Block.getBlockFromItem(item).getClass().getSimpleName() : item.getClass().getSimpleName(); - } -} diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelperV2.java b/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelperV2.java deleted file mode 100644 index 2b8414b5..00000000 --- a/src/main/java/WayofTime/bloodmagic/util/helper/InventoryRenderHelperV2.java +++ /dev/null @@ -1,64 +0,0 @@ -package WayofTime.bloodmagic.util.helper; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.item.Item; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.ModelLoader; - -public class InventoryRenderHelperV2 -{ - - private final String domain; - - public InventoryRenderHelperV2(String domain) - { - this.domain = domain.endsWith(":") ? domain.replace(":", "") : domain; - } - - public void registerMesher(Item item, ItemMeshDefinition meshDefinition) - { - ModelLoader.setCustomMeshDefinition(item, meshDefinition); - } - - public void registerRender(Item item, int meta, String name, String variant) - { - ModelLoader.setCustomModelResourceLocation(item, meta, new ModelResourceLocation(new ResourceLocation(domain, "item/" + name), "type=" + variant)); - } - - public void registerRender(Item item, int meta, String variant) - { - registerRender(item, meta, item.getRegistryName().getResourcePath(), variant); - } - - public void registerRender(Item item, String name, String variant) - { - registerRender(item, 0, name, variant); - } - - public void registerRender(Item item, String variant) - { - registerRender(item, item.getRegistryName().getResourcePath(), variant); - } - - public void registerRender(Block block, int meta, String name, String variant) - { - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(block), meta, new ModelResourceLocation(new ResourceLocation(domain, name), variant)); - } - - public void registerRender(Block block, int meta, String variant) - { - registerRender(block, meta, block.getRegistryName().getResourcePath(), variant); - } - - public void registerRender(Block block, String name, String variant) - { - registerRender(block, 0, name, variant); - } - - public void registerRender(Block block, String variant) - { - registerRender(block, block.getRegistryName().getResourcePath(), variant); - } -} diff --git a/src/main/resources/Guide-API-Version.info b/src/main/resources/Guide-API-Version.info deleted file mode 100644 index 27323dad..00000000 --- a/src/main/resources/Guide-API-Version.info +++ /dev/null @@ -1 +0,0 @@ -@VERSION@ \ No newline at end of file diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index f531fc4a..53f9f649 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,13 +1,13 @@ [ { - "modid": "BloodMagic", + "modid": "bloodmagic", "name": "Blood Magic: Alchemical Wizardry", "description": "Rituals, spells, and more!", "version": "${version}", - "mcversion": "1.8.9", + "mcversion": "${mcversion}", "url": "http://www.minecraftforum.net/topic/1899223-bloodmagic", "updateUrl": "", - "authorList": [ "WayofTime" ], + "authorList": [ "WayofTime", "TehNut" ], "credits": "", "logoFile": "", "screenshots": [], diff --git a/src/main/resources/todo.txt b/src/main/resources/todo.txt deleted file mode 100644 index 8c06bf8c..00000000 --- a/src/main/resources/todo.txt +++ /dev/null @@ -1,2 +0,0 @@ --Create effect for the light ritual block. --Create effect for the fire ritual block. \ No newline at end of file