patience/mc_rebalance
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Compare commits

base: patience:aac9a8c36c4bc34ab59fff7d05d986ec581d45da
Branches Tags
patience:1.21
patience:main
patience:golden-paxel
patience:1.0.2+1.0.3
patience:1.0.1+1.0.2
patience:1.0.0+1.0.1
patience:1.0.0+1.0.0
patience:mod-release
..
compare: patience:609694372f85191c66e5cf3ba56389f9c0d23b65
Branches Tags
patience:1.21
patience:main
patience:golden-paxel
patience:1.0.2+1.0.3
patience:1.0.1+1.0.2
patience:1.0.0+1.0.1
patience:1.0.0+1.0.0
patience:mod-release

2 commits
aac9a8c36c ... 609694372f

Author SHA1 Message Date
patience 609694372f
Merge remote-tracking branch 'origin/1.21' into 1.21 2026-03-01 15:01:58 +00:00
patience 2b690e4f94
Made Crumble not crash to desktop 2026-03-01 15:01:46 +00:00
1 changed files with 12 additions and 8 deletions
Show stats Expand all files Collapse all files

20
src/main/java/xyz/nearmisses/patience/mc_rebalance/enchant_effects/CrumbleEffect.java
View file

@ -6,14 +6,14 @@ import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.effect.MobEffects; import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.enchantment.EnchantedItemInUse; import net.minecraft.world.item.enchantment.EnchantedItemInUse;
import net.minecraft.world.item.enchantment.LevelBasedValue; import net.minecraft.world.item.enchantment.LevelBasedValue;
import net.minecraft.world.item.enchantment.effects.EnchantmentEntityEffect; import net.minecraft.world.item.enchantment.effects.EnchantmentEntityEffect;
import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.Vec3;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import xyz.nearmisses.patience.mc_rebalance.MCRebalance;
import java.util.Objects;
public record CrumbleEffect(LevelBasedValue amount) implements EnchantmentEntityEffect { public record CrumbleEffect(LevelBasedValue amount) implements EnchantmentEntityEffect {
public static final MapCodec<CrumbleEffect> CODEC = RecordCodecBuilder.mapCodec(instance -> public static final MapCodec<CrumbleEffect> CODEC = RecordCodecBuilder.mapCodec(instance ->
@ -22,15 +22,19 @@ public record CrumbleEffect(LevelBasedValue amount) implements EnchantmentEntity
).apply(instance, CrumbleEffect::new) ).apply(instance, CrumbleEffect::new)
); );
// This method has certain flaws (if wither's the first on the list, this enchantment doesn't work), but I'm actually fine with that currently (deters players from trying to half-and-half their effect application).
@Override @Override
public void apply(ServerLevel world, int level, EnchantedItemInUse context, Entity target, Vec3 pos) { public void apply(ServerLevel world, int level, EnchantedItemInUse context, Entity target, Vec3 pos) {
if (target instanceof Player player && player.getActiveEffects().iterator().hasNext()) { if (target instanceof LivingEntity player && player.getActiveEffects().iterator().hasNext()) {
MobEffectInstance effect = player.getActiveEffects().iterator().next(); MobEffectInstance effect = player.getActiveEffects().iterator().next();
player.getActiveEffects().remove(effect); if(effect.is(MobEffects.WITHER)){return;}
player.getActiveEffects().add(new MobEffectInstance(MobEffects.WITHER, player.removeEffect(effect.getEffect());
(int)(effect.getDuration() * this.amount.calculate(level)), MCRebalance.LOGGER.info(String.valueOf(effect));
(effect.getAmplifier() > 0 ? effect.getAmplifier() - 1 : 0) + (player.hasEffect(MobEffects.WITHER) ? Objects.requireNonNull(player.getEffect(MobEffects.WITHER)).getAmplifier() : 0) player.addEffect(new MobEffectInstance(MobEffects.WITHER,
)); // That last line is a mess, but far less so than my initial attempt. Reduced RNG pending. //(int)(effect.getDuration() * this.amount.calculate(level)),
(int)(200*this.amount.calculate(level)), // Consider which of these would be better
(effect.getAmplifier() > 0 ? effect.getAmplifier() - 1 : 0) + (player.hasEffect(MobEffects.WITHER) ? player.getEffect(MobEffects.WITHER).getAmplifier() : 0)
), context.owner());
} }
} }