6.2.1

RobertSkalko · RobertSkalko · commit b8eae70bc1c2 · 2025-03-01T11:54:35.000+01:00
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,32 +1,5 @@
 Changelog of recent updates: https://github.com/RobertSkalko/Mine-And-Slash-Rework/blob/1.20-Forge/changelogs/v.6.2.txt
 
-v.6.2.0
+v.6.2.1
 
-- orbs of crafting was moved to library of exile mod so it's not needed anymore
-- the harvest now a separate required dependency (I tried to make it an optional dependency but was a bit too difficult, I might try to jarjar it again later)
-- adventure maps are now a separate required dependency called: dungeon realm
-- old dimension will stay as an empty dimension so future saves aren't borked by its removal
-- return to old map item system meaning: maps drop again, no more upgrading, but i made map boss always drop 1 map
-- uber maps changed slightly, now maps can become uber maps with an orb item, crafted with 4 uber frags, but the map must be mythic for the orb to be used
-- map mobs now drop vanilla loot again, this was removed due to item clutter, but will clash with the dungeon mod features now possibly
-- builder note: map boss arenas now need the 'map_teleporter' block
-- builder note2: harvest maps now use harvest_spawner blocks placed around the map instead of the league processor;32 something block
-- the map dimension no longer puts you in adventure mode, now uses events to make sure you can't place/break etc, report any bugs please!
-- new feature, command blocks should no longer show in maps
-- other dimension mod addons for dungeon realm now connect the maps, um. That means if you enter a harvest/obelisk etc through a map, it counts as your map too
-- changed dungeon datapack json, now require all types of rooms and no more fallback rooms
-- changed rarity json, map finish rarity is now a separate datapack under library mod
-- removed spawned mobs, now use mob lists from library mod
-- datapack checker now works for any of library's datapacks, not just mns
-- ailment procs now show damage chat messages when applied
-- buffed gathering profession dropchances at early levels by reducing the effect of exp to loot multiplier by half
-Now all gathers count as if they have an extra 50 experience. So if say you're mining a block that gives 10 exp, you'd before have 0.1x loot multi,
-now you'd have 0.6x loot multi. For a block that gives 200 exp, loot multi was 2x before, now it's 2.5x
-- as maps are now drops again, added a currency that allows you to upgrade map rarity
-- removed map lives system, possibly temporary
-
-New Feature: Relics!
-- the map device can now be equipped with relics
-- relics boost your maps with stats like mob pack size, chance to contain additional harvest etc
-- relics currently drop once per map boss and 3 per uber boss
-Enjoy customizing your maps and playing content you like or want to focus on!
+- fixed prophecy gui
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx2G
 # --- COMMON GRADLE START ---
 # Mod Properties
-mod_version=6.2.0
+mod_version=6.2.1
 # Minecraft Versions
 minecraft_version=1.20.1
 forgeversion=47.1.43
@@ -20,7 +20,7 @@ modrinth_id=oifKCkhG
 release_type=release
 maven_group=com.robertx22
 # Dependencies
-exile_library_version=2.0.1
+exile_library_version=2.0.2
 curios_version=5.2.0-beta.3+1.20.1
 jei_version=15.2.0.27
 wiki_toolkit_version=0.2.4
@@ -29,5 +29,5 @@ publish_plugin_version=0.8.3
 # -- Mod Specific --
 player_animator_version=1.0.2-rc1+1.20
 orbs_of_crafting_version=1.0.3
-dungeon_realm_version=1.0.0
+dungeon_realm_version=1.0.3
 the_harvest_version=1.0.0
diff --git a/src/main/java/com/robertx22/addons/dungeon_realm/DungeonAddonEvents.java b/src/main/java/com/robertx22/addons/dungeon_realm/DungeonAddonEvents.java
@@ -51,7 +51,7 @@ public void accept(OnStartMapEvent event) {
 
                         WorldData.get(event.p.level()).map.setData(event.p, mapdata, event.mapInfo.structure, event.startChunkPos.getMiddleBlockPosition(5));
 
-                        Load.Unit(event.p).getCooldowns().setOnCooldown("start_map", 20 * 60 * 2);
+                        Load.Unit(event.p).getCooldowns().setOnCooldown("start_map", ServerContainer.get().MAP_START_COOLDOWN_SECONDS.get() * 20);
                     }
                 }
             }
