diff --git a/gradle.properties b/gradle.properties index 6460ecb18..d42f61dd5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,6 +6,6 @@ versions_minecraft=1.19.2 versions_minecraft_range=[1.19.2,1.20) versions_forge=43.2.0 versions_forge_range=[43.2.0,) -versions_mod=1.8.0 +versions_mod=1.8.1 versions_mlib=5.0.0 versions_mlib_range=[5.0.0,6.0.0) diff --git a/src/main/java/com/majruszsdifficulty/items/EvokerFangScrollItem.java b/src/main/java/com/majruszsdifficulty/items/EvokerFangScrollItem.java index 760a24e25..8dce82dbb 100644 --- a/src/main/java/com/majruszsdifficulty/items/EvokerFangScrollItem.java +++ b/src/main/java/com/majruszsdifficulty/items/EvokerFangScrollItem.java @@ -92,6 +92,7 @@ private void increaseDamage( OnPreDamaged.Data data ) { public static class Tooltip { public Tooltip() { OnItemAttributeTooltip.listen( this::addSpellInfo ) + .addCondition( Condition.predicate( data->Registries.EVOKER_FANG_SCROLL.isPresent() ) ) .addCondition( Condition.predicate( data->data.itemStack.is( Registries.EVOKER_FANG_SCROLL.get() ) ) ); } diff --git a/src/main/java/com/majruszsdifficulty/items/SonicBoomScrollItem.java b/src/main/java/com/majruszsdifficulty/items/SonicBoomScrollItem.java index 0992654a6..89660ec77 100644 --- a/src/main/java/com/majruszsdifficulty/items/SonicBoomScrollItem.java +++ b/src/main/java/com/majruszsdifficulty/items/SonicBoomScrollItem.java @@ -64,6 +64,7 @@ protected SoundEvent getCastSound() { public static class Tooltip { public Tooltip() { OnItemAttributeTooltip.listen( this::addSpellInfo ) + .addCondition( Condition.predicate( data->Registries.SONIC_BOOM_SCROLL.isPresent() ) ) .addCondition( Condition.predicate( data->data.itemStack.is( Registries.SONIC_BOOM_SCROLL.get() ) ) ); } diff --git a/src/main/java/com/majruszsdifficulty/items/SoulJarItem.java b/src/main/java/com/majruszsdifficulty/items/SoulJarItem.java index 8c8ae24d9..aa31fe6f3 100644 --- a/src/main/java/com/majruszsdifficulty/items/SoulJarItem.java +++ b/src/main/java/com/majruszsdifficulty/items/SoulJarItem.java @@ -145,7 +145,7 @@ private void increaseDamage( OnPreDamaged.Data data ) { } private void increaseSpeed( OnBreakSpeed.Data data ) { - data.event.setNewSpeed( data.event.getNewSpeed() + data.event.getOriginalSpeed() * MINE_BONUS * getMultiplier( data.player ) ); + data.newSpeed *= 1.0f + MINE_BONUS * getMultiplier( data.player ); } private void applyRandomSouls( OnLoot.Data data ) { diff --git a/src/main/java/com/majruszsdifficulty/treasurebags/TreasureBagManager.java b/src/main/java/com/majruszsdifficulty/treasurebags/TreasureBagManager.java index d28d56704..6fcd525bf 100644 --- a/src/main/java/com/majruszsdifficulty/treasurebags/TreasureBagManager.java +++ b/src/main/java/com/majruszsdifficulty/treasurebags/TreasureBagManager.java @@ -96,6 +96,7 @@ public TreasureBagManager() { OnPlayerTick.listen( this::giveTreasureBagToHero ) .addCondition( Condition.isServer() ) .addCondition( Condition.< OnPlayerTick.Data > cooldown( 20, Dist.DEDICATED_SERVER ).configurable( false ) ) + .addCondition( Condition.predicate( data->TreasureBagItem.Pillager.CONFIG.isEnabled() ) ) .addCondition( Condition.predicate( data->{ Raid raid = data.getServerLevel().getRaidAt( data.player.blockPosition() ); if( raid == null || !raid.isVictory() || !data.player.hasEffect( MobEffects.HERO_OF_THE_VILLAGE ) ) { diff --git a/src/main/java/com/majruszsdifficulty/undeadarmy/components/RewardsController.java b/src/main/java/com/majruszsdifficulty/undeadarmy/components/RewardsController.java index 4427758aa..66fe95ab9 100644 --- a/src/main/java/com/majruszsdifficulty/undeadarmy/components/RewardsController.java +++ b/src/main/java/com/majruszsdifficulty/undeadarmy/components/RewardsController.java @@ -1,6 +1,7 @@ package com.majruszsdifficulty.undeadarmy.components; import com.majruszsdifficulty.Registries; +import com.majruszsdifficulty.items.TreasureBagItem; import com.majruszsdifficulty.undeadarmy.UndeadArmy; import com.majruszsdifficulty.undeadarmy.data.WaveDef; import com.mlib.entities.EntityHelper; @@ -12,7 +13,9 @@ record RewardsController( UndeadArmy undeadArmy ) implements IComponent { public void onWaveFinished() { this.giveExperienceReward(); if( this.undeadArmy.isLastWave() ) { - this.giveTreasureReward(); + if( TreasureBagItem.UndeadArmy.CONFIG.isEnabled() ) { + this.giveTreasureReward(); + } if( this.undeadArmy.config.isResetAllParticipantsKillRequirementsEnabled() ) { this.resetAllKillRequirements(); }