diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index eab0e992..9f21dde4 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -25,7 +25,7 @@ b03040d7a168653bf8df3600033b8fde2383db30 assets/bloodmagic/blockstates/selfsacri f1ca47098385a955155cab9c2a97219e02d390a0 assets/bloodmagic/blockstates/steadfastdemoncrystal.json 48ed6b25a5d8d8074c38d772fdc27c1753d42c36 assets/bloodmagic/blockstates/vengefuldemoncrystal.json e6d9cf699667aaa47efff37b2b033895dee29c15 assets/bloodmagic/blockstates/waterritualstone.json -2ca6eb2babe7613dd82d330eeaf5a87f704342c5 assets/bloodmagic/lang/en_us.json +69f7dee8ac7105339c604bc9b211386200165a2a assets/bloodmagic/lang/en_us.json 34445195b9f2459475cde53454bc8e37d32865d7 assets/bloodmagic/models/block/accelerationrune.json bcdbccc49d4509571be6988762ab87126275a4c8 assets/bloodmagic/models/block/airritualstone.json adf6c0b1e25451609486dc8c8cfbd9cf0f8c67f4 assets/bloodmagic/models/block/alchemicalreactionchamber.json diff --git a/src/generated/resources/assets/bloodmagic/lang/en_us.json b/src/generated/resources/assets/bloodmagic/lang/en_us.json index bfc91602..9c870d10 100644 --- a/src/generated/resources/assets/bloodmagic/lang/en_us.json +++ b/src/generated/resources/assets/bloodmagic/lang/en_us.json @@ -146,6 +146,12 @@ "ritual.bloodmagic.animalGrowthRitual.vengeful.info": "(Vengeful) Decreases the time it takes for adults to breed again.", "ritual.bloodmagic.armourEvolveRitual": "Ritual of Living Evolution", "ritual.bloodmagic.armourEvolveRitual.info": "Increases the amount of maximum Upgrade Points on your Living Armor to 300.", + "ritual.bloodmagic.blockRange.firstBlock": "First block for new range stored.", + "ritual.bloodmagic.blockRange.inactive": "The ritual stone is currently inactive, and cannot have its range modified.", + "ritual.bloodmagic.blockRange.noRange": "The range was not properly chosen.", + "ritual.bloodmagic.blockRange.success": "New range successfully set!", + "ritual.bloodmagic.blockRange.tooBig": "The block range given is too big! Needs to be at most %s blocks.", + "ritual.bloodmagic.blockRange.tooFar": "The block range given is too far! Needs to be within a vertical range of %s blocks and a horizontal range of %s blocks.", "ritual.bloodmagic.cobblestoneRitual": "Le Vulcanos Frigius", "ritual.bloodmagic.condorRitual.info": "Provides flight in an area around the ritual.", "ritual.bloodmagic.containmentRitual": "Ritual of Containment", @@ -269,6 +275,8 @@ "ritual.bloodmagic.wellOfSufferingRitual.altar.info": "(Altar) This range defines the area that the ritual searches for the blood altar. Changing this will either expand or limit the range to a certain region.", "ritual.bloodmagic.wellOfSufferingRitual.damage.info": "(Damage) This defines where the ritual will damage a mob. All mobs inside of this range (except for players) will receive damage over time.", "ritual.bloodmagic.wellOfSufferingRitual.info": "Attacks mobs within its damage zone and puts the LP into a nearby blood altar.", + "ritual.bloodmagic.willConfig.set": "The ritual will use these Demon Will types: %s", + "ritual.bloodmagic.willConfig.void": "The ritual no longer uses Demon Will", "ritual.bloodmagic.zephyrRitual": "Call of the Zephyr", "ritual.bloodmagic.zephyrRitual.chest.info": "(Chest) The location of the inventory that the ritual will place the picked up items into.", "ritual.bloodmagic.zephyrRitual.info": "Picks up items within its range and places them into the linked chest.", diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java index 5326cde4..6c8546b0 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java @@ -111,6 +111,15 @@ public class GeneratorLanguage extends LanguageProvider add("tooltip.bloodmagic.holdShiftForInfo", "Press shift for extra info"); + add("ritual.bloodmagic.blockRange.tooBig", "The block range given is too big! Needs to be at most %s blocks."); + add("ritual.bloodmagic.blockRange.tooFar", "The block range given is too far! Needs to be within a vertical range of %s blocks and a horizontal range of %s blocks."); + add("ritual.bloodmagic.blockRange.inactive", "The ritual stone is currently inactive, and cannot have its range modified."); + add("ritual.bloodmagic.blockRange.noRange", "The range was not properly chosen."); + add("ritual.bloodmagic.blockRange.firstBlock", "First block for new range stored."); + add("ritual.bloodmagic.blockRange.success", "New range successfully set!"); + add("ritual.bloodmagic.willConfig.set", "The ritual will use these Demon Will types: %s"); + add("ritual.bloodmagic.willConfig.void", "The ritual no longer uses Demon Will"); + add("ritual.bloodmagic.testRitual", "Test Ritual"); add("ritual.bloodmagic.waterRitual", "Ritual of the Full Spring"); add("ritual.bloodmagic.lavaRitual", "Serenade of the Nether"); diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemRitualReader.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemRitualReader.java index 45928bff..babf4939 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemRitualReader.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemRitualReader.java @@ -26,6 +26,7 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.demonaura.WorldDemonWillHandler; import wayoftime.bloodmagic.ritual.AreaDescriptor; import wayoftime.bloodmagic.ritual.EnumRitualReaderState; import wayoftime.bloodmagic.ritual.IMasterRitualStone; @@ -34,6 +35,7 @@ import wayoftime.bloodmagic.util.ChatUtil; import wayoftime.bloodmagic.util.Constants; import wayoftime.bloodmagic.util.helper.NBTHelper; import wayoftime.bloodmagic.util.helper.TextHelper; +import wayoftime.bloodmagic.will.DemonWillHolder; import wayoftime.bloodmagic.will.EnumDemonWillType; import wayoftime.bloodmagic.will.IDiscreteDemonWill; @@ -202,10 +204,12 @@ public class ItemRitualReader extends Item this.setCurrentBlockRange(stack, newRange); } Ritual ritual = master.getCurrentRitual(); + List willConfig = master.getActiveWillConfig(); + DemonWillHolder holder = WorldDemonWillHandler.getWillHolder(master.getWorldObj(), master.getBlockPos()); - int maxHorizontalRange = ritual.getMaxHorizontalRadiusForRange(range, null, null); - int maxVerticalRange = ritual.getMaxVerticalRadiusForRange(range, null, null); - int maxVolume = ritual.getMaxVolumeForRange(range, null, null); + int maxHorizontalRange = ritual.getMaxHorizontalRadiusForRange(range, willConfig, holder); + int maxVerticalRange = ritual.getMaxVerticalRadiusForRange(range, willConfig, holder); + int maxVolume = ritual.getMaxVolumeForRange(range, willConfig, holder); switch (master.setBlockRangeByBounds(player, range, containedPos, pos2)) { diff --git a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualLava.java b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualLava.java index ae29c08b..9ffd53c2 100644 --- a/src/main/java/wayoftime/bloodmagic/ritual/types/RitualLava.java +++ b/src/main/java/wayoftime/bloodmagic/ritual/types/RitualLava.java @@ -274,8 +274,7 @@ public class RitualLava extends Ritual @Override public ITextComponent[] provideInformationOfRitualToPlayer(PlayerEntity player) { - return new ITextComponent[] - { new TranslationTextComponent(this.getTranslationKey() + ".info"), + return new ITextComponent[] { new TranslationTextComponent(this.getTranslationKey() + ".info"), new TranslationTextComponent(this.getTranslationKey() + ".default.info"), new TranslationTextComponent(this.getTranslationKey() + ".corrosive.info"), new TranslationTextComponent(this.getTranslationKey() + ".steadfast.info"),