Some Geas Updates

Author: SammySemicolon

aseprite/malum_textures.ase

@@ -187,6 +187,7 @@ dependencies {
     compileOnlyApi(("team.lodestar.lodestone:lodestone:${property("minecraft_version")}-${property("lodestone_version")}"))
     runtimeOnly(("team.lodestar.lodestone:lodestone:${property("minecraft_version")}-${property("lodestone_version")}"))
 
+    // Wayward Attributes
     compileOnlyApi(("team.lodestar.wayward_attributes:wayward_attributes:${property("minecraft_version")}-${property("wayward_attributes_version")}"))
     runtimeOnly(("team.lodestar.wayward_attributes:wayward_attributes:${property("minecraft_version")}-${property("wayward_attributes_version")}"))
 

build.gradle.kts

@@ -0,0 +1,28 @@
+# Tweaks
+- The healing rite now only triggers if the healing would actually have an effect, bless thy ears
+- Spellwoven Sprites now break blocks as if the player did it, this fires the BlockDropsEvent with the breaker being listed as the player, hopefully allowing for better compatibility with any loot modifying effects
+
+# Geas Changes
+
+Pact of the Lone Druid
+- Now also increases Healing Received
+
+Pact of the Prospector
+- Prospector's Streak is now called Avarice
+- Avarice now stacks up to 10, up from 5
+- Avarice (Steak) now heals when applied
+- Avarice no longer increases mining speed
+
+Pact of the Pyromaniac
+- Now Called Pact of the Blastweaver
+- Pyromaniac's Fervor is now consolidated into Avarice
+- Avarice grants the same benefits as with the Pact of the Prospector
+- Avarice additionally increases mining, attack and movement speed
+- Avarice increases incoming explosion damage
+- No longer causes explosions to ignite you, or others
+
+# Textures
+- Updated various geas textures
+
+# Bugfixes
+- Fixed some ordering issues with Wind Tunnels

changelogs/1.8.2.txt

@@ -15,7 +15,7 @@ parchment_mappings_version=2024.11.17
 
 mod_name=Malum
 mod_id=malum
-mod_version=1.8.1
+mod_version=1.8.2
 mod_license=All Rights Reserved
 mod_group_id=com.sammy.malum
 mod_authors=Sammy Semicolon

gradle.properties

@@ -416,6 +416,7 @@
   "effect.malum.arcanaphage": "Arcanaphage",
   "effect.malum.ascension": "Ascension",
   "effect.malum.ascension.description": "Eases your fall and reduces gravity after a successful Scythe Ascenison.",
+  "effect.malum.avarice": "Avarice",
   "effect.malum.burning_fervor": "Burning Fervor",
   "effect.malum.burning_fervor.description": "Your tools are bolstered with radiance, increasing your mining and attack speed.",
   "effect.malum.cancerous_growth": "Cancerous Growth",
@@ -443,8 +444,6 @@
   "effect.malum.lifted": "Lifted",
   "effect.malum.oaken_might": "Oaken Might",
   "effect.malum.oaken_might.description": "Your fists and tools are reinforced with earth, increasing your strength.",
-  "effect.malum.prospectors_streak": "Prospector's Streak",
-  "effect.malum.pyromaniacs_fervor": "Pyromaniacs Fervor",
   "effect.malum.rejected": "Rejected",
   "effect.malum.sacred_nourishment": "Sacred Nourishment",
   "effect.malum.shaken_faith": "Shaken Faith",
@@ -749,7 +748,7 @@
   "jukebox_song.malum.arcane_elegy": "Kultik - Arcane Elegy",
   "malum.effect.curio.always_sprint": "Sprinting Always Available",
   "malum.effect.curio.ascension_launch": "Ascension Launches Targets Upwards",
-  "malum.effect.curio.bigger_explosions": "Improves Explosions",
+  "malum.effect.curio.bigger_explosions": "Enhances Explosions",
   "malum.effect.curio.burning_damage": "Burning Damage",
   "malum.effect.curio.burning_resistance": "Damage Resistance When Ablaze",
   "malum.effect.curio.crits": "Critical Strikes",
@@ -794,6 +793,11 @@
   "malum.effect.erosive_silence": "Erosion Damage Silences Targets",
   "malum.effect.erosive_spread": "Charges a Spread of Eroding Sub-munitions",
   "malum.effect.geas.aggressive_enemies": "Increases Enemy Aggression",
+  "malum.effect.geas.avarice_combustion": "Avarice Engulfs You In Flames When Struck",
+  "malum.effect.geas.avarice_fervor": "Avarice Hastens You",
+  "malum.effect.geas.avarice_fortune": "Avarice Increases Fortune Chance",
+  "malum.effect.geas.avarice_healing": "Avarice Recovers Lost Health",
+  "malum.effect.geas.avarice_vulnerability": "Avarice Increases Explosive Damage Taken",
   "malum.effect.geas.bonus_reach": "Avoiding Harm Increases Reach",
   "malum.effect.geas.buffered_damage": "Half Of Incoming Damage Is Buffered",
   "malum.effect.geas.buffered_damage_more_overall": "Buffered Damage Is Amplified",
@@ -805,9 +809,7 @@
   "malum.effect.geas.desperate_need": "Gluttony Becomes Desperate Need",
   "malum.effect.geas.desperate_need_betrayal": "The Rot Will Consume You",
   "malum.effect.geas.desperate_need_scythe_proficiency": "Desperate Need Substantially Increases Scythe Proficiency",
-  "malum.effect.geas.explosion_fire": "Explosions Set You Ablaze",
-  "malum.effect.geas.explosion_lover": "Explosion Damage Generates Pyromaniac's Fervor",
-  "malum.effect.geas.explosion_resistance": "Shields Against Explosions",
+  "malum.effect.geas.explosion_lover": "Nearby Explosions Grant Avarice",
   "malum.effect.geas.extinguish_hurt": "Being Extinguished Hurts You",
   "malum.effect.geas.faster_draw_time": "Successful Ranged Damage Builds Up Extra Draw Speed",
   "malum.effect.geas.faster_natural_healing": "Saturation Heals Faster",
@@ -819,7 +821,6 @@
   "malum.effect.geas.fragile_reach_damage": "The High Priest's Rule Grips You Tightly",
   "malum.effect.geas.gleeful_target": "Ailments, Blessings, Curses are Paused When Struck",
   "malum.effect.geas.gleeful_target_arcane_resonance": "Arcane Resonance Aids Stasis Duration",
-  "malum.effect.geas.greed_combustion": "Prospector's Streak Turns Into Flames When Struck",
   "malum.effect.geas.healing_aura": "Healing is Shared with Nearby Creatures",
   "malum.effect.geas.healing_aura_no_filter": "Shared Healing Heals All, Ally or Not",
   "malum.effect.geas.high_hunger_more_armor": "Being Well Fed Provides Extra Armor",
@@ -842,25 +843,23 @@
   "malum.effect.geas.more_runes": "2 Rune Slots",
   "malum.effect.geas.more_saturation": "Meals Provide Extra Saturation",
   "malum.effect.geas.movement_acceleration": "Sprinting Builds Up Extra Momentum",
-  "malum.effect.geas.no_armor": "Equipped Armour Damages You",
+  "malum.effect.geas.no_armor": "Equipped Armour Shackles You",
   "malum.effect.geas.no_armor_armor": "The Absence of Equipped Armour Becomes Armor",
+  "malum.effect.geas.no_armor_healing": "The Absence of Equipped Armour Enhances Healing",
   "malum.effect.geas.no_normal_foods": "You Must Only Eat Rot",
   "malum.effect.geas.no_passive_healing": "Saturation And Hunger No Longer Restore Health",
   "malum.effect.geas.only_scythe": "Regular Weapons Crumble In Your Hands",
   "malum.effect.geas.oops_all_magic": "All Incoming Damage Functions As Magic",
-  "malum.effect.geas.ore_prospecting": "Ore Collection Generates Prospector's Streak",
+  "malum.effect.geas.ore_prospecting": "Collecting Precious Minerals Grants Avarice",
   "malum.effect.geas.outgoing_fall_damage_auto_attack": "Outgoing Fall Damage Attacks Targets Regardless Of Distance",
   "malum.effect.geas.passive_healing": "Passive Health Recovery",
   "malum.effect.geas.poison_slash": "Desperate Need Enables Poisonous Scythe Slashes",
   "malum.effect.geas.poison_slash_consumes_desperate_need": "Desperate Need Fades When Attacking",
   "malum.effect.geas.presence_breaker": "Refusal, Detachment, Exile is Forced onto Targets",
   "malum.effect.geas.presence_breaker_arcane_resonance": "Arcane Resonance Favors Exile Duration",
-  "malum.effect.geas.prospectors_streak": "Prospector's Streak Grants Mining Speed And Fortune Chance",
-  "malum.effect.geas.pyromaniacs_fervor": "Pyromaniac's Fervor Increases Mining, Attack and Movement Speed",
   "malum.effect.geas.rocket_jumping": "Wind Gusts Provide Greater Propulsion",
   "malum.effect.geas.rotten_healing": "Eating Rotten Foods Heals You",
   "malum.effect.geas.rune_vulnerability": "Each Equipped Rune Dampens Healing, Armor and Magic Resistance",
-  "malum.effect.geas.scary_fire": "Fire Damage Is Deadlier",
   "malum.effect.geas.scythe_combo": "Scythe Cuts Create Combo-Attacks",
   "malum.effect.geas.soul_ward_on_hit": "Magic Damage Recovers Soul Ward",
   "malum.effect.geas.spirits_absorption": "Spirit Collection Grants Absorption",
@@ -870,6 +869,7 @@
   "malum.effect.geas.staff_homing": "Staff Projectiles Home In on Targets",
   "malum.effect.geas.trial_of_faith": "Gluttony Becomes Trial of Faith",
   "malum.effect.geas.trial_of_faith_healing": "Trial of Faith Increases Healing Received",
+  "malum.effect.geas.vastly_bigger_explosions": "Greatly Enhances Explosions",
   "malum.effect.geas.water_agility": "You Move and Swing Faster In Water",
   "malum.effect.geas.water_damage_resistance": "You Take Reduced Damage in Water",
   "malum.effect.geas.weak_legs": "Fall Damage Is Amplified",
@@ -1086,7 +1086,7 @@
   "malum.gui.book.entry.pact_of_the_prospector": "Pact of the Prospector",
   "malum.gui.book.entry.pact_of_the_prospector.description": "To grow one's fortune",
   "malum.gui.book.entry.pact_of_the_pyromaniac": "Pact of The Pyromaniac",
-  "malum.gui.book.entry.pact_of_the_pyromaniac.description": "To spread the fire",
+  "malum.gui.book.entry.pact_of_the_pyromaniac.description": "To prosper from ruin",
   "malum.gui.book.entry.pact_of_the_reaper": "Pact of The Reaper",
   "malum.gui.book.entry.pact_of_the_reaper.description": "To master the harvest blade",
   "malum.gui.book.entry.pact_of_the_shattering_addict": "Pact of The Shattering Addict",
@@ -2202,6 +2202,10 @@
   "malum.gui.geas.pact_of_the_berserker.cons": "Hurt yourself, hurt others\n -Wrath Decreases Overtime\n -All Incoming Damage is Doubled",
   "malum.gui.geas.pact_of_the_berserker.pros": "$m0.7/$An endless wrath, a constant anger, your pain brings rage, and rage is power.\n -Taking damage converts it to Wrath\n -Dealing damage utilizes Wrath to Repeatedly Blast Enemies with Wicked Arcana",
   "malum.gui.geas.pact_of_the_berserker.tooltip": "Your pain, their pain",
+  "malum.gui.geas.pact_of_the_blastweaver": "Pact Of The Blastweaver",
+  "malum.gui.geas.pact_of_the_blastweaver.cons": "Your greed exposes you to your own man-made ruin.\n -Avarice increases incoming explosive damage",
+  "malum.gui.geas.pact_of_the_blastweaver.pros": "$m0.7/$Greed and Haste, fueled by Kinetic Impact.\n -Explosions are greatly empowered and grant Avarice upon detonation\n -Avarice gradually improves Fortune Chance\n -Avarice provides additional benefits to Movement Speed, Attack Speed and Mining Speed, up to a Fifty Percent increase",
+  "malum.gui.geas.pact_of_the_blastweaver.tooltip": "Draw power from recklessness",
   "malum.gui.geas.pact_of_the_cloudskipper": "Pact Of The Cloudskipper",
   "malum.gui.geas.pact_of_the_cloudskipper.cons": "That which you rely on shall eventually crush you.\n -Fall Damage Taken is Doubled",
   "malum.gui.geas.pact_of_the_cloudskipper.pros": "$m0.8/$Gravity; The greatest force to leverage against.\n -Wind Gusts Provide Greater Propulsion and Grant Ascension\n -Ascension State Grants Greater Aerial Manoeuvrability",
@@ -2223,8 +2227,8 @@
   "malum.gui.geas.pact_of_the_lifeweaver.pros": "A rare generosity, everything that you are you will share with others.\n -Passively Recovers your Health\n -Health Recovery is Shared With Nearby Creatures",
   "malum.gui.geas.pact_of_the_lifeweaver.tooltip": "Weave your life into miracles",
   "malum.gui.geas.pact_of_the_lone_druid": "Pact Of The Lone Druid",
-  "malum.gui.geas.pact_of_the_lone_druid.cons": "To be unburdened is to cull all shackles\n -Wearing any Armour Hurts You",
-  "malum.gui.geas.pact_of_the_lone_druid.pros": "To be complete is to be unburdened.\n -Each Empty Armor Slot grants Four Armor and Two Armor Toughness",
+  "malum.gui.geas.pact_of_the_lone_druid.cons": "To be unburdened is to cull all shackles\n -Wearing any armour shackles you, damaging your soul",
+  "malum.gui.geas.pact_of_the_lone_druid.pros": "To be complete is to be unburdened.\n -Each empty armour slot grants four Armor and two Armor Toughness\n -Each empty armour slot increases Healing Received by One Fifth",
   "malum.gui.geas.pact_of_the_lone_druid.tooltip": "Shed your second skin",
   "malum.gui.geas.pact_of_the_parasite": "Pact Of The Parasite",
   "malum.gui.geas.pact_of_the_parasite.cons": "Your fragility is still very much real.\n -Reduces Healing Received by Four Tenths",
@@ -2239,13 +2243,9 @@
   "malum.gui.geas.pact_of_the_profane_glutton.pros": "$m0.6/$Rot shall become your greatest weapon.\n -Gluttony becomes Desperate Need, Increasing Scythe Proficiency Substantially\n -Desperate Need Gains Potency Faster with an Increased Limit of Power\n -Scythe Strikes While Blessed by Desperate Need create an additional Poisonous Slash",
   "malum.gui.geas.pact_of_the_profane_glutton.tooltip": "Consume.",
   "malum.gui.geas.pact_of_the_prospector": "Pact Of The Prospector",
-  "malum.gui.geas.pact_of_the_prospector.cons": "Burn with Greed\n -Being Struck when imbued with Prospector's Streak engulfs you in flames",
-  "malum.gui.geas.pact_of_the_prospector.pros": "A favor born from flame.\n -Collecting Precious Minerals generates Prospector's Streak, increasing Mining Speed Fortune Chance",
+  "malum.gui.geas.pact_of_the_prospector.cons": "Burn with Greed\n -Being Struck when imbued with Avarice engulfs you in flames",
+  "malum.gui.geas.pact_of_the_prospector.pros": "A favor born from flame.\n -Collecting Precious Minerals grants Avarice\n -Avarice gradually improves Fortune Chance\n -Avarice additionally recovers one heart of lost health when applied",
   "malum.gui.geas.pact_of_the_prospector.tooltip": "Burn with greed",
-  "malum.gui.geas.pact_of_the_pyromaniac": "Pact Of The Pyromaniac",
-  "malum.gui.geas.pact_of_the_pyromaniac.cons": "You can only handle so much pressure.\n -High Fervor Ignites You When Struck By Blast Impact\n -Incoming Fire Damage is Doubled",
-  "malum.gui.geas.pact_of_the_pyromaniac.pros": "$m0.8/$Recklessness and Haste, fueled by Kinetic Impact.\n -Blowing Yourself Up Generates Pyromaniac's Fervor, Increasing Movement and Mining Speed\n -Grants Damage Resistance Against Explosions",
-  "malum.gui.geas.pact_of_the_pyromaniac.tooltip": "Draw power from recklessness",
   "malum.gui.geas.pact_of_the_reaper": "Pact Of The Reaper",
   "malum.gui.geas.pact_of_the_reaper.cons": "To break the bond will be your undoing\n -Reduces Damage Dealt using Forsworn Weapons by Nine Tenths\n -Forsworn Weapons Deteriorate When Used",
   "malum.gui.geas.pact_of_the_reaper.pros": "A pact forged between your Soul and your Scythe, the Chains of Arcana bind you together.\n -Scythe Attacks occasionally trigger follow up cuts",

lib/lodestone-1.20.1-1.4.25.jar

@@ -3,7 +3,7 @@
   "criteria": {
     "has_the_recipe": {
       "conditions": {
-        "recipe": "malum:pact_of_the_pyromaniac"
+        "recipe": "malum:pact_of_the_blastweaver"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -15,7 +15,7 @@
   ],
   "rewards": {
     "recipes": [
-      "malum:pact_of_the_pyromaniac"
+      "malum:pact_of_the_blastweaver"
     ]
   }
 }

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

@@ -18,7 +18,7 @@
     "count": 16,
     "item": "minecraft:blaze_powder"
   },
-  "result": "malum:pact_of_the_pyromaniac",
+  "result": "malum:pact_of_the_blastweaver",
   "spirits": [
     {
       "type": "malum:arcane",

…soul_binding/pact_of_the_pyromaniac.json …oul_binding/pact_of_the_blastweaver.jsonsrc/generated/resources/data/malum/advancement/recipes/soul_binding/pact_of_the_pyromaniac.json renamed to src/generated/resources/data/malum/advancement/recipes/soul_binding/pact_of_the_blastweaver.json src/generated/resources/data/malum/advancement/recipes/soul_binding/pact_of_the_pyromaniac.json renamed to src/generated/resources/data/malum/advancement/recipes/soul_binding/pact_of_the_blastweaver.json

@@ -42,8 +42,12 @@ public void render(ManaMoteBlockEntity blockEntityIn, float partialTicks, PoseSt
         var invertedDirections = new ArrayList<Direction>();
         for (Direction direction : Direction.values()) {
             if (!ManaMoteBlock.isOccluded(state, direction)) {
-                directions.add(direction.getOpposite());
-                invertedDirections.add(direction);
+                var usedDirection = direction;
+                if (usedDirection.getAxis().isVertical()) {
+                    usedDirection = usedDirection.getOpposite();
+                }
+                directions.add(usedDirection.getOpposite());
+                invertedDirections.add(usedDirection);
             }
             else {
                 wobble -= 0.2f;

…soul_binding/pact_of_the_pyromaniac.json …oul_binding/pact_of_the_blastweaver.jsonsrc/generated/resources/data/malum/recipe/soul_binding/pact_of_the_pyromaniac.json renamed to src/generated/resources/data/malum/recipe/soul_binding/pact_of_the_blastweaver.json src/generated/resources/data/malum/recipe/soul_binding/pact_of_the_pyromaniac.json renamed to src/generated/resources/data/malum/recipe/soul_binding/pact_of_the_blastweaver.json

@@ -11,6 +11,7 @@
 import net.minecraft.world.phys.*;
 import org.jetbrains.annotations.*;
 import org.joml.*;
+import team.lodestar.lodestone.handlers.*;
 import team.lodestar.lodestone.registry.client.*;
 import team.lodestar.lodestone.systems.rendering.*;
 import team.lodestar.lodestone.systems.rendering.cube.*;
@@ -119,6 +120,7 @@ public void render(WindTunnelBlockEntity tunnel, float partialTicks, PoseStack p
                 float v0 = isInward ? -vOffset : vOffset;
                 float v1 = v0 + tunnelLength * (isInward ? -1f : 1f);
                 builder
+                        .replaceBufferSource(LodestoneRenderHandler.LATE_DEFERRED_RENDER)
                         .setAlpha(alpha)
                         .setUV(u0, v0, u1, v1)
                         .setRenderType(renderType)
@@ -151,6 +153,7 @@ private void renderBorder(PoseStack poseStack, boolean up, boolean down, boolean
         poseStack.mulPose(Axis.XN.rotationDegrees(90));
         poseStack.mulPose(Axis.ZN.rotationDegrees(180));
         builder
+                .replaceBufferSource(LodestoneRenderHandler.LATE_DEFERRED_RENDER)
                 .setAlpha(0.9f)
                 .setUV(u0, v0, u1, v1)
                 .setRenderType(border)