6.2.5

Author: RobertSkalko

CHANGELOG.txt

@@ -1,5 +1,8 @@
 Changelog of recent updates: https://github.com/RobertSkalko/Mine-And-Slash-Rework/blob/1.20-Forge/changelogs/v.6.2.txt
 
-v.6.2.4
+v.6.2.5
 
-- added quickloot
+- attempt to fix entity configs overriding levels for harvest and obelisk maps
+- added localizations
+- server crash fix
+- some

gradle.properties

@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx2G
 # --- COMMON GRADLE START ---
 # Mod Properties
-mod_version=6.2.4
+mod_version=6.2.5
 # Minecraft Versions
 minecraft_version=1.20.1
 forgeversion=47.1.43

src/main/java/com/robertx22/mine_and_slash/database/registry/ExileDB.java

@@ -56,8 +56,7 @@ public class ExileDB {
 
 
     public static DimensionConfig getDimensionConfig(LevelAccessor world) {
-        String id = MapManager.getResourceLocation((Level) world)
-                .toString();
+        String id = MapManager.getResourceLocation((Level) world).toString();
 
         if (!DimensionConfigs().isRegistered(id)) {
             return ExileDB.DimensionConfigs().get(DimensionConfig.DEFAULT_ID);

src/main/java/com/robertx22/mine_and_slash/mmorpg/MMORPG.java

@@ -21,8 +21,6 @@
 import com.robertx22.mine_and_slash.aoe_data.database.stat_effects.StatEffects;
 import com.robertx22.mine_and_slash.aoe_data.database.stats.Stats;
 import com.robertx22.mine_and_slash.aoe_data.datapacks.lang_file.CreateLangFile;
-import com.robertx22.mine_and_slash.capability.player.container.BackpackQuickLootButton;
-import com.robertx22.mine_and_slash.capability.player.container.BackpackScreen;
 import com.robertx22.mine_and_slash.characters.PlayerStats;
 import com.robertx22.mine_and_slash.config.forge.ClientConfigs;
 import com.robertx22.mine_and_slash.config.forge.ServerContainer;
@@ -57,7 +55,6 @@
 import net.minecraftforge.client.event.EntityRenderersEvent;
 import net.minecraftforge.client.event.RegisterClientTooltipComponentFactoriesEvent;
 import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
-import net.minecraftforge.client.event.ScreenEvent;
 import net.minecraftforge.data.event.GatherDataEvent;
 import net.minecraftforge.eventbus.api.EventPriority;
 import net.minecraftforge.eventbus.api.IEventBus;
@@ -157,10 +154,6 @@ public void accept(ExileEvents.OnCheckIsDevToolsRunning event) {
             x.register(SocketTooltip.SocketComponent.class, SocketTooltip::new);
         });
 
-        ForgeEvents.registerForgeEvent(ScreenEvent.Init.class, x -> {
-            BackpackQuickLootButton.addLootButton(x);
-        });
-
 
         DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> {
 

src/main/java/com/robertx22/mine_and_slash/mmorpg/init/ClientInit.java

@@ -6,6 +6,7 @@
 import com.robertx22.mine_and_slash.a_libraries.dmg_number_particle.DamageParticle;
 import com.robertx22.mine_and_slash.a_libraries.dmg_number_particle.DamageParticleRenderer;
 import com.robertx22.mine_and_slash.a_libraries.player_animations.PlayerAnimations;
+import com.robertx22.mine_and_slash.capability.player.container.BackpackQuickLootButton;
 import com.robertx22.mine_and_slash.config.forge.ClientConfigs;
 import com.robertx22.mine_and_slash.config.forge.overlay.OverlayPresets;
 import com.robertx22.mine_and_slash.gui.SocketTooltip;
@@ -29,6 +30,7 @@
 import net.minecraftforge.client.event.RenderGuiOverlayEvent;
 import net.minecraftforge.client.event.RenderLivingEvent;
 import net.minecraftforge.client.event.RenderTooltipEvent;
+import net.minecraftforge.client.event.ScreenEvent;
 import net.minecraftforge.client.event.sound.PlaySoundEvent;
 import net.minecraftforge.client.gui.overlay.VanillaGuiOverlay;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
@@ -40,6 +42,10 @@ public class ClientInit {
 
     public static void onInitializeClient(final FMLClientSetupEvent event) {
 
+        ForgeEvents.registerForgeEvent(ScreenEvent.Init.class, x -> {
+            BackpackQuickLootButton.addLootButton(x);
+        });
+
         OrbAddonClientInit.init();
 
         OverlayPresets.init();

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

@@ -63,6 +63,8 @@ public static int scaleExpReward(int exp, int level) {
         return (int) (Math.pow(exp * GameBalanceConfig.get().NORMAL_STAT_SCALING.getMultiFor(level), 1.1F));
     }
 
+    public static String OBELISK_DIM = "ancient_obelisks:obelisk";
+    public static String HARVEST_DIM = "the_harvest:harvest";
 
     public static LevelInfo determineLevel(@Nullable LivingEntity en, Level world, BlockPos pos, @Nullable Player nearestPlayer, boolean usevariance) {
 
@@ -72,6 +74,10 @@ public static LevelInfo determineLevel(@Nullable LivingEntity en, Level world, B
 
         var opt = WorldUtils.ifMapData(world, pos);
 
+        boolean scaletoPlayer = false;
+
+        boolean ignoreEntityConfig = false;
+
         if (opt.isPresent()) {
 
             var data = opt.get();
@@ -82,11 +88,18 @@ public static LevelInfo determineLevel(@Nullable LivingEntity en, Level world, B
             } else {
                 System.out.print("A mob spawned in a dungeon world without a dungeon data nearby!");
             }
+        } else {
+            // if the player enters side content not connected to map, it wont have data, so it should force the level to scale to player
+            var dimid = MapManager.getResourceLocation((Level) world).toString();
+            if (dimid.equals(OBELISK_DIM) || dimid.equals(HARVEST_DIM)) {
+                scaletoPlayer = true;
+                ignoreEntityConfig = true;
+            }
         }
 
         DimensionConfig dimConfig = ExileDB.getDimensionConfig(world);
 
-        if (ServerContainer.get().SCALE_MOB_LEVEL_TO_NEAREST_PLAYER.get() && nearestPlayer != null) {
+        if ((scaletoPlayer || ServerContainer.get().SCALE_MOB_LEVEL_TO_NEAREST_PLAYER.get()) && nearestPlayer != null) {
             info.set(LevelInfo.LevelSource.NEAREST_PLAYER_CONFIG, Load.Unit(nearestPlayer).getLevel());
         } else {
             if (isInMinLevelArea(sw, pos, dimConfig)) {
@@ -109,8 +122,10 @@ public static LevelInfo determineLevel(@Nullable LivingEntity en, Level world, B
         info.capToRange(LevelInfo.LevelSource.MAX_LEVEL, new MinMax(1, GameBalanceConfig.get().MAX_LEVEL));
 
         if (en != null) {
-            var enconfig = ExileDB.getEntityConfig(en, Load.Unit(en));
-            info.capToRange(LevelInfo.LevelSource.ENTITY_CONFIG, new MinMax(enconfig.min_lvl, enconfig.max_lvl));
+            if (!ignoreEntityConfig) {
+                var enconfig = ExileDB.getEntityConfig(en, Load.Unit(en));
+                info.capToRange(LevelInfo.LevelSource.ENTITY_CONFIG, new MinMax(enconfig.min_lvl, enconfig.max_lvl));
+            }
         }
 
         return info;