Skip to content

Commit d260d9a

Browse files
SammySemicolonSammySemicolon
committed
bugfixes
1 parent b959eb5 commit d260d9a

File tree

8 files changed

+50
-24
lines changed

8 files changed

+50
-24
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -423,15 +423,15 @@
423423
"enchantment.malum.animated": "Animated",
424424
"enchantment.malum.animated.desc": "Improves attack speed.",
425425
"enchantment.malum.ascension": "Ascension",
426-
"enchantment.malum.ascension.desc": "Enables the Scythe to propel the player upwards, pushing away nearby enemies when used.",
426+
"enchantment.malum.ascension.desc": "Enables the Scythe to propel the player upwards, slashing nearby enemies when used.",
427427
"enchantment.malum.capacitor": "Capacitor",
428-
"enchantment.malum.capacitor.desc": "Adds Reserve Staff Charges for use with the staff",
428+
"enchantment.malum.capacitor.desc": "Adds additional Spell Charges for use with the staff",
429429
"enchantment.malum.haunted": "Haunted",
430430
"enchantment.malum.haunted.desc": "Improves the Weapon's Magic Damage",
431431
"enchantment.malum.rebound": "Rebound",
432432
"enchantment.malum.rebound.desc": "Allows the Scythe to be thrown much like a boomerang when used.",
433433
"enchantment.malum.replenishing": "Replenishing",
434-
"enchantment.malum.replenishing.desc": "Reduces the Staff's ranged attack cooldown when dealing melee damage.",
434+
"enchantment.malum.replenishing.desc": "Restores Spell Charges when dealing melee damage with the staff.",
435435
"enchantment.malum.spirit_plunder": "Spirit Plunder",
436436
"enchantment.malum.spirit_plunder.desc": "Reaps extra Spirits when killing an enemy.",
437437
"entity.malum.draining_bolt": "Draining Bolt",

‎src/generated/resources/data/malum/tags/malum/geas_types/is_oath.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"values": [
3-
"malum:oath_of_unsighted_resistance",
43
"malum:oath_of_the_undiscerned_maw",
5-
"malum:oath_of_the_gleeful_target",
6-
"malum:oath_of_the_inverted_heart",
4+
"malum:oath_of_unsighted_resistance",
5+
"malum:oath_of_the_overburdened_mind",
6+
"malum:oath_of_the_overkeen_eye",
77
"malum:oath_of_the_overeager_fist",
88
"malum:oath_of_unmakers_disdain",
9-
"malum:oath_of_the_overburdened_mind",
10-
"malum:oath_of_the_overkeen_eye"
9+
"malum:oath_of_the_gleeful_target",
10+
"malum:oath_of_the_inverted_heart"
1111
]
1212
}

‎src/generated/resources/data/minecraft/tags/block/features_cannot_replace.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"values": [
3+
"malum:void_conduit",
4+
"malum:primordial_soup",
5+
"malum:void_depot",
6+
"malum:weeping_well_center",
7+
"malum:weeping_well_side",
8+
"malum:weeping_well_side_mirror",
9+
"malum:weeping_well_corner",
10+
"malum:weeping_well_flagstone",
11+
"malum:weeping_well_column_base",
12+
"malum:weeping_well_column",
13+
"malum:weeping_well_column_cap"
14+
]
15+
}

