Merged 1.9.10 release

changelog.md

@@ -1,6 +1,5 @@
-- added Undead Army compatibility with RpgZ mod (suggested by @Sazuzaki)
-- added Japanese translation (thanks to @もふざとう)
-- changed fishing requirements for Angler Treasure Bag from 20/15/10 to 16 on all game stages
-- fixed bug with mobs being able to spawn in Mushroom Fields and Deep Dark (reported by @Dagamer2021)
-- fixed bug with Undead Army progress bars displaying invalid values after reentering the world
-- fixed bug with mob groups being able to spawn recursively
+- added Forge tags to items (thanks to @DiogoSoaresMiranda)
+- added Korean translation (thanks to @glasslim)
+- fixed compatibility crash related to Soul Jar (reported by @𝙿𝙰𝚇𝚇)
+- fixed compatibility error when reloading resources (reported by @SettingDust)
+- fixed compatibility crash with Randomium (reported by @Doom, @ZacGames, @AllyJaxx)

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

@@ -251,7 +251,8 @@ public static class Client {
 				.addCondition( data->data.itemStack.getItem() instanceof SoulJar );
 
 			OnItemAttributeTooltip.listen( Client::addTooltip )
-				.addCondition( data->SoulJar.canHaveSouls( data.itemStack ) );
+				.addCondition( data->SoulJar.canHaveSouls( data.itemStack ) )
+				.addCondition( data->Side.getLocalPlayer() != null /* compatibility check */ );
 
 			OnItemTooltip.listen( Client::addTooltip )
 				.addCondition( data->SoulJar.canHaveSouls( data.itemStack ) );

common/src/main/java/com/majruszsdifficulty/itemsets/ItemSet.java

@@ -66,7 +66,8 @@ public List< ItemSetRequirement > findRequirementsMet( LivingEntity entity ) {
 	private ItemSet() {
 		Side.runOnClient( ()->()->{
 			OnItemTooltip.listen( data->Client.addTooltip( data, this ) )
-				.addCondition( data->this.requirements.stream().anyMatch( requirement->requirement.is( data.itemStack ) ) );
+				.addCondition( data->this.requirements.stream().anyMatch( requirement->requirement.is( data.itemStack ) ) )
+				.addCondition( data->Side.getLocalPlayer() != null /* compatibility check */ );
 		} );
 	}
 

common/src/main/resources/data/forge/tags/items/axes.json

@@ -0,0 +1,5 @@
+{
+    "values": [
+      "majruszsdifficulty:enderium_axe"
+    ]
+  }

common/src/main/resources/data/forge/tags/items/boots.json

@@ -0,0 +1,6 @@
+{
+    "values": [
+      "majruszsdifficulty:enderium_boots",
+      "majruszsdifficulty:tattered_boots"
+    ]
+  }

common/src/main/resources/data/forge/tags/items/chestplates.json

@@ -0,0 +1,6 @@
+{
+    "values": [
+      "majruszsdifficulty:enderium_chestplate",
+      "majruszsdifficulty:tattered_chestplate"
+    ]
+  }

common/src/main/resources/data/forge/tags/items/helmets.json

@@ -0,0 +1,6 @@
+{
+    "values": [
+      "majruszsdifficulty:enderium_helmet",
+      "majruszsdifficulty:tattered_helmet"
+    ]
+  }

common/src/main/resources/data/forge/tags/items/hoes.json

@@ -0,0 +1,5 @@
+{
+    "values": [
+      "majruszsdifficulty:enderium_hoe"
+    ]
+  }

common/src/main/resources/data/forge/tags/items/ingots.json

@@ -0,0 +1,5 @@
+{
+    "values": [
+      "majruszsdifficulty:enderium_ingot"
+    ]
+  }

common/src/main/resources/data/forge/tags/items/leggings.json

@@ -0,0 +1,6 @@
+{
+    "values": [
+      "majruszsdifficulty:enderium_leggings",
+      "majruszsdifficulty:tattered_leggings"
+    ]
+  }

common/src/main/resources/data/forge/tags/items/nuggets.json

@@ -0,0 +1,5 @@
+  {
+    "values": [
+      "majruszsdifficulty:enderium_shard"
+    ]
+  }

common/src/main/resources/data/forge/tags/items/pickaxes.json

@@ -0,0 +1,5 @@
+{
+    "values": [
+      "majruszsdifficulty:enderium_pickaxe"
+    ]
+  }

common/src/main/resources/data/forge/tags/items/shovels.json

@@ -0,0 +1,5 @@
+{
+    "values": [
+      "majruszsdifficulty:enderium_shovel"
+    ]
+  }

common/src/main/resources/data/forge/tags/items/swords.json

@@ -0,0 +1,6 @@
+{
+    "values": [
+      "majruszsdifficulty:enderium_sword",
+      "majruszsdifficulty:wither_sword"
+    ]
+  }

gradle.properties

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