Merge pull request #226 from mahjerion/1.20-Forge

small fixes/changes

Author: RobertSkalko

gradle.properties

@@ -28,5 +28,5 @@ publish_plugin_version=0.8.3
 # --- COMMON GRADLE END ---
 # -- Mod Specific --
 player_animator_version=1.0.2-rc1+1.20
-dungeon_realm_version=1.1.1
+dungeon_realm_version=1.1.2
 the_harvest_version=1.1.0

src/main/java/com/robertx22/mine_and_slash/capability/player/data/PlayerConfigData.java

@@ -33,7 +33,7 @@ public enum Config {
         AGGRESSIVE_SUMMONS("aggressive_summons", true, Words.TITLE_FEATURE_AGGRO_SUMMONS, Words.AGGRESIVE_SUMMONS, false),
         STAT_ORDER_TEST("stat_order_test", false, Words.TITLE_FEATURE_STAT_ORDER_DEBUG, Words.STAT_ORDER_TEST, true),
         DAMAGE_CONFLICT_MSG("damage_conflict_check", false, Words.TITLE_FEATURE_DMG_CONFLICT_DEBUG, Words.DMG_CONFLICT_CHECK, true),
-        EVERYONE_IS_ALLY("everyone_is_ally", false, Words.TITLE_FEATURE_EVERYONE_ALLY, Words.EVERYONE_IS_ALLY, false),
+        //EVERYONE_IS_ALLY("everyone_is_ally", false, Words.TITLE_FEATURE_EVERYONE_ALLY, Words.EVERYONE_IS_ALLY, false),
         //DROP_MAP_CHEST_CONTENTS_ON_GROUND("drop_map_chest_contents_on_ground", false, Words.TITLE_FEATURE_DROP_MAP_CHEST_ITEMS, Words.DROP_MAP_CHEST_CONTENTS_ON_GROUND, false)
         ;
 

src/main/java/com/robertx22/mine_and_slash/config/forge/ServerContainer.java

@@ -77,6 +77,7 @@ public static ServerContainer get() {
         COMBAT_TO_PROFESSION_RESTED_XP_GENERATION = b.defineInRange("COMBAT_TO_PROFESSION_RESTED_XP_GENERATION", 0.25, 0, 1);
         PROFESSION_TO_COMBAT_RESTED_XP_GENERATION = b.defineInRange("PROFESSION_TO_COMBAT_RESTED_XP_GENERATION", 0.1, 0, 1);
         RESTED_XP_DEATH_PENALTY = b.defineInRange("RESTED_XP_DEATH_PENALTY", 0.5F, 0, 1);
+        PARTY_EXP_BONUS = b.comment("Additional exp before splitting between players.").defineInRange("PARTY_EXP_BONUS", 0.2F, 0, 1);
 
         FAVOR_DEATH_LOSS = b.defineInRange("favor_death_loss", 50D, 0, 10000);
         MAX_POSSIBLE_FAVOR = b.defineInRange("MAX_POSSIBLE_FAVOR", 10000000, 0, 10000000);
@@ -258,6 +259,7 @@ public boolean isEntitySummonBlacklisted(LivingEntity entity) {
     public ForgeConfigSpec.DoubleValue COMBAT_TO_PROFESSION_RESTED_XP_GENERATION;
     public ForgeConfigSpec.DoubleValue PROFESSION_TO_COMBAT_RESTED_XP_GENERATION;
     public ForgeConfigSpec.DoubleValue RESTED_XP_DEATH_PENALTY;
+    public ForgeConfigSpec.DoubleValue PARTY_EXP_BONUS;
 
     public ForgeConfigSpec.DoubleValue UNARMED_ENERGY_COST;
 

src/main/java/com/robertx22/mine_and_slash/event_hooks/my_events/OnMobDeathDrops.java

@@ -151,7 +151,7 @@ private static void GiveExp(LivingEntity victim, Player killer, EntityData kille
                 members = 4;
             }
 
-            float teamMulti = 1 + (0.2F * members);
+            float teamMulti = (float) (1 + (ServerContainer.get().PARTY_EXP_BONUS.get() * members));
 
             exp *= teamMulti;
 

src/main/java/com/robertx22/mine_and_slash/loot/blueprints/bases/UniqueGearPart.java

@@ -18,6 +18,7 @@ protected UniqueGear generateIfNull() {
                     .getWrapped()
                     .of(x -> x.rarity.equals(blueprint.rarity.get().GUID()))
                     .of(x -> blueprint.info.map_tier >= x.min_tier)
+                    .of(x -> blueprint.info.level >= x.min_drop_lvl)
                     .of(x -> x.canSpawnInLeague(blueprint.info.league))
                     .of(x -> x.getBaseGear().GUID().equals(blueprint.gearItemSlot.get().GUID()));
 

src/main/java/com/robertx22/mine_and_slash/maps/MapItemData.java

@@ -317,7 +317,29 @@ public List<ItemStack> getSalvageResult(ExileStack stack) {
             return Arrays.asList();
         }
         int amount = 1;
-        return Arrays.asList(new ItemStack(RarityItems.RARITY_STONE.getOrDefault(getRarity().GUID(), RarityItems.RARITY_STONE.get(IRarity.COMMON_ID)).get(), amount));
+
+        GearRarity mapRarity = getRarity();
+
+        // Find the rarity to use for the stone, capping at tier 2 (Rare)
+        // Find the rarity with item_tier == 2 (Rare)
+        Optional<GearRarity> rareRarityOpt = ExileDB.GearRarities()
+                .getList()
+                .stream()
+                .filter(r -> r.item_tier == 2)
+                .findFirst();
+
+        GearRarity stoneRarity;
+        if (mapRarity.item_tier < 2) {
+            stoneRarity = mapRarity;
+        } else {
+            // If map is Rare or above, use Rare
+            stoneRarity = rareRarityOpt.orElse(mapRarity); // fallback to mapRarity if not found
+        }
+
+        return Arrays.asList(new ItemStack(
+                RarityItems.RARITY_STONE.getOrDefault(stoneRarity.GUID(), RarityItems.RARITY_STONE.get(IRarity.COMMON_ID)).get(),
+                amount
+        ));
     }
 
     @Override

src/main/java/com/robertx22/mine_and_slash/uncommon/localization/Words.java

@@ -144,7 +144,7 @@ public enum Words implements IAutoLocName {
     STAT_ORDER_TEST("Stat Order Test [Debug Option]\nThis runs a few tests when you attack something to be sure the stats are working in correct order and sends warning message if they don't. Only use when debugging stats. For example, crit chance should work before crit damage stat"),
     DMG_CONFLICT_CHECK("Mod Conflict Check [Debug Option]\n\nChecks if Mine and Slash damage has been overrided by another mod.\nSends a message to player if there's a problem.\n THIS IS A DEBUG OPTION"),
     AGGRESIVE_SUMMONS("Your summons will now attack anything they guess is an enemy, and no longer need guidance from you.\n\nYou need to Re-Summon your minions for this to take effect"),
-    EVERYONE_IS_ALLY("By default your spells only target your MNS team members and yourself.\n\nWith this enabled, your heals, buffs etc will target everyone, including possible enemies!"),
+    EVERYONE_IS_ALLY("By default your spells only target your MNS team members and yourself.\n\nWith this enabled, your heals, buffs etc will target even un-teamed players!"),
     DROP_MAP_CHEST_CONTENTS_ON_GROUND("When you loot chests in maps, should they drop their contents on the ground automatically? \n\nThis is helpful if you use the Master Backpack or other loot filtering mods like Sophisticated Backpacks."),
 
     WHILE_UNDER_AURA("While Under Effect of %1$s:"),

src/main/java/com/robertx22/mine_and_slash/uncommon/utilityclasses/EntityFinder.java

@@ -187,14 +187,6 @@ public Setup<T> predicate(Predicate<T> p) {
 
         public Setup<T> searchFor(AllyOrEnemy f) {
             this.entityPredicate = f;
-
-            if (f == AllyOrEnemy.allies) {
-                if (this.caster instanceof Player p) {
-                    if (Load.player(p).config.isConfigEnabled(PlayerConfigData.Config.EVERYONE_IS_ALLY)) {
-                        this.entityPredicate = AllyOrEnemy.all;
-                    }
-                }
-            }
             return this;
         }