From c8996c8fba736d0cc7620a24640da1f2f752a32b Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 23 Sep 2019 09:51:22 -0700 Subject: [PATCH] Sweeping changes, mainly NBT related --- .../AlchemyArrayEffectLaputa.java | 16 ++-- .../alchemyArray/AlchemyCircleRenderer.java | 2 +- .../bloodmagic/altar/BloodAltar.java | 96 +++++++++---------- .../bloodmagic/block/BlockBloodLight.java | 2 +- .../bloodmagic/block/BlockBloodTank.java | 4 +- .../WayofTime/bloodmagic/client/Sprite.java | 2 +- .../client/gui/GuiBloodMagicConfig.java | 2 +- .../client/gui/GuiItemRoutingNode.java | 2 +- .../client/hud/ElementRegistry.java | 4 +- .../bloodmagic/client/hud/GuiEditHUD.java | 10 +- .../client/hud/element/ElementDemonAura.java | 4 +- .../element/ElementDivinedInformation.java | 2 +- .../client/hud/element/ElementHolding.java | 6 +- .../client/hud/element/ElementItemStack.java | 2 +- .../client/hud/element/ElementString.java | 6 +- .../hud/element/ElementTileInformation.java | 8 +- .../bloodmagic/client/key/KeyBindings.java | 4 +- .../AttractorAlchemyCircleRenderer.java | 2 +- .../BindingAlchemyCircleRenderer.java | 4 +- .../DualAlchemyCircleRenderer.java | 4 +- .../MobSacrificeAlchemyCircleRenderer.java | 8 +- .../SingleAlchemyCircleRenderer.java | 2 +- .../StaticAlchemyCircleRenderer.java | 2 +- .../TurretAlchemyCircleRenderer.java | 8 +- .../client/render/block/RenderAltar.java | 8 +- .../client/render/block/RenderBloodTank.java | 4 +- .../render/block/RenderDemonCrucible.java | 2 +- .../client/render/block/RenderFakeBlocks.java | 2 +- .../render/block/RenderItemRoutingNode.java | 2 +- .../render/entity/RenderEntityBloodLight.java | 2 +- .../render/entity/RenderEntityMimic.java | 6 +- .../render/entity/RenderEntitySoulSnare.java | 2 +- .../entity/layer/LayerAlchemyCircle.java | 2 +- .../compat/guideapi/entry/EntryText.java | 2 +- .../guideapi/page/PageAlchemyArray.java | 4 +- .../compat/guideapi/page/PageAltarRecipe.java | 2 +- .../page/PageTartaricForgeRecipe.java | 2 +- .../compat/waila/BloodMagicHwylaPlugin.java | 14 ++- .../provider/DataProviderAlchemyArray.java | 4 +- .../provider/DataProviderBloodAltar.java | 64 ++++++------- .../waila/provider/DataProviderBloodTank.java | 6 +- .../waila/provider/DataProviderMimic.java | 2 +- .../DataProviderRitualController.java | 16 ++-- .../waila/provider/DataProviderTeleposer.java | 2 +- .../core/data/BMWorldSavedData.java | 14 +-- .../bloodmagic/core/data/Binding.java | 14 +-- .../bloodmagic/core/data/SoulNetwork.java | 14 +-- .../bloodmagic/core/data/SoulTicket.java | 12 +-- .../bloodmagic/core/registry/OrbRegistry.java | 2 +- .../entity/mob/EntityAspectedDemonBase.java | 2 +- .../entity/mob/EntityCorruptedChicken.java | 4 +- .../entity/mob/EntityCorruptedSheep.java | 8 +- .../entity/mob/EntityDemonBase.java | 4 +- .../bloodmagic/entity/mob/EntityMimic.java | 16 ++-- .../entity/mob/EntitySentientSpecter.java | 4 +- .../entity/projectile/EntityBloodLight.java | 8 +- .../entity/projectile/EntityMeteor.java | 16 ++-- .../projectile/EntitySentientArrow.java | 8 +- .../bloodmagic/event/SoulNetworkEvent.java | 4 +- .../bloodmagic/item/ItemBloodOrb.java | 2 +- .../bloodmagic/item/ItemExperienceBook.java | 2 +- .../bloodmagic/item/ItemInscriptionTool.java | 2 +- .../bloodmagic/item/ItemLavaCrystal.java | 6 +- .../bloodmagic/item/ItemRitualDiviner.java | 8 +- .../bloodmagic/item/ItemRitualReader.java | 18 ++-- .../item/ItemTelepositionFocus.java | 10 +- .../item/alchemy/ItemCuttingFluid.java | 4 +- .../item/armour/ItemLivingArmour.java | 8 +- .../item/armour/ItemSentientArmour.java | 20 ++-- .../bloodmagic/item/block/ItemBlockMimic.java | 6 +- .../item/inventory/InventoryHolding.java | 4 +- .../item/inventory/ItemInventory.java | 8 +- .../item/routing/ItemNodeRouter.java | 6 +- .../item/sigil/ItemSigilHolding.java | 8 +- .../item/sigil/ItemSigilTeleposition.java | 8 +- .../item/sigil/ItemSigilTransposition.java | 10 +- .../bloodmagic/item/soul/ItemMonsterSoul.java | 2 +- .../item/soul/ItemSentientArmourGem.java | 2 +- .../bloodmagic/item/soul/ItemSentientAxe.java | 18 ++-- .../bloodmagic/item/soul/ItemSentientBow.java | 12 +-- .../item/soul/ItemSentientPickaxe.java | 18 ++-- .../item/soul/ItemSentientShovel.java | 18 ++-- .../item/soul/ItemSentientSword.java | 16 ++-- .../bloodmagic/item/soul/ItemSoulGem.java | 4 +- .../soulBreath/ItemSoulBreathContainer.java | 2 +- .../bloodmagic/livingArmour/LivingArmour.java | 24 ++--- .../LivingArmourUpgradeBattleHungry.java | 4 +- .../tracker/StatTrackerArrowProtect.java | 4 +- .../tracker/StatTrackerArrowShot.java | 4 +- .../tracker/StatTrackerCriticalStrike.java | 2 +- .../tracker/StatTrackerDigging.java | 4 +- .../tracker/StatTrackerExperience.java | 2 +- .../tracker/StatTrackerFallProtect.java | 4 +- .../tracker/StatTrackerFireResist.java | 4 +- .../livingArmour/tracker/StatTrackerFood.java | 4 +- .../tracker/StatTrackerGraveDigger.java | 2 +- .../tracker/StatTrackerGrimReaperSprint.java | 4 +- .../tracker/StatTrackerHealthboost.java | 2 +- .../livingArmour/tracker/StatTrackerJump.java | 4 +- .../tracker/StatTrackerMeleeDamage.java | 2 +- .../tracker/StatTrackerMovement.java | 2 +- .../tracker/StatTrackerNightSight.java | 6 +- .../tracker/StatTrackerPhysicalProtect.java | 4 +- .../tracker/StatTrackerPoison.java | 4 +- .../tracker/StatTrackerRepairing.java | 2 +- .../tracker/StatTrackerSelfSacrifice.java | 4 +- .../tracker/StatTrackerSolarPowered.java | 2 +- .../tracker/StatTrackerSprintAttack.java | 2 +- .../tracker/StatTrackerStepAssist.java | 2 +- .../LivingArmourUpgradeFireResist.java | 4 +- .../LivingArmourUpgradeGrimReaperSprint.java | 4 +- .../LivingArmourUpgradePoisonResist.java | 4 +- .../upgrade/LivingArmourUpgradeRepairing.java | 4 +- .../LivingArmourUpgradeSolarPowered.java | 4 +- .../PlayerVelocityPacketProcessor.java | 2 +- .../bloodmagic/potion/BMPotionUtils.java | 4 +- .../bloodmagic/potion/PotionBloodMagic.java | 2 +- .../bloodmagic/proxy/ClientProxy.java | 8 +- .../bloodmagic/ritual/AreaDescriptor.java | 16 ++-- .../bloodmagic/ritual/CapabilityRuneType.java | 6 +- .../bloodmagic/ritual/EnumRuneType.java | 2 +- .../WayofTime/bloodmagic/ritual/Ritual.java | 16 ++-- .../bloodmagic/ritual/RitualRenderer.java | 2 +- .../ritual/types/RitualForsakenSoul.java | 8 +- .../types/RitualLivingArmourDowngrade.java | 4 +- .../bloodmagic/ritual/types/RitualPortal.java | 6 +- .../bloodmagic/soul/DemonWillHolder.java | 6 +- .../bloodmagic/soul/EnumDemonWillType.java | 2 +- .../bloodmagic/teleport/PortalLocation.java | 14 +-- .../bloodmagic/tile/TileAlchemyArray.java | 16 ++-- .../bloodmagic/tile/TileAlchemyTable.java | 24 ++--- .../WayofTime/bloodmagic/tile/TileAltar.java | 2 +- .../bloodmagic/tile/TileBloodTank.java | 6 +- .../bloodmagic/tile/TileDemonCrucible.java | 2 +- .../bloodmagic/tile/TileDemonCrystal.java | 10 +- .../tile/TileDemonCrystallizer.java | 2 +- .../tile/TileDimensionalPortal.java | 14 +-- .../bloodmagic/tile/TileIncenseAltar.java | 4 +- .../bloodmagic/tile/TileInventory.java | 4 +- .../bloodmagic/tile/TileInversionPillar.java | 14 +-- .../tile/TileMasterRitualStone.java | 22 ++--- .../WayofTime/bloodmagic/tile/TileMimic.java | 32 +++---- .../bloodmagic/tile/TilePhantomBlock.java | 4 +- .../tile/TilePurificationAltar.java | 6 +- .../bloodmagic/tile/TileSoulForge.java | 4 +- .../bloodmagic/tile/TileSpectralBlock.java | 10 +- .../bloodmagic/tile/TileTeleposer.java | 4 +- .../bloodmagic/tile/base/TileBase.java | 29 +++--- .../bloodmagic/tile/base/TileTicking.java | 12 +-- .../tile/routing/TileFilteredRoutingNode.java | 12 +-- .../tile/routing/TileMasterRoutingNode.java | 42 ++++---- .../tile/routing/TileRoutingNode.java | 30 +++--- .../WayofTime/bloodmagic/util/ChatUtil.java | 4 +- .../bloodmagic/util/GhostItemHelper.java | 4 +- .../util/handler/event/ClientHandler.java | 6 +- .../util/handler/event/WillHandler.java | 2 +- .../bloodmagic/util/helper/ItemHelper.java | 6 +- 157 files changed, 622 insertions(+), 623 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java index ad2de048..73030287 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectLaputa.java @@ -113,18 +113,18 @@ public class AlchemyArrayEffectLaputa extends AlchemyArrayEffect { @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger("radius", radius); - tag.setInteger("teleportHeightOffset", teleportHeightOffset); - tag.setInteger(Constants.NBT.X_COORD, currentPos.getX()); - tag.setInteger(Constants.NBT.Y_COORD, currentPos.getY()); - tag.setInteger(Constants.NBT.Z_COORD, currentPos.getZ()); + tag.putInt("radius", radius); + tag.putInt("teleportHeightOffset", teleportHeightOffset); + tag.putInt(Constants.NBT.X_COORD, currentPos.getX()); + tag.putInt(Constants.NBT.Y_COORD, currentPos.getY()); + tag.putInt(Constants.NBT.Z_COORD, currentPos.getZ()); } @Override public void readFromNBT(CompoundNBT tag) { - radius = tag.getInteger("radius"); - teleportHeightOffset = tag.getInteger("teleportHeightOffset"); - currentPos = new BlockPos(tag.getInteger(Constants.NBT.X_COORD), tag.getInteger(Constants.NBT.Y_COORD), tag.getInteger(Constants.NBT.Z_COORD)); + radius = tag.getInt("radius"); + teleportHeightOffset = tag.getInt("teleportHeightOffset"); + currentPos = new BlockPos(tag.getInt(Constants.NBT.X_COORD), tag.getInt(Constants.NBT.Y_COORD), tag.getInt(Constants.NBT.Z_COORD)); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java index 0f24ac37..1c80f949 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java @@ -77,7 +77,7 @@ public class AlchemyCircleRenderer { float size = 1.0F * getSizeModifier(craftTime); // Bind the texture to the circle - Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + Minecraft.getInstance().renderEngine.bindTexture(arrayResource); GlStateManager.disableCull(); GlStateManager.enableBlend(); diff --git a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java index 7d13dc2e..036aea15 100644 --- a/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/altar/BloodAltar.java @@ -82,21 +82,21 @@ public class BloodAltar implements IFluidHandler { if (fluid != null) setMainFluid(fluid); - FluidStack fluidOut = new FluidStack(BlockLifeEssence.getLifeEssence(), tagCompound.getInteger(Constants.NBT.OUTPUT_AMOUNT)); + FluidStack fluidOut = new FluidStack(BlockLifeEssence.getLifeEssence(), tagCompound.getInt(Constants.NBT.OUTPUT_AMOUNT)); setOutputFluid(fluidOut); - FluidStack fluidIn = new FluidStack(BlockLifeEssence.getLifeEssence(), tagCompound.getInteger(Constants.NBT.INPUT_AMOUNT)); + FluidStack fluidIn = new FluidStack(BlockLifeEssence.getLifeEssence(), tagCompound.getInt(Constants.NBT.INPUT_AMOUNT)); setInputFluid(fluidIn); } - internalCounter = tagCompound.getInteger("internalCounter"); + internalCounter = tagCompound.getInt("internalCounter"); altarTier = Enums.getIfPresent(AltarTier.class, tagCompound.getString(Constants.NBT.ALTAR_TIER)).or(AltarTier.ONE); isActive = tagCompound.getBoolean(Constants.NBT.ALTAR_ACTIVE); - liquidRequired = tagCompound.getInteger(Constants.NBT.ALTAR_LIQUID_REQ); + liquidRequired = tagCompound.getInt(Constants.NBT.ALTAR_LIQUID_REQ); canBeFilled = tagCompound.getBoolean(Constants.NBT.ALTAR_FILLABLE); isUpgraded = tagCompound.getBoolean(Constants.NBT.ALTAR_UPGRADED); - consumptionRate = tagCompound.getInteger(Constants.NBT.ALTAR_CONSUMPTION_RATE); - drainRate = tagCompound.getInteger(Constants.NBT.ALTAR_DRAIN_RATE); + consumptionRate = tagCompound.getInt(Constants.NBT.ALTAR_CONSUMPTION_RATE); + drainRate = tagCompound.getInt(Constants.NBT.ALTAR_DRAIN_RATE); consumptionMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_CONSUMPTION_MULTIPLIER); efficiencyMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_EFFICIENCY_MULTIPLIER); selfSacrificeEfficiencyMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_SELF_SACRIFICE_MULTIPLIER); @@ -104,18 +104,18 @@ public class BloodAltar implements IFluidHandler { capacityMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_CAPACITY_MULTIPLIER); orbCapacityMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_ORB_CAPACITY_MULTIPLIER); dislocationMultiplier = tagCompound.getFloat(Constants.NBT.ALTAR_DISLOCATION_MULTIPLIER); - capacity = tagCompound.getInteger(Constants.NBT.ALTAR_CAPACITY); - bufferCapacity = tagCompound.getInteger(Constants.NBT.ALTAR_BUFFER_CAPACITY); - progress = tagCompound.getInteger(Constants.NBT.ALTAR_PROGRESS); + capacity = tagCompound.getInt(Constants.NBT.ALTAR_CAPACITY); + bufferCapacity = tagCompound.getInt(Constants.NBT.ALTAR_BUFFER_CAPACITY); + progress = tagCompound.getInt(Constants.NBT.ALTAR_PROGRESS); isResultBlock = tagCompound.getBoolean(Constants.NBT.ALTAR_IS_RESULT_BLOCK); - lockdownDuration = tagCompound.getInteger(Constants.NBT.ALTAR_LOCKDOWN_DURATION); - accelerationUpgrades = tagCompound.getInteger(Constants.NBT.ALTAR_ACCELERATION_UPGRADES); - demonBloodDuration = tagCompound.getInteger(Constants.NBT.ALTAR_DEMON_BLOOD_DURATION); - cooldownAfterCrafting = tagCompound.getInteger(Constants.NBT.ALTAR_COOLDOWN_AFTER_CRAFTING); - chargingRate = tagCompound.getInteger(Constants.NBT.ALTAR_CHARGE_RATE); - chargingFrequency = tagCompound.getInteger(Constants.NBT.ALTAR_CHARGE_FREQUENCY); - totalCharge = tagCompound.getInteger(Constants.NBT.ALTAR_TOTAL_CHARGE); - maxCharge = tagCompound.getInteger(Constants.NBT.ALTAR_MAX_CHARGE); + lockdownDuration = tagCompound.getInt(Constants.NBT.ALTAR_LOCKDOWN_DURATION); + accelerationUpgrades = tagCompound.getInt(Constants.NBT.ALTAR_ACCELERATION_UPGRADES); + demonBloodDuration = tagCompound.getInt(Constants.NBT.ALTAR_DEMON_BLOOD_DURATION); + cooldownAfterCrafting = tagCompound.getInt(Constants.NBT.ALTAR_COOLDOWN_AFTER_CRAFTING); + chargingRate = tagCompound.getInt(Constants.NBT.ALTAR_CHARGE_RATE); + chargingFrequency = tagCompound.getInt(Constants.NBT.ALTAR_CHARGE_FREQUENCY); + totalCharge = tagCompound.getInt(Constants.NBT.ALTAR_TOTAL_CHARGE); + maxCharge = tagCompound.getInt(Constants.NBT.ALTAR_MAX_CHARGE); currentTierDisplayed = Enums.getIfPresent(AltarTier.class, tagCompound.getString(Constants.NBT.ALTAR_CURRENT_TIER_DISPLAYED)).or(AltarTier.ONE); } @@ -124,42 +124,42 @@ public class BloodAltar implements IFluidHandler { if (fluid != null) fluid.writeToNBT(tagCompound); else - tagCompound.setString(Constants.NBT.EMPTY, ""); + tagCompound.putString(Constants.NBT.EMPTY, ""); if (fluidOutput != null) - tagCompound.setInteger(Constants.NBT.OUTPUT_AMOUNT, fluidOutput.amount); + tagCompound.putInt(Constants.NBT.OUTPUT_AMOUNT, fluidOutput.amount); if (fluidInput != null) - tagCompound.setInteger(Constants.NBT.INPUT_AMOUNT, fluidInput.amount); + tagCompound.putInt(Constants.NBT.INPUT_AMOUNT, fluidInput.amount); - tagCompound.setInteger("internalCounter", internalCounter); - tagCompound.setString(Constants.NBT.ALTAR_TIER, altarTier.name()); - tagCompound.setBoolean(Constants.NBT.ALTAR_ACTIVE, isActive); - tagCompound.setInteger(Constants.NBT.ALTAR_LIQUID_REQ, liquidRequired); - tagCompound.setBoolean(Constants.NBT.ALTAR_FILLABLE, canBeFilled); - tagCompound.setBoolean(Constants.NBT.ALTAR_UPGRADED, isUpgraded); - tagCompound.setInteger(Constants.NBT.ALTAR_CONSUMPTION_RATE, consumptionRate); - tagCompound.setInteger(Constants.NBT.ALTAR_DRAIN_RATE, drainRate); - tagCompound.setFloat(Constants.NBT.ALTAR_CONSUMPTION_MULTIPLIER, consumptionMultiplier); - tagCompound.setFloat(Constants.NBT.ALTAR_EFFICIENCY_MULTIPLIER, efficiencyMultiplier); - tagCompound.setFloat(Constants.NBT.ALTAR_SACRIFICE_MULTIPLIER, sacrificeEfficiencyMultiplier); - tagCompound.setFloat(Constants.NBT.ALTAR_SELF_SACRIFICE_MULTIPLIER, selfSacrificeEfficiencyMultiplier); - tagCompound.setBoolean(Constants.NBT.ALTAR_IS_RESULT_BLOCK, isResultBlock); - tagCompound.setFloat(Constants.NBT.ALTAR_CAPACITY_MULTIPLIER, capacityMultiplier); - tagCompound.setFloat(Constants.NBT.ALTAR_ORB_CAPACITY_MULTIPLIER, orbCapacityMultiplier); - tagCompound.setFloat(Constants.NBT.ALTAR_DISLOCATION_MULTIPLIER, dislocationMultiplier); - tagCompound.setInteger(Constants.NBT.ALTAR_CAPACITY, capacity); - tagCompound.setInteger(Constants.NBT.ALTAR_PROGRESS, progress); - tagCompound.setInteger(Constants.NBT.ALTAR_BUFFER_CAPACITY, bufferCapacity); - tagCompound.setInteger(Constants.NBT.ALTAR_LOCKDOWN_DURATION, lockdownDuration); - tagCompound.setInteger(Constants.NBT.ALTAR_ACCELERATION_UPGRADES, accelerationUpgrades); - tagCompound.setInteger(Constants.NBT.ALTAR_DEMON_BLOOD_DURATION, demonBloodDuration); - tagCompound.setInteger(Constants.NBT.ALTAR_COOLDOWN_AFTER_CRAFTING, cooldownAfterCrafting); - tagCompound.setInteger(Constants.NBT.ALTAR_CHARGE_RATE, chargingRate); - tagCompound.setInteger(Constants.NBT.ALTAR_CHARGE_FREQUENCY, chargingFrequency); - tagCompound.setInteger(Constants.NBT.ALTAR_TOTAL_CHARGE, totalCharge); - tagCompound.setInteger(Constants.NBT.ALTAR_MAX_CHARGE, maxCharge); - tagCompound.setString(Constants.NBT.ALTAR_CURRENT_TIER_DISPLAYED, currentTierDisplayed.name()); + tagCompound.putInt("internalCounter", internalCounter); + tagCompound.putString(Constants.NBT.ALTAR_TIER, altarTier.name()); + tagCompound.putBoolean(Constants.NBT.ALTAR_ACTIVE, isActive); + tagCompound.putInt(Constants.NBT.ALTAR_LIQUID_REQ, liquidRequired); + tagCompound.putBoolean(Constants.NBT.ALTAR_FILLABLE, canBeFilled); + tagCompound.putBoolean(Constants.NBT.ALTAR_UPGRADED, isUpgraded); + tagCompound.putInt(Constants.NBT.ALTAR_CONSUMPTION_RATE, consumptionRate); + tagCompound.putInt(Constants.NBT.ALTAR_DRAIN_RATE, drainRate); + tagCompound.putFloat(Constants.NBT.ALTAR_CONSUMPTION_MULTIPLIER, consumptionMultiplier); + tagCompound.putFloat(Constants.NBT.ALTAR_EFFICIENCY_MULTIPLIER, efficiencyMultiplier); + tagCompound.putFloat(Constants.NBT.ALTAR_SACRIFICE_MULTIPLIER, sacrificeEfficiencyMultiplier); + tagCompound.putFloat(Constants.NBT.ALTAR_SELF_SACRIFICE_MULTIPLIER, selfSacrificeEfficiencyMultiplier); + tagCompound.putBoolean(Constants.NBT.ALTAR_IS_RESULT_BLOCK, isResultBlock); + tagCompound.putFloat(Constants.NBT.ALTAR_CAPACITY_MULTIPLIER, capacityMultiplier); + tagCompound.putFloat(Constants.NBT.ALTAR_ORB_CAPACITY_MULTIPLIER, orbCapacityMultiplier); + tagCompound.putFloat(Constants.NBT.ALTAR_DISLOCATION_MULTIPLIER, dislocationMultiplier); + tagCompound.putInt(Constants.NBT.ALTAR_CAPACITY, capacity); + tagCompound.putInt(Constants.NBT.ALTAR_PROGRESS, progress); + tagCompound.putInt(Constants.NBT.ALTAR_BUFFER_CAPACITY, bufferCapacity); + tagCompound.putInt(Constants.NBT.ALTAR_LOCKDOWN_DURATION, lockdownDuration); + tagCompound.putInt(Constants.NBT.ALTAR_ACCELERATION_UPGRADES, accelerationUpgrades); + tagCompound.putInt(Constants.NBT.ALTAR_DEMON_BLOOD_DURATION, demonBloodDuration); + tagCompound.putInt(Constants.NBT.ALTAR_COOLDOWN_AFTER_CRAFTING, cooldownAfterCrafting); + tagCompound.putInt(Constants.NBT.ALTAR_CHARGE_RATE, chargingRate); + tagCompound.putInt(Constants.NBT.ALTAR_CHARGE_FREQUENCY, chargingFrequency); + tagCompound.putInt(Constants.NBT.ALTAR_TOTAL_CHARGE, totalCharge); + tagCompound.putInt(Constants.NBT.ALTAR_MAX_CHARGE, maxCharge); + tagCompound.putString(Constants.NBT.ALTAR_CURRENT_TIER_DISPLAYED, currentTierDisplayed.name()); } public void startCycle() { diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java index cfa597dc..ebc22ba0 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java @@ -91,7 +91,7 @@ public class BlockBloodLight extends Block { @Override @SideOnly(Side.CLIENT) public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random rand) { - ClientPlayerEntity player = Minecraft.getMinecraft().player; + ClientPlayerEntity player = Minecraft.getInstance().player; if (rand.nextInt(3) != 0) { world.spawnParticle(EnumParticleTypes.REDSTONE, pos.getX() + 0.5D + rand.nextGaussian() / 8, pos.getY() + 0.5D, pos.getZ() + 0.5D + rand.nextGaussian() / 8, 0, 0, 0, 0); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java index a3bdfd77..b289bfd8 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java @@ -116,7 +116,7 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB if (bloodTank.getTank().getFluid() != null) { bloodTank.getTank().getFluid().writeToNBT(fluidTag); CompoundNBT dropTag = new CompoundNBT(); - dropTag.setTag("Fluid", fluidTag); + dropTag.put("Fluid", fluidTag); drop.setTagCompound(dropTag); } @@ -131,7 +131,7 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB TileBloodTank bloodTank = (TileBloodTank) tile; CompoundNBT tag = stack.getTagCompound(); if (stack.hasTagCompound() && stack.getTagCompound().hasKey("Fluid")) { - FluidStack fluidStack = FluidStack.loadFluidStackFromNBT(tag.getCompoundTag("Fluid")); + FluidStack fluidStack = FluidStack.loadFluidStackFromNBT(tag.getCompound("Fluid")); bloodTank.getTank().setFluid(fluidStack); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/Sprite.java b/src/main/java/WayofTime/bloodmagic/client/Sprite.java index cb92dcd1..f6e54ea6 100644 --- a/src/main/java/WayofTime/bloodmagic/client/Sprite.java +++ b/src/main/java/WayofTime/bloodmagic/client/Sprite.java @@ -43,7 +43,7 @@ public class Sprite { } public void draw(int x, int y) { - Minecraft.getMinecraft().renderEngine.bindTexture(textureLocation); + Minecraft.getInstance().renderEngine.bindTexture(textureLocation); float f = 0.00390625F; float f1 = 0.00390625F; Tessellator tessellator = Tessellator.getInstance(); diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java index b4f55629..a14c5710 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiBloodMagicConfig.java @@ -27,7 +27,7 @@ public class GuiBloodMagicConfig extends GuiConfig { elements.addAll(ConfigElement.from(ConfigHandler.class).getChildElements()); elements.add(new ConfigElement(BloodMagic.RITUAL_MANAGER.getConfig().getCategory("rituals"))); - if (Minecraft.getMinecraft().world != null) + if (Minecraft.getInstance().world != null) elements.add(new DummyElementEditHUD(BloodMagic.NAME, "config." + BloodMagic.MODID + ".edit_hud")); return elements; diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java index 72ffef7b..edf65f6a 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java @@ -129,7 +129,7 @@ public class GuiItemRoutingNode extends ContainerScreen { super.drawScreen(mouseX, mouseY, partialTicks); this.renderHoveredToolTip(mouseX, mouseY); - Minecraft.getMinecraft().fontRenderer.drawString(inventory.getName(), xSize, ySize / 4, 4210752); + Minecraft.getInstance().fontRenderer.drawString(inventory.getName(), xSize, ySize / 4, 4210752); } /** diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java b/src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java index 9c62ee31..642ea5e4 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/ElementRegistry.java @@ -114,10 +114,10 @@ public class ElementRegistry { @SubscribeEvent public static void onRenderOverlay(RenderGameOverlayEvent.Pre event) { if (event.getType() == RenderGameOverlayEvent.ElementType.HOTBAR) { - ScaledResolution resolution = new ScaledResolution(Minecraft.getMinecraft()); + ScaledResolution resolution = new ScaledResolution(Minecraft.getInstance()); for (HUDElement element : HUD_ELEMENTS.values()) { - if (!element.shouldRender(Minecraft.getMinecraft())) + if (!element.shouldRender(Minecraft.getInstance())) continue; Vector2f position = ELEMENT_INFO.get(getKey(element)).getPosition(); diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java b/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java index c14d65c4..af605d69 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/GuiEditHUD.java @@ -47,7 +47,7 @@ public class GuiEditHUD extends Screen { drawDefaultBackground(); super.drawScreen(mouseX, mouseY, partialTicks); - ScaledResolution resolution = new ScaledResolution(Minecraft.getMinecraft()); + ScaledResolution resolution = new ScaledResolution(Minecraft.getInstance()); for (HUDElement element : ElementRegistry.getElements()) { if (dragged == element) continue; @@ -87,7 +87,7 @@ public class GuiEditHUD extends Screen { @Override protected void mouseReleased(int mouseX, int mouseY, int state) { if (dragged != null) { - ScaledResolution resolution = new ScaledResolution(Minecraft.getMinecraft()); + ScaledResolution resolution = new ScaledResolution(Minecraft.getInstance()); Point bounded = getBoundedDrag(resolution, mouseX, mouseY); float xPos = (float) ((bounded.x) / resolution.getScaledWidth_double()); float yPos = (float) ((bounded.y) / resolution.getScaledHeight_double()); @@ -105,7 +105,7 @@ public class GuiEditHUD extends Screen { protected void actionPerformed(Button button) { switch (button.id) { case 0: { - Minecraft.getMinecraft().displayGuiScreen(parent); + Minecraft.getInstance().displayGuiScreen(parent); break; } case 1: { @@ -116,12 +116,12 @@ public class GuiEditHUD extends Screen { } case 2: { ElementRegistry.save(currentOverrides); - Minecraft.getMinecraft().displayGuiScreen(parent); + Minecraft.getInstance().displayGuiScreen(parent); break; } case 3: { currentOverrides.clear(); - Minecraft.getMinecraft().displayGuiScreen(parent); + Minecraft.getInstance().displayGuiScreen(parent); break; } } diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java index a039b541..4a75a97e 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDemonAura.java @@ -31,7 +31,7 @@ public class ElementDemonAura extends HUDElement { @Override public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) { - Minecraft minecraft = Minecraft.getMinecraft(); + Minecraft minecraft = Minecraft.getInstance(); PlayerEntity player = minecraft.player; minecraft.getTextureManager().bindTexture(BAR_LOCATION); @@ -73,6 +73,6 @@ public class ElementDemonAura extends HUDElement { @Override public boolean shouldRender(Minecraft minecraft) { - return Utils.canPlayerSeeDemonWill(Minecraft.getMinecraft().player); + return Utils.canPlayerSeeDemonWill(Minecraft.getInstance().player); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java index 4854f312..d461e8f9 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementDivinedInformation.java @@ -21,7 +21,7 @@ public abstract class ElementDivinedInformation extends El @Override public boolean shouldRender(Minecraft minecraft) { - PlayerEntity player = Minecraft.getMinecraft().player; + PlayerEntity player = Minecraft.getInstance().player; ItemStack sigilStack = player.getHeldItem(Hand.MAIN_HAND); boolean flag = false; if (simple) { diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java index c83e9966..bd8fefe2 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java @@ -28,7 +28,7 @@ public class ElementHolding extends HUDElement { GlStateManager.color(1.0F, 1.0F, 1.0F); HOLDING_BAR.draw(drawX, drawY); - Minecraft minecraft = Minecraft.getMinecraft(); + Minecraft minecraft = Minecraft.getInstance(); ItemStack sigilHolding = minecraft.player.getHeldItemMainhand(); // Check mainhand for Sigil of Holding if (!(sigilHolding.getItem() == RegistrarBloodMagicItems.SIGIL_HOLDING)) @@ -74,12 +74,12 @@ public class ElementHolding extends HUDElement { GlStateManager.translate((float) (-(x + 8)), (float) (-(y + 12)), 0.0F); } - Minecraft.getMinecraft().getRenderItem().renderItemAndEffectIntoGUI(player, stack, x, y); + Minecraft.getInstance().getRenderItem().renderItemAndEffectIntoGUI(player, stack, x, y); if (animation > 0.0F) GlStateManager.popMatrix(); - Minecraft.getMinecraft().getRenderItem().renderItemOverlays(Minecraft.getMinecraft().fontRenderer, stack, x, y); + Minecraft.getInstance().getRenderItem().renderItemOverlays(Minecraft.getInstance().fontRenderer, stack, x, y); } } } diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementItemStack.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementItemStack.java index 5f783e55..d7dee606 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementItemStack.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementItemStack.java @@ -17,7 +17,7 @@ public class ElementItemStack extends HUDElement { @Override public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) { RenderHelper.enableGUIStandardItemLighting(); - Minecraft.getMinecraft().getRenderItem().renderItemIntoGUI(stack, drawX, drawY); + Minecraft.getInstance().getRenderItem().renderItemIntoGUI(stack, drawX, drawY); RenderHelper.disableStandardItemLighting(); } } diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementString.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementString.java index 419ebe25..88016c2d 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementString.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementString.java @@ -10,14 +10,14 @@ public class ElementString extends HUDElement { private ITextComponent[] display; public ElementString(ITextComponent... display) { - super(getMaxStringWidth(display), (Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT + 2) * display.length - 2); + super(getMaxStringWidth(display), (Minecraft.getInstance().fontRenderer.FONT_HEIGHT + 2) * display.length - 2); this.display = display; } @Override public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) { - FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; + FontRenderer fontRenderer = Minecraft.getInstance().fontRenderer; for (ITextComponent drawText : display) { fontRenderer.drawStringWithShadow(drawText.getFormattedText(), drawX, drawY, 14737632); drawY += fontRenderer.FONT_HEIGHT + 2; @@ -25,7 +25,7 @@ public class ElementString extends HUDElement { } private static int getMaxStringWidth(ITextComponent... display) { - FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; + FontRenderer fontRenderer = Minecraft.getInstance().fontRenderer; int maxWidth = 0; for (ITextComponent drawText : display) if (fontRenderer.getStringWidth(drawText.getFormattedText()) > maxWidth) diff --git a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementTileInformation.java b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementTileInformation.java index f8092cf6..9b6f88fe 100644 --- a/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementTileInformation.java +++ b/src/main/java/WayofTime/bloodmagic/client/hud/element/ElementTileInformation.java @@ -31,24 +31,24 @@ public abstract class ElementTileInformation extends HUDEl @SuppressWarnings("unchecked") @Override public void draw(ScaledResolution resolution, float partialTicks, int drawX, int drawY) { - T tile = (T) Minecraft.getMinecraft().world.getTileEntity(Minecraft.getMinecraft().objectMouseOver.getBlockPos()); + T tile = (T) Minecraft.getInstance().world.getTileEntity(Minecraft.getInstance().objectMouseOver.getBlockPos()); int yOffset = 0; for (Pair> sprite : information) { sprite.getLeft().draw(drawX, drawY + yOffset); int textY = drawY + yOffset + (sprite.getLeft().getTextureHeight() / 4); - Minecraft.getMinecraft().fontRenderer.drawStringWithShadow((tile != null && tile.getClass() == tileClass) ? sprite.getRight().apply(tile) : "?", drawX + sprite.getLeft().getTextureWidth() + 2, textY, Color.WHITE.getRGB()); + Minecraft.getInstance().fontRenderer.drawStringWithShadow((tile != null && tile.getClass() == tileClass) ? sprite.getRight().apply(tile) : "?", drawX + sprite.getLeft().getTextureWidth() + 2, textY, Color.WHITE.getRGB()); yOffset += sprite.getLeft().getTextureHeight() + 2; } } @Override public boolean shouldRender(Minecraft minecraft) { - RayTraceResult trace = Minecraft.getMinecraft().objectMouseOver; + RayTraceResult trace = Minecraft.getInstance().objectMouseOver; if (trace == null || trace.typeOfHit != RayTraceResult.Type.BLOCK) return false; - TileEntity tile = Minecraft.getMinecraft().world.getTileEntity(trace.getBlockPos()); + TileEntity tile = Minecraft.getInstance().world.getTileEntity(trace.getBlockPos()); if (tile == null || !tileClass.isAssignableFrom(tile.getClass())) return false; diff --git a/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java b/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java index 8d7b86d4..583f54da 100644 --- a/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java +++ b/src/main/java/WayofTime/bloodmagic/client/key/KeyBindings.java @@ -33,7 +33,7 @@ public enum KeyBindings { @SideOnly(Side.CLIENT) @Override public void handleKeybind() { - ClientPlayerEntity player = Minecraft.getMinecraft().player; + ClientPlayerEntity player = Minecraft.getInstance().player; if (player.getHeldItemMainhand().getItem() instanceof ItemSigilHolding) ClientHandler.cycleSigil(player.getHeldItemMainhand(), player, -1); } @@ -42,7 +42,7 @@ public enum KeyBindings { @SideOnly(Side.CLIENT) @Override public void handleKeybind() { - ClientPlayerEntity player = Minecraft.getMinecraft().player; + ClientPlayerEntity player = Minecraft.getInstance().player; if (player.getHeldItemMainhand().getItem() instanceof ItemSigilHolding) ClientHandler.cycleSigil(player.getHeldItemMainhand(), player, 1); } 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 057ee09d..3131c610 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java @@ -69,7 +69,7 @@ public class AttractorAlchemyCircleRenderer extends AlchemyCircleRenderer { float size = 1.0F * getSizeModifier(craftTime); // Bind the texture to the circle - Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + Minecraft.getInstance().renderEngine.bindTexture(arrayResource); GlStateManager.disableCull(); GlStateManager.enableBlend(); 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 6fc89ccb..8f487060 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java @@ -99,7 +99,7 @@ public class BindingAlchemyCircleRenderer extends AlchemyCircleRenderer { float size = 3.0F; // Bind the texture to the circle - Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + Minecraft.getInstance().renderEngine.bindTexture(arrayResource); GlStateManager.disableCull(); GlStateManager.enableBlend(); @@ -159,7 +159,7 @@ public class BindingAlchemyCircleRenderer extends AlchemyCircleRenderer { for (int i = 0; i < 5; i++) { GlStateManager.pushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(arraysResources[i]); + Minecraft.getInstance().renderEngine.bindTexture(arraysResources[i]); float newSize = 1; float distance = BindingAlchemyCircleRenderer.getDistanceOfCircle(i, craftTime); float angle = BindingAlchemyCircleRenderer.getAngleOfCircle(i, craftTime); 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 ec483fc2..44661394 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java @@ -99,7 +99,7 @@ public class DualAlchemyCircleRenderer extends AlchemyCircleRenderer { GlStateManager.rotate(rotation.getHorizontalAngle() + 180, 0, 0, 1); // Bind the texture to the circle - Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + Minecraft.getInstance().renderEngine.bindTexture(arrayResource); GlStateManager.pushMatrix(); GlStateManager.rotate(rot, 0, 0, 1); double var31 = 0.0D; @@ -119,7 +119,7 @@ public class DualAlchemyCircleRenderer extends AlchemyCircleRenderer { GlStateManager.popMatrix(); // Bind the second texture to the circle - Minecraft.getMinecraft().renderEngine.bindTexture(secondaryArrayResource); + Minecraft.getInstance().renderEngine.bindTexture(secondaryArrayResource); GlStateManager.pushMatrix(); GlStateManager.rotate(-rot, 0, 0, 1); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java index 8c84e8f1..62c3a02e 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java @@ -69,7 +69,7 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer { float size = 1.0F * getSizeModifier(craftTime); // Bind the texture to the circle - Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + Minecraft.getInstance().renderEngine.bindTexture(arrayResource); GlStateManager.disableCull(); GlStateManager.enableBlend(); @@ -126,14 +126,14 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer { for (int i = 1; i <= 3; i++) { GlStateManager.pushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(bottomArrayResource); + Minecraft.getInstance().renderEngine.bindTexture(bottomArrayResource); translateAndRotateFloatingArray(tessellator, wr, size, rot, craftTime, i); GlStateManager.popMatrix(); } //Render the main array. GlStateManager.pushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + Minecraft.getInstance().renderEngine.bindTexture(arrayResource); // GlStateManager.rotate(rot, 0, 0, 1); renderStandardCircle(tessellator, wr, 3); GlStateManager.popMatrix(); @@ -146,7 +146,7 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer { swirlSize = 3 * (craftTime - 40) / 60; } GlStateManager.pushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(mobSacrificeSwirlResource); + Minecraft.getInstance().renderEngine.bindTexture(mobSacrificeSwirlResource); GlStateManager.translate(0, 0, 0.1); GlStateManager.rotate(rot / 3, 0, 0, 1); renderStandardCircle(tessellator, wr, swirlSize); 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 26472bb5..1e292998 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java @@ -97,7 +97,7 @@ public class SingleAlchemyCircleRenderer extends AlchemyCircleRenderer { GlStateManager.rotate(rotation.getHorizontalAngle() + 180, 0, 0, 1); // Bind the texture to the circle - Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + Minecraft.getInstance().renderEngine.bindTexture(arrayResource); GlStateManager.pushMatrix(); GlStateManager.rotate(rot, 0, 0, 1); double var31 = 0.0D; 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 36652fc6..80d58a79 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java @@ -58,7 +58,7 @@ public class StaticAlchemyCircleRenderer extends AlchemyCircleRenderer { float size = 1.0F * getSizeModifier(craftTime); // Bind the texture to the circle - Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + Minecraft.getInstance().renderEngine.bindTexture(arrayResource); GlStateManager.disableCull(); GlStateManager.enableBlend(); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java index 0603abc8..77a72a3f 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java @@ -79,7 +79,7 @@ public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer { float size = 1.0F * getSizeModifier(craftTime); // Bind the texture to the circle - Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + Minecraft.getInstance().renderEngine.bindTexture(arrayResource); GlStateManager.disableCull(); GlStateManager.enableBlend(); @@ -135,21 +135,21 @@ public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer { GlStateManager.rotate((float) ((pitch + 90) * getStartupPitchYawRatio(craftTime)), 1, 0, 0); GlStateManager.pushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(bottomArrayResource); + Minecraft.getInstance().renderEngine.bindTexture(bottomArrayResource); GlStateManager.rotate(-rot, 0, 0, 1); GlStateManager.translate(0, 0, -bottomHeightOffset); renderStandardCircle(tessellator, wr, size / 2); GlStateManager.popMatrix(); GlStateManager.pushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(middleArrayResource); + Minecraft.getInstance().renderEngine.bindTexture(middleArrayResource); GlStateManager.rotate(0, 0, 0, 1); GlStateManager.translate(0, 0, -middleHeightOffset); renderStandardCircle(tessellator, wr, size); GlStateManager.popMatrix(); GlStateManager.pushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource); + Minecraft.getInstance().renderEngine.bindTexture(arrayResource); GlStateManager.rotate(rot, 0, 0, 1); GlStateManager.translate(0, 0, -topHeightOffset); renderStandardCircle(tessellator, wr, size); 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 5b8d2cc4..6a094932 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderAltar.java @@ -54,11 +54,11 @@ public class RenderAltar extends TileEntityRenderer { float size = 0.8f; - TextureAtlasSprite fluidStillSprite = Minecraft.getMinecraft().getTextureMapBlocks().getTextureExtry(fluid.getStill().toString()); + TextureAtlasSprite fluidStillSprite = Minecraft.getInstance().getTextureMapBlocks().getTextureExtry(fluid.getStill().toString()); int fluidColor = fluid.getColor(fluidStack); - Minecraft.getMinecraft().renderEngine.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); + Minecraft.getInstance().renderEngine.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); setGLColorFromInt(fluidColor); double uMin = (double) fluidStillSprite.getMinU(); @@ -78,7 +78,7 @@ public class RenderAltar extends TileEntityRenderer { } private void renderItem(ItemStack stack) { - ItemRenderer itemRenderer = Minecraft.getMinecraft().getRenderItem(); + ItemRenderer itemRenderer = Minecraft.getInstance().getRenderItem(); if (!stack.isEmpty()) { GlStateManager.translate(0.5, 1, 0.5); GlStateManager.pushMatrix(); @@ -100,7 +100,7 @@ public class RenderAltar extends TileEntityRenderer { } private void renderHologram(TileAltar altar, AltarTier tier, float partialTicks) { - ClientPlayerEntity player = Minecraft.getMinecraft().player; + ClientPlayerEntity player = Minecraft.getInstance().player; World world = player.world; if (tier == AltarTier.ONE) 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 5dd1e340..1c384246 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java @@ -17,7 +17,7 @@ import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class RenderBloodTank extends TileEntityRenderer { - private static final Minecraft mc = Minecraft.getMinecraft(); + private static final Minecraft mc = Minecraft.getInstance(); @Override public void render(TileBloodTank bloodTank, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { @@ -49,7 +49,7 @@ public class RenderBloodTank extends TileEntityRenderer { Tessellator tessellator = Tessellator.getInstance(); BufferBuilder buffer = tessellator.getBuffer(); - TextureAtlasSprite fluid = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(renderFluid.getStill().toString()); + TextureAtlasSprite fluid = Minecraft.getInstance().getTextureMapBlocks().getAtlasSprite(renderFluid.getStill().toString()); fluid = fluid == null ? mc.getTextureMapBlocks().getMissingSprite() : fluid; buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); 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 a7fceec7..c69a2053 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderDemonCrucible.java @@ -13,7 +13,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; public class RenderDemonCrucible extends TileEntityRenderer { - public static Minecraft mc = Minecraft.getMinecraft(); + public static Minecraft mc = Minecraft.getInstance(); public static ResourceLocation resource = new ResourceLocation("bloodmagic", "textures/blocks/lifeEssenceStill.png"); public static float minHeight = 0.6497f; public static float maxHeight = 0.79f; diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderFakeBlocks.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderFakeBlocks.java index 62516e8f..331fc733 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderFakeBlocks.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderFakeBlocks.java @@ -18,7 +18,7 @@ public class RenderFakeBlocks { double maxZ = minZ + 1; Tessellator tessellator = Tessellator.getInstance(); BufferBuilder wr = tessellator.getBuffer(); - Minecraft.getMinecraft().renderEngine.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); + Minecraft.getInstance().renderEngine.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java index 6f16f809..9fa0fccb 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/block/RenderItemRoutingNode.java @@ -20,7 +20,7 @@ import java.util.List; public class RenderItemRoutingNode extends TileEntityRenderer { private static final ResourceLocation beamTexture = new ResourceLocation(BloodMagic.MODID, "textures/entities/nodeBeam.png"); - private static final Minecraft mc = Minecraft.getMinecraft(); + private static final Minecraft mc = Minecraft.getInstance(); @Override public void render(TileRoutingNode tileNode, double x, double y, double z, float partialTicks, int destroyStage, float alpha) { diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java index 45214ac1..8a6c56f2 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityBloodLight.java @@ -12,7 +12,7 @@ import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.util.ResourceLocation; public class RenderEntityBloodLight extends EntityRenderer { - private final ItemRenderer renderItem = Minecraft.getMinecraft().getRenderItem(); + private final ItemRenderer renderItem = Minecraft.getInstance().getRenderItem(); public RenderEntityBloodLight(EntityRendererManager renderManagerIn) { super(renderManagerIn); diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java index 6cde4204..9ef06886 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java @@ -26,7 +26,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderEntityMimic extends MobRenderer { private static final ResourceLocation SPIDER_TEXTURES = new ResourceLocation("textures/entity/spider/spider.png"); - Minecraft minecraft = Minecraft.getMinecraft(); + Minecraft minecraft = Minecraft.getInstance(); public RenderEntityMimic(EntityRendererManager renderManagerIn) { super(renderManagerIn, new ModelMimic(), 1.0F); @@ -49,7 +49,7 @@ public class RenderEntityMimic extends MobRenderer { ItemStack itemstack = mimic.getMimicItemStack(); Item item = itemstack.getItem(); - Minecraft minecraft = Minecraft.getMinecraft(); + Minecraft minecraft = Minecraft.getInstance(); GlStateManager.pushMatrix(); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); @@ -70,7 +70,7 @@ public class RenderEntityMimic extends MobRenderer { if (!StringUtils.isNullOrEmpty(s)) { gameprofile = SkullTileEntity.updateGameProfile(new GameProfile(null, s)); - nbttagcompound.setTag("SkullOwner", NBTUtil.writeGameProfile(new CompoundNBT(), gameprofile)); + nbttagcompound.putTag("SkullOwner", NBTUtil.writeGameProfile(new CompoundNBT(), gameprofile)); } } } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java index 106ec48e..783d68d4 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySoulSnare.java @@ -13,7 +13,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; public class RenderEntitySoulSnare extends EntityRenderer { - private final ItemRenderer renderItem = Minecraft.getMinecraft().getRenderItem(); + private final ItemRenderer renderItem = Minecraft.getInstance().getRenderItem(); public RenderEntitySoulSnare(EntityRendererManager renderManagerIn) { super(renderManagerIn); 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 5e5da140..d818f024 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 @@ -37,7 +37,7 @@ public class LayerAlchemyCircle implements Layer float size = 3.0F; // Bind the texture to the circle - Minecraft.getMinecraft().renderEngine.bindTexture(ARRAY_TEXTURE); + Minecraft.getInstance().renderEngine.bindTexture(ARRAY_TEXTURE); GlStateManager.disableCull(); GlStateManager.enableBlend(); diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java index 577e4f85..9ce5c229 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/entry/EntryText.java @@ -28,7 +28,7 @@ public class EntryText extends EntryResourceLocation { @Override @SideOnly(Side.CLIENT) public void drawExtras(Book book, CategoryAbstract category, int entryX, int entryY, int entryWidth, int entryHeight, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRendererObj) { - Minecraft.getMinecraft().getTextureManager().bindTexture(image); + Minecraft.getInstance().getTextureManager().bindTexture(image); GuiHelper.drawSizedIconWithoutColor(entryX + 4, entryY + 2, 8, 8, 1F); boolean startFlag = fontRendererObj.getUnicodeFlag(); diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAlchemyArray.java index caa0df9a..b3325e86 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAlchemyArray.java @@ -51,13 +51,13 @@ public class PageAlchemyArray extends Page { int x = guiLeft + 65; int y = guiTop + 30; - Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("bloodmagicguide" + ":textures/gui/alchemyArrayCrafting.png")); + Minecraft.getInstance().getTextureManager().bindTexture(new ResourceLocation("bloodmagicguide" + ":textures/gui/alchemyArrayCrafting.png")); guiBase.drawTexturedModalRect(x, y, 0, 0, 62, 88 + (outputStack.isEmpty() ? 0 : 26)); guiBase.drawCenteredString(fontRenderer, TextHelper.localize("guide.bloodmagic.page.alchemyArray"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); for (ResourceLocation arrayResource : arrayResources) { - Minecraft.getMinecraft().getTextureManager().bindTexture(arrayResource); + Minecraft.getInstance().getTextureManager().bindTexture(arrayResource); GlStateManager.pushMatrix(); GlStateManager.translate(x + 2, y + 28, 0); GlStateManager.scale(scale, scale, scale); diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java index 2d661567..a2327e95 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageAltarRecipe.java @@ -37,7 +37,7 @@ public class PageAltarRecipe extends Page { @Override @SideOnly(Side.CLIENT) public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) { - Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("bloodmagicguide" + ":textures/gui/altar.png")); + Minecraft.getInstance().getTextureManager().bindTexture(new ResourceLocation("bloodmagicguide" + ":textures/gui/altar.png")); guiBase.drawTexturedModalRect(guiLeft + 42, guiTop + 53, 0, 0, 146, 104); guiBase.drawCenteredString(fontRenderer, TextHelper.localize("guide.bloodmagic.page.bloodAltar"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); diff --git a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java index 64302417..7b3dad2b 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/compat/guideapi/page/PageTartaricForgeRecipe.java @@ -44,7 +44,7 @@ public class PageTartaricForgeRecipe extends Page { @Override @SideOnly(Side.CLIENT) public void draw(Book book, CategoryAbstract category, EntryAbstract entry, int guiLeft, int guiTop, int mouseX, int mouseY, GuiBase guiBase, FontRenderer fontRenderer) { - Minecraft.getMinecraft().getTextureManager().bindTexture(new ResourceLocation("bloodmagicguide" + ":textures/gui/soulForge.png")); + Minecraft.getInstance().getTextureManager().bindTexture(new ResourceLocation("bloodmagicguide" + ":textures/gui/soulForge.png")); guiBase.drawTexturedModalRect(guiLeft + 42, guiTop + 53, 0, 0, 146, 104); guiBase.drawCenteredString(fontRenderer, TextHelper.localize("guide.bloodmagic.page.soulForge"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0); diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java index 46e16f45..3366cd65 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/BloodMagicHwylaPlugin.java @@ -4,18 +4,22 @@ import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.util.Constants; import WayofTime.bloodmagic.compat.waila.provider.*; import WayofTime.bloodmagic.tile.*; +import mcp.mobius.waila.api.IRegistrar; import mcp.mobius.waila.api.IWailaPlugin; -import mcp.mobius.waila.api.IWailaRegistrar; +import mcp.mobius.waila.api.TooltipPosition; import mcp.mobius.waila.api.WailaPlugin; +import net.minecraft.util.ResourceLocation; @WailaPlugin public class BloodMagicHwylaPlugin implements IWailaPlugin { + public static final ResourceLocation CONFIG_SHOW_ALTAR_STATS = new ResourceLocation(BloodMagic.MODID, "show_altar_stats"); + @Override - public void register(IWailaRegistrar registrar) { - registrar.registerBodyProvider(DataProviderBloodAltar.INSTANCE, TileAltar.class); - registrar.registerNBTProvider(DataProviderBloodAltar.INSTANCE, TileAltar.class); - registrar.addConfig(BloodMagic.MODID, Constants.Compat.WAILA_CONFIG_ALTAR, true); + public void register(IRegistrar registrar) { + registrar.registerComponentProvider(DataProviderBloodAltar.INSTANCE, TooltipPosition.BODY, TileAltar.class); + registrar.registerBlockDataProvider(DataProviderBloodAltar.INSTANCE, TileAltar.class); + registrar.addConfig(CONFIG_SHOW_ALTAR_STATS, true); registrar.registerBodyProvider(DataProviderTeleposer.INSTANCE, TileTeleposer.class); registrar.registerNBTProvider(DataProviderTeleposer.INSTANCE, TileTeleposer.class); diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java index 95109a73..31471c74 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderAlchemyArray.java @@ -48,9 +48,9 @@ public class DataProviderAlchemyArray implements IWailaDataProvider { public CompoundNBT getNBTData(ServerPlayerEntity player, TileEntity te, CompoundNBT tag, World world, BlockPos pos) { TileAlchemyArray alchemyArray = (TileAlchemyArray) te; if (!alchemyArray.getStackInSlot(0).isEmpty()) - tag.setString("reagent", alchemyArray.getStackInSlot(0).getDisplayName()); + tag.putString("reagent", alchemyArray.getStackInSlot(0).getDisplayName()); if (!alchemyArray.getStackInSlot(1).isEmpty()) - tag.setString("catalyst", alchemyArray.getStackInSlot(1).getDisplayName()); + tag.putString("catalyst", alchemyArray.getStackInSlot(1).getDisplayName()); return tag; } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java index d144fb3f..95169561 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodAltar.java @@ -1,23 +1,23 @@ package WayofTime.bloodmagic.compat.waila.provider; import WayofTime.bloodmagic.ConfigHandler; -import WayofTime.bloodmagic.util.Constants; +import WayofTime.bloodmagic.compat.waila.BloodMagicHwylaPlugin; import WayofTime.bloodmagic.core.RegistrarBloodMagicItems; import WayofTime.bloodmagic.item.sigil.ItemSigilDivination; import WayofTime.bloodmagic.tile.TileAltar; -import WayofTime.bloodmagic.util.helper.TextHelper; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.IComponentProvider; +import mcp.mobius.waila.api.IDataAccessor; +import mcp.mobius.waila.api.IPluginConfig; +import mcp.mobius.waila.api.IServerDataProvider; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; -import javax.annotation.Nonnull; import java.util.List; /** @@ -25,35 +25,31 @@ import java.util.List; * href="https://github.com/tterrag1098">tterrag1098. Originally implemented * in ImLookingAtBlood by Pokefenn. */ -public class DataProviderBloodAltar implements IWailaDataProvider { +public class DataProviderBloodAltar implements IComponentProvider, IServerDataProvider { - public static final IWailaDataProvider INSTANCE = new DataProviderBloodAltar(); + public static final DataProviderBloodAltar INSTANCE = new DataProviderBloodAltar(); - @Nonnull @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (!config.getConfig(Constants.Compat.WAILA_CONFIG_ALTAR)) - return currenttip; + public void appendBody(List tooltip, IDataAccessor accessor, IPluginConfig config) { + if (!config.get(BloodMagicHwylaPlugin.CONFIG_SHOW_ALTAR_STATS)) + return; - if (accessor.getNBTData().hasKey("altar")) { - CompoundNBT altarData = accessor.getNBTData().getCompoundTag("altar"); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentAltarTier", altarData.getInteger("tier"))); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentAltarCapacity", altarData.getInteger("capacity"))); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentEssence", altarData.getInteger("stored"))); + if (accessor.getServerData().contains("altar")) { + CompoundNBT altarData = accessor.getServerData().getCompound("altar"); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sigil.seer.currentAltarTier", altarData.getInt("tier"))); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sigil.seer.currentAltarCapacity", altarData.getInt("capacity"))); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sigil.seer.currentEssence", altarData.getInt("stored"))); - if (altarData.hasKey("charge")) { - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentAltarProgress.percent", altarData.getInteger("progress") + "%")); - currenttip.add(TextHelper.localizeEffect("tooltip.bloodmagic.sigil.seer.currentCharge", altarData.getInteger("charge"))); + if (altarData.contains("charge")) { + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sigil.seer.currentAltarProgress.percent", altarData.getInt("progress") + "%")); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sigil.seer.currentCharge", altarData.getInt("charge"))); } } - - return currenttip; } - @Nonnull @Override - public CompoundNBT getNBTData(ServerPlayerEntity player, TileEntity te, CompoundNBT tag, World world, BlockPos pos) { - TileAltar altar = (TileAltar) te; + public void appendServerData(CompoundNBT tag, ServerPlayerEntity player, World world, TileEntity tileEntity) { + TileAltar altar = (TileAltar) tileEntity; boolean hasSigil = false; boolean hasSeer = false; @@ -76,20 +72,18 @@ public class DataProviderBloodAltar implements IWailaDataProvider { } if (!hasSeer && !hasSigil) - return tag; + return; CompoundNBT altarData = new CompoundNBT(); - altarData.setInteger("tier", altar.getTier().toInt()); - altarData.setInteger("capacity", altar.getCapacity()); - altarData.setInteger("stored", altar.getCurrentBlood()); + altarData.putInt("tier", altar.getTier().toInt()); + altarData.putInt("capacity", altar.getCapacity()); + altarData.putInt("stored", altar.getCurrentBlood()); if (hasSeer) { - altarData.setInteger("progress", (int) (((double) altar.getProgress() / (double) altar.getLiquidRequired() * 100) / altar.getStackInSlot(0).getCount())); - altarData.setInteger("charge", altar.getTotalCharge()); + altarData.putInt("progress", (int) (((double) altar.getProgress() / (double) altar.getLiquidRequired() * 100) / altar.getStackInSlot(0).getCount())); + altarData.putInt("charge", altar.getTotalCharge()); } - tag.setTag("altar", altarData); - - return tag; + tag.put("altar", altarData); } public static boolean hasStack(ItemStack stack, PlayerEntity player) { diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java index ed35e77b..6083ae52 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java @@ -42,10 +42,10 @@ public class DataProviderBloodTank implements IWailaDataProvider { @Override public CompoundNBT getNBTData(ServerPlayerEntity player, TileEntity te, CompoundNBT tag, World world, BlockPos pos) { TileBloodTank tank = (TileBloodTank) te; - tag.setInteger("tier", tank.getBlockMetadata() + 1); - tag.setInteger("capacity", tank.capacity); + tag.putInt("tier", tank.getBlockMetadata() + 1); + tag.putInt("capacity", tank.capacity); if (tank.getTank().getFluid() != null) - tag.setTag("fluid", tank.getTank().getFluid().writeToNBT(new CompoundNBT())); + tag.put("fluid", tank.getTank().getFluid().writeToNBT(new CompoundNBT())); return tag; } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java index 43d11f75..551fb29f 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderMimic.java @@ -50,7 +50,7 @@ public class DataProviderMimic implements IWailaDataProvider { if (shareTag != null) item.setTag("nbt", shareTag); - tag.setTag("mimiced", item); + tag.put("mimiced", item); } return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java index 4cf4ca0b..5d6bad56 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java @@ -57,21 +57,21 @@ public class DataProviderRitualController implements IWailaDataProvider { if (te instanceof TileMasterRitualStone) { TileMasterRitualStone mrs = (TileMasterRitualStone) te; - tag.setBoolean("master", true); + tag.putBoolean("master", true); if (mrs.getCurrentRitual() != null) { - tag.setString("ritual", mrs.getCurrentRitual().getTranslationKey()); - tag.setBoolean("active", mrs.isActive()); + tag.putString("ritual", mrs.getCurrentRitual().getTranslationKey()); + tag.putBoolean("active", mrs.isActive()); if (mrs.getOwner() != null) - tag.setString("owner", PlayerHelper.getUsernameFromUUID(mrs.getOwner())); - tag.setBoolean("enabled", BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(mrs.getCurrentRitual()), false)); + tag.putString("owner", PlayerHelper.getUsernameFromUUID(mrs.getOwner())); + tag.putBoolean("enabled", BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(mrs.getCurrentRitual()), false)); } } else { - tag.setBoolean("master", false); + tag.putBoolean("master", false); ImperfectRitual ritual = BloodMagic.RITUAL_MANAGER.getImperfectRitual(world.getBlockState(pos.up())); if (ritual != null) { - tag.setString("ritual", ritual.getTranslationKey()); - tag.setBoolean("enabled", BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(ritual), false)); + tag.putString("ritual", ritual.getTranslationKey()); + tag.putBoolean("enabled", BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(ritual), false)); } } diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java index d30b65d4..03b9611b 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderTeleposer.java @@ -51,7 +51,7 @@ public class DataProviderTeleposer implements IWailaDataProvider { CompoundNBT focusData = new CompoundNBT(); focusData.setTag("pos", NBTUtil.createPosTag(focus.getBlockPos(contained))); focusData.setInteger("dim", contained.getTagCompound().getInteger(Constants.NBT.DIMENSION_ID)); - tag.setTag("focus", focusData); + tag.put("focus", focusData); } return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java b/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java index c7de2d48..135aaabd 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/BMWorldSavedData.java @@ -34,11 +34,11 @@ public class BMWorldSavedData extends WorldSavedData { } @Override - public void readFromNBT(CompoundNBT tagCompound) { - ListNBT networkData = tagCompound.getTagList("networkData", 10); + public void read(CompoundNBT tagCompound) { + ListNBT networkData = tagCompound.getList("networkData", 10); - for (int i = 0; i < networkData.tagCount(); i++) { - CompoundNBT data = networkData.getCompoundTagAt(i); + for (int i = 0; i < networkData.size(); i++) { + CompoundNBT data = networkData.getCompound(i); SoulNetwork network = SoulNetwork.fromNBT(data); network.setParent(this); soulNetworks.put(network.getPlayerId(), network); @@ -46,12 +46,12 @@ public class BMWorldSavedData extends WorldSavedData { } @Override - public CompoundNBT writeToNBT(CompoundNBT tagCompound) { + public CompoundNBT write(CompoundNBT tagCompound) { ListNBT networkData = new ListNBT(); for (SoulNetwork soulNetwork : soulNetworks.values()) - networkData.appendTag(soulNetwork.serializeNBT()); + networkData.add(soulNetwork.serializeNBT()); - tagCompound.setTag("networkData", networkData); + tagCompound.put("networkData", networkData); return tagCompound; } diff --git a/src/main/java/WayofTime/bloodmagic/core/data/Binding.java b/src/main/java/WayofTime/bloodmagic/core/data/Binding.java index 4d107cef..3c2e9ed1 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/Binding.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/Binding.java @@ -2,7 +2,7 @@ package WayofTime.bloodmagic.core.data; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.INBT; import net.minecraft.nbt.NBTUtil; import net.minecraftforge.common.util.INBTSerializable; @@ -26,14 +26,14 @@ public class Binding implements INBTSerializable { @Override public CompoundNBT serializeNBT() { CompoundNBT tag = new CompoundNBT(); - tag.setTag("id", NBTUtil.createUUIDTag(uuid)); - tag.setString("name", name); + tag.put("id", NBTUtil.writeUniqueId(uuid)); + tag.putString("name", name); return tag; } @Override public void deserializeNBT(CompoundNBT nbt) { - this.uuid = NBTUtil.getUUIDFromTag(nbt.getCompoundTag("id")); + this.uuid = NBTUtil.readUniqueId(nbt.getCompound("id")); this.name = nbt.getString("name"); } @@ -57,11 +57,11 @@ public class Binding implements INBTSerializable { @Nullable public static Binding fromStack(ItemStack stack) { - if (!stack.hasTagCompound()) // Definitely hasn't been bound yet. + if (!stack.hasTag()) // Definitely hasn't been bound yet. return null; - NBTBase bindingTag = stack.getTagCompound().getTag("binding"); - if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.isEmpty()) // Make sure it's both a tag compound and that it has actual data. + INBT bindingTag = stack.getTag().get("binding"); + if (bindingTag == null || bindingTag.getId() != 10) // Make sure it's both a tag compound and that it has actual data. return null; Binding binding = new Binding(); diff --git a/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java index e4eacb8f..30ec5dea 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java @@ -150,13 +150,13 @@ public class SoulNetwork implements INBTSerializable { public void hurtPlayer(PlayerEntity user, float syphon) { if (user != null) { if (syphon < 100 && syphon > 0) { - if (!user.capabilities.isCreativeMode) { + if (!user.isCreative()) { user.hurtResistantTime = 0; user.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F); } } else if (syphon >= 100) { - if (!user.capabilities.isCreativeMode) { + if (!user.isCreative()) { for (int i = 0; i < ((syphon + 99) / 100); i++) { user.hurtResistantTime = 0; user.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F); @@ -228,17 +228,17 @@ public class SoulNetwork implements INBTSerializable { @Override public CompoundNBT serializeNBT() { CompoundNBT tagCompound = new CompoundNBT(); - tagCompound.setString("playerId", getPlayerId().toString()); - tagCompound.setInteger("currentEssence", getCurrentEssence()); - tagCompound.setInteger("orbTier", getOrbTier()); + tagCompound.putString("playerId", getPlayerId().toString()); + tagCompound.putInt("currentEssence", getCurrentEssence()); + tagCompound.putInt("orbTier", getOrbTier()); return tagCompound; } @Override public void deserializeNBT(CompoundNBT nbt) { this.playerId = UUID.fromString(nbt.getString("playerId")); - this.currentEssence = nbt.getInteger("currentEssence"); - this.orbTier = nbt.getInteger("orbTier"); + this.currentEssence = nbt.getInt("currentEssence"); + this.orbTier = nbt.getInt("orbTier"); } public static SoulNetwork fromNBT(CompoundNBT tagCompound) { diff --git a/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java b/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java index 5c04038b..412048d9 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/SoulTicket.java @@ -1,6 +1,6 @@ package WayofTime.bloodmagic.core.data; -import net.minecraft.command.ICommandSender; +import net.minecraft.command.ICommandSource; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -40,21 +40,21 @@ public class SoulTicket { * @return A description in the format block|dimensionID|pos */ public static SoulTicket block(World world, BlockPos pos, int amount) { - return new SoulTicket(new StringTextComponent("block|" + world.provider.getDimension() + "|" + pos.toLong()), amount); + return new SoulTicket(new StringTextComponent("block|" + world.dimension.getDimension() + "|" + pos.toLong()), amount); } /** * @return A description in the format item|item registry name|dimensionID|entityName|entityPos */ public static SoulTicket item(ItemStack itemStack, World world, Entity entity, int amount) { - return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName() + "|" + world.provider.getDimension() + "|" + entity.getPersistentID()), amount); + return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName() + "|" + world.dimension.getDimension() + "|" + entity.getCachedUniqueIdString()), amount); } /** * @return A description in the format item|item registry name|dimensionID|pos */ public static SoulTicket item(ItemStack itemStack, World world, BlockPos pos, int amount) { - return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName() + "|" + world.provider.getDimension() + "|" + pos.toLong()), amount); + return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName() + "|" + world.dimension.getDimension() + "|" + pos.toLong()), amount); } /** @@ -64,8 +64,8 @@ public class SoulTicket { return new SoulTicket(new StringTextComponent("item|" + itemStack.getItem().getRegistryName()), amount); } - public static SoulTicket command(ICommandSender sender, String command, int amount) { - return new SoulTicket(new StringTextComponent("command|" + command + "|" + sender.getName()), amount); + public static SoulTicket command(ICommandSource sender, String command, int amount) { + return new SoulTicket(new StringTextComponent("command|" + command + "|" + sender.toString()), amount); } // TODO maybe make it check the amount?? diff --git a/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java b/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java index 497d90fc..189ab880 100644 --- a/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/core/registry/OrbRegistry.java @@ -51,7 +51,7 @@ public class OrbRegistry { public static ItemStack getOrbStack(BloodOrb orb) { ItemStack ret = new ItemStack(ORB_ITEM); CompoundNBT tag = new CompoundNBT(); - tag.setString("orb", orb.getRegistryName().toString()); + tag.putString("orb", orb.getRegistryName().toString()); ret.setTagCompound(tag); return ret; } diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java index d47c1e68..4200cf0d 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityAspectedDemonBase.java @@ -185,7 +185,7 @@ public abstract class EntityAspectedDemonBase extends EntityDemonBase { public void writeEntityToNBT(CompoundNBT tag) { super.writeEntityToNBT(tag); - tag.setString(Constants.NBT.WILL_TYPE, this.getType().toString()); + tag.putString(Constants.NBT.WILL_TYPE, this.getType().toString()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java index 1ea7e265..417d62d5 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedChicken.java @@ -176,14 +176,14 @@ public class EntityCorruptedChicken extends EntityAspectedDemonBase { super.readEntityFromNBT(compound); if (compound.hasKey("EggLayTime")) { - this.timeUntilNextEgg = compound.getInteger("EggLayTime"); + this.timeUntilNextEgg = compound.getInt("EggLayTime"); } } @Override public void writeEntityToNBT(CompoundNBT compound) { super.writeEntityToNBT(compound); - compound.setInteger("EggLayTime", this.timeUntilNextEgg); + compound.putInt("EggLayTime", this.timeUntilNextEgg); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java index 621b1a63..5e4acc3b 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityCorruptedSheep.java @@ -214,9 +214,9 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh @Override public void writeEntityToNBT(CompoundNBT tag) { super.writeEntityToNBT(tag); - tag.setBoolean("Sheared", this.getSheared()); - tag.setByte("Color", (byte) this.getFleeceColor().getMetadata()); - tag.setInteger("protection", this.protectionCooldown); + tag.putBoolean("Sheared", this.getSheared()); + tag.putByte("Color", (byte) this.getFleeceColor().getMetadata()); + tag.putInt("protection", this.protectionCooldown); } @Override @@ -224,7 +224,7 @@ public class EntityCorruptedSheep extends EntityAspectedDemonBase implements ISh super.readEntityFromNBT(tag); this.setSheared(tag.getBoolean("Sheared")); this.setFleeceColor(DyeColor.byMetadata(tag.getByte("Color"))); - this.protectionCooldown = tag.getInteger("protection"); + this.protectionCooldown = tag.getInt("protection"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java index 5f0d0245..c43c7b98 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityDemonBase.java @@ -164,9 +164,9 @@ public class EntityDemonBase extends CreatureEntity implements IEntityOwnable { super.writeEntityToNBT(tag); if (this.getOwnerId() == null) { - tag.setString("OwnerUUID", ""); + tag.putString("OwnerUUID", ""); } else { - tag.setString("OwnerUUID", this.getOwnerId().toString()); + tag.putString("OwnerUUID", this.getOwnerId().toString()); } } diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java index 41361017..40ca056f 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntityMimic.java @@ -66,11 +66,11 @@ public class EntityMimic extends EntityDemonBase { public void writeEntityToNBT(CompoundNBT tag) { super.writeEntityToNBT(tag); - tag.setBoolean("dropItemsOnBreak", dropItemsOnBreak); - tag.setTag("tileTag", tileTag); - tag.setInteger("metaOfReplacedBlock", metaOfReplacedBlock); - tag.setInteger("playerCheckRadius", playerCheckRadius); - tag.setString("stateOfReplacedBlock", stateOfReplacedBlock.toString()); + tag.putBoolean("dropItemsOnBreak", dropItemsOnBreak); + tag.put("tileTag", tileTag); + tag.putInt("metaOfReplacedBlock", metaOfReplacedBlock); + tag.putInt("playerCheckRadius", playerCheckRadius); + tag.putString("stateOfReplacedBlock", stateOfReplacedBlock.toString()); } @Override @@ -78,9 +78,9 @@ public class EntityMimic extends EntityDemonBase { super.readEntityFromNBT(tag); dropItemsOnBreak = tag.getBoolean("dropItemsOnBreak"); - tileTag = tag.getCompoundTag("tileTag"); - metaOfReplacedBlock = tag.getInteger("metaOfReplacedBlock"); - playerCheckRadius = tag.getInteger("playerCheckRadius"); + tileTag = tag.getCompound("tileTag"); + metaOfReplacedBlock = tag.getInt("metaOfReplacedBlock"); + playerCheckRadius = tag.getInt("playerCheckRadius"); stateOfReplacedBlock = StateUtil.parseState(tag.getString("stateOfReplacedBlock")); } diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java index 6ec43ae9..f2b2f999 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java @@ -358,9 +358,9 @@ public class EntitySentientSpecter extends EntityDemonBase { public void writeEntityToNBT(CompoundNBT tag) { super.writeEntityToNBT(tag); - tag.setString(Constants.NBT.WILL_TYPE, type.toString()); + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); - tag.setBoolean("sentientArmour", wasGivenSentientArmour); + tag.putBoolean("sentientArmour", wasGivenSentientArmour); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java index 1ed0d6ef..bb8b8cab 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityBloodLight.java @@ -142,15 +142,15 @@ public class EntityBloodLight extends ThrowableEntity implements IThrowableEntit @Override public void writeEntityToNBT(CompoundNBT nbt) { super.writeEntityToNBT(nbt); - nbt.setInteger(Constants.NBT.PROJECTILE_TICKS_IN_AIR, ticksInAir); - nbt.setInteger(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR, maxTicksInAir); + nbt.putInt(Constants.NBT.PROJECTILE_TICKS_IN_AIR, ticksInAir); + nbt.putInt(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR, maxTicksInAir); } @Override public void readEntityFromNBT(CompoundNBT nbt) { super.readEntityFromNBT(nbt); - ticksInAir = nbt.getInteger(Constants.NBT.PROJECTILE_TICKS_IN_AIR); - maxTicksInAir = nbt.getInteger(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR); + ticksInAir = nbt.getInt(Constants.NBT.PROJECTILE_TICKS_IN_AIR); + maxTicksInAir = nbt.getInt(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java index 7fd8ae60..5a73d56e 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntityMeteor.java @@ -88,22 +88,22 @@ public class EntityMeteor extends ThrowableEntity implements IThrowableEntity { @Override public void writeEntityToNBT(CompoundNBT nbt) { super.writeEntityToNBT(nbt); - nbt.setInteger(Constants.NBT.PROJECTILE_TICKS_IN_AIR, ticksInAir); - nbt.setInteger(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR, maxTicksInAir); - nbt.setDouble("radiusModifier", radiusModifier); - nbt.setDouble("explosionModifier", explosionModifier); - nbt.setDouble("fillerChance", fillerChance); + nbt.putInt(Constants.NBT.PROJECTILE_TICKS_IN_AIR, ticksInAir); + nbt.putInt(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR, maxTicksInAir); + nbt.putDouble("radiusModifier", radiusModifier); + nbt.putDouble("explosionModifier", explosionModifier); + nbt.putDouble("fillerChance", fillerChance); if (!meteorStack.isEmpty()) meteorStack.writeToNBT(nbt); else - nbt.setBoolean("noItem", true); + nbt.putBoolean("noItem", true); } @Override public void readEntityFromNBT(CompoundNBT nbt) { super.readEntityFromNBT(nbt); - ticksInAir = nbt.getInteger(Constants.NBT.PROJECTILE_TICKS_IN_AIR); - maxTicksInAir = nbt.getInteger(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR); + ticksInAir = nbt.getInt(Constants.NBT.PROJECTILE_TICKS_IN_AIR); + maxTicksInAir = nbt.getInt(Constants.NBT.PROJECTILE_MAX_TICKS_IN_AIR); radiusModifier = nbt.getDouble("radiusModifier"); explosionModifier = nbt.getDouble("explosionModifier"); fillerChance = nbt.getDouble("fillerChance"); diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java index 6fc72e52..baf6538f 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java +++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java @@ -260,9 +260,9 @@ public class EntitySentientArrow extends ArrowEntity { public void writeEntityToNBT(CompoundNBT tag) { super.writeEntityToNBT(tag); - tag.setDouble("reimbursement", reimbursedAmountOnHit); - tag.setInteger("currentLevel", currentLevel); - tag.setString(Constants.NBT.WILL_TYPE, type.toString()); + tag.putDouble("reimbursement", reimbursedAmountOnHit); + tag.putInt("currentLevel", currentLevel); + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); } @Override @@ -271,7 +271,7 @@ public class EntitySentientArrow extends ArrowEntity { reimbursedAmountOnHit = tag.getDouble("reimbursement"); type = EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); - currentLevel = tag.getInteger("currentLevel"); + currentLevel = tag.getInt("currentLevel"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java b/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java index 0aae8212..2f27c0d0 100644 --- a/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java +++ b/src/main/java/WayofTime/bloodmagic/event/SoulNetworkEvent.java @@ -4,8 +4,8 @@ import WayofTime.bloodmagic.core.data.SoulNetwork; import WayofTime.bloodmagic.core.data.SoulTicket; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.eventhandler.Cancelable; -import net.minecraftforge.fml.common.eventhandler.Event; +import net.minecraftforge.eventbus.api.Cancelable; +import net.minecraftforge.eventbus.api.Event; public class SoulNetworkEvent extends Event { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java index a343b514..7b15599a 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java @@ -46,7 +46,7 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb { for (BloodOrb orb : RegistrarBloodMagic.BLOOD_ORBS) { ItemStack orbStack = new ItemStack(this); CompoundNBT tag = new CompoundNBT(); - tag.setString("orb", orb.getRegistryName().toString()); + tag.putString("orb", orb.getRegistryName().toString()); orbStack.setTagCompound(tag); list.add(orbStack); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java index 3ca9e276..426c4679 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java @@ -124,7 +124,7 @@ public class ItemExperienceBook extends Item implements IVariantProvider { CompoundNBT tag = stack.getTagCompound(); - tag.setDouble("experience", exp); + tag.putDouble("experience", exp); } public static double getStoredExperience(ItemStack stack) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java index 26f900c8..fda68ca5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemInscriptionTool.java @@ -47,7 +47,7 @@ public class ItemInscriptionTool extends ItemEnum.Variant implemen ItemStack stack = new ItemStack(this, 1, runeType.ordinal()); CompoundNBT tag = new CompoundNBT(); - tag.setInteger(Constants.NBT.USES, 10); + tag.putInt(Constants.NBT.USES, 10); stack.setTagCompound(tag); list.add(stack); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index 78ebbe37..78ad52d6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -16,7 +16,7 @@ import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.util.*; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.INBT; import net.minecraft.nbt.NBTUtil; import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; @@ -74,12 +74,12 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide if (stack.getTagCompound() == null) // hasTagCompound doesn't work on empty stacks with tags return null; - NBTBase bindingTag = stack.getTagCompound().getTag("binding"); + INBT bindingTag = stack.getTagCompound().getTag("binding"); if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.isEmpty()) // Make sure it's both a tag compound and that it has actual data. return null; CompoundNBT nbt = (CompoundNBT) bindingTag; - return new Binding(NBTUtil.getUUIDFromTag(nbt.getCompoundTag("id")), nbt.getString("name")); + return new Binding(NBTUtil.getUUIDFromTag(nbt.getCompound("id")), nbt.getString("name")); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index 6f2e534a..bb914f7e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -375,7 +375,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { CompoundNBT tag = stack.getTagCompound(); - tag.setInteger(Constants.NBT.DIRECTION, direction.getIndex()); + tag.putInt(Constants.NBT.DIRECTION, direction.getIndex()); } public Direction getDirection(ItemStack stack) { @@ -386,12 +386,12 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { CompoundNBT tag = stack.getTagCompound(); - int dir = tag.getInteger(Constants.NBT.DIRECTION); + int dir = tag.getInt(Constants.NBT.DIRECTION); if (dir == 0) { return Direction.NORTH; } - return Direction.VALUES[tag.getInteger(Constants.NBT.DIRECTION)]; + return Direction.VALUES[tag.getInt(Constants.NBT.DIRECTION)]; } /** @@ -464,7 +464,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider { CompoundNBT tag = stack.getTagCompound(); - tag.setString("current_ritual", key); + tag.putString("current_ritual", key); } public String getCurrentRitual(ItemStack stack) { diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java index ae919cb9..9888fad3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java @@ -204,9 +204,9 @@ public class ItemRitualReader extends Item implements IVariantProvider { public ItemStack setBlockPos(ItemStack stack, BlockPos pos) { stack = NBTHelper.checkNBT(stack); CompoundNBT itemTag = stack.getTagCompound(); - itemTag.setInteger(Constants.NBT.X_COORD, pos.getX()); - itemTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); - itemTag.setInteger(Constants.NBT.Z_COORD, pos.getZ()); + itemTag.putInt(Constants.NBT.X_COORD, pos.getX()); + itemTag.putInt(Constants.NBT.Y_COORD, pos.getY()); + itemTag.putInt(Constants.NBT.Z_COORD, pos.getZ()); return stack; } @@ -218,9 +218,9 @@ public class ItemRitualReader extends Item implements IVariantProvider { public ItemStack setMasterBlockPos(ItemStack stack, BlockPos pos) { stack = NBTHelper.checkNBT(stack); CompoundNBT itemTag = stack.getTagCompound(); - itemTag.setInteger(Constants.NBT.X_COORD + "master", pos.getX()); - itemTag.setInteger(Constants.NBT.Y_COORD + "master", pos.getY()); - itemTag.setInteger(Constants.NBT.Z_COORD + "master", pos.getZ()); + itemTag.putInt(Constants.NBT.X_COORD + "master", pos.getX()); + itemTag.putInt(Constants.NBT.Y_COORD + "master", pos.getY()); + itemTag.putInt(Constants.NBT.Z_COORD + "master", pos.getZ()); return stack; } @@ -237,7 +237,7 @@ public class ItemRitualReader extends Item implements IVariantProvider { CompoundNBT tag = stack.getTagCompound(); - tag.setString("range", range); + tag.putString("range", range); } public void cycleReader(ItemStack stack, PlayerEntity player) { @@ -259,7 +259,7 @@ public class ItemRitualReader extends Item implements IVariantProvider { CompoundNBT tag = stack.getTagCompound(); - tag.setInteger(Constants.NBT.RITUAL_READER, state.ordinal()); + tag.putInt(Constants.NBT.RITUAL_READER, state.ordinal()); } public EnumRitualReaderState getState(ItemStack stack) { @@ -270,7 +270,7 @@ public class ItemRitualReader extends Item implements IVariantProvider { CompoundNBT tag = stack.getTagCompound(); - return EnumRitualReaderState.values()[tag.getInteger(Constants.NBT.RITUAL_READER)]; + return EnumRitualReaderState.values()[tag.getInt(Constants.NBT.RITUAL_READER)]; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java index 4f45001a..0bf4a0b3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemTelepositionFocus.java @@ -64,7 +64,7 @@ public class ItemTelepositionFocus extends ItemEnum.Variant enchantmentMap = EnchantmentHelper.getEnchantments(previousArmour); EnchantmentHelper.setEnchantments(enchantmentMap, newArmour); } @@ -349,7 +349,7 @@ public class ItemSentientArmour extends ArmorItem implements ISpecialArmor, IMes return null; } - CompoundNBT tag = omegaTag.getCompoundTag("armour"); + CompoundNBT tag = omegaTag.getCompound("armour"); return new ItemStack(tag); } @@ -380,7 +380,7 @@ public class ItemSentientArmour extends ArmorItem implements ISpecialArmor, IMes CompoundNBT tag = stack.getTagCompound(); - tag.setString(Constants.NBT.WILL_TYPE, type.toString()); + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); } public void setAbilitiesOfArmour(EnumDemonWillType type, double willValue, ItemStack armourStack) { @@ -468,7 +468,7 @@ public class ItemSentientArmour extends ArmorItem implements ISpecialArmor, IMes CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); + tag.putDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); } public double getKnockbackResistance(ItemStack stack) { @@ -483,7 +483,7 @@ public class ItemSentientArmour extends ArmorItem implements ISpecialArmor, IMes CompoundNBT tag = stack.getTagCompound(); - tag.setDouble("knockback", kb); + tag.putDouble("knockback", kb); } public double getSpeedBoost(ItemStack stack) { @@ -498,7 +498,7 @@ public class ItemSentientArmour extends ArmorItem implements ISpecialArmor, IMes CompoundNBT tag = stack.getTagCompound(); - tag.setDouble("speed", speed); + tag.putDouble("speed", speed); } public double getDamageBoost(ItemStack stack) { @@ -513,7 +513,7 @@ public class ItemSentientArmour extends ArmorItem implements ISpecialArmor, IMes CompoundNBT tag = stack.getTagCompound(); - tag.setDouble("damage", damage); + tag.putDouble("damage", damage); } public double getAttackSpeedBoost(ItemStack stack) { @@ -528,7 +528,7 @@ public class ItemSentientArmour extends ArmorItem implements ISpecialArmor, IMes CompoundNBT tag = stack.getTagCompound(); - tag.setDouble("attackSpeed", attackSpeed); + tag.putDouble("attackSpeed", attackSpeed); } public static void revertAllArmour(PlayerEntity player) { diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockMimic.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockMimic.java index 242e2974..c3ef8980 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockMimic.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockMimic.java @@ -59,9 +59,9 @@ public class ItemBlockMimic extends ItemBlockEnum { CompoundNBT tileTag = getTagFromTileEntity(tileReplaced); if (tileReplaced != null) { CompoundNBT voidTag = new CompoundNBT(); - voidTag.setInteger("x", pos.getX()); - voidTag.setInteger("y", pos.getY()); - voidTag.setInteger("z", pos.getZ()); + voidTag.putInt("x", pos.getX()); + voidTag.putInt("y", pos.getY()); + voidTag.putInt("z", pos.getZ()); tileReplaced.readFromNBT(voidTag); } diff --git a/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java b/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java index a6eb1973..56c517c7 100644 --- a/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/inventory/InventoryHolding.java @@ -49,8 +49,8 @@ public class InventoryHolding extends ItemInventory { nbtTagCompound = new CompoundNBT(); UUID uuid = UUID.randomUUID(); - nbtTagCompound.setLong(Constants.NBT.MOST_SIG, uuid.getMostSignificantBits()); - nbtTagCompound.setLong(Constants.NBT.LEAST_SIG, uuid.getLeastSignificantBits()); + nbtTagCompound.putLong(Constants.NBT.MOST_SIG, uuid.getMostSignificantBits()); + nbtTagCompound.putLong(Constants.NBT.LEAST_SIG, uuid.getLeastSignificantBits()); } writeToNBT(nbtTagCompound); diff --git a/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java b/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java index 329f5aea..93c07286 100644 --- a/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java +++ b/src/main/java/WayofTime/bloodmagic/item/inventory/ItemInventory.java @@ -49,7 +49,7 @@ public class ItemInventory implements IInventory { for (int i = 0; i < tags.tagCount(); i++) { if (!isSyncedSlot(i)) { - CompoundNBT data = tags.getCompoundTagAt(i); + CompoundNBT data = tags.getCompound(i); byte j = data.getByte(Constants.NBT.SLOT); if (j >= 0 && j < inventory.size()) { @@ -71,14 +71,14 @@ public class ItemInventory implements IInventory { } } - tagCompound.setTag(Constants.NBT.ITEMS, tags); + tagCompound.putTag(Constants.NBT.ITEMS, tags); } public void readFromStack(ItemStack masterStack) { if (masterStack != null) { NBTHelper.checkNBT(masterStack); CompoundNBT tag = masterStack.getTagCompound(); - readFromNBT(tag.getCompoundTag(Constants.NBT.ITEM_INVENTORY)); + readFromNBT(tag.getCompound(Constants.NBT.ITEM_INVENTORY)); } } @@ -88,7 +88,7 @@ public class ItemInventory implements IInventory { CompoundNBT tag = masterStack.getTagCompound(); CompoundNBT invTag = new CompoundNBT(); writeToNBT(invTag); - tag.setTag(Constants.NBT.ITEM_INVENTORY, invTag); + tag.put(Constants.NBT.ITEM_INVENTORY, invTag); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java index 6665b7fd..4d475a5f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java @@ -187,9 +187,9 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi public ItemStack setBlockPos(ItemStack stack, BlockPos pos) { NBTHelper.checkNBT(stack); CompoundNBT itemTag = stack.getTagCompound(); - itemTag.setInteger(Constants.NBT.X_COORD, pos.getX()); - itemTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); - itemTag.setInteger(Constants.NBT.Z_COORD, pos.getZ()); + itemTag.putInt(Constants.NBT.X_COORD, pos.getX()); + itemTag.putInt(Constants.NBT.Y_COORD, pos.getY()); + itemTag.putInt(Constants.NBT.Z_COORD, pos.getZ()); return stack; } } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java index 18a8c3a8..425e9ee6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java @@ -140,14 +140,14 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl for (int i = 0; i < inventorySize; i++) { if (!inventory.get(i).isEmpty()) { CompoundNBT tag = new CompoundNBT(); - tag.setByte(Constants.NBT.SLOT, (byte) i); + tag.putByte(Constants.NBT.SLOT, (byte) i); inventory.get(i).writeToNBT(tag); itemList.appendTag(tag); } } - inventoryTag.setTag(Constants.NBT.ITEMS, itemList); - itemTag.setTag(Constants.NBT.ITEM_INVENTORY, inventoryTag); + inventoryTag.put(Constants.NBT.ITEMS, itemList); + itemTag.put(Constants.NBT.ITEM_INVENTORY, inventoryTag); } @Override @@ -248,7 +248,7 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl } CompoundNBT inventoryTag = tagCompound.getCompoundTag(Constants.NBT.ITEM_INVENTORY); - ListNBT tagList = inventoryTag.getTagList(Constants.NBT.ITEMS, 10); + ListNBT tagList = inventoryTag.getList(Constants.NBT.ITEMS, 10); if (tagList.isEmpty()) { return NonNullList.withSize(inventorySize, ItemStack.EMPTY); diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java index 4303d3fd..3950db3b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTeleposition.java @@ -117,7 +117,7 @@ public class ItemSigilTeleposition extends ItemSigilBase { else tagCompound = stack.getTagCompound(); - tagCompound.setTag("tplocation", location.serializeNBT()); + tagCompound.putTag("tplocation", location.serializeNBT()); } public static class TeleportLocation implements INBTSerializable { @@ -140,14 +140,14 @@ public class ItemSigilTeleposition extends ItemSigilBase { @Override public CompoundNBT serializeNBT() { CompoundNBT tag = new CompoundNBT(); - tag.setInteger("dim", dim); - tag.setLong("pos", pos.toLong()); + tag.putInt("dim", dim); + tag.putLong("pos", pos.toLong()); return tag; } @Override public void deserializeNBT(CompoundNBT nbt) { - this.dim = nbt.getInteger("dim"); + this.dim = nbt.getInt("dim"); this.pos = BlockPos.fromLong(nbt.getLong("pos")); } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java index a2dc3b3d..fa898cb9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilTransposition.java @@ -39,7 +39,7 @@ public class ItemSigilTransposition extends ItemSigilBase { if (tag.hasKey("stored")) { tooltip.add(" "); - tooltip.add(tag.getCompoundTag("stored").getString("display")); + tooltip.add(tag.getCompound("stored").getString("display")); } } @@ -51,7 +51,7 @@ public class ItemSigilTransposition extends ItemSigilBase { CompoundNBT tag = stack.getTagCompound(); if (tag.hasKey("stored")) - return super.getItemStackDisplayName(stack) + " (" + tag.getCompoundTag("stored").getString("display") + ")"; + return super.getItemStackDisplayName(stack) + " (" + tag.getCompound("stored").getString("display") + ")"; return super.getItemStackDisplayName(stack); } @@ -96,8 +96,8 @@ public class ItemSigilTransposition extends ItemSigilBase { } else if (stack.hasTagCompound() && stack.getTagCompound().hasKey("stored")) { BlockState worldState = world.getBlockState(blockPos); CompoundNBT storedTag = stack.getTagCompound().getCompoundTag("stored"); - BlockState storedState = NBTUtil.readBlockState(storedTag.getCompoundTag("state")); - CompoundNBT tileData = storedTag.hasKey("tileData") ? storedTag.getCompoundTag("tileData") : null; + BlockState storedState = NBTUtil.readBlockState(storedTag.getCompound("state")); + CompoundNBT tileData = storedTag.hasKey("tileData") ? storedTag.getCompound("tileData") : null; if (!worldState.getBlock().isReplaceable(world, blockPos)) blockPos = blockPos.offset(side); @@ -133,7 +133,7 @@ public class ItemSigilTransposition extends ItemSigilBase { return super.getNBTShareTag(stack); CompoundNBT shareTag = stack.getTagCompound().copy(); - CompoundNBT storedTag = shareTag.getCompoundTag("stored"); + CompoundNBT storedTag = shareTag.getCompound("stored"); storedTag.removeTag("state"); storedTag.removeTag("stored"); diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java index c96bda23..3445bbe1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemMonsterSoul.java @@ -63,7 +63,7 @@ public class ItemMonsterSoul extends ItemEnum.Variant soulStack.setItemDamage(type.ordinal()); - tag.setDouble(Constants.NBT.SOULS, souls); + tag.putDouble(Constants.NBT.SOULS, souls); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java index a7c64efa..2406975f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java @@ -61,7 +61,7 @@ public class ItemSentientArmourGem extends Item implements IMeshProvider { public ItemMeshDefinition getMeshDefinition() { return stack -> { boolean flag = false; - NonNullList armourInventory = Minecraft.getMinecraft().player.inventory.armorInventory; + NonNullList armourInventory = Minecraft.getInstance().player.inventory.armorInventory; for (ItemStack armourStack : armourInventory) { if (armourStack != null && armourStack.getItem() instanceof ItemSentientArmour) { flag = true; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java index f6ca9758..5fcc00bb 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java @@ -232,7 +232,7 @@ public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMeshP CompoundNBT tag = stack.getTagCompound(); - tag.setString(Constants.NBT.WILL_TYPE, type.toString()); + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); } @Override @@ -349,7 +349,7 @@ public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMeshP CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); + tag.putDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); } public double getDrainOfActivatedSword(ItemStack stack) { @@ -364,7 +364,7 @@ public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMeshP CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); + tag.putDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); } public double getStaticDropOfActivatedSword(ItemStack stack) { @@ -379,7 +379,7 @@ public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMeshP CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); + tag.putDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); } public double getDropOfActivatedSword(ItemStack stack) { @@ -394,7 +394,7 @@ public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMeshP CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DROP, drop); + tag.putDouble(Constants.NBT.SOUL_SWORD_DROP, drop); } public double getHealthBonusOfSword(ItemStack stack) { @@ -409,7 +409,7 @@ public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMeshP CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); + tag.putDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); } public double getAttackSpeedOfSword(ItemStack stack) { @@ -424,7 +424,7 @@ public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMeshP CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); } public double getSpeedOfSword(ItemStack stack) { @@ -439,7 +439,7 @@ public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMeshP CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); } public double getDigSpeedOfSword(ItemStack stack) { @@ -454,7 +454,7 @@ public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMeshP CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index 9516da29..d23b0a96 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java @@ -164,7 +164,7 @@ public class ItemSentientBow extends BowItem implements IMultiWillTool, ISentien CompoundNBT tag = stack.getTagCompound(); - tag.setDouble("damage", damage); + tag.putDouble("damage", damage); } public double getDamageAdded(ItemStack stack) { @@ -180,7 +180,7 @@ public class ItemSentientBow extends BowItem implements IMultiWillTool, ISentien CompoundNBT tag = stack.getTagCompound(); - tag.setFloat("velocity", velocity); + tag.putFloat("velocity", velocity); } public float getVelocityOfArrow(ItemStack stack) { @@ -200,7 +200,7 @@ public class ItemSentientBow extends BowItem implements IMultiWillTool, ISentien CompoundNBT tag = stack.getTagCompound(); - tag.setString(Constants.NBT.WILL_TYPE, type.toString()); + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); } public double getDrainOfActivatedBow(ItemStack stack) { @@ -215,7 +215,7 @@ public class ItemSentientBow extends BowItem implements IMultiWillTool, ISentien CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); + tag.putDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); } public double getStaticDropOfActivatedBow(ItemStack stack) { @@ -230,7 +230,7 @@ public class ItemSentientBow extends BowItem implements IMultiWillTool, ISentien CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); + tag.putDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); } public double getDropOfActivatedBow(ItemStack stack) { @@ -245,7 +245,7 @@ public class ItemSentientBow extends BowItem implements IMultiWillTool, ISentien CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DROP, drop); + tag.putDouble(Constants.NBT.SOUL_SWORD_DROP, drop); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java index a2714804..a1556a5b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java @@ -232,7 +232,7 @@ public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon CompoundNBT tag = stack.getTagCompound(); - tag.setString(Constants.NBT.WILL_TYPE, type.toString()); + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); } @Override @@ -348,7 +348,7 @@ public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); + tag.putDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); } public double getDrainOfActivatedSword(ItemStack stack) { @@ -363,7 +363,7 @@ public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); + tag.putDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); } public double getStaticDropOfActivatedSword(ItemStack stack) { @@ -378,7 +378,7 @@ public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); + tag.putDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); } public double getDropOfActivatedSword(ItemStack stack) { @@ -393,7 +393,7 @@ public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DROP, drop); + tag.putDouble(Constants.NBT.SOUL_SWORD_DROP, drop); } public double getHealthBonusOfSword(ItemStack stack) { @@ -408,7 +408,7 @@ public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); + tag.putDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); } public double getAttackSpeedOfSword(ItemStack stack) { @@ -423,7 +423,7 @@ public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); } public double getSpeedOfSword(ItemStack stack) { @@ -438,7 +438,7 @@ public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); } public double getDigSpeedOfSword(ItemStack stack) { @@ -453,7 +453,7 @@ public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java index 5bb7104f..d04beea9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java @@ -232,7 +232,7 @@ public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, CompoundNBT tag = stack.getTagCompound(); - tag.setString(Constants.NBT.WILL_TYPE, type.toString()); + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); } @Override @@ -349,7 +349,7 @@ public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); + tag.putDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); } public double getDrainOfActivatedSword(ItemStack stack) { @@ -364,7 +364,7 @@ public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); + tag.putDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); } public double getStaticDropOfActivatedSword(ItemStack stack) { @@ -379,7 +379,7 @@ public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); + tag.putDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); } public double getDropOfActivatedSword(ItemStack stack) { @@ -394,7 +394,7 @@ public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DROP, drop); + tag.putDouble(Constants.NBT.SOUL_SWORD_DROP, drop); } public double getHealthBonusOfSword(ItemStack stack) { @@ -409,7 +409,7 @@ public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); + tag.putDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); } public double getAttackSpeedOfSword(ItemStack stack) { @@ -424,7 +424,7 @@ public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); } public double getSpeedOfSword(ItemStack stack) { @@ -439,7 +439,7 @@ public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); } public double getDigSpeedOfSword(ItemStack stack) { @@ -454,7 +454,7 @@ public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_DIG_SPEED, speed); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java index befbfd10..4953ba3b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java @@ -214,7 +214,7 @@ public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IM CompoundNBT tag = stack.getTagCompound(); - tag.setString(Constants.NBT.WILL_TYPE, type.toString()); + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); } @Override @@ -330,7 +330,7 @@ public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IM CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); + tag.putDouble(Constants.NBT.SOUL_SWORD_DAMAGE, damage); } public double getDrainOfActivatedSword(ItemStack stack) { @@ -345,7 +345,7 @@ public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IM CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); + tag.putDouble(Constants.NBT.SOUL_SWORD_ACTIVE_DRAIN, drain); } public double getStaticDropOfActivatedSword(ItemStack stack) { @@ -360,7 +360,7 @@ public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IM CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); + tag.putDouble(Constants.NBT.SOUL_SWORD_STATIC_DROP, drop); } public double getDropOfActivatedSword(ItemStack stack) { @@ -375,7 +375,7 @@ public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IM CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_DROP, drop); + tag.putDouble(Constants.NBT.SOUL_SWORD_DROP, drop); } public double getHealthBonusOfSword(ItemStack stack) { @@ -390,7 +390,7 @@ public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IM CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); + tag.putDouble(Constants.NBT.SOUL_SWORD_HEALTH, hp); } public double getAttackSpeedOfSword(ItemStack stack) { @@ -405,7 +405,7 @@ public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IM CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_ATTACK_SPEED, speed); } public double getSpeedOfSword(ItemStack stack) { @@ -420,7 +420,7 @@ public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IM CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); + tag.putDouble(Constants.NBT.SOUL_SWORD_SPEED, speed); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java index 2df52e4f..9cec0e42 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java @@ -176,7 +176,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I CompoundNBT tag = soulGemStack.getTagCompound(); - tag.setDouble(Constants.NBT.SOULS, souls); + tag.putDouble(Constants.NBT.SOULS, souls); } @Override @@ -244,7 +244,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I return; } - tag.setString(Constants.NBT.WILL_TYPE, type.toString()); + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java index de5180bf..47743536 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java +++ b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemSoulBreathContainer.java @@ -18,7 +18,7 @@ public abstract class ItemSoulBreathContainer extends Item implements ISoulBreat public void setBreath(ItemStack stack, double amount) { CompoundNBT tag = stack.getTagCompound(); - tag.setDouble(Constants.NBT.BREATH, amount); + tag.putDouble(Constants.NBT.BREATH, amount); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java index 8144dbfd..ac8474d6 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java @@ -212,15 +212,15 @@ public class LivingArmour implements ILivingArmour { @Override public void readFromNBT(CompoundNBT tag) { - maxUpgradePoints = Math.max(100, tag.getInteger("maxUpgradePoints")); + maxUpgradePoints = Math.max(100, tag.getInt("maxUpgradePoints")); - ListNBT upgradeTags = tag.getTagList("upgrades", 10); + ListNBT upgradeTags = tag.getList("upgrades", 10); if (upgradeTags != null) { for (int i = 0; i < upgradeTags.tagCount(); i++) { - CompoundNBT upgradeTag = upgradeTags.getCompoundTagAt(i); + CompoundNBT upgradeTag = upgradeTags.getCompound(i); String key = upgradeTag.getString("key"); - int level = upgradeTag.getInteger("level"); - CompoundNBT nbtTag = upgradeTag.getCompoundTag("upgrade"); + int level = upgradeTag.getInt("level"); + CompoundNBT nbtTag = upgradeTag.getCompound("upgrade"); LivingArmourUpgrade upgrade = LivingArmourHandler.generateUpgradeFromKey(key, level, nbtTag); if (upgrade != null) { upgradeMap.put(key, upgrade); @@ -238,7 +238,7 @@ public class LivingArmour implements ILivingArmour { } StatTracker tracker = (StatTracker) obj; String key = tracker.getUniqueIdentifier(); - CompoundNBT trackerTag = tag.getCompoundTag(key); + CompoundNBT trackerTag = tag.getCompound(key); if (!trackerTag.isEmpty()) { tracker.readFromNBT(trackerTag); } @@ -251,7 +251,7 @@ public class LivingArmour implements ILivingArmour { @Override public void writeToNBT(CompoundNBT tag, boolean forceWrite) { - tag.setInteger("maxUpgradePoints", maxUpgradePoints); + tag.putInt("maxUpgradePoints", maxUpgradePoints); ListNBT tags = new ListNBT(); @@ -262,14 +262,14 @@ public class LivingArmour implements ILivingArmour { CompoundNBT nbtTag = new CompoundNBT(); upgrade.writeToNBT(nbtTag); - upgradeTag.setString("key", upgrade.getUniqueIdentifier()); - upgradeTag.setInteger("level", upgrade.getUpgradeLevel()); - upgradeTag.setTag("upgrade", nbtTag); + upgradeTag.putString("key", upgrade.getUniqueIdentifier()); + upgradeTag.putInt("level", upgrade.getUpgradeLevel()); + upgradeTag.put("upgrade", nbtTag); tags.appendTag(upgradeTag); } - tag.setTag("upgrades", tags); + tag.put("upgrades", tags); for (Entry entry : trackerMap.entrySet()) { StatTracker tracker = entry.getValue(); @@ -284,7 +284,7 @@ public class LivingArmour implements ILivingArmour { CompoundNBT trackerTag = new CompoundNBT(); tracker.writeToNBT(trackerTag); - tag.setTag(key, trackerTag); + tag.put(key, trackerTag); tracker.resetDirty(); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java index 37c20df3..868b5b27 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java @@ -51,12 +51,12 @@ public class LivingArmourUpgradeBattleHungry extends LivingArmourUpgrade { @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger("timer", timer); + tag.putInt("timer", timer); } @Override public void readFromNBT(CompoundNBT tag) { - timer = tag.getInteger("timer"); + timer = tag.getInt("timer"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java index 65f9706f..66aa6b7d 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowProtect.java @@ -31,12 +31,12 @@ public class StatTrackerArrowProtect extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - totalDamage = tag.getInteger(BloodMagic.MODID + ".tracker.arrowProtect"); + totalDamage = tag.getInt(BloodMagic.MODID + ".tracker.arrowProtect"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.arrowProtect", totalDamage); + tag.putInt(BloodMagic.MODID + ".tracker.arrowProtect", totalDamage); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java index 1b9550f5..fb9c3932 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerArrowShot.java @@ -31,12 +31,12 @@ public class StatTrackerArrowShot extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - totalShots = tag.getInteger(BloodMagic.MODID + ".tracker.trickShot"); + totalShots = tag.getInt(BloodMagic.MODID + ".tracker.trickShot"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.trickShot", totalShots); + tag.putInt(BloodMagic.MODID + ".tracker.trickShot", totalShots); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java index 9096e539..2d5f2e23 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerCriticalStrike.java @@ -36,7 +36,7 @@ public class StatTrackerCriticalStrike extends StatTracker { @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.criticalStrike", totalDamageDealt); + tag.putDouble(BloodMagic.MODID + ".tracker.criticalStrike", totalDamageDealt); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java index 9b407907..fe324590 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerDigging.java @@ -31,12 +31,12 @@ public class StatTrackerDigging extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - totalBlocksDug = tag.getInteger(BloodMagic.MODID + ".tracker.digging"); + totalBlocksDug = tag.getInt(BloodMagic.MODID + ".tracker.digging"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.digging", totalBlocksDug); + tag.putInt(BloodMagic.MODID + ".tracker.digging", totalBlocksDug); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java index 09f2c95e..6e334002 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerExperience.java @@ -36,7 +36,7 @@ public class StatTrackerExperience extends StatTracker { @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.experienced", totalExperienceGained); + tag.putDouble(BloodMagic.MODID + ".tracker.experienced", totalExperienceGained); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java index 481a91f0..f40aaad7 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFallProtect.java @@ -31,12 +31,12 @@ public class StatTrackerFallProtect extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - totalDamage = tag.getInteger(BloodMagic.MODID + ".tracker.fallProtect"); + totalDamage = tag.getInt(BloodMagic.MODID + ".tracker.fallProtect"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.fallProtect", totalDamage); + tag.putInt(BloodMagic.MODID + ".tracker.fallProtect", totalDamage); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java index fcbcd93c..becc5329 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFireResist.java @@ -29,12 +29,12 @@ public class StatTrackerFireResist extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - totalFireTicks = tag.getInteger(BloodMagic.MODID + ".tracker.fire"); + totalFireTicks = tag.getInt(BloodMagic.MODID + ".tracker.fire"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.fire", totalFireTicks); + tag.putInt(BloodMagic.MODID + ".tracker.fire", totalFireTicks); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java index 757de371..06a2bd42 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerFood.java @@ -34,12 +34,12 @@ public class StatTrackerFood extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - foodEaten = tag.getInteger(BloodMagic.MODID + ".tracker.foodEaten"); + foodEaten = tag.getInt(BloodMagic.MODID + ".tracker.foodEaten"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.foodEaten", foodEaten); + tag.putInt(BloodMagic.MODID + ".tracker.foodEaten", foodEaten); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java index 0797ba9c..465d68a2 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGraveDigger.java @@ -36,7 +36,7 @@ public class StatTrackerGraveDigger extends StatTracker { @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.graveDigger", totalDamageDealt); + tag.putDouble(BloodMagic.MODID + ".tracker.graveDigger", totalDamageDealt); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java index 9b2e087b..9fb78303 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerGrimReaperSprint.java @@ -32,12 +32,12 @@ public class StatTrackerGrimReaperSprint extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - totalDeaths = tag.getInteger(BloodMagic.MODID + ".tracker.grimReaper"); + totalDeaths = tag.getInt(BloodMagic.MODID + ".tracker.grimReaper"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.grimReaper", totalDeaths); + tag.putInt(BloodMagic.MODID + ".tracker.grimReaper", totalDeaths); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java index 56aa43c5..04efda5f 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerHealthboost.java @@ -36,7 +36,7 @@ public class StatTrackerHealthboost extends StatTracker { @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.health", totalHealthGenned); + tag.putDouble(BloodMagic.MODID + ".tracker.health", totalHealthGenned); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java index cd9ac778..155c8b70 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerJump.java @@ -32,12 +32,12 @@ public class StatTrackerJump extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - totalJumps = tag.getInteger(BloodMagic.MODID + ".tracker.jump"); + totalJumps = tag.getInt(BloodMagic.MODID + ".tracker.jump"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.jump", totalJumps); + tag.putInt(BloodMagic.MODID + ".tracker.jump", totalJumps); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java index 82b7ece1..54aafd31 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMeleeDamage.java @@ -36,7 +36,7 @@ public class StatTrackerMeleeDamage extends StatTracker { @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.meleeDamage", totalDamageDealt); + tag.putDouble(BloodMagic.MODID + ".tracker.meleeDamage", totalDamageDealt); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java index 0b68e699..ab355dbd 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerMovement.java @@ -40,7 +40,7 @@ public class StatTrackerMovement extends StatTracker { @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.movement", totalMovement); + tag.putDouble(BloodMagic.MODID + ".tracker.movement", totalMovement); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java index 12791b42..85978584 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerNightSight.java @@ -36,13 +36,13 @@ public class StatTrackerNightSight extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { totalDamageDealt = tag.getDouble(BloodMagic.MODID + ".tracker.nightSight"); - totalNightVision = tag.getInteger(BloodMagic.MODID + ".tracker.nightSightVision"); + totalNightVision = tag.getInt(BloodMagic.MODID + ".tracker.nightSightVision"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.nightSight", totalDamageDealt); - tag.setInteger(BloodMagic.MODID + ".tracker.nightSightVision", totalNightVision); + tag.putDouble(BloodMagic.MODID + ".tracker.nightSight", totalDamageDealt); + tag.putInt(BloodMagic.MODID + ".tracker.nightSightVision", totalNightVision); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java index e60c6788..2cf5da7d 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPhysicalProtect.java @@ -31,12 +31,12 @@ public class StatTrackerPhysicalProtect extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - totalDamage = tag.getInteger(BloodMagic.MODID + ".tracker.physicalProtect"); + totalDamage = tag.getInt(BloodMagic.MODID + ".tracker.physicalProtect"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.physicalProtect", totalDamage); + tag.putInt(BloodMagic.MODID + ".tracker.physicalProtect", totalDamage); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java index 94c394d6..56d4b125 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerPoison.java @@ -30,12 +30,12 @@ public class StatTrackerPoison extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - totalPoisonTicks = tag.getInteger(BloodMagic.MODID + ".tracker.poison"); + totalPoisonTicks = tag.getInt(BloodMagic.MODID + ".tracker.poison"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.poison", totalPoisonTicks); + tag.putInt(BloodMagic.MODID + ".tracker.poison", totalPoisonTicks); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java index 981f349f..4ab0bb17 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerRepairing.java @@ -36,7 +36,7 @@ public class StatTrackerRepairing extends StatTracker { @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.repair", totalDamage); + tag.putDouble(BloodMagic.MODID + ".tracker.repair", totalDamage); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java index d62f2f47..06712f6c 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSelfSacrifice.java @@ -32,12 +32,12 @@ public class StatTrackerSelfSacrifice extends StatTracker { @Override public void readFromNBT(CompoundNBT tag) { - totalSacrifices = tag.getInteger(BloodMagic.MODID + ".tracker.selfSacrifice"); + totalSacrifices = tag.getInt(BloodMagic.MODID + ".tracker.selfSacrifice"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.selfSacrifice", totalSacrifices); + tag.putInt(BloodMagic.MODID + ".tracker.selfSacrifice", totalSacrifices); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java index 87be975d..6e738b1a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSolarPowered.java @@ -36,7 +36,7 @@ public class StatTrackerSolarPowered extends StatTracker { @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.solarPowered", totalHealthGenned); + tag.putDouble(BloodMagic.MODID + ".tracker.solarPowered", totalHealthGenned); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java index ae828d2e..3ab852ed 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerSprintAttack.java @@ -36,7 +36,7 @@ public class StatTrackerSprintAttack extends StatTracker { @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.sprintAttack", totalDamageDealt); + tag.putDouble(BloodMagic.MODID + ".tracker.sprintAttack", totalDamageDealt); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java index 657edb74..5a55d555 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/tracker/StatTrackerStepAssist.java @@ -39,7 +39,7 @@ public class StatTrackerStepAssist extends StatTracker { @Override public void writeToNBT(CompoundNBT tag) { - tag.setDouble(BloodMagic.MODID + ".tracker.stepAssist", totalMovement); + tag.putDouble(BloodMagic.MODID + ".tracker.stepAssist", totalMovement); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java index 827bc8c8..ec34a3cc 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java @@ -54,12 +54,12 @@ public class LivingArmourUpgradeFireResist extends LivingArmourUpgrade { @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(Constants.NBT.UPGRADE_FIRE_TIMER, fireCooldown); + tag.putInt(Constants.NBT.UPGRADE_FIRE_TIMER, fireCooldown); } @Override public void readFromNBT(CompoundNBT tag) { - fireCooldown = tag.getInteger(Constants.NBT.UPGRADE_FIRE_TIMER); + fireCooldown = tag.getInt(Constants.NBT.UPGRADE_FIRE_TIMER); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java index 6e198169..ffea15d0 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java @@ -50,12 +50,12 @@ public class LivingArmourUpgradeGrimReaperSprint extends LivingArmourUpgrade { @Override public void readFromNBT(CompoundNBT tag) { - deathTimer = tag.getInteger(BloodMagic.MODID + ".tracker.grimReaper"); + deathTimer = tag.getInt(BloodMagic.MODID + ".tracker.grimReaper"); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.grimReaper", deathTimer); + tag.putInt(BloodMagic.MODID + ".tracker.grimReaper", deathTimer); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java index 23620d2a..87e2d273 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java @@ -55,12 +55,12 @@ public class LivingArmourUpgradePoisonResist extends LivingArmourUpgrade { @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(Constants.NBT.UPGRADE_POISON_TIMER, poisonCooldown); + tag.putInt(Constants.NBT.UPGRADE_POISON_TIMER, poisonCooldown); } @Override public void readFromNBT(CompoundNBT tag) { - poisonCooldown = tag.getInteger(Constants.NBT.UPGRADE_POISON_TIMER); + poisonCooldown = tag.getInt(Constants.NBT.UPGRADE_POISON_TIMER); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java index 71e0f1ff..36b8ad84 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java @@ -58,12 +58,12 @@ public class LivingArmourUpgradeRepairing extends LivingArmourUpgrade { @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger("repairingDelay", delay); + tag.putInt("repairingDelay", delay); } @Override public void readFromNBT(CompoundNBT tag) { - delay = tag.getInteger("repairingDelay"); + delay = tag.getInt("repairingDelay"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java index 810a9673..81be945d 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java @@ -64,12 +64,12 @@ public class LivingArmourUpgradeSolarPowered extends LivingArmourUpgrade { @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(BloodMagic.MODID + ".tracker.solarPowered", counter); + tag.putInt(BloodMagic.MODID + ".tracker.solarPowered", counter); } @Override public void readFromNBT(CompoundNBT tag) { - counter = tag.getInteger(BloodMagic.MODID + ".tracker.solarPowered"); + counter = tag.getInt(BloodMagic.MODID + ".tracker.solarPowered"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/network/PlayerVelocityPacketProcessor.java b/src/main/java/WayofTime/bloodmagic/network/PlayerVelocityPacketProcessor.java index 5b5d1595..324c4d0f 100644 --- a/src/main/java/WayofTime/bloodmagic/network/PlayerVelocityPacketProcessor.java +++ b/src/main/java/WayofTime/bloodmagic/network/PlayerVelocityPacketProcessor.java @@ -51,7 +51,7 @@ public class PlayerVelocityPacketProcessor implements IMessage, IMessageHandler< @SideOnly(Side.CLIENT) public void onMessageFromServer() { - PlayerEntity player = Minecraft.getMinecraft().player; + PlayerEntity player = Minecraft.getInstance().player; player.motionX = motionX; player.motionY = motionY; player.motionZ = motionZ; diff --git a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java b/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java index 0c97612e..be6b60bf 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java +++ b/src/main/java/WayofTime/bloodmagic/potion/BMPotionUtils.java @@ -88,7 +88,7 @@ public class BMPotionUtils { NBTHelper.checkNBT(flaskStack); CompoundNBT tag = flaskStack.getTagCompound(); - tag.setDouble(Constants.NBT.POTION_AUGMENT_LENGHT + potion.getName(), value); + tag.putDouble(Constants.NBT.POTION_AUGMENT_LENGHT + potion.getName(), value); } public static int getAugmentedLength(int originalLength, double lengthAugment, double powerAugment) { @@ -113,7 +113,7 @@ public class BMPotionUtils { nbttaglist.appendTag(potioneffect.writeCustomPotionEffectToNBT(new CompoundNBT())); } - nbttagcompound.setTag("CustomPotionEffects", nbttaglist); + nbttagcompound.putTag("CustomPotionEffects", nbttaglist); stack.setTagCompound(nbttagcompound); return stack; } diff --git a/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java b/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java index 4aa8bb2c..cc29bc82 100644 --- a/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/potion/PotionBloodMagic.java @@ -49,7 +49,7 @@ public class PotionBloodMagic extends Effect { @Override @SideOnly(Side.CLIENT) public int getStatusIconIndex() { - Minecraft.getMinecraft().renderEngine.bindTexture(texture); + Minecraft.getInstance().renderEngine.bindTexture(texture); return super.getStatusIconIndex(); } diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index 31c3d98e..4cd83fb9 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -87,7 +87,7 @@ public class ClientProxy extends CommonProxy { @Override public void init() { super.init(); - Minecraft.getMinecraft().getItemColors().registerItemColorHandler((stack, tintIndex) -> + Minecraft.getInstance().getItemColors().registerItemColorHandler((stack, tintIndex) -> { try { if (stack.hasTagCompound() && stack.getTagCompound().hasKey(Constants.NBT.COLOR)) @@ -98,7 +98,7 @@ public class ClientProxy extends CommonProxy { } return -1; }, RegistrarBloodMagicItems.SIGIL_HOLDING); - Minecraft.getMinecraft().getItemColors().registerItemColorHandler((stack, tintIndex) -> + Minecraft.getInstance().getItemColors().registerItemColorHandler((stack, tintIndex) -> { if (tintIndex != 0 && tintIndex != 2) return -1; @@ -108,7 +108,7 @@ public class ClientProxy extends CommonProxy { return PotionUtils.getPotionColorFromEffectList(PotionUtils.getEffectsFromStack(stack)); }, RegistrarBloodMagicItems.POTION_FLASK); - Minecraft.getMinecraft().getItemColors().registerItemColorHandler((stack, tintIndex) -> + Minecraft.getInstance().getItemColors().registerItemColorHandler((stack, tintIndex) -> { // if (tintIndex != 0 && tintIndex != 2) // return -1; @@ -127,7 +127,7 @@ public class ClientProxy extends CommonProxy { } private void addElytraLayer() { - EntityRendererManager renderManager = Minecraft.getMinecraft().getRenderManager(); + EntityRendererManager renderManager = Minecraft.getInstance().getRenderManager(); try { Map skinMap = ObfuscationReflectionHelper.getPrivateValue(EntityRendererManager.class, renderManager, "skinMap", "field_178636_l"); skinMap.get("default").addLayer(new LayerBloodElytra(skinMap.get("default"))); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java b/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java index cba24d19..a4117e2f 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/AreaDescriptor.java @@ -206,18 +206,18 @@ public abstract class AreaDescriptor implements Iterator { @Override public void readFromNBT(CompoundNBT tag) { - minimumOffset = new BlockPos(tag.getInteger(Constants.NBT.X_COORD + "min"), tag.getInteger(Constants.NBT.Y_COORD + "min"), tag.getInteger(Constants.NBT.Z_COORD + "min")); - maximumOffset = new BlockPos(tag.getInteger(Constants.NBT.X_COORD + "max"), tag.getInteger(Constants.NBT.Y_COORD + "max"), tag.getInteger(Constants.NBT.Z_COORD + "max")); + minimumOffset = new BlockPos(tag.getInt(Constants.NBT.X_COORD + "min"), tag.getInt(Constants.NBT.Y_COORD + "min"), tag.getInt(Constants.NBT.Z_COORD + "min")); + maximumOffset = new BlockPos(tag.getInt(Constants.NBT.X_COORD + "max"), tag.getInt(Constants.NBT.Y_COORD + "max"), tag.getInt(Constants.NBT.Z_COORD + "max")); } @Override public void writeToNBT(CompoundNBT tag) { - tag.setInteger(Constants.NBT.X_COORD + "min", minimumOffset.getX()); - tag.setInteger(Constants.NBT.Y_COORD + "min", minimumOffset.getY()); - tag.setInteger(Constants.NBT.Z_COORD + "min", minimumOffset.getZ()); - tag.setInteger(Constants.NBT.X_COORD + "max", maximumOffset.getX()); - tag.setInteger(Constants.NBT.Y_COORD + "max", maximumOffset.getY()); - tag.setInteger(Constants.NBT.Z_COORD + "max", maximumOffset.getZ()); + tag.putInt(Constants.NBT.X_COORD + "min", minimumOffset.getX()); + tag.putInt(Constants.NBT.Y_COORD + "min", minimumOffset.getY()); + tag.putInt(Constants.NBT.Z_COORD + "min", minimumOffset.getZ()); + tag.putInt(Constants.NBT.X_COORD + "max", maximumOffset.getX()); + tag.putInt(Constants.NBT.Y_COORD + "max", maximumOffset.getY()); + tag.putInt(Constants.NBT.Z_COORD + "max", maximumOffset.getZ()); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/CapabilityRuneType.java b/src/main/java/WayofTime/bloodmagic/ritual/CapabilityRuneType.java index cebfc676..1b47776e 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/CapabilityRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/CapabilityRuneType.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.ritual; import net.minecraft.nbt.ByteNBT; -import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.INBT; import net.minecraft.util.Direction; import net.minecraftforge.common.capabilities.Capability; @@ -10,12 +10,12 @@ import java.util.concurrent.Callable; public final class CapabilityRuneType { public static class RuneTypeStorage implements Capability.IStorage { @Override - public NBTBase writeNBT(Capability capability, IRitualStone.Tile instance, Direction side) { + public INBT writeNBT(Capability capability, IRitualStone.Tile instance, Direction side) { return new ByteNBT((byte) instance.getRuneType().ordinal()); } @Override - public void readNBT(Capability capability, IRitualStone.Tile instance, Direction side, NBTBase nbt) { + public void readNBT(Capability capability, IRitualStone.Tile instance, Direction side, INBT nbt) { instance.setRuneType(EnumRuneType.byMetadata(((ByteNBT) nbt).getByte())); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java b/src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java index eb0734d6..585c1e33 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/EnumRuneType.java @@ -48,7 +48,7 @@ public enum EnumRuneType implements IStringSerializable, ISubItem { public ItemStack getStack(int count) { ItemStack ret = new ItemStack(RegistrarBloodMagicItems.INSCRIPTION_TOOL, count, ordinal()); CompoundNBT tag = new CompoundNBT(); - tag.setInteger(Constants.NBT.USES, 10); + tag.putInt(Constants.NBT.USES, 10); ret.setTagCompound(tag); return ret; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java b/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java index 26d7f834..f4a1f8d4 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java @@ -50,16 +50,16 @@ public abstract class Ritual { } public void readFromNBT(CompoundNBT tag) { - ListNBT tags = tag.getTagList("areas", 10); + ListNBT tags = tag.getList("areas", 10); if (tags.isEmpty()) { return; } - for (int i = 0; i < tags.tagCount(); i++) { - CompoundNBT newTag = tags.getCompoundTagAt(i); + for (int i = 0; i < tags.size(); i++) { + CompoundNBT newTag = tags.getCompound(i); String rangeKey = newTag.getString("key"); - CompoundNBT storedTag = newTag.getCompoundTag("area"); + CompoundNBT storedTag = newTag.getCompound("area"); AreaDescriptor desc = this.getBlockRange(rangeKey); if (desc != null) { desc.readFromNBT(storedTag); @@ -72,17 +72,17 @@ public abstract class Ritual { for (Entry entry : modableRangeMap.entrySet()) { CompoundNBT newTag = new CompoundNBT(); - newTag.setString("key", entry.getKey()); + newTag.putString("key", entry.getKey()); CompoundNBT storedTag = new CompoundNBT(); entry.getValue().writeToNBT(storedTag); - newTag.setTag("area", storedTag); + newTag.put("area", storedTag); - tags.appendTag(newTag); + tags.add(newTag); } - tag.setTag("areas", tags); + tag.put("areas", tags); } /** diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualRenderer.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualRenderer.java index a5df2590..2cd14840 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualRenderer.java @@ -7,6 +7,6 @@ public abstract class RitualRenderer { public abstract void renderAt(IMasterRitualStone masterRitualStone, double x, double y, double z); protected void bindTexture(ResourceLocation resourceLocation) { - Minecraft.getMinecraft().getTextureManager().bindTexture(resourceLocation); + Minecraft.getInstance().getTextureManager().bindTexture(resourceLocation); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java index a77b9506..30dbc856 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualForsakenSoul.java @@ -52,7 +52,7 @@ public class RitualForsakenSoul extends Ritual { for (int i = 0; i < MAX_UNIQUENESS; i++) { String key = "uniq" + i; if (tag.hasKey(key)) { - keyList.add(tag.getInteger(key)); + keyList.add(tag.getInt(key)); } } } @@ -61,12 +61,12 @@ public class RitualForsakenSoul extends Ritual { public void writeToNBT(CompoundNBT tag) { super.writeToNBT(tag); - tag.setDouble("willBuffer", willBuffer); - tag.setDouble("crystalBuffer", crystalBuffer); + tag.putDouble("willBuffer", willBuffer); + tag.putDouble("crystalBuffer", crystalBuffer); for (int i = 0; i < Math.min(MAX_UNIQUENESS, keyList.size()); i++) { String key = "uniq" + i; - tag.setInteger(key, keyList.get(i)); + tag.putInt(key, keyList.get(i)); } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java index dcf2d4d7..4fa5220c 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLivingArmourDowngrade.java @@ -128,14 +128,14 @@ public class RitualLivingArmourDowngrade extends Ritual { public void readFromNBT(CompoundNBT tag) { super.readFromNBT(tag); - this.internalTimer = tag.getInteger("internalTimer"); + this.internalTimer = tag.getInt("internalTimer"); } @Override public void writeToNBT(CompoundNBT tag) { super.writeToNBT(tag); - tag.setInteger("internalTimer", internalTimer); + tag.putInt("internalTimer", internalTimer); } public ItemStack getStackFromItemFrame(World world, BlockPos masterPos, Direction direction) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java index c64a1713..1a85c233 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java @@ -88,7 +88,7 @@ public class RitualPortal extends Ritual { } if (LocationsHandler.getLocationsHandler().addLocation(name, new PortalLocation(x, y + 1, z, world.provider.getDimension()))) { - portalRitualTag.setString(PORTAL_ID_TAG, name); + portalRitualTag.putString(PORTAL_ID_TAG, name); return true; } } @@ -210,14 +210,14 @@ public class RitualPortal extends Ritual { public void readFromNBT(CompoundNBT tag) { super.readFromNBT(tag); - portalRitualTag = tag.getCompoundTag(PORTAL_NBT_TAG); + portalRitualTag = tag.getCompound(PORTAL_NBT_TAG); } @Override public void writeToNBT(CompoundNBT tag) { super.writeToNBT(tag); - tag.setTag(PORTAL_NBT_TAG, portalRitualTag); + tag.put(PORTAL_NBT_TAG, portalRitualTag); } public BlockState getBlockState(World world, int x, int y, int z) { diff --git a/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java b/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java index 84c06e33..884431b0 100644 --- a/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java +++ b/src/main/java/WayofTime/bloodmagic/soul/DemonWillHolder.java @@ -54,7 +54,7 @@ public class DemonWillHolder { } public void readFromNBT(CompoundNBT tag, String key) { - CompoundNBT willTag = tag.getCompoundTag(key); + CompoundNBT willTag = tag.getCompound(key); willMap.clear(); @@ -69,10 +69,10 @@ public class DemonWillHolder { public void writeToNBT(CompoundNBT tag, String key) { CompoundNBT willTag = new CompoundNBT(); for (Entry entry : willMap.entrySet()) { - willTag.setDouble("EnumWill" + entry.getKey().getName(), entry.getValue()); + willTag.putDouble("EnumWill" + entry.getKey().getName(), entry.getValue()); } - tag.setTag(key, willTag); + tag.put(key, willTag); } public void clearWill() { diff --git a/src/main/java/WayofTime/bloodmagic/soul/EnumDemonWillType.java b/src/main/java/WayofTime/bloodmagic/soul/EnumDemonWillType.java index 8854afb6..86f5898f 100644 --- a/src/main/java/WayofTime/bloodmagic/soul/EnumDemonWillType.java +++ b/src/main/java/WayofTime/bloodmagic/soul/EnumDemonWillType.java @@ -41,6 +41,6 @@ public enum EnumDemonWillType implements IStringSerializable, ISubItem { @Nonnull @Override public ItemStack getStack(int count) { - return new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, count, ordinal()); + return new ItemStack(RegistrarBloodMagicItems.ITEM_DEMON_CRYSTAL, count); } } diff --git a/src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java b/src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java index 37460c8f..91e41cac 100644 --- a/src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java +++ b/src/main/java/WayofTime/bloodmagic/teleport/PortalLocation.java @@ -26,11 +26,11 @@ public class PortalLocation implements Serializable { public CompoundNBT writeToNBT(CompoundNBT tag) { CompoundNBT locationTag = new CompoundNBT(); - locationTag.setInteger(Constants.NBT.X_COORD, x); - locationTag.setInteger(Constants.NBT.Y_COORD, y); - locationTag.setInteger(Constants.NBT.Z_COORD, z); - locationTag.setInteger(Constants.NBT.DIMENSION_ID, dimension); - tag.setTag(Constants.NBT.PORTAL_LOCATION, locationTag); + locationTag.putInt(Constants.NBT.X_COORD, x); + locationTag.putInt(Constants.NBT.Y_COORD, y); + locationTag.putInt(Constants.NBT.Z_COORD, z); + locationTag.putInt(Constants.NBT.DIMENSION_ID, dimension); + tag.put(Constants.NBT.PORTAL_LOCATION, locationTag); return tag; } @@ -82,8 +82,8 @@ public class PortalLocation implements Serializable { public static PortalLocation readFromNBT(CompoundNBT tag) { if (tag.hasKey(Constants.NBT.PORTAL_LOCATION)) { - CompoundNBT locationTag = tag.getCompoundTag(Constants.NBT.PORTAL_LOCATION); - return new PortalLocation(locationTag.getInteger(Constants.NBT.X_COORD), locationTag.getInteger(Constants.NBT.Y_COORD), locationTag.getInteger(Constants.NBT.Z_COORD), locationTag.getInteger(Constants.NBT.DIMENSION_ID)); + CompoundNBT locationTag = tag.getCompound(Constants.NBT.PORTAL_LOCATION); + return new PortalLocation(locationTag.getInt(Constants.NBT.X_COORD), locationTag.getInt(Constants.NBT.Y_COORD), locationTag.getInt(Constants.NBT.Z_COORD), locationTag.getInt(Constants.NBT.DIMENSION_ID)); } return null; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java index 8f753ecf..b4d528b1 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyArray.java @@ -41,7 +41,7 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche public void deserialize(CompoundNBT tagCompound) { super.deserialize(tagCompound); this.isActive = tagCompound.getBoolean("isActive"); - this.activeCounter = tagCompound.getInteger("activeCounter"); + this.activeCounter = tagCompound.getInt("activeCounter"); this.key = tagCompound.getString("key"); if (!tagCompound.hasKey("doDropIngredients")) //Check if the array is old { @@ -49,7 +49,7 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche } else { this.doDropIngredients = tagCompound.getBoolean("doDropIngredients"); } - this.rotation = Direction.HORIZONTALS[tagCompound.getInteger(Constants.NBT.DIRECTION)]; + this.rotation = Direction.HORIZONTALS[tagCompound.getInt(Constants.NBT.DIRECTION)]; CompoundNBT arrayTag = tagCompound.getCompoundTag("arrayTag"); arrayEffect = AlchemyArrayRecipeRegistry.getAlchemyArrayEffect(key); @@ -61,17 +61,17 @@ public class TileAlchemyArray extends TileInventory implements ITickable, IAlche @Override public CompoundNBT serialize(CompoundNBT tagCompound) { super.serialize(tagCompound); - tagCompound.setBoolean("isActive", isActive); - tagCompound.setInteger("activeCounter", activeCounter); - tagCompound.setString("key", "".equals(key) ? "empty" : key); - tagCompound.setBoolean("doDropIngredients", doDropIngredients); - tagCompound.setInteger(Constants.NBT.DIRECTION, rotation.getHorizontalIndex()); + tagCompound.putBoolean("isActive", isActive); + tagCompound.putInt("activeCounter", activeCounter); + tagCompound.putString("key", "".equals(key) ? "empty" : key); + tagCompound.putBoolean("doDropIngredients", doDropIngredients); + tagCompound.putInt(Constants.NBT.DIRECTION, rotation.getHorizontalIndex()); CompoundNBT arrayTag = new CompoundNBT(); if (arrayEffect != null) { arrayEffect.writeToNBT(arrayTag); } - tagCompound.setTag("arrayTag", arrayTag); + tagCompound.putTag("arrayTag", arrayTag); return tagCompound; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java index 9b9aec1a..fb5a286c 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java @@ -73,11 +73,11 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, super.deserialize(tag); isSlave = tag.getBoolean("isSlave"); - direction = Direction.byIndex(tag.getInteger(Constants.NBT.DIRECTION)); - connectedPos = new BlockPos(tag.getInteger(Constants.NBT.X_COORD), tag.getInteger(Constants.NBT.Y_COORD), tag.getInteger(Constants.NBT.Z_COORD)); + direction = Direction.byIndex(tag.getInt(Constants.NBT.DIRECTION)); + connectedPos = new BlockPos(tag.getInt(Constants.NBT.X_COORD), tag.getInt(Constants.NBT.Y_COORD), tag.getInt(Constants.NBT.Z_COORD)); - burnTime = tag.getInteger("burnTime"); - ticksRequired = tag.getInteger("ticksRequired"); + burnTime = tag.getInt("burnTime"); + ticksRequired = tag.getInt("ticksRequired"); byte[] array = tag.getByteArray("blockedSlots"); for (int i = 0; i < array.length; i++) @@ -88,20 +88,20 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); - tag.setBoolean("isSlave", isSlave); - tag.setInteger(Constants.NBT.DIRECTION, direction.getIndex()); - tag.setInteger(Constants.NBT.X_COORD, connectedPos.getX()); - tag.setInteger(Constants.NBT.Y_COORD, connectedPos.getY()); - tag.setInteger(Constants.NBT.Z_COORD, connectedPos.getZ()); + tag.putBoolean("isSlave", isSlave); + tag.putInt(Constants.NBT.DIRECTION, direction.getIndex()); + tag.putInt(Constants.NBT.X_COORD, connectedPos.getX()); + tag.putInt(Constants.NBT.Y_COORD, connectedPos.getY()); + tag.putInt(Constants.NBT.Z_COORD, connectedPos.getZ()); - tag.setInteger("burnTime", burnTime); - tag.setInteger("ticksRequired", ticksRequired); + tag.putInt("burnTime", burnTime); + tag.putInt("ticksRequired", ticksRequired); byte[] blockedSlotArray = new byte[blockedSlots.length]; for (int i = 0; i < blockedSlots.length; i++) blockedSlotArray[i] = (byte) (blockedSlots[i] ? 1 : 0); - tag.setByteArray("blockedSlots", blockedSlotArray); + tag.putByteArray("blockedSlots", blockedSlotArray); return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java index 35dc8cdf..eb8eb4be 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAltar.java @@ -37,7 +37,7 @@ public class TileAltar extends TileInventory implements IBloodAltar, ITickable { CompoundNBT altarTag = new CompoundNBT(); this.bloodAltar.writeToNBT(altarTag); - tagCompound.setTag("bloodAltar", altarTag); + tagCompound.putTag("bloodAltar", altarTag); return tagCompound; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java b/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java index 8a7cfe0d..a1ccbbeb 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java @@ -28,7 +28,7 @@ public class TileBloodTank extends TileBase { public void deserialize(CompoundNBT tagCompound) { super.deserialize(tagCompound); tank.readFromNBT(tagCompound.getCompoundTag(Constants.NBT.TANK)); - capacity = tagCompound.getInteger(Constants.NBT.ALTAR_CAPACITY); + capacity = tagCompound.getInt(Constants.NBT.ALTAR_CAPACITY); tank.setCapacity(capacity); } @@ -36,8 +36,8 @@ public class TileBloodTank extends TileBase { public CompoundNBT serialize(CompoundNBT tagCompound) { super.serialize(tagCompound); if (tank.getFluidAmount() != 0) - tagCompound.setTag(Constants.NBT.TANK, tank.writeToNBT(new CompoundNBT())); - tagCompound.setInteger(Constants.NBT.ALTAR_CAPACITY, capacity); + tagCompound.putTag(Constants.NBT.TANK, tank.writeToNBT(new CompoundNBT())); + tagCompound.putInt(Constants.NBT.ALTAR_CAPACITY, capacity); return tagCompound; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java index 6f4ba7f7..92c8721b 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrucible.java @@ -107,7 +107,7 @@ public class TileDemonCrucible extends TileInventory implements ITickable, IDemo super.serialize(tag); for (Entry entry : willMap.entrySet()) { - tag.setDouble("EnumWill" + entry.getKey().getName(), entry.getValue()); + tag.putDouble("EnumWill" + entry.getKey().getName(), entry.getValue()); } return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java index 125d3557..22037b11 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java @@ -147,17 +147,17 @@ public class TileDemonCrystal extends TileTicking { @Override public void deserialize(CompoundNBT tag) { holder.readFromNBT(tag, "Will"); - crystalCount = tag.getInteger("crystalCount"); - placement = Direction.byIndex(tag.getInteger("placement")); + crystalCount = tag.getInt("crystalCount"); + placement = Direction.byIndex(tag.getInt("placement")); progressToNextCrystal = tag.getDouble("progress"); } @Override public CompoundNBT serialize(CompoundNBT tag) { holder.writeToNBT(tag, "Will"); - tag.setInteger("crystalCount", crystalCount); - tag.setInteger("placement", placement.getIndex()); - tag.setDouble("progress", progressToNextCrystal); + tag.putInt("crystalCount", crystalCount); + tag.putInt("placement", placement.getIndex()); + tag.putDouble("progress", progressToNextCrystal); return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java index fe9137c4..00e80f0b 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java @@ -73,7 +73,7 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond @Override public CompoundNBT serialize(CompoundNBT tag) { holder.writeToNBT(tag, "Will"); - tag.setDouble("internalCounter", internalCounter); + tag.putDouble("internalCounter", internalCounter); return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java index afabdfe7..f450095d 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java @@ -15,17 +15,17 @@ public class TileDimensionalPortal extends TileBase { public void deserialize(CompoundNBT tagCompound) { portalID = tagCompound.getString(RitualPortal.PORTAL_ID_TAG); - masterStoneX = tagCompound.getInteger("masterStoneX"); - masterStoneY = tagCompound.getInteger("masterStoneY"); - masterStoneZ = tagCompound.getInteger("masterStoneZ"); + masterStoneX = tagCompound.getInt("masterStoneX"); + masterStoneY = tagCompound.getInt("masterStoneY"); + masterStoneZ = tagCompound.getInt("masterStoneZ"); } public CompoundNBT serialize(CompoundNBT tagCompound) { - tagCompound.setString(RitualPortal.PORTAL_ID_TAG, Strings.isNullOrEmpty(portalID) ? "" : portalID); + tagCompound.putString(RitualPortal.PORTAL_ID_TAG, Strings.isNullOrEmpty(portalID) ? "" : portalID); - tagCompound.setInteger("masterStoneX", masterStoneX); - tagCompound.setInteger("masterStoneY", masterStoneY); - tagCompound.setInteger("masterStoneZ", masterStoneZ); + tagCompound.putInt("masterStoneX", masterStoneX); + tagCompound.putInt("masterStoneY", masterStoneY); + tagCompound.putInt("masterStoneZ", masterStoneZ); return tagCompound; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java index 1f645991..6a417023 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileIncenseAltar.java @@ -70,8 +70,8 @@ public class TileIncenseAltar extends TileInventory implements ITickable { @Override public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); - tag.setDouble("tranquility", tranquility); - tag.setDouble("incenseAddition", incenseAddition); + tag.putDouble("tranquility", tranquility); + tag.putDouble("incenseAddition", incenseAddition); return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java b/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java index 5d6607f0..dc3ae9da 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileInventory.java @@ -57,7 +57,7 @@ public class TileInventory extends TileBase implements IInventory { for (int i = 0; i < tags.tagCount(); i++) { if (!isSyncedSlot(i)) { - CompoundNBT data = tags.getCompoundTagAt(i); + CompoundNBT data = tags.getCompound(i); byte j = data.getByte("Slot"); if (j >= 0 && j < inventory.size()) { @@ -81,7 +81,7 @@ public class TileInventory extends TileBase implements IInventory { } } - tagCompound.setTag("Items", tags); + tagCompound.putTag("Items", tags); return tagCompound; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java b/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java index 41ee1d2f..491a7cb6 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileInversionPillar.java @@ -203,8 +203,8 @@ public class TileInversionPillar extends TileTicking { type = EnumDemonWillType.valueOf(tag.getString(Constants.NBT.WILL_TYPE).toUpperCase(Locale.ENGLISH)); currentInversion = tag.getDouble("currentInversion"); - currentInfectionRadius = tag.getInteger("currentInfectionRadius"); - consecutiveFailedChecks = tag.getInteger("consecutiveFailedChecks"); + currentInfectionRadius = tag.getInt("currentInfectionRadius"); + consecutiveFailedChecks = tag.getInt("consecutiveFailedChecks"); animationOffsetValue = tag.getFloat("animationOffset"); animationOffset.setValue(animationOffsetValue); @@ -214,11 +214,11 @@ public class TileInversionPillar extends TileTicking { public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); - tag.setString(Constants.NBT.WILL_TYPE, type.toString()); - tag.setDouble("currentInversion", currentInversion); - tag.setInteger("currentInfectionRadius", currentInfectionRadius); - tag.setInteger("consecutiveFailedChecks", consecutiveFailedChecks); - tag.setFloat("animationOffset", animationOffsetValue); + tag.putString(Constants.NBT.WILL_TYPE, type.toString()); + tag.putDouble("currentInversion", currentInversion); + tag.putInt("currentInfectionRadius", currentInfectionRadius); + tag.putInt("consecutiveFailedChecks", consecutiveFailedChecks); + tag.putFloat("animationOffset", animationOffsetValue); return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index ac7531db..ce5a84c0 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -79,14 +79,14 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS cachedNetwork = NetworkHelper.getSoulNetwork(owner); currentRitual = BloodMagic.RITUAL_MANAGER.getRitual(tag.getString(Constants.NBT.CURRENT_RITUAL)); if (currentRitual != null) { - CompoundNBT ritualTag = tag.getCompoundTag(Constants.NBT.CURRENT_RITUAL_TAG); + CompoundNBT ritualTag = tag.getCompound(Constants.NBT.CURRENT_RITUAL_TAG); if (!ritualTag.isEmpty()) { currentRitual.readFromNBT(ritualTag); } } active = tag.getBoolean(Constants.NBT.IS_RUNNING); - activeTime = tag.getInteger(Constants.NBT.RUNTIME); - direction = Direction.VALUES[tag.getInteger(Constants.NBT.DIRECTION)]; + activeTime = tag.getInt(Constants.NBT.RUNTIME); + direction = Direction.VALUES[tag.getInt(Constants.NBT.DIRECTION)]; redstoned = tag.getBoolean(Constants.NBT.IS_REDSTONED); for (EnumDemonWillType type : EnumDemonWillType.values()) { @@ -100,20 +100,20 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS public CompoundNBT serialize(CompoundNBT tag) { String ritualId = BloodMagic.RITUAL_MANAGER.getId(getCurrentRitual()); if (owner != null) - tag.setUniqueId("owner", owner); - tag.setString(Constants.NBT.CURRENT_RITUAL, Strings.isNullOrEmpty(ritualId) ? "" : ritualId); + tag.putUniqueId("owner", owner); + tag.putString(Constants.NBT.CURRENT_RITUAL, Strings.isNullOrEmpty(ritualId) ? "" : ritualId); if (currentRitual != null) { CompoundNBT ritualTag = new CompoundNBT(); currentRitual.writeToNBT(ritualTag); - tag.setTag(Constants.NBT.CURRENT_RITUAL_TAG, ritualTag); + tag.put(Constants.NBT.CURRENT_RITUAL_TAG, ritualTag); } - tag.setBoolean(Constants.NBT.IS_RUNNING, isActive()); - tag.setInteger(Constants.NBT.RUNTIME, getActiveTime()); - tag.setInteger(Constants.NBT.DIRECTION, direction.getIndex()); - tag.setBoolean(Constants.NBT.IS_REDSTONED, redstoned); + tag.putBoolean(Constants.NBT.IS_RUNNING, isActive()); + tag.putInt(Constants.NBT.RUNTIME, getActiveTime()); + tag.putInt(Constants.NBT.DIRECTION, direction.getIndex()); + tag.putBoolean(Constants.NBT.IS_REDSTONED, redstoned); for (EnumDemonWillType type : currentActiveWillConfig) { - tag.setBoolean("EnumWill" + type, true); + tag.putBoolean("EnumWill" + type, true); } return tag; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java b/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java index 88829e15..6e5fd68a 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMimic.java @@ -256,24 +256,24 @@ public class TileMimic extends TileInventory implements ITickable { super.deserialize(tag); dropItemsOnBreak = tag.getBoolean("dropItemsOnBreak"); - tileTag = tag.getCompoundTag("tileTag"); + tileTag = tag.getCompound("tileTag"); stateOfReplacedBlock = StateUtil.parseState(tag.getString("stateOfReplacedBlock")); mimicedTile = getTileFromStackWithTag(getWorld(), pos, getStackInSlot(0), tileTag, stateOfReplacedBlock); - playerCheckRadius = tag.getInteger("playerCheckRadius"); - potionSpawnRadius = tag.getInteger("potionSpawnRadius"); - potionSpawnInterval = Math.max(1, tag.getInteger("potionSpawnInterval")); + playerCheckRadius = tag.getInt("playerCheckRadius"); + potionSpawnRadius = tag.getInt("potionSpawnRadius"); + potionSpawnInterval = Math.max(1, tag.getInt("potionSpawnInterval")); } @Override public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); - tag.setBoolean("dropItemsOnBreak", dropItemsOnBreak); - tag.setTag("tileTag", tileTag); - tag.setInteger("playerCheckRadius", playerCheckRadius); - tag.setInteger("potionSpawnRadius", potionSpawnRadius); - tag.setInteger("potionSpawnInterval", potionSpawnInterval); - tag.setString("stateOfReplacedBlock", stateOfReplacedBlock.toString()); + tag.putBoolean("dropItemsOnBreak", dropItemsOnBreak); + tag.put("tileTag", tileTag); + tag.putInt("playerCheckRadius", playerCheckRadius); + tag.putInt("potionSpawnRadius", potionSpawnRadius); + tag.putInt("potionSpawnInterval", potionSpawnInterval); + tag.putString("stateOfReplacedBlock", stateOfReplacedBlock.toString()); return tag; } @@ -320,9 +320,9 @@ public class TileMimic extends TileInventory implements ITickable { if (world.setBlockState(pos, state, 3)) { TileEntity tile = world.getTileEntity(pos); if (tile != null) { - tileTag.setInteger("x", pos.getX()); - tileTag.setInteger("y", pos.getY()); - tileTag.setInteger("z", pos.getZ()); + tileTag.putInt("x", pos.getX()); + tileTag.putInt("y", pos.getY()); + tileTag.putInt("z", pos.getZ()); tile.readFromNBT(tileTag); } @@ -346,9 +346,9 @@ public class TileMimic extends TileInventory implements ITickable { if (tag != null) { CompoundNBT copyTag = tag.copy(); - copyTag.setInteger("x", pos.getX()); - copyTag.setInteger("y", pos.getY()); - copyTag.setInteger("z", pos.getZ()); + copyTag.putInt("x", pos.getX()); + copyTag.putInt("y", pos.getY()); + copyTag.putInt("z", pos.getZ()); tile.readFromNBT(copyTag); } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java index b9e2ad30..553fc9bf 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePhantomBlock.java @@ -18,12 +18,12 @@ public class TilePhantomBlock extends TileTicking { @Override public void deserialize(CompoundNBT tagCompound) { - this.ticksRemaining = tagCompound.getInteger(Constants.NBT.TICKS_REMAINING); + this.ticksRemaining = tagCompound.getInt(Constants.NBT.TICKS_REMAINING); } @Override public CompoundNBT serialize(CompoundNBT tagCompound) { - tagCompound.setInteger(Constants.NBT.TICKS_REMAINING, ticksRemaining); + tagCompound.putInt(Constants.NBT.TICKS_REMAINING, ticksRemaining); return tagCompound; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java b/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java index e4a74df2..6710da46 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TilePurificationAltar.java @@ -74,9 +74,9 @@ public class TilePurificationAltar extends TileInventory implements ITickable { public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); - tag.setDouble("totalPurity", totalPurity); - tag.setDouble("maxPurity", maxPurity); - tag.setDouble("purityRate", purityRate); + tag.putDouble("totalPurity", totalPurity); + tag.putDouble("maxPurity", maxPurity); + tag.putDouble("purityRate", purityRate); return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java index 1ceab097..8d1b7807 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java @@ -37,14 +37,14 @@ public class TileSoulForge extends TileInventory implements ITickable, IDemonWil public void deserialize(CompoundNBT tag) { super.deserialize(tag); - burnTime = tag.getInteger(Constants.NBT.SOUL_FORGE_BURN); + burnTime = tag.getInt(Constants.NBT.SOUL_FORGE_BURN); } @Override public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); - tag.setInteger(Constants.NBT.SOUL_FORGE_BURN, burnTime); + tag.putInt(Constants.NBT.SOUL_FORGE_BURN, burnTime); return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java index 54475123..4d5d1eef 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java @@ -22,16 +22,16 @@ public class TileSpectralBlock extends TileTicking { @Override public void deserialize(CompoundNBT tagCompound) { - ticksRemaining = tagCompound.getInteger(Constants.NBT.TICKS_REMAINING); + ticksRemaining = tagCompound.getInt(Constants.NBT.TICKS_REMAINING); containedBlockName = tagCompound.getString(Constants.NBT.CONTAINED_BLOCK_NAME); - containedBlockMeta = tagCompound.getInteger(Constants.NBT.CONTAINED_BLOCK_META); + containedBlockMeta = tagCompound.getInt(Constants.NBT.CONTAINED_BLOCK_META); } @Override public CompoundNBT serialize(CompoundNBT tagCompound) { - tagCompound.setInteger(Constants.NBT.TICKS_REMAINING, ticksRemaining); - tagCompound.setString(Constants.NBT.CONTAINED_BLOCK_NAME, Strings.isNullOrEmpty(containedBlockName) ? "" : containedBlockName); - tagCompound.setInteger(Constants.NBT.CONTAINED_BLOCK_META, containedBlockMeta); + tagCompound.putInt(Constants.NBT.TICKS_REMAINING, ticksRemaining); + tagCompound.putString(Constants.NBT.CONTAINED_BLOCK_NAME, Strings.isNullOrEmpty(containedBlockName) ? "" : containedBlockName); + tagCompound.putInt(Constants.NBT.CONTAINED_BLOCK_META, containedBlockMeta); return tagCompound; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java index 30009812..a6d19da3 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileTeleposer.java @@ -37,13 +37,13 @@ public class TileTeleposer extends TileInventory implements ITickable { @Override public void deserialize(CompoundNBT tagCompound) { super.deserialize(tagCompound); - previousInput = tagCompound.getInteger(Constants.NBT.PREVIOUS_INPUT); + previousInput = tagCompound.getInt(Constants.NBT.PREVIOUS_INPUT); } @Override public CompoundNBT serialize(CompoundNBT tagCompound) { super.serialize(tagCompound); - tagCompound.setInteger(Constants.NBT.PREVIOUS_INPUT, previousInput); + tagCompound.putInt(Constants.NBT.PREVIOUS_INPUT, previousInput); return tagCompound; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java b/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java index 8a05ad0e..257b1487 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java +++ b/src/main/java/WayofTime/bloodmagic/tile/base/TileBase.java @@ -16,22 +16,23 @@ import net.minecraftforge.fml.relauncher.SideOnly; * Handles data syncing and core data writing/reading. */ public class TileBase extends TileEntity { + @Override - public final void readFromNBT(CompoundNBT compound) { - super.readFromNBT(compound); - deserializeBase(compound); - deserialize(compound); + public final void deserializeNBT(CompoundNBT nbt) { + super.deserializeNBT(nbt); + deserializeBase(nbt); + deserialize(nbt); } @Override - public final CompoundNBT writeToNBT(CompoundNBT compound) { - super.writeToNBT(compound); - serializeBase(compound); - return serialize(compound); + public final CompoundNBT serializeNBT() { + CompoundNBT tag = super.serializeNBT(); + serializeBase(tag); + return serialize(tag); } /** - * Called by {@link #readFromNBT(CompoundNBT)} + * Called by {@link #deserializeNBT(CompoundNBT)} *

* Internal data (such as coordinates) are handled for you. Just read the data you need. * @@ -52,7 +53,7 @@ public class TileBase extends TileEntity { } /** - * Called by {@link #writeToNBT(CompoundNBT)} + * Called by {@link #serializeNBT()} *

* Internal data (such as coordinates) are handled for you. Just read the data you need. * @@ -89,14 +90,14 @@ public class TileBase extends TileEntity { @Override public final SUpdateTileEntityPacket getUpdatePacket() { - return new SUpdateTileEntityPacket(getPos(), -999, writeToNBT(new CompoundNBT())); + return new SUpdateTileEntityPacket(getPos(), -999, serializeNBT()); } @Override @SideOnly(Side.CLIENT) public final void onDataPacket(NetworkManager net, SUpdateTileEntityPacket pkt) { super.onDataPacket(net, pkt); - readFromNBT(pkt.getNbtCompound()); + deserialize(pkt.getNbtCompound()); onDataPacketClientReceived(); } @@ -109,11 +110,11 @@ public class TileBase extends TileEntity { @Override public final CompoundNBT getUpdateTag() { - return writeToNBT(new CompoundNBT()); + return serializeNBT(); } @Override public final void handleUpdateTag(CompoundNBT tag) { - readFromNBT(tag); + deserializeNBT(tag); } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/base/TileTicking.java b/src/main/java/WayofTime/bloodmagic/tile/base/TileTicking.java index 33c18025..85e3154d 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/base/TileTicking.java +++ b/src/main/java/WayofTime/bloodmagic/tile/base/TileTicking.java @@ -1,18 +1,18 @@ package WayofTime.bloodmagic.tile.base; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.ITickable; +import net.minecraft.tileentity.ITickableTileEntity; /** * Base class for tiles that tick. Allows disabling the ticking programmatically. */ // TODO - Move implementations that depend on existed ticks to new methods from here. -public abstract class TileTicking extends TileBase implements ITickable { +public abstract class TileTicking extends TileBase implements ITickableTileEntity { private int ticksExisted; private boolean shouldTick = true; @Override - public final void update() { + public final void tick() { if (shouldTick()) { ticksExisted++; onUpdate(); @@ -21,14 +21,14 @@ public abstract class TileTicking extends TileBase implements ITickable { @Override void deserializeBase(CompoundNBT tagCompound) { - this.ticksExisted = tagCompound.getInteger("ticksExisted"); + this.ticksExisted = tagCompound.getInt("ticksExisted"); this.shouldTick = tagCompound.getBoolean("shouldTick"); } @Override CompoundNBT serializeBase(CompoundNBT tagCompound) { - tagCompound.setInteger("ticksExisted", getTicksExisted()); - tagCompound.setBoolean("shouldTick", shouldTick()); + tagCompound.putInt("ticksExisted", getTicksExisted()); + tagCompound.putBoolean("shouldTick", shouldTick()); return tagCompound; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java index ccadc1e4..b22c997f 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileFilteredRoutingNode.java @@ -44,18 +44,18 @@ public class TileFilteredRoutingNode extends TileRoutingNode implements ISidedIn @Override public void deserialize(CompoundNBT tag) { super.deserialize(tag); - currentActiveSlot = tag.getInteger("currentSlot"); + currentActiveSlot = tag.getInt("currentSlot"); priorities = tag.getIntArray(Constants.NBT.ROUTING_PRIORITY); if (priorities.length != 6) { priorities = new int[6]; } if (!tag.getBoolean("updated")) { - ListNBT tags = tag.getTagList("Items", 10); + ListNBT tags = tag.getList("Items", 10); inventory = NonNullList.withSize(getSizeInventory(), ItemStack.EMPTY); for (int i = 0; i < tags.tagCount(); i++) { if (!isSyncedSlot(i)) { - CompoundNBT data = tags.getCompoundTagAt(i); + CompoundNBT data = tags.getCompound(i); byte j = data.getByte("Slot"); if (j == 0) { @@ -73,9 +73,9 @@ public class TileFilteredRoutingNode extends TileRoutingNode implements ISidedIn @Override public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); - tag.setInteger("currentSlot", currentActiveSlot); - tag.setIntArray(Constants.NBT.ROUTING_PRIORITY, priorities); - tag.setBoolean("updated", true); + tag.putInt("currentSlot", currentActiveSlot); + tag.putIntArray(Constants.NBT.ROUTING_PRIORITY, priorities); + tag.putBoolean("updated", true); return tag; } diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java index a0457aee..5391ee41 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileMasterRoutingNode.java @@ -191,32 +191,32 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti ListNBT tags = new ListNBT(); for (BlockPos pos : generalNodeList) { CompoundNBT posTag = new CompoundNBT(); - posTag.setInteger(Constants.NBT.X_COORD, pos.getX()); - posTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); - posTag.setInteger(Constants.NBT.Z_COORD, pos.getZ()); + posTag.putInt(Constants.NBT.X_COORD, pos.getX()); + posTag.putInt(Constants.NBT.Y_COORD, pos.getY()); + posTag.putInt(Constants.NBT.Z_COORD, pos.getZ()); tags.appendTag(posTag); } - tag.setTag(Constants.NBT.ROUTING_MASTER_GENERAL, tags); + tag.put(Constants.NBT.ROUTING_MASTER_GENERAL, tags); tags = new ListNBT(); for (BlockPos pos : inputNodeList) { CompoundNBT posTag = new CompoundNBT(); - posTag.setInteger(Constants.NBT.X_COORD, pos.getX()); - posTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); - posTag.setInteger(Constants.NBT.Z_COORD, pos.getZ()); + posTag.putInt(Constants.NBT.X_COORD, pos.getX()); + posTag.putInt(Constants.NBT.Y_COORD, pos.getY()); + posTag.putInt(Constants.NBT.Z_COORD, pos.getZ()); tags.appendTag(posTag); } - tag.setTag(Constants.NBT.ROUTING_MASTER_INPUT, tags); + tag.put(Constants.NBT.ROUTING_MASTER_INPUT, tags); tags = new ListNBT(); for (BlockPos pos : outputNodeList) { CompoundNBT posTag = new CompoundNBT(); - posTag.setInteger(Constants.NBT.X_COORD, pos.getX()); - posTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); - posTag.setInteger(Constants.NBT.Z_COORD, pos.getZ()); + posTag.putInt(Constants.NBT.X_COORD, pos.getX()); + posTag.putInt(Constants.NBT.Y_COORD, pos.getY()); + posTag.putInt(Constants.NBT.Z_COORD, pos.getZ()); tags.appendTag(posTag); } - tag.setTag(Constants.NBT.ROUTING_MASTER_OUTPUT, tags); + tag.put(Constants.NBT.ROUTING_MASTER_OUTPUT, tags); return tag; } @@ -224,24 +224,24 @@ public class TileMasterRoutingNode extends TileInventory implements IMasterRouti public void deserialize(CompoundNBT tag) { super.deserialize(tag); - ListNBT tags = tag.getTagList(Constants.NBT.ROUTING_MASTER_GENERAL, 10); + ListNBT tags = tag.getList(Constants.NBT.ROUTING_MASTER_GENERAL, 10); for (int i = 0; i < tags.tagCount(); i++) { - CompoundNBT blockTag = tags.getCompoundTagAt(i); - BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD)); + CompoundNBT blockTag = tags.getCompound(i); + BlockPos newPos = new BlockPos(blockTag.getInt(Constants.NBT.X_COORD), blockTag.getInt(Constants.NBT.Y_COORD), blockTag.getInt(Constants.NBT.Z_COORD)); generalNodeList.add(newPos); } - tags = tag.getTagList(Constants.NBT.ROUTING_MASTER_INPUT, 10); + tags = tag.getList(Constants.NBT.ROUTING_MASTER_INPUT, 10); for (int i = 0; i < tags.tagCount(); i++) { - CompoundNBT blockTag = tags.getCompoundTagAt(i); - BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD)); + CompoundNBT blockTag = tags.getCompound(i); + BlockPos newPos = new BlockPos(blockTag.getInt(Constants.NBT.X_COORD), blockTag.getInt(Constants.NBT.Y_COORD), blockTag.getInt(Constants.NBT.Z_COORD)); inputNodeList.add(newPos); } - tags = tag.getTagList(Constants.NBT.ROUTING_MASTER_OUTPUT, 10); + tags = tag.getList(Constants.NBT.ROUTING_MASTER_OUTPUT, 10); for (int i = 0; i < tags.tagCount(); i++) { - CompoundNBT blockTag = tags.getCompoundTagAt(i); - BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD)); + CompoundNBT blockTag = tags.getCompound(i); + BlockPos newPos = new BlockPos(blockTag.getInt(Constants.NBT.X_COORD), blockTag.getInt(Constants.NBT.Y_COORD), blockTag.getInt(Constants.NBT.Z_COORD)); outputNodeList.add(newPos); } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java index fb402861..3fa08545 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java @@ -39,20 +39,20 @@ public class TileRoutingNode extends TileInventory implements IRoutingNode, IIte public CompoundNBT serialize(CompoundNBT tag) { super.serialize(tag); CompoundNBT masterTag = new CompoundNBT(); - masterTag.setInteger(Constants.NBT.X_COORD, masterPos.getX()); - masterTag.setInteger(Constants.NBT.Y_COORD, masterPos.getY()); - masterTag.setInteger(Constants.NBT.Z_COORD, masterPos.getZ()); - tag.setTag(Constants.NBT.ROUTING_MASTER, masterTag); + masterTag.putInt(Constants.NBT.X_COORD, masterPos.getX()); + masterTag.putInt(Constants.NBT.Y_COORD, masterPos.getY()); + masterTag.putInt(Constants.NBT.Z_COORD, masterPos.getZ()); + tag.put(Constants.NBT.ROUTING_MASTER, masterTag); ListNBT tags = new ListNBT(); for (BlockPos pos : connectionList) { CompoundNBT posTag = new CompoundNBT(); - posTag.setInteger(Constants.NBT.X_COORD, pos.getX()); - posTag.setInteger(Constants.NBT.Y_COORD, pos.getY()); - posTag.setInteger(Constants.NBT.Z_COORD, pos.getZ()); - tags.appendTag(posTag); + posTag.putInt(Constants.NBT.X_COORD, pos.getX()); + posTag.putInt(Constants.NBT.Y_COORD, pos.getY()); + posTag.putInt(Constants.NBT.Z_COORD, pos.getZ()); + tags.add(posTag); } - tag.setTag(Constants.NBT.ROUTING_CONNECTION, tags); + tag.put(Constants.NBT.ROUTING_CONNECTION, tags); return tag; } @@ -60,13 +60,13 @@ public class TileRoutingNode extends TileInventory implements IRoutingNode, IIte public void deserialize(CompoundNBT tag) { super.deserialize(tag); connectionList.clear(); - CompoundNBT masterTag = tag.getCompoundTag(Constants.NBT.ROUTING_MASTER); - masterPos = new BlockPos(masterTag.getInteger(Constants.NBT.X_COORD), masterTag.getInteger(Constants.NBT.Y_COORD), masterTag.getInteger(Constants.NBT.Z_COORD)); + CompoundNBT masterTag = tag.getCompound(Constants.NBT.ROUTING_MASTER); + masterPos = new BlockPos(masterTag.getInt(Constants.NBT.X_COORD), masterTag.getInt(Constants.NBT.Y_COORD), masterTag.getInt(Constants.NBT.Z_COORD)); - ListNBT tags = tag.getTagList(Constants.NBT.ROUTING_CONNECTION, 10); - for (int i = 0; i < tags.tagCount(); i++) { - CompoundNBT blockTag = tags.getCompoundTagAt(i); - BlockPos newPos = new BlockPos(blockTag.getInteger(Constants.NBT.X_COORD), blockTag.getInteger(Constants.NBT.Y_COORD), blockTag.getInteger(Constants.NBT.Z_COORD)); + ListNBT tags = tag.getList(Constants.NBT.ROUTING_CONNECTION, 10); + for (int i = 0; i < tags.size(); i++) { + CompoundNBT blockTag = tags.getCompound(i); + BlockPos newPos = new BlockPos(blockTag.getInt(Constants.NBT.X_COORD), blockTag.getInt(Constants.NBT.Y_COORD), blockTag.getInt(Constants.NBT.Z_COORD)); connectionList.add(newPos); } } diff --git a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java index 68428f47..8a792f99 100644 --- a/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java +++ b/src/main/java/WayofTime/bloodmagic/util/ChatUtil.java @@ -20,7 +20,7 @@ public class ChatUtil { private static int lastAdded; private static void sendNoSpamMessages(ITextComponent[] messages) { - NewChatGui chat = Minecraft.getMinecraft().ingameGUI.getChatGUI(); + NewChatGui chat = Minecraft.getInstance().ingameGUI.getChatGUI(); for (int i = DELETION_ID + messages.length - 1; i <= lastAdded; i++) { chat.deleteChatLine(i); } @@ -219,7 +219,7 @@ public class ChatUtil { public static class Handler implements IMessageHandler { @Override public IMessage onMessage(final PacketNoSpamChat message, MessageContext ctx) { - Minecraft.getMinecraft().addScheduledTask(() -> sendNoSpamMessages(message.chatLines)); + Minecraft.getInstance().addScheduledTask(() -> sendNoSpamMessages(message.chatLines)); return null; } } diff --git a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java b/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java index cb1ef51b..5621e3f0 100644 --- a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java @@ -9,14 +9,14 @@ public class GhostItemHelper { NBTHelper.checkNBT(stack); CompoundNBT tag = stack.getTagCompound(); - tag.setInteger(Constants.NBT.GHOST_STACK_SIZE, amount); + tag.putInt(Constants.NBT.GHOST_STACK_SIZE, amount); } public static int getItemGhostAmount(ItemStack stack) { NBTHelper.checkNBT(stack); CompoundNBT tag = stack.getTagCompound(); - return tag.getInteger(Constants.NBT.GHOST_STACK_SIZE); + return tag.getInt(Constants.NBT.GHOST_STACK_SIZE); } public static boolean hasGhostAmount(ItemStack stack) { 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 b8bddf1f..06fd87a4 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -68,7 +68,7 @@ public class ClientHandler { public static TextureAtlasSprite bloodStoneBrick; public static TextureAtlasSprite beacon; public static TextureAtlasSprite crystalCluster; - public static Minecraft minecraft = Minecraft.getMinecraft(); + public static Minecraft minecraft = Minecraft.getInstance(); private static TileMasterRitualStone mrsHoloTile; private static Ritual mrsHoloRitual; private static Direction mrsHoloDirection; @@ -93,7 +93,7 @@ public class ClientHandler { @SubscribeEvent public static void onSoundEvent(PlaySoundEvent event) { - PlayerEntity player = Minecraft.getMinecraft().player; + PlayerEntity player = Minecraft.getInstance().player; if (player != null && player.isPotionActive(RegistrarBloodMagic.DEAFNESS)) { event.setResultSound(null); } @@ -146,7 +146,7 @@ public class ClientHandler { @SubscribeEvent public static void onMouseEvent(MouseEvent event) { - ClientPlayerEntity player = Minecraft.getMinecraft().player; + ClientPlayerEntity player = Minecraft.getInstance().player; if (event.getDwheel() != 0 && player != null && player.isSneaking()) { ItemStack stack = player.getHeldItemMainhand(); 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 acfda0d0..0380cf30 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/WillHandler.java @@ -143,7 +143,7 @@ public class WillHandler { WillChunk ac = WorldDemonWillHandler.getWillChunk(dim, loc.x, loc.z); if (ac != null) { - nbt.setShort("base", ac.getBase()); + nbt.putShort("base", ac.getBase()); ac.getCurrentWill().writeToNBT(nbt, "current"); if (!event.getChunk().isLoaded()) WorldDemonWillHandler.removeWillChunk(dim, loc.x, loc.z); diff --git a/src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java b/src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java index 760bf085..a0e53917 100644 --- a/src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/helper/ItemHelper.java @@ -93,7 +93,7 @@ public class ItemHelper { NBTHelper.checkNBT(stack); CompoundNBT tag = stack.getTagCompound(); - tag.setString("key", key); + tag.putString("key", key); } } @@ -113,7 +113,7 @@ public class ItemHelper { NBTHelper.checkNBT(stack); CompoundNBT tag = stack.getTagCompound(); - tag.setInteger("level", level); + tag.putInt("level", level); } } @@ -122,7 +122,7 @@ public class ItemHelper { NBTHelper.checkNBT(stack); CompoundNBT tag = stack.getTagCompound(); - return tag.getInteger("level"); + return tag.getInt("level"); } return 0;