Merge branch 'SammySemicolon:1.21.1' into 1.21.1

Author: ChuijkYahus

changelogs/1.8.2.txt

@@ -1,13 +1,16 @@
 # 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
+- Updated and exposed to the config the transparency of the malignant scarf in first person
 
 # Curio Changes
 
 Belt of the Prospector
 - Grants a 50% chance to gain Avarice when collecting valuables
 - Avarice increases fortune chance by 10%, up to 100%
 - No longer shields valuables from explosions
+  - This behavior will be moved to a different system
+- Entry updated accordingly
 
 # Geas Changes
 
@@ -36,4 +39,5 @@ Pact of the Pyromaniac
 - Updated some Brilliance textures
 
 # Bugfixes
+- Fixed some substantial lag that appears due to the new weeping well renderer on some machines
 - Fixed some render ordering issues with Wind Tunnels

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

@@ -1151,6 +1151,7 @@
   "malum.gui.book.entry.page.headline.basic_artifice.wavemaker": "Wavemaker",
   "malum.gui.book.entry.page.headline.belt_of_the_magebane": "Belt of the Magebane",
   "malum.gui.book.entry.page.headline.belt_of_the_prospector": "Belt of the Prospector",
+  "malum.gui.book.entry.page.headline.belt_of_the_prospector.avarice": "Avarice",
   "malum.gui.book.entry.page.headline.belt_of_the_prospector.ring_of_the_demolitionist": "Ring of the Demolitionist",
   "malum.gui.book.entry.page.headline.belt_of_the_prospector.ring_of_the_hoarder": "Ring of the Hoarder",
   "malum.gui.book.entry.page.headline.belt_of_the_starved": "Belt of the Starved",
@@ -1458,7 +1459,9 @@
   "malum.gui.book.entry.page.text.basic_artifice.wavemaker.1": "Earthen seeks to stand, to stay. Given a signal or lack thereof, this acts like a clock, emitting the inverse of the input every so often on a steady rhythm, and emitting the input the rest of the time.",
   "malum.gui.book.entry.page.text.belt_of_the_magebane.1": "The Belt of the Magebane is a simple innovation, but a dangerously effective one. Normally, after being struck by any attack, soul ward will not recover until a long moment after. That moment of downtime has proven itself detrimental far too frequently. But that ends now.",
   "malum.gui.book.entry.page.text.belt_of_the_magebane.2": "While worn, the belt provides a substantial bonus to soul ward recovery rate, while also improving capacity slightly. Furthermore, the belt will absorb the arcane essence of any instance of magical damage that strikes its bearer, converting that repurposed energy into immediate recovery of soul ward.",
-  "malum.gui.book.entry.page.text.belt_of_the_prospector.1": "To fuel my various magics and other goals I more often than not find myself needing various earthen treasures. By unearthing said treasures, this belt will temporarily enable a benefit similar to Fortune. Additionally, explosions $idirectly/$ caused by me will break blocks as if using Fortune III, plus the bonus.",
+  "malum.gui.book.entry.page.text.belt_of_the_prospector.1": "To fuel my various magics and other goals I more often than not find myself needing various earthen treasures. Through enchanting - specifically through Fortune - I've been able to better suit my tools for extracting multitudes of resource at a time. Within this entry I will detail how Spirit Arcana can be utilized in a similar manner.",
+  "malum.gui.book.entry.page.text.belt_of_the_prospector.2": "When Avarice is successfully channeled through a tool with a submaximal Fortune enchantment, the applied bonus will be raised as if Fortune was at it's maximum level. Similarly, The Belt of the Prospector will bless any explosions $iI/$ create with Fortune III, plus the bonus from Avarice.",
+  "malum.gui.book.entry.page.text.belt_of_the_prospector.avarice.1": "While wearing the Belt of the Prospector, any valuable resources I extract will carry an imbued intent, an overflowing Avarice. Upon collection of such intent, the carried Avarice is temporarily inscribed onto my soul. Each amplitude of Avarice enables an added One Tenth chance for an additional level of Fortune when breaking blocks.",
   "malum.gui.book.entry.page.text.belt_of_the_prospector.ring_of_the_demolitionist.1": "If raw explosive power is not sufficient, you simply aren't using enough of it. This ring amplifies explosions, mitigating that issue.",
   "malum.gui.book.entry.page.text.belt_of_the_prospector.ring_of_the_hoarder.1": "Explosions are chaotic, and messy, inherently. This is hardly a problem, when I want to cause such rampant destruction to collect resources, but collecting the items is a burden. This ring entangles the explosion with my soul, causing the debris and loot to appear at my location.",
   "malum.gui.book.entry.page.text.belt_of_the_starved.1": "The arcana I collect occasionally have scraps of wishes and desires woven in. Often, given the base nature of what I reap, this comes in the form of hunger, lust, or petty grudges. All of these impurities can be catalyzed into Gluttony, an stacking amplifier towards magic damage.",
@@ -2206,7 +2209,7 @@
   "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.6/$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.pros": "$m0.6/$Greed and Haste, fueled by Kinetic Impact.\n -Explosions are greatly empowered and grant Avarice upon detonation\n -Avarice improves Fortune Chance\n -Avarice additionally further empowers explosions",
   "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",
@@ -2230,7 +2233,7 @@
   "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 shackles you, damaging your soul",
-  "malum.gui.geas.pact_of_the_lone_druid.pros": "$m0.7/$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 Fourth",
+  "malum.gui.geas.pact_of_the_lone_druid.pros": "$m0.7/$To be complete is to be unburdened.\n -Each empty armour slot grants five points of Armor and two points of Armor Toughness\n -Each empty armour slot increases Healing Received by One Fourth",
   "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",
@@ -2414,6 +2417,8 @@
   "malum.subtitle.arcane_rock_place": "Block placed",
   "malum.subtitle.arcane_rock_step": "Footsteps",
   "malum.subtitle.arcane_whispers": "Arcane whispers",
+  "malum.subtitle.avarice_collected": "Avarice collected",
+  "malum.subtitle.avarice_grants_fortune": "Avarice grants fortune",
   "malum.subtitle.blazing_quartz_block_break": "Block broken",
   "malum.subtitle.blazing_quartz_block_fall": "Blazing quartz block fall",
   "malum.subtitle.blazing_quartz_block_hit": "Block breaking",

src/generated/resources/assets/malum/sounds.json

@@ -364,6 +364,24 @@
     ],
     "subtitle": "malum.subtitle.arcane_whispers"
   },
+  "avarice_collected": {
+    "sounds": [
+      "malum:curiosities/avarice/collect1",
+      "malum:curiosities/avarice/collect2",
+      "malum:curiosities/avarice/collect3",
+      "malum:curiosities/avarice/collect4"
+    ],
+    "subtitle": "malum.subtitle.avarice_collected"
+  },
+  "avarice_grants_fortune": {
+    "sounds": [
+      "malum:curiosities/avarice/fortune1",
+      "malum:curiosities/avarice/fortune2",
+      "malum:curiosities/avarice/fortune3",
+      "malum:curiosities/avarice/fortune4"
+    ],
+    "subtitle": "malum.subtitle.avarice_grants_fortune"
+  },
   "blazing_quartz_block_break": {
     "sounds": [
       "malum:blocks/gemstone/break1",

src/main/java/com/sammy/malum/client/renderer/renderpass/ParallelWorldRenderer.java

@@ -1,14 +1,18 @@
 package com.sammy.malum.client.renderer.renderpass;
 
 import com.mojang.blaze3d.pipeline.RenderTarget;
+import com.mojang.blaze3d.pipeline.TextureTarget;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.*;
 import com.mojang.math.*;
+import com.sammy.malum.config.ClientConfig;
 import com.sammy.malum.registry.client.*;
+import com.sammy.malum.registry.common.MalumAttachmentTypes;
 import dev.kosmx.playerAnim.core.util.*;
 import net.minecraft.client.Camera;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.renderer.*;
 import net.minecraft.util.*;
 import org.joml.*;
@@ -24,7 +28,7 @@
 
 public class ParallelWorldRenderer extends BeforeLevelRenderPass {
     public static ParallelWorldRenderer INSTANCE;
-    private final RenderTarget target = TextureHelper.generateTextureTarget(true);
+    private final RenderTarget target = new TextureTarget(Minecraft.getInstance().getWindow().getWidth()/2, Minecraft.getInstance().getWindow().getHeight()/2, true, Minecraft.ON_OSX);
     private static final RenderStateShard.OutputStateShard outputState = StateShardHelper.createOutputState("parallelWorld", () -> INSTANCE.target.bindWrite(false));
 
     public ParallelWorldRenderer() {
@@ -106,7 +110,17 @@ public void render(DeltaTracker deltaTracker, Camera camera, GameRenderer gameRe
 
     @Override
     public boolean shouldRender(DeltaTracker deltaTracker, Camera camera, GameRenderer gameRenderer, Matrix4f matrix4f, Matrix4f matrix4f1) {
-        return true;
+        if (!ClientConfig.PARALLEL_WORLD.getConfigValue()) {
+            return false;
+        }
+        var player = Minecraft.getInstance().player;
+        if (player == null) {
+            return false;
+        }
+        if (player.hasData(MalumAttachmentTypes.WEEPING_WELL_INFO)) {
+            return player.getData(MalumAttachmentTypes.WEEPING_WELL_INFO).isNearWeepingWell;
+        }
+        return false;
     }
 
     @Override

src/main/java/com/sammy/malum/client/scarf/ScarfRenderHandler.java

@@ -1,6 +1,7 @@
 package com.sammy.malum.client.scarf;
 
 import com.mojang.blaze3d.vertex.*;
+import com.sammy.malum.config.ClientConfig;
 import net.minecraft.client.*;
 import net.minecraft.client.renderer.*;
 import net.minecraft.core.*;
@@ -129,21 +130,24 @@ public ScarfRenderData setAlpha(float alpha) {
         }
 
         public void render(LivingEntity entity, float partialTicks) {
-            BlockPos blockpos = entity.blockPosition().above(2);
             var minecraft = Minecraft.getInstance();
-            int light = entity.level().hasChunkAt(blockpos) ? LevelRenderer.getLightColor(entity.level(), blockpos) : 0;
-            var renderType = LodestoneRenderTypes.TEXTURE_FADE.apply(token);
-            var builder = VFXBuilders.createWorld().setRenderType(renderType).setLight(light).setAlpha(alpha);
-            var scarfStart = getScarfStart(entity, partialTicks);
-            float alpha = 1f;
+            float alpha = this.alpha;
             if (entity.equals(minecraft.cameraEntity)) {
                 if (minecraft.options.getCameraType().isFirstPerson()) {
-                    alpha = 0.75f;
+                    alpha *= ClientConfig.SCARF_OPACITY.getConfigValue();
                 }
             }
+            if (alpha <= 0) {
+                return;
+            }
+            var blockpos = entity.blockPosition().above(2);
+            int light = entity.level().hasChunkAt(blockpos) ? LevelRenderer.getLightColor(entity.level(), blockpos) : 0;
+            var renderType = LodestoneRenderTypes.TEXTURE_FADE.apply(token);
+            var builder = VFXBuilders.createWorld().setRenderType(renderType).setLight(light).setAlpha(alpha);
+            var scarfStart = getScarfStart(entity, partialTicks);
             points.setOrigin(scarfStart);
             //TODO: actually giving it the partial tick makes it jitter when the player is stationary, but not doing so makes it jitter when the player is moving... for whatever reason
-            builder.setAlpha(alpha).usePartialTicks(0).renderTrail(points,
+            builder.usePartialTicks(0).renderTrail(points,
                     f -> Mth.lerp(f, endingScale, scale),
                     f -> builder.setColor(ColorHelper.colorLerp(Easing.LINEAR, Mth.floor(f * 4) / 4f, secondaryColor, primaryColor))
             );

src/main/java/com/sammy/malum/client/screen/codex/entries/TinkeringEntries.java

@@ -174,7 +174,9 @@ public static void setupEntries(ArcanaProgressionScreen screen) {
 
         screen.addEntry("belt_of_the_prospector", -9, 6, b -> b
                 .configureWidget(w -> w.setIcon(BELT_OF_THE_PROSPECTOR))
-                .addPage(new HeadlineTextPage("belt_of_the_prospector", "belt_of_the_prospector.1"))
+                .addPage(new HeadlineTextItemPage("belt_of_the_prospector", BELT_OF_THE_PROSPECTOR.get()))
+                .addPage(new HeadlineTextPage("belt_of_the_prospector.avarice"))
+                .addPage(new TextPage("belt_of_the_prospector.2"))
                 .addPage(SpiritInfusionPage.fromOutput(BELT_OF_THE_PROSPECTOR.get()))
                 .addReference(new EntryReference(
                         RING_OF_THE_HOARDER.get(),

src/main/java/com/sammy/malum/common/data/attachment/AvariceMarkData.java

@@ -7,8 +7,10 @@
 import com.sammy.malum.core.handlers.GeasEffectHandler;
 import com.sammy.malum.registry.common.MalumAttachmentTypes;
 import com.sammy.malum.registry.common.MalumMobEffects;
+import com.sammy.malum.registry.common.MalumSoundEvents;
 import com.sammy.malum.registry.common.MalumTags;
 import com.sammy.malum.registry.common.magic.MalumGeasEffectTypes;
+import com.sammy.malum.visual_effects.AvariceParticleEffects;
 import com.sammy.malum.visual_effects.GeasParticleEffects;
 import io.netty.buffer.*;
 import net.minecraft.core.BlockPos;
@@ -26,13 +28,12 @@
 import net.neoforged.neoforge.event.level.BlockDropsEvent;
 import net.neoforged.neoforge.event.tick.EntityTickEvent;
 import team.lodestar.lodestone.helpers.EntityHelper;
-
-import java.util.function.Function;
+import team.lodestar.lodestone.helpers.SoundHelper;
 
 public class AvariceMarkData {
 
     public static Codec<AvariceMarkData> CODEC = RecordCodecBuilder.create(obj -> obj.group(
-            Codec.BOOL.optionalFieldOf("hasProspectorMark", false).forGetter(AvariceMarkData::hasProspectorMark),
+            Codec.BOOL.optionalFieldOf("hasProspectorMark", false).forGetter(AvariceMarkData::hasAvariceMark),
             Codec.INT.optionalFieldOf("carriedAvarice", 0).forGetter(AvariceMarkData::getCarriedAvarice)
     ).apply(obj, AvariceMarkData::new));
 
@@ -47,7 +48,7 @@ private AvariceMarkData(boolean hasAvariceMark, int carriedAvarice) {
     public AvariceMarkData() {
     }
 
-    public boolean hasProspectorMark() {
+    public boolean hasAvariceMark() {
         return hasAvariceMark;
     }
 
@@ -80,7 +81,7 @@ public static int getAppliedAvarice(LivingEntity entity) {
 
     public void tickData(Entity entity) {
         if (entity.level().isClientSide) {
-            GeasParticleEffects.avariceItemParticles(entity.level(), entity);
+            AvariceParticleEffects.avariceItemParticles(entity.level(), entity);
         }
     }
 
@@ -97,8 +98,8 @@ public static void entityTick(EntityTickEvent.Pre event) {
     public static void pickupItem(ItemEntityPickupEvent.Post event) {
         ItemEntity entity = event.getItemEntity();
         entity.getExistingData(MalumAttachmentTypes.AVARICE_MARK).ifPresent(data -> {
-            if (data.hasProspectorMark()) {
-                applyAvarice(event.getPlayer(), data.carriedAvarice);
+            if (data.hasAvariceMark()) {
+                applyAvarice(event.getPlayer(), data.carriedAvarice*event.getOriginalStack().getCount());
             }
         });
     }
@@ -122,14 +123,17 @@ public static ItemEntity tryMarkEntity(ItemEntity entity, int amount) {
     public static void applyAvarice(LivingEntity target, int amount) {
         var effect = MalumMobEffects.AVARICE;
         var instance = target.getEffect(effect);
+        float volume = 1f;
         if (instance == null) {
             target.addEffect(new MobEffectInstance(effect, 400, amount-1, true, true, true));
         } else {
             EntityHelper.amplifyEffect(instance, target, amount, 9);
             EntityHelper.extendEffect(instance, target, 400, 2400);
+            volume -= Math.min(instance.getAmplifier()*0.05f, 0.5f);
         }
         if (GeasEffectHandler.hasGeasEffect(target, MalumGeasEffectTypes.PACT_OF_THE_PROSPECTOR)) {
             target.heal(amount*2);
         }
+        SoundHelper.playSound(target, MalumSoundEvents.AVARICE_COLLECT.get(), volume, 0.8f + target.getRandom().nextFloat() * 0.4f);
     }
 }

src/main/java/com/sammy/malum/common/effect/geas/AvariceEffect.java

@@ -2,18 +2,28 @@
 
 import com.sammy.malum.*;
 import com.sammy.malum.registry.common.*;
+import com.sammy.malum.registry.common.magic.MalumSpiritTypes;
 import net.minecraft.resources.*;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.effect.*;
 import net.minecraft.world.entity.*;
+import net.minecraft.world.phys.Vec3;
 import team.lodestar.lodestone.helpers.*;
 
+import javax.annotation.Nullable;
+
+import static com.sammy.malum.visual_effects.networked.MalumNetworkedParticleEffectColorData.fromSpirits;
+
 public class AvariceEffect extends MobEffect {
     public AvariceEffect() {
         super(MobEffectCategory.BENEFICIAL, ColorHelper.getColor(255, 230, 93));
-        final ResourceLocation id = MalumMod.malumPath("prospectors_greed");
     }
 
-    public static int addFortune(LivingEntity entity) {
+    public static int addFortune(LivingEntity entity, @Nullable Vec3 position, int enchantmentLevel) {
+        if (!(entity.level() instanceof ServerLevel level)) {
+            return 0;
+        }
+
         var effect = MalumMobEffects.AVARICE;
         var instance = entity.getEffect(effect);
         if (instance != null) {
@@ -26,6 +36,17 @@ public static int addFortune(LivingEntity entity) {
                 }
                 chance--;
             }
+            if (bonus > 0) {
+                if (enchantmentLevel < 3) {
+                    bonus += 3 - enchantmentLevel;
+                }
+                if (position != null) {
+                    MalumParticleEffectTypes.AVARICE_FORTUNE_EFFECT.createEffect(position)
+                            .color(MalumSpiritTypes.INFERNAL_SPIRIT)
+                            .spawn(level);
+                }
+                SoundHelper.playSound(entity, MalumSoundEvents.AVARICE_FORTUNE.get(), 1.0f, 0.8f + entity.getRandom().nextFloat() * 0.4f);
+            }
             return bonus;
         }
         return 0;

src/main/java/com/sammy/malum/common/effect/rite/aura/soulwood/OakenMightEffect.java

@@ -31,7 +31,7 @@ public static void increaseDamage(LivingDamageEvent.Pre event) {
                 return;
             }
             int amplifier = instance.getAmplifier() + 1;
-            final ItemStack weapon = entity.getWeaponItem();
+            var weapon = entity.getWeaponItem();
             if (weapon.isEmpty() || weapon.is(MalumTags.ItemTags.COUNTS_AS_EMPTY_HAND)) {
                 amplifier *= 2;
                 SoundHelper.playSound(entity, MalumSoundEvents.OAKEN_MIGHT_HIT.get(), 1.0f, 0.8f + entity.getRandom().nextFloat() * 0.4f);