diff --git a/src/main/java/com/robertx22/mine_and_slash/capability/player/PlayerData.java b/src/main/java/com/robertx22/mine_and_slash/capability/player/PlayerData.java
@@ -18,7 +18,6 @@
 import com.robertx22.mine_and_slash.gui.screens.stat_gui.StatCalcInfoData;
 import com.robertx22.mine_and_slash.mmorpg.SlashRef;
 import com.robertx22.mine_and_slash.prophecy.PlayerProphecies;
-import com.robertx22.mine_and_slash.saveclasses.DeathStatsData;
 import com.robertx22.mine_and_slash.saveclasses.perks.TalentsData;
 import com.robertx22.mine_and_slash.saveclasses.spells.SpellCastingData;
 import com.robertx22.mine_and_slash.saveclasses.spells.SpellSchoolsData;
@@ -110,7 +109,6 @@ public void syncToClient(Player player) {
     public TeamData team = new TeamData();
     public TalentsData talents = new TalentsData();
     public StatPointsData statPoints = new StatPointsData();
-    public DeathStatsData deathStats = new DeathStatsData();
     public SpellSchoolsData ascClass = new SpellSchoolsData();
     public PlayerProphecies prophecy = new PlayerProphecies();
     public SpellCastingData spellCastingData = new SpellCastingData();
@@ -133,7 +131,7 @@ public void syncToClient(Player player) {
 
     public int bonusTalents = 0;
 
-  
+
     public int omensFilled = 0;
 
     public PlayerData(Player player) {
@@ -157,7 +155,6 @@ public CompoundTag serializeNBT() {
         LoadSave.Save(talents, nbt, TALENTS_DATA);
         LoadSave.Save(prophecy, nbt, PROPHECY);
         LoadSave.Save(statPoints, nbt, STAT_POINTS);
-        LoadSave.Save(deathStats, nbt, DEATH_STATS);
         LoadSave.Save(ascClass, nbt, ASC);
         LoadSave.Save(spellCastingData, nbt, CAST);
         LoadSave.Save(config, nbt, CONFIG);
@@ -187,7 +184,6 @@ public void deserializeNBT(CompoundTag nbt) {
         this.prophecy = loadOrBlank(PlayerProphecies.class, new PlayerProphecies(), nbt, PROPHECY, new PlayerProphecies());
         this.talents = loadOrBlank(TalentsData.class, new TalentsData(), nbt, TALENTS_DATA, new TalentsData());
         this.statPoints = loadOrBlank(StatPointsData.class, new StatPointsData(), nbt, STAT_POINTS, new StatPointsData());
-        this.deathStats = loadOrBlank(DeathStatsData.class, new DeathStatsData(), nbt, DEATH_STATS, new DeathStatsData());
         this.ascClass = loadOrBlank(SpellSchoolsData.class, new SpellSchoolsData(), nbt, ASC, new SpellSchoolsData());
         this.spellCastingData = loadOrBlank(SpellCastingData.class, new SpellCastingData(), nbt, CAST, new SpellCastingData());
         this.config = loadOrBlank(PlayerConfigData.class, new PlayerConfigData(), nbt, CONFIG, new PlayerConfigData());
diff --git a/src/main/java/com/robertx22/mine_and_slash/config/forge/ServerContainer.java b/src/main/java/com/robertx22/mine_and_slash/config/forge/ServerContainer.java
@@ -82,6 +82,8 @@ public static ServerContainer get() {
         FAVOR_DEATH_LOSS = b.defineInRange("favor_death_loss", 50D, 0, 10000);
         MAX_POSSIBLE_FAVOR = b.defineInRange("MAX_POSSIBLE_FAVOR", 10000000, 0, 10000000);
         FAVOR_CHEST_GAIN = b.defineInRange("favor_chest_gain", 1D, 0, 10000);
+        MAP_START_COOLDOWN_SECONDS = b.defineInRange("MAP_START_COOLDOWN_SECONDS", 60 * 2, 0, 10000000);
+
 
         GEAR_DROPRATE = b.defineInRange("gear_drop_rate", 7D, 0, 1000);
         SOUl_DROPRATE = b.defineInRange("soul_drop_rate", 0.3D, 0, 1000);
@@ -264,6 +266,7 @@ public boolean isSoulCleanBanned(Item item) {
     public ForgeConfigSpec.DoubleValue BLOCK_COST;
 
     public ForgeConfigSpec.IntValue MAX_POSSIBLE_FAVOR;
+    public ForgeConfigSpec.IntValue MAP_START_COOLDOWN_SECONDS;
 
 
     public ForgeConfigSpec.IntValue MAP_GEN_TERRAIN_RADIUS;
diff --git a/src/main/java/com/robertx22/mine_and_slash/database/data/stats/types/resources/DamageAbsorbedByMana.java b/src/main/java/com/robertx22/mine_and_slash/database/data/stats/types/resources/DamageAbsorbedByMana.java
@@ -2,13 +2,11 @@
 
 import com.robertx22.mine_and_slash.database.data.stats.Stat;
 import com.robertx22.mine_and_slash.database.data.stats.StatScaling;
-import com.robertx22.mine_and_slash.saveclasses.DeathStatsData;
 import com.robertx22.mine_and_slash.saveclasses.unit.ResourceType;
 import com.robertx22.mine_and_slash.saveclasses.unit.StatData;
 import com.robertx22.mine_and_slash.uncommon.effectdatas.DamageEvent;
 import com.robertx22.mine_and_slash.uncommon.enumclasses.Elements;
 import net.minecraft.util.Mth;
-import net.minecraft.world.entity.player.Player;
 
 public class DamageAbsorbedByMana extends Stat {
     public static String GUID = "mana_shield";
@@ -73,11 +71,6 @@ public static float modifyEntityDamage(DamageEvent effect, float dmg) {
             float dmgReduced = Mth.clamp(dmg * data.getValue() / 100F, 0, currentMana - (maxMana * 0.5F));
 
             if (dmgReduced > 0) {
-
-                if (effect.target instanceof Player) {
-                    DeathStatsData.record((Player) effect.target, effect.getElement(), dmgReduced);
-                }
-
                 effect.targetData.getResources()
                         .spend(effect.target, ResourceType.mana, dmgReduced);
 
diff --git a/src/main/java/com/robertx22/mine_and_slash/database/data/stats/types/resources/magic_shield/MagicShield.java b/src/main/java/com/robertx22/mine_and_slash/database/data/stats/types/resources/magic_shield/MagicShield.java
@@ -1,16 +1,14 @@
 package com.robertx22.mine_and_slash.database.data.stats.types.resources.magic_shield;
 
+import com.robertx22.library_of_exile.utils.SoundUtils;
 import com.robertx22.mine_and_slash.database.data.stats.Stat;
 import com.robertx22.mine_and_slash.database.data.stats.StatScaling;
-import com.robertx22.mine_and_slash.saveclasses.DeathStatsData;
 import com.robertx22.mine_and_slash.saveclasses.unit.ResourceType;
 import com.robertx22.mine_and_slash.uncommon.effectdatas.DamageEvent;
 import com.robertx22.mine_and_slash.uncommon.enumclasses.Elements;
-import com.robertx22.library_of_exile.utils.SoundUtils;
 import net.minecraft.ChatFormatting;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.util.Mth;
-import net.minecraft.world.entity.player.Player;
 
 public class MagicShield extends Stat {
     public static String GUID = "magic_shield";
@@ -72,10 +70,7 @@ public static float modifyEntityDamage(DamageEvent effect, float dmg) {
                 SoundUtils.playSound(effect.target, SoundEvents.GENERIC_HURT, 0.5F, 1);
                 SoundUtils.playSound(effect.target, SoundEvents.GUARDIAN_HURT, 1, 1);
 
-                if (effect.target instanceof Player) {
-                    DeathStatsData.record((Player) effect.target, effect.getElement(), dmgReduced);
-                }
-
+               
                 effect.targetData.getResources().spend(effect.target, ResourceType.magic_shield, dmgReduced);
 
 
diff --git a/src/main/java/com/robertx22/mine_and_slash/event_hooks/my_events/OnPlayerDeath.java b/src/main/java/com/robertx22/mine_and_slash/event_hooks/my_events/OnPlayerDeath.java
@@ -6,6 +6,7 @@
 import com.robertx22.mine_and_slash.capability.player.data.PlayerBuffData;
 import com.robertx22.mine_and_slash.config.forge.ServerContainer;
 import com.robertx22.mine_and_slash.uncommon.datasaving.Load;
+import com.robertx22.mine_and_slash.uncommon.localization.Words;
 import net.minecraft.world.entity.player.Player;
 
 public class OnPlayerDeath extends EventConsumer<ExileEvents.OnPlayerDeath> {
@@ -27,18 +28,18 @@ public void accept(ExileEvents.OnPlayerDeath event) {
 
                 PlayerData data = Load.player(player);
 
-
                 if (Load.Unit(player).getLevel() > ServerContainer.get().DEATH_PENALTY_START_LEVEL.get()) {
                     Load.Unit(player).onDeathDoPenalty();
                     data.rested_xp.onDeath();
                     data.favor.onDeath(player);
+                } else {
+                    player.sendSystemMessage(Words.DEATH_PENALTY_AVOIDED.locName(ServerContainer.get().DEATH_PENALTY_START_LEVEL.get()));
                 }
 
-                data.deathStats.died = true;
                 data.buff = new PlayerBuffData(); // we delete all the buff foods and potions on death, if in the future i want some buffs to persist across death, change this
                 data.playerDataSync.setDirty();
 
-    
+
             }
 
         } catch (Exception e) {
diff --git a/src/main/java/com/robertx22/mine_and_slash/event_hooks/ontick/OnServerTick.java b/src/main/java/com/robertx22/mine_and_slash/event_hooks/ontick/OnServerTick.java
@@ -51,11 +51,12 @@ public static void onEndTick(ServerPlayer player) {
 
                 WorldUtils.ifMapData(sw, player.blockPosition()).ifPresent(map -> {
 
-
-                    if (map != null && map.map != null) {
-                        if (!map.map.getStatReq().meetsReq(map.map.lvl, unitdata)) {
-                            //float minusres = map.map.getStatReq().getLackingResistNumber(map.map.lvl, unitdata);
-                            player.hurt(player.damageSources().generic(), player.getMaxHealth() * 0.1F);
+                    if (player.tickCount % 20 == 0) {
+                        if (map != null && map.map != null) {
+                            if (!map.map.getStatReq().meetsReq(map.map.lvl, unitdata)) {
+                                //float minusres = map.map.getStatReq().getLackingResistNumber(map.map.lvl, unitdata);
+                                player.hurt(player.damageSources().generic(), player.getMaxHealth() * 0.1F);
+                            }
                         }
                     }
 
diff --git a/src/main/java/com/robertx22/mine_and_slash/gui/screens/character_screen/MainHubScreen.java b/src/main/java/com/robertx22/mine_and_slash/gui/screens/character_screen/MainHubScreen.java
@@ -1,5 +1,6 @@
 package com.robertx22.mine_and_slash.gui.screens.character_screen;
 
+import com.robertx22.dungeon_realm.main.DungeonMain;
 import com.robertx22.library_of_exile.main.Packets;
 import com.robertx22.library_of_exile.utils.RenderUtils;
 import com.robertx22.library_of_exile.utils.TextUTIL;
@@ -53,7 +54,6 @@
 import com.robertx22.mine_and_slash.uncommon.enumclasses.Elements;
 import com.robertx22.mine_and_slash.uncommon.localization.Gui;
 import com.robertx22.mine_and_slash.uncommon.localization.Words;
-import com.robertx22.mine_and_slash.uncommon.utilityclasses.WorldUtils;
 import com.robertx22.mine_and_slash.vanilla_mc.packets.AllocateStatPacket;
 import com.robertx22.mine_and_slash.vanilla_mc.packets.proxies.OpenGuiWrapper;
 import net.minecraft.ChatFormatting;
@@ -256,7 +256,7 @@ public void init() {
         }
         rightButtons.add(new OpenJewelsScreen());
 
-        if (WorldUtils.isMapWorldClass(this.mc.level, mc.player.blockPosition())) {
+        if (mc.level.dimension().location().equals(DungeonMain.DIMENSION_KEY)) {
             if (Load.player(mc.player).prophecy.affixOffers.isEmpty()) {
                 rightButtons.add(new ProphecyScreen());
             } else {
diff --git a/src/main/java/com/robertx22/mine_and_slash/mmorpg/event_registers/CommonEvents.java b/src/main/java/com/robertx22/mine_and_slash/mmorpg/event_registers/CommonEvents.java
@@ -2,7 +2,6 @@
 
 import com.robertx22.library_of_exile.events.base.EventConsumer;
 import com.robertx22.library_of_exile.events.base.ExileEvents;
-import com.robertx22.mine_and_slash.capability.player.PlayerData;
 import com.robertx22.mine_and_slash.database.DatabaseCaches;
 import com.robertx22.mine_and_slash.event_hooks.damage_hooks.LivingHurtUtils;
 import com.robertx22.mine_and_slash.event_hooks.damage_hooks.reworked.NewDamageMain;
@@ -54,7 +53,7 @@ public static void register() {
             x.put(SlashEntities.SKELETON.get(), Skeleton.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.3).build());
             x.put(SlashEntities.SPIDER.get(), Spider.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.5).build());
             x.put(SlashEntities.ZOMBIE.get(), Zombie.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.4).build());
-           
+
             x.put(SlashEntities.FIRE_GOLEM.get(), Zombie.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.45).build());
             x.put(SlashEntities.COLD_GOLEM.get(), Zombie.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.45).build());
             x.put(SlashEntities.LIGHTNING_GOLEM.get(), Zombie.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.45).build());
@@ -257,23 +256,6 @@ public static void register() {
 
         });
 
-        ExileEvents.PLAYER_DEATH.register(new EventConsumer<ExileEvents.OnPlayerDeath>() {
-            @Override
-            public void accept(ExileEvents.OnPlayerDeath event) {
-                if (event.player instanceof ServerPlayer) {
-                    try {
-                        PlayerData data = Load.player(event.player);
-
-                        data.deathStats.deathPos = event.player.blockPosition();
-                        data.deathStats.deathDim = event.player.level().dimension()
-                                .location()
-                                .toString();
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-        });
 
         ExileEvents.ON_PLAYER_LOGIN.register(new EventConsumer<ExileEvents.OnPlayerLogin>() {
             @Override
diff --git a/src/main/java/com/robertx22/mine_and_slash/saveclasses/DeathStatsData.java b/src/main/java/com/robertx22/mine_and_slash/saveclasses/DeathStatsData.java
diff --git a/src/main/java/com/robertx22/mine_and_slash/uncommon/localization/Chats.java b/src/main/java/com/robertx22/mine_and_slash/uncommon/localization/Chats.java
@@ -156,7 +156,8 @@ public enum Chats implements IAutoLocName {
     NEW_DAY("A new day has arrived! Profession drop rates have been boosted for the following items:"),
 
     ERROR_TYPE_AND_REASON("%1$s %2$s"),
-    TOO_LOW_LEVEL("You need to be level %1$s to do this"),
+    TOO_LOW_LEVEL_TODO("You need to be level %1$s to do this"), // todo switch to this eventually
+    TOO_LOW_LEVEL("You need to be higher level to do this"),
 
     EAT_FOOD_ERROR("[Food Eat Fail]: "),
     EQUIP_AURA_ERROR("[Augment Equip Fail]: "),
diff --git a/src/main/java/com/robertx22/mine_and_slash/uncommon/localization/Words.java b/src/main/java/com/robertx22/mine_and_slash/uncommon/localization/Words.java
@@ -7,6 +7,8 @@
 
 // to use a "%" here, do %% or '%'
 public enum Words implements IAutoLocName {
+    DEATH_PENALTY_AVOIDED("Dying usually incurs a loss, but players below level %1$s are temporarily safeguarded."),
+
     TOTAL_COMBINE_DAMAGE("Total Combined Damage: %1$s\n"),
     AILMENT_DAMAGE_NOTE("Note: Ailment damage is calculated and shown when it's applied, instead of when the damage actually hurts the enemy.\n"),
     BONUS_DAMAGE_TYPE("\n- Bonus Damage Types:\n"),
diff --git a/src/main/resources/assets/mmorpg/icon.png b/src/main/resources/assets/mmorpg/icon.png
diff --git a/src/main/resources/assets/mmorpg/lang/en_us.json b/src/main/resources/assets/mmorpg/lang/en_us.json
diff --git a/src/main/resources/assets/mmorpg/modpack_dev_helper/dungeon_realm_dungeon.txt b/src/main/resources/assets/mmorpg/modpack_dev_helper/dungeon_realm_dungeon.txt

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public void accept(OnStartMapEvent event) {`
`51`	`51`
`52`	`52`	`WorldData.get(event.p.level()).map.setData(event.p, mapdata, event.mapInfo.structure, event.startChunkPos.getMiddleBlockPosition(5));`
`53`	`53`
`54`		`- Load.Unit(event.p).getCooldowns().setOnCooldown("start_map", 20 * 60 * 2);`
	`54`	`+ Load.Unit(event.p).getCooldowns().setOnCooldown("start_map", ServerContainer.get().MAP_START_COOLDOWN_SECONDS.get() * 20);`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`}`