Merged 1.9.1 release

changelog.md

@@ -1,58 +1,3 @@
-- changed required Majrusz Library version from 5.0.0+ to 7.0.0+
-- added support for custom game stages (suggested by @samjviana)
-- added support for per player difficulty (suggested by @Not-February)
-- added support for custom mob groups (suggested by @NiveStinks)
-- added Fragile End Stone
-- added Infernal Sponge and Soaked Infernal Sponge to Wither Treasure Bag
-- added chance for Pillagers to hold fireworks and Multishot crossbows (suggested by @Tides of Twilight)
-- added glass break sound when Glass Regeneration gets removed
-- added possibility to cure Bleeding with Milk Bucket and Golden Apples (suggested by @draglorr)
-- added possibility to open Treasure Bags by right-clicking it in the inventory
-- added possibility to apply Soul Jar to shields with weaker variants of bonuses
-- added 4% Bleeding chance bonus per each level of Impaling on Trident
-- added config list for animals that should not apply Bleeding
-- added config list for mobs with effects they can apply
-- added config for default immunity for undead mobs
-- added config for mobs that should be applicable by Bleeding (suggested by @zekeflynn)
-- added config for scrolls
-- updated Russian translation (thanks to @reyzex)
-- removed Netherite and Enderium Axes from Cursed Armors in End Cities
-- removed detailed tooltip from Cursed Armor Spawn Egg
-- removed Cloth drop chance from Undead Army mobs
-- removed Emerald as drop chance from Illusioner
-- removed reputation bonus when using Bandages on Villagers
-- removed recipe that converts Tattered Armor to Cloths
-- removed recipe that converts Cerberus Fangs to Bone Meal
-- removed check for natural spawns in Undead Army requirement
-- removed advancements for opening 16th Treasure Bag
-- removed night multiplier bonus for damage and health
-- removed Enderman soul from Soul Jar
-- removed creative mode tab for Treasure Bags
-- made Bleeding immunity factor based on armor value and armor toughness (suggested by @Qee1y)
-- made blood particles darker the longer they last
-- made Giant launch attack weaker when player has knockback resistance
-- made Illusioner always have at least one illusion at the exact same position
-- made Cursed Armor spawn naturally during Blood Moon (suggested by @Tides of Twilight)
-- changed `Enderium Block` name to `Block of Enderium` to better match the vanilla (suggested by @nickolas78gr)
-- changed Wither Sword repair material from Bone to Cerberus Fang
-- changed Angler Treasure Bag id from `majruszsdifficulty:fishing_treasure_bag` to `majruszsdifficulty:angler_treasure_bag`
-- increased Cursed Armor experience from 0-7 to 7
-- increased armor toughness of Enderium Armor from 3.5 to 4
-- increased required undead kills to trigger the Undead Army from 75 to 100
-- increased mob health bonus from 0%/10%/20% to 0%/15%/30%
-- decreased double loot chance from 0%/10%/20% to 0%/5%/10%
-- decreased Cerberus move speed by 11%
-- decreased Cerberus experience from 60-90 to 26-46
-- decreased attack damage from 16 to 14 of Scroll of Sonic Boom 
-- rebalanced Bleeding chances on tools
-- replaced 12-36 Iron/Gold Nuggets with 1-3 Raw Iron/Gold in Angler Treasure Bag
-- replaced Illusioner texture with the one from Minecraft Dungeons
-- reworked Undead Set bonuses
-- swapped drop chances for Rotten Flesh and Cloth inside Undead Army Treasure Bag
-- fixed bug with Tank's area attack not always spawning in front of the Tank
-- fixed bug with Tank's attack always emitting sound even if it did not hit anyone
-- fixed bug with Curse Armor playing assemble animation after reloading the world
-- fixed bug with Bleeding tooltip not displaying proper value on server
-- fixed bug with Treasure Bag message appearing after changing worlds
-- fixed bug with Scroll animations not working properly on low frames per second
-- fixed bug with Enderium Shard Locator not working properly in the second hand (reported by @Ladocterus)
+- fixed crash when using Undead Battle Standard on server
+- fixed bug with thunder not working properly during Undead Army
+- fixed bug with Soul Jar damage bonus being calculated incorrectly

common/src/main/java/com/majruszsdifficulty/items/SoulJar.java

@@ -78,7 +78,7 @@ private static void randomize( OnPlayerInteracted data ) {
 	}
 
 	private static void increaseDamage( OnEntityPreDamaged data ) {
-		data.damage += data.original * DAMAGE_BONUS * SoulJar.getMultiplier( data.attacker, data.attacker.getOffhandItem() );
+		data.damage += DAMAGE_BONUS * SoulJar.getMultiplier( data.attacker, data.attacker.getOffhandItem() );
 		data.spawnMagicParticles = true;
 	}
 

common/src/main/java/com/majruszsdifficulty/items/UndeadBattleStandard.java

@@ -3,6 +3,7 @@
 import com.majruszlibrary.events.OnItemTooltip;
 import com.majruszlibrary.events.OnPlayerInteracted;
 import com.majruszlibrary.item.ItemHelper;
+import com.majruszlibrary.platform.Side;
 import com.majruszlibrary.text.TextHelper;
 import com.majruszsdifficulty.undeadarmy.UndeadArmyHelper;
 import net.minecraft.ChatFormatting;
@@ -23,10 +24,11 @@ public UndeadBattleStandard() {
 	}
 
 	private static void tryToSpawn( OnPlayerInteracted data ) {
-		if( UndeadArmyHelper.tryToSpawn( data.player ) ) {
+		if( Side.isLogicalServer() && UndeadArmyHelper.tryToSpawn( data.player ) ) {
 			ItemHelper.consumeItemOnUse( data.itemStack, data.player );
-			data.finish();
 		}
+
+		data.finish();
 	}
 
 	private static void addTooltip( OnItemTooltip data ) {

common/src/main/java/com/majruszsdifficulty/undeadarmy/listeners/LightningSpawner.java

@@ -1,5 +1,6 @@
 package com.majruszsdifficulty.undeadarmy.listeners;
 
+import com.majruszlibrary.events.base.Priority;
 import com.majruszlibrary.math.AnyPos;
 import com.majruszsdifficulty.undeadarmy.UndeadArmy;
 import com.majruszsdifficulty.undeadarmy.events.OnUndeadArmyStateChanged;
@@ -13,6 +14,7 @@
 public class LightningSpawner {
 	static {
 		OnUndeadArmyStateChanged.listen( LightningSpawner::spawn )
+			.priority( Priority.LOW )
 			.addCondition( data->data.undeadArmy.phase.state == UndeadArmy.Phase.State.WAVE_PREPARING );
 	}
 

gradle.properties

@@ -7,7 +7,7 @@ minecraft_version=1.20.1
 # Mod
 mod_id=majruszsdifficulty
 mod_archives_name=majruszs-difficulty
-mod_version=1.9.0
+mod_version=1.9.1
 mod_display_name=Majrusz's Progressive Difficulty
 mod_description=Mod that progressively increases the game difficulty over time.
 mod_authors=Majrusz