Skip to content

Commit b987232

Browse files
committed
Remake PR WayofTime#1930 on 1.20.
Squash-Merge the 1.18 PR branch into a new 1.20 branch. commit 0f2cfdd Author: VT-14 <GamingVT14@Gmail.com> Date: Sat Sep 3 23:55:06 2022 -0400 Added "Default Ranges" to Ritual Documentation * Added new "Default Ranges" page type. Applied to all relevant Ritual entries. * Removed `RitualInfoProcessor`. Replaced with a new `RitualProcessorCore`, `RitualDataProcessor`, and `RitualInfoProcessor`. Added completley new `RitualRangesProcessor`. Core contains the shared code for all 3. * Removed the Blood Altar link from the "List of Rituals" category text. Due to a bug in Patchouli it would be clicked instead of the actual Ritual Entry someone wanted. * Added "waterTank" area description to the Water Ritual entry.
1 parent f41d1e0 commit b987232

35 files changed

+632
-272
lines changed

src/generated/resources/assets/bloodmagic/lang/en_us.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,17 +160,22 @@
160160
"guide.patchouli.bloodmagic.arc_processor.fluid": "%dmb of %s",
161161
"guide.patchouli.bloodmagic.arc_processor.no_fluid": "None",
162162
"guide.patchouli.bloodmagic.common.double_new_line": "$(br2)%s",
163+
"guide.patchouli.bloodmagic.common.header": "$(bold)%s$()$(br)",
163164
"guide.patchouli.bloodmagic.living_armour_upgrade_table.level": "Level",
164165
"guide.patchouli.bloodmagic.living_armour_upgrade_table.upgrade_points": "Upgrade Points",
165166
"guide.patchouli.bloodmagic.ritual_info.activation_cost": "$(br)Activation Cost: $(blood)%d LP$()",
166167
"guide.patchouli.bloodmagic.ritual_info.awakened_activation_crystal_link": "$(l:bloodmagic:rituals/activation_crystals#awakened)%s$(/l)",
167168
"guide.patchouli.bloodmagic.ritual_info.counter_formatter": "$(br)%s%s$()",
168169
"guide.patchouli.bloodmagic.ritual_info.full_range": "Full Range",
169170
"guide.patchouli.bloodmagic.ritual_info.info_formatter": "%s$(br)%s$(br2)%s$(br)%s%s%s",
170-
"guide.patchouli.bloodmagic.ritual_info.range_formatter": "$(br) $(li)Max Volume: %s$(li)Horizontal Radius: %s$(li)Vertical Radius: %s",
171+
"guide.patchouli.bloodmagic.ritual_info.range_formatter": "$(br) $(li)Max Volume: %s$(li)Max Horizontal Radius: %s$(li)Max Vertical Radius: %s",
171172
"guide.patchouli.bloodmagic.ritual_info.text_override_formatter": "\\$(%s)%s\\$()",
172173
"guide.patchouli.bloodmagic.ritual_info.upkeep_cost": "$(br)Base Usage Cost: $(blood)%d LP$()$(br)Base Interval: %d Ticks",
173174
"guide.patchouli.bloodmagic.ritual_info.weak_activation_crystal_link": "$(l:bloodmagic:rituals/activation_crystals#weak)%s$(/l)",
175+
"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)",
176+
"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)",
177+
"guide.patchouli.bloodmagic.ritual_ranges.away_from_mrs": "Size: %d x %d x %d$(br)Center: (%d, %d, %d)$(br2)",
178+
"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)",
174179
"hud.bloodmagic.inactive": "Inactive",
175180
"item.bloodmagic.activationcrystalawakened": "Awakened Activation Crystal",
176181
"item.bloodmagic.activationcrystalcreative": "Creative Activation Crystal",
@@ -467,7 +472,7 @@
467472
"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.",
468473
"ritual.bloodmagic.cobblestoneRitual": "Le Vulcanos Frigius",
469474
"ritual.bloodmagic.condorRitual": "Reverence of the Condor",
470-
"ritual.bloodmagic.condorRitual.flightRange.info": "Players within this range will receive a Flight buff.",
475+
"ritual.bloodmagic.condorRitual.flightRange.info": "(Flight Range) Players within this range will receive a Flight buff.",
471476
"ritual.bloodmagic.condorRitual.info": "Provides flight in an area around the ritual.",
472477
"ritual.bloodmagic.containmentRitual": "Ritual of Containment",
473478
"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.",

src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ protected void addTranslations()
392392
add("ritual.bloodmagic.fellingRitual.fellingRange.info", "(Cutting) The range that the ritual will search out logs and leaves in order to cut down.");
393393
add("ritual.bloodmagic.fellingRitual.chest.info", "(Chest) The location of the inventory that the ritual will place the results into.");
394394
add("ritual.bloodmagic.pumpRitual.pumpRange.info", "(Pump) The region that the ritual will look for fluids to grab from the world.");
395-
add("ritual.bloodmagic.condorRitual.flightRange.info", "Players within this range will receive a Flight buff.");
395+
add("ritual.bloodmagic.condorRitual.flightRange.info", "(Flight Range) Players within this range will receive a Flight buff.");
396396
add("ritual.bloodmagic.downgradeRitual.info", "Consumes items from a linked chest to forcefully downgrade worn Living Armour.");
397397
add("ritual.bloodmagic.groundingRitual.groundingRange.info", "(Range) Affects entities within range.");
398398

@@ -508,6 +508,7 @@ protected void addTranslations()
508508
add("guide.bloodmagic.name", "Sanguine Scientiem");
509509
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$().");
510510
add("guide.bloodmagic.subtitle", "Alchemical Wizardry");
511+
add("guide.patchouli.bloodmagic.common.header", "$(bold)%s$()$(br)"); // Bold + new line
511512
add("guide.patchouli.bloodmagic.common.double_new_line", "$(br2)%s");
512513
add("guide.patchouli.bloodmagic.arc_processor.fluid", "%dmb of %s");
513514
add("guide.patchouli.bloodmagic.arc_processor.no_fluid", "None");
@@ -520,8 +521,12 @@ protected void addTranslations()
520521
add("guide.patchouli.bloodmagic.ritual_info.counter_formatter", "$(br)%s%s$()");
521522
add("guide.patchouli.bloodmagic.ritual_info.text_override_formatter", "\\$(%s)%s\\$()");
522523
add("guide.patchouli.bloodmagic.ritual_info.info_formatter", "%s$(br)%s$(br2)%s$(br)%s%s%s");
523-
add("guide.patchouli.bloodmagic.ritual_info.range_formatter", "$(br) $(li)Max Volume: %s$(li)Horizontal Radius: %s$(li)Vertical Radius: %s");
524+
add("guide.patchouli.bloodmagic.ritual_info.range_formatter", "$(br) $(li)Max Volume: %s$(li)Max Horizontal Radius: %s$(li)Max Vertical Radius: %s");
524525
add("guide.patchouli.bloodmagic.ritual_info.full_range", "Full Range");
526+
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)");
527+
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)");
528+
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)");
529+
add("guide.patchouli.bloodmagic.ritual_ranges.away_from_mrs", "Size: %d x %d x %d$(br)Center: (%d, %d, %d)$(br2)");
525530

526531
// Keybinds
527532
add("bloodmagic.keybind.open_holding", "Open Sigil of Holding");

src/main/java/wayoftime/bloodmagic/compat/patchouli/processors/RitualInfoProcessor.java

Lines changed: 0 additions & 265 deletions
This file was deleted.

0 commit comments

Comments
 (0)