Skip to content

Added "Default Ranges" to Ritual Documentation. + Related Tweaks. #1930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 1.18.2
Choose a base branch
from
Open

Added "Default Ranges" to Ritual Documentation. + Related Tweaks. #1930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/generated/resources/.cache/cache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ e6d9cf699667aaa47efff37b2b033895dee29c15 assets/bloodmagic/blockstates/waterritu
42f26f715bddd16c069f9b51e3767b36477c8908 assets/bloodmagic/blockstates/woodtilepath.json
3c6ce233dae6c1307d9016406c324bbe844b4e1e assets/bloodmagic/blockstates/wornstonebrickpath.json
d59655f12d1724b73b77c373fb6864fcff69db12 assets/bloodmagic/blockstates/wornstonetilepath.json
739d3af2c9fba76f1465d032b80fc205c3b19df9 assets/bloodmagic/lang/en_us.json
347bb4182165f1a5b19f5fdb2f208b9da73e02c1 assets/bloodmagic/lang/en_us.json
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The cache folder in its entirety, honestly, not really this change.

34445195b9f2459475cde53454bc8e37d32865d7 assets/bloodmagic/models/block/accelerationrune.json
c7554e6d0084dee801862519afd0ea519e14b092 assets/bloodmagic/models/block/accelerationrune2.json
bcdbccc49d4509571be6988762ab87126275a4c8 assets/bloodmagic/models/block/airritualstone.json
Expand Down
9 changes: 7 additions & 2 deletions src/generated/resources/assets/bloodmagic/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,17 +159,22 @@
"guide.patchouli.bloodmagic.arc_processor.fluid": "%dmb of %s",
"guide.patchouli.bloodmagic.arc_processor.no_fluid": "None",
"guide.patchouli.bloodmagic.common.double_new_line": "$(br2)%s",
"guide.patchouli.bloodmagic.common.header": "$(bold)%s$()$(br)",
"guide.patchouli.bloodmagic.living_armour_upgrade_table.level": "Level",
"guide.patchouli.bloodmagic.living_armour_upgrade_table.upgrade_points": "Upgrade Points",
"guide.patchouli.bloodmagic.ritual_info.activation_cost": "$(br)Activation Cost: $(blood)%d LP$()",
"guide.patchouli.bloodmagic.ritual_info.awakened_activation_crystal_link": "$(l:bloodmagic:rituals/activation_crystals#awakened)%s$(/l)",
"guide.patchouli.bloodmagic.ritual_info.counter_formatter": "$(br)%s%s$()",
"guide.patchouli.bloodmagic.ritual_info.full_range": "Full Range",
"guide.patchouli.bloodmagic.ritual_info.info_formatter": "%s$(br)%s$(br2)%s$(br)%s%s%s",
"guide.patchouli.bloodmagic.ritual_info.range_formatter": "$(br) $(li)Max Volume: %s$(li)Horizontal Radius: %s$(li)Vertical Radius: %s",
"guide.patchouli.bloodmagic.ritual_info.range_formatter": "$(br) $(li)Max Volume: %s$(li)Max Horizontal Radius: %s$(li)Max Vertical Radius: %s",
"guide.patchouli.bloodmagic.ritual_info.text_override_formatter": "\\$(%s)%s\\$()",
"guide.patchouli.bloodmagic.ritual_info.upkeep_cost": "$(br)Base Usage Cost: $(blood)%d LP$()$(br)Base Interval: %d Ticks",
"guide.patchouli.bloodmagic.ritual_info.weak_activation_crystal_link": "$(l:bloodmagic:rituals/activation_crystals#weak)%s$(/l)",
"guide.patchouli.bloodmagic.ritual_ranges.above_mrs": "Size: %d x %d x %d$(br)Center: %d above the $(l:bloodmagic:rituals/ritual_stones)Master Ritual Stone$()$(br2)",
"guide.patchouli.bloodmagic.ritual_ranges.at_mrs": "Size: %d x %d x %d$(br)Center: at the $(l:bloodmagic:rituals/ritual_stones)Master Ritual Stone$()$(br2)",
"guide.patchouli.bloodmagic.ritual_ranges.away_from_mrs": "Size: %d x %d x %d$(br)Center: (%d, %d, %d)$(br2)",
"guide.patchouli.bloodmagic.ritual_ranges.below_mrs": "Size: %d x %d x %d$(br)Center: %d below the $(l:bloodmagic:rituals/ritual_stones)Master Ritual Stone$()$(br2)",
"hud.bloodmagic.inactive": "Inactive",
"item.bloodmagic.activationcrystalawakened": "Awakened Activation Crystal",
"item.bloodmagic.activationcrystalcreative": "Creative Activation Crystal",
Expand Down Expand Up @@ -465,7 +470,7 @@
"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": "Reverence of the Condor",
"ritual.bloodmagic.condorRitual.flightRange.info": "Players within this range will receive a Flight buff.",
"ritual.bloodmagic.condorRitual.flightRange.info": "(Flight Range) Players within this range will receive a Flight buff.",
"ritual.bloodmagic.condorRitual.info": "Provides flight in an area around the ritual.",
"ritual.bloodmagic.containmentRitual": "Ritual of Containment",
"ritual.bloodmagic.containmentRitual.containmentRange.info": "(Containment) The area of the ritual where mobs will be pulled. All mobs are pulled towards the master ritual stone, regardless of where this area is.",
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ protected void addTranslations()
add("ritual.bloodmagic.fellingRitual.fellingRange.info", "(Cutting) The range that the ritual will search out logs and leaves in order to cut down.");
add("ritual.bloodmagic.fellingRitual.chest.info", "(Chest) The location of the inventory that the ritual will place the results into.");
add("ritual.bloodmagic.pumpRitual.pumpRange.info", "(Pump) The region that the ritual will look for fluids to grab from the world.");
add("ritual.bloodmagic.condorRitual.flightRange.info", "Players within this range will receive a Flight buff.");
add("ritual.bloodmagic.condorRitual.flightRange.info", "(Flight Range) Players within this range will receive a Flight buff.");
add("ritual.bloodmagic.downgradeRitual.info", "Consumes items from a linked chest to forcefully downgrade worn Living Armour.");
add("ritual.bloodmagic.groundingRitual.groundingRange.info", "(Range) Affects entities within range.");

Expand Down Expand Up @@ -503,6 +503,7 @@ protected void addTranslations()
add("guide.bloodmagic.name", "Sanguine Scientiem");
add("guide.bloodmagic.landing_text", "Welcome to $(6)Blood Magic$()! $(br2)$(l:bloodmagic:utility/nyi)A lot of stuff$() isn't yet implemented, so please excuse our dust. $(br2)Click $(l:bloodmagic:utility/getting_started)HERE$() to get started. If you find any bugs, please report them on our $(l:https://github.com/WayofTime/BloodMagic/issues)Github$().");
add("guide.bloodmagic.subtitle", "Alchemical Wizardry");
add("guide.patchouli.bloodmagic.common.header", "$(bold)%s$()$(br)"); // Bold + new line
add("guide.patchouli.bloodmagic.common.double_new_line", "$(br2)%s");
add("guide.patchouli.bloodmagic.arc_processor.fluid", "%dmb of %s");
add("guide.patchouli.bloodmagic.arc_processor.no_fluid", "None");
Expand All @@ -515,8 +516,12 @@ protected void addTranslations()
add("guide.patchouli.bloodmagic.ritual_info.counter_formatter", "$(br)%s%s$()");
add("guide.patchouli.bloodmagic.ritual_info.text_override_formatter", "\\$(%s)%s\\$()");
add("guide.patchouli.bloodmagic.ritual_info.info_formatter", "%s$(br)%s$(br2)%s$(br)%s%s%s");
add("guide.patchouli.bloodmagic.ritual_info.range_formatter", "$(br) $(li)Max Volume: %s$(li)Horizontal Radius: %s$(li)Vertical Radius: %s");
add("guide.patchouli.bloodmagic.ritual_info.range_formatter", "$(br) $(li)Max Volume: %s$(li)Max Horizontal Radius: %s$(li)Max Vertical Radius: %s");
add("guide.patchouli.bloodmagic.ritual_info.full_range", "Full Range");
add("guide.patchouli.bloodmagic.ritual_ranges.at_mrs", "Size: %d x %d x %d$(br)Center: at the $(l:bloodmagic:rituals/ritual_stones)Master Ritual Stone$()$(br2)");
add("guide.patchouli.bloodmagic.ritual_ranges.above_mrs", "Size: %d x %d x %d$(br)Center: %d above the $(l:bloodmagic:rituals/ritual_stones)Master Ritual Stone$()$(br2)");
add("guide.patchouli.bloodmagic.ritual_ranges.below_mrs", "Size: %d x %d x %d$(br)Center: %d below the $(l:bloodmagic:rituals/ritual_stones)Master Ritual Stone$()$(br2)");
add("guide.patchouli.bloodmagic.ritual_ranges.away_from_mrs", "Size: %d x %d x %d$(br)Center: (%d, %d, %d)$(br2)");

// Keybinds
add("bloodmagic.keybind.open_holding", "Open Sigil of Holding");
Expand Down
264 changes: 0 additions & 264 deletions src/main/java/wayoftime/bloodmagic/compat/patchouli/processors/RitualInfoProcessor.java
View file
Open in desktop

This file was deleted.

Loading