diff --git a/changelog.txt b/changelog.txt index 3676ebd0..b9412c01 100644 --- a/changelog.txt +++ b/changelog.txt @@ -4,6 +4,8 @@ Version 2.0.3-51 - Added the Demon Will Aura Gauge to accurately determine the Will in the Aura. - Added the ability for rituals to have a Demon Will set on them. Now to get rituals to use them. - Fixed it so that the Crushing Ritual now ignores liquids +- Added the Mark of the Falling Tower ritual. +- Changed the tooltip of the ritual diviner so that it gives information about the selected ritual. ------------------------------------------------------ Version 2.0.2-50 diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index e8f4f874..49f874d0 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -1,10 +1,9 @@ package WayofTime.bloodmagic.item; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; -import WayofTime.bloodmagic.util.Utils; -import WayofTime.bloodmagic.util.handler.event.ClientHandler; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; @@ -36,11 +35,14 @@ import WayofTime.bloodmagic.api.registry.RitualRegistry; import WayofTime.bloodmagic.api.ritual.EnumRuneType; import WayofTime.bloodmagic.api.ritual.Ritual; import WayofTime.bloodmagic.api.ritual.RitualComponent; +import WayofTime.bloodmagic.api.soul.EnumDemonWillType; import WayofTime.bloodmagic.api.util.helper.RitualHelper; import WayofTime.bloodmagic.client.IVariantProvider; import WayofTime.bloodmagic.registry.ModBlocks; import WayofTime.bloodmagic.tile.TileMasterRitualStone; import WayofTime.bloodmagic.util.ChatUtil; +import WayofTime.bloodmagic.util.Utils; +import WayofTime.bloodmagic.util.handler.event.ClientHandler; import WayofTime.bloodmagic.util.helper.TextHelper; public class ItemRitualDiviner extends Item implements IVariantProvider @@ -236,8 +238,20 @@ public class ItemRitualDiviner extends Item implements IVariantProvider tooltip.add(TextHelper.localize("tooltip.BloodMagic.diviner.currentRitual") + TextHelper.localize(ritual.getUnlocalizedName())); boolean sneaking = Keyboard.isKeyDown(Keyboard.KEY_RSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT); + boolean extraInfo = sneaking && Keyboard.isKeyDown(Keyboard.KEY_M); - if (sneaking) + if (extraInfo) + { + tooltip.add(""); + + for (EnumDemonWillType type : EnumDemonWillType.values()) + { + if (TextHelper.canTranslate(ritual.getUnlocalizedName() + "." + type.getName().toLowerCase() + ".info")) + { + tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect(ritual.getUnlocalizedName() + "." + type.getName().toLowerCase() + ".info")))); + } + } + } else if (sneaking) { tooltip.add(TextHelper.localize(tooltipBase + "currentDirection", Utils.toFancyCasing(getDirection(stack).getName()))); tooltip.add(""); @@ -300,7 +314,14 @@ public class ItemRitualDiviner extends Item implements IVariantProvider } else { tooltip.add(""); - tooltip.add(TextHelper.localize(tooltipBase + "extraInfo")); + if (TextHelper.canTranslate(ritual.getUnlocalizedName() + ".info")) + { + tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect(ritual.getUnlocalizedName() + ".info")))); + tooltip.add(""); + } + + tooltip.add(TextHelper.localizeEffect(tooltipBase + "extraInfo")); + tooltip.add(TextHelper.localizeEffect(tooltipBase + "extraExtraInfo")); } } } diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 2062c505..66c4951d 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -326,7 +326,8 @@ tooltip.BloodMagic.diviner.earthRune=Earth Runes: %d tooltip.BloodMagic.diviner.duskRune=Dusk Runes: %d tooltip.BloodMagic.diviner.dawnRune=Dawn Runes: %d tooltip.BloodMagic.diviner.totalRune=Total Runes: %d -tooltip.BloodMagic.diviner.extraInfo=Press shift for extra info +tooltip.BloodMagic.diviner.extraInfo=&9-Hold shift for rune info- +tooltip.BloodMagic.diviner.extraExtraInfo=&9-Hold shift + M for augmentation info- tooltip.BloodMagic.diviner.currentDirection=Current Direction: %s tooltip.BloodMagic.ritualReader.currentState=Current mode: %s