From db7647029df607966700baf0b441913d1af6a0ed Mon Sep 17 00:00:00 2001 From: Majrusz Date: Sun, 3 Dec 2023 12:36:11 +0100 Subject: [PATCH 1/5] Updated version name --- changelog.md | 58 ----------------------------------------------- gradle.properties | 2 +- 2 files changed, 1 insertion(+), 59 deletions(-) diff --git a/changelog.md b/changelog.md index b119d01d6..e69de29bb 100644 --- a/changelog.md +++ b/changelog.md @@ -1,58 +0,0 @@ -- 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) \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index b9cf30c0c..4a5f84220 100644 --- a/gradle.properties +++ b/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-unfinished mod_display_name=Majrusz's Progressive Difficulty mod_description=Mod that progressively increases the game difficulty over time. mod_authors=Majrusz From 17d8c335cfe3d494552a7e2f9e6966f4de1bc6fe Mon Sep 17 00:00:00 2001 From: Majrusz Date: Sun, 3 Dec 2023 12:38:03 +0100 Subject: [PATCH 2/5] Fixed bug with Soul Jar damage bonus being calculated incorrectly --- changelog.md | 1 + common/src/main/java/com/majruszsdifficulty/items/SoulJar.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index e69de29bb..adb8f93c7 100644 --- a/changelog.md +++ b/changelog.md @@ -0,0 +1 @@ +- fixed bug with Soul Jar damage bonus being calculated incorrectly \ No newline at end of file diff --git a/common/src/main/java/com/majruszsdifficulty/items/SoulJar.java b/common/src/main/java/com/majruszsdifficulty/items/SoulJar.java index 726d39555..e728adc29 100644 --- a/common/src/main/java/com/majruszsdifficulty/items/SoulJar.java +++ b/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; } From ca60526cbdf499391840feaf84e62f90ef187579 Mon Sep 17 00:00:00 2001 From: Majrusz Date: Sun, 3 Dec 2023 12:49:11 +0100 Subject: [PATCH 3/5] Fixed bug with thunder not working properly during Undead Army --- changelog.md | 1 + .../undeadarmy/listeners/LightningSpawner.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/changelog.md b/changelog.md index adb8f93c7..fa62c88ed 100644 --- a/changelog.md +++ b/changelog.md @@ -1 +1,2 @@ +- fixed bug with thunder not working properly during Undead Army - fixed bug with Soul Jar damage bonus being calculated incorrectly \ No newline at end of file diff --git a/common/src/main/java/com/majruszsdifficulty/undeadarmy/listeners/LightningSpawner.java b/common/src/main/java/com/majruszsdifficulty/undeadarmy/listeners/LightningSpawner.java index 68c1d4d0c..9222883e3 100644 --- a/common/src/main/java/com/majruszsdifficulty/undeadarmy/listeners/LightningSpawner.java +++ b/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 ); } From ead74c418ab60f34c71abe53aced332061140828 Mon Sep 17 00:00:00 2001 From: Majrusz Date: Sun, 3 Dec 2023 13:19:49 +0100 Subject: [PATCH 4/5] Fixed crash when using Undead Battle Standard on server --- changelog.md | 1 + .../com/majruszsdifficulty/items/UndeadBattleStandard.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changelog.md b/changelog.md index fa62c88ed..609ae35aa 100644 --- a/changelog.md +++ b/changelog.md @@ -1,2 +1,3 @@ +- 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 \ No newline at end of file diff --git a/common/src/main/java/com/majruszsdifficulty/items/UndeadBattleStandard.java b/common/src/main/java/com/majruszsdifficulty/items/UndeadBattleStandard.java index 7c5126216..a18acac96 100644 --- a/common/src/main/java/com/majruszsdifficulty/items/UndeadBattleStandard.java +++ b/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 ) { From 298907aa03f7847585a475b931f9b1b935004e40 Mon Sep 17 00:00:00 2001 From: Majrusz Date: Sun, 3 Dec 2023 13:21:03 +0100 Subject: [PATCH 5/5] Removed unfinished tag --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4a5f84220..b9a28347c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ minecraft_version=1.20.1 # Mod mod_id=majruszsdifficulty mod_archives_name=majruszs-difficulty -mod_version=1.9.1-unfinished +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