‎src/main/java/com/sammy/malum/common/geas/pact/aqueous/SelfCareGeas.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public static void onEat(Level level, LivingEntity livingEntity, ItemStack food)
3434
}
3535
if (livingEntity instanceof Player player) {
3636
if (GeasEffectHandler.hasGeasEffect(player, MalumGeasEffectTypeRegistry.PACT_OF_SELF_CARE)) {
37-
player.getFoodData().eat(0, 1.5f);
37+
player.getFoodData().add(0, 1.5f);
3838
for (MobEffectInstance instance : livingEntity.getActiveEffectsMap().values()) {
3939
var e = instance.getEffect().value();
4040
if (e.getCategory().equals(MobEffectCategory.HARMFUL)) {

‎src/main/java/com/sammy/malum/datagen/lang/MalumLang.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,9 +466,9 @@ protected void addTranslations() {
466466

467467
addEnchantmentNameAndDescription(EnchantmentRegistry.ANIMATED, "Improves attack speed.");
468468
addEnchantmentNameAndDescription(EnchantmentRegistry.REBOUND, "Allows the Scythe to be thrown much like a boomerang when used.");
469-
addEnchantmentNameAndDescription(EnchantmentRegistry.ASCENSION, "Enables the Scythe to propel the player upwards, pushing away nearby enemies when used.");
470-
addEnchantmentNameAndDescription(EnchantmentRegistry.REPLENISHING, "Reduces the Staff's ranged attack cooldown when dealing melee damage.");
471-
addEnchantmentNameAndDescription(EnchantmentRegistry.CAPACITOR, "Adds Reserve Staff Charges for use with the staff");
469+
addEnchantmentNameAndDescription(EnchantmentRegistry.ASCENSION, "Enables the Scythe to propel the player upwards, slashing nearby enemies when used.");
470+
addEnchantmentNameAndDescription(EnchantmentRegistry.REPLENISHING, "Restores Spell Charges when dealing melee damage with the staff.");
471+
addEnchantmentNameAndDescription(EnchantmentRegistry.CAPACITOR, "Adds additional Spell Charges for use with the staff");
472472
addEnchantmentNameAndDescription(EnchantmentRegistry.HAUNTED, "Improves the Weapon's Magic Damage");
473473
addEnchantmentNameAndDescription(EnchantmentRegistry.SPIRIT_PLUNDER, "Reaps extra Spirits when killing an enemy.");
474474

‎src/main/java/com/sammy/malum/registry/common/block/MalumBlockProperties.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -536,17 +536,19 @@ public static LodestoneBlockProperties WEEPING_WELL() {
536536
.strength(-1.0F, 3600000.0F)
537537
.sound(SoundRegistry.WEEPING_WELL_BRICKS)
538538
.isRedstoneConductor((a,b,c) -> false)
539+
.addTag(FEATURES_CANNOT_REPLACE)
539540
.mapColor(MapColor.COLOR_GRAY)
540541
.isValidSpawn(Blocks::never)
541542
.noLootTable();
542543
}
543544

544545
public static LodestoneBlockProperties PRIMORDIAL_SOUP() {
545546
return new LodestoneBlockProperties()
547+
.strength(-1.0F, 3600000.0F)
548+
.sound(SoundRegistry.BLIGHTED_EARTH)
546549
.mapColor(MapColor.TERRACOTTA_BLACK)
547550
.pushReaction(PushReaction.BLOCK)
548-
.setCutoutRenderType()
549-
.sound(SoundRegistry.BLIGHTED_EARTH)
550-
.strength(-1.0F, 3600000.0F);
551+
.addTag(FEATURES_CANNOT_REPLACE)
552+
.setCutoutRenderType();
551553
}
552554
}

‎src/main/java/com/sammy/malum/visual_effects/networked/geas/ShakenFaithParticleEffect.java‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,17 @@
99
import net.minecraft.world.phys.*;
1010
import net.neoforged.api.distmarker.*;
1111
import team.lodestar.lodestone.helpers.*;
12+
import team.lodestar.lodestone.systems.easing.*;
13+
import team.lodestar.lodestone.systems.particle.*;
14+
import team.lodestar.lodestone.systems.particle.builder.*;
1215
import team.lodestar.lodestone.systems.particle.data.*;
1316
import team.lodestar.lodestone.systems.particle.data.spin.*;
1417
import team.lodestar.lodestone.systems.particle.world.behaviors.*;
1518

1619
import java.util.function.*;
1720

21+
import static net.minecraft.util.Mth.nextFloat;
22+
1823
public class ShakenFaithParticleEffect extends SlashAttackParticleEffect {
1924

2025
public ShakenFaithParticleEffect(String id) {
@@ -36,16 +41,18 @@ public Supplier<ParticleEffectActor> get() {
3641
float angle = nbtData.compoundTag.getFloat("angle");
3742
boolean mirror = nbtData.compoundTag.getBoolean("mirror");
3843

39-
for (int i = 0; i < 3; i++) {
40-
float spinOffset = angle + RandomHelper.randomBetween(random, -0.5f, 0.5f) + (mirror ? 3.14f : 0);
41-
var slash = WeaponParticleEffects.spawnSlashParticle(level, positionData.getAsVector(), ParticleRegistry.ROUNDABOUT_SLASH, colorData);
44+
final Vec3 pos = positionData.getAsVector();
45+
for (int i = 0; i < 6; i++) {
46+
float spinOffset = angle + RandomHelper.randomBetween(random, -1.5f, 1.5f) + (mirror ? 3.14f : 0);
47+
var slash = WeaponParticleEffects.spawnSlashParticle(level, pos, ParticleRegistry.ROUNDABOUT_SLASH, colorData);
4248
slash.getBuilder()
43-
.setSpinData(SpinParticleData.create(0).setSpinOffset(spinOffset).build())
44-
.setScaleData(GenericParticleData.create(RandomHelper.randomBetween(random, 2.5f, 3.5f)+i*0.5f, 0).build())
45-
.setMotion(direction.scale(RandomHelper.randomBetween(random, 0.3f, 0.4f)))
49+
.setSpinData(SpinParticleData.createRandomDirection(random, 0.15f - i * 0.025f, 0.02f).setSpinOffset(spinOffset).build())
50+
.setScaleData(GenericParticleData.create(RandomHelper.randomBetween(random, 0.5f, 1.5f)+i*0.25f, 0).build())
4651
.setBehavior(PointyDirectionalParticleBehavior.pointyDirectional(direction))
47-
.multiplyLifetime(2.5f)
48-
.setLifeDelay(i*2);
52+
.setLifetime(RandomHelper.randomBetween(random, 8, 12))
53+
.setLifeDelay(i/2);
54+
slash.spawnParticles();
55+
slash.getBuilder().setBehavior(BillboardParticleBehavior.INSTANCE);
4956
slash.spawnParticles();
5057
}
5158
};

‎src/main/resources/META-INF/accesstransformer.cfg‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,4 +146,6 @@ public net.minecraft.world.entity.LivingEntity attackStrengthTicker # attackStre
146146

147147
public net.minecraft.world.entity.LivingEntity dead # dead
148148

149-
public net.minecraft.world.level.Explosion damageCalculator # damageCalculator
149+
public net.minecraft.world.level.Explosion damageCalculator # damageCalculator
150+
151+
public net.minecraft.world.food.FoodData add(IF)V # add

0 commit comments

Comments
 (0)