From 22ef134c848b24284c2ac80277283a78b5230d96 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Tue, 30 Apr 2019 17:20:23 -0700 Subject: [PATCH 1/4] Update changelog --- Changelog.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Changelog.txt b/Changelog.txt index 9b352203b..583aeb5e4 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,3 +1,15 @@ +Version 2.1.51 + You can now customize a locale outside of the JAR! (Thanks mikroskeem) + Added a new locale reload command 'mmolocalereload' (Thanks mikroskeem) + Locales can now be overriden by placing a file with an appropriate name inside /plugins/mcMMO/locales/ (Thanks mikroskeem) + + NOTES + Locales only support ASCII and UTF16 characters at the moment, so you'll need to run special characters through a UTF16 converter (google it) to get them to work, I'll be fixing this in the future! + The locale name must match the internal file you are overriding (ie: locale_en_US.properties) + Locale will first check for a users locale file, if it doesn't exist it will use internal resources (files inside the JAR) + If a locale is found, it will use locale entries from that file, if any entries are missing, it will use entries from en_US inside the JAR + The locale file names are structured like this 'locale_XX_XX.properties', replace XX with your country codes, if you are not overriding en_US you will have to change the targetted locale inside config.yml + Version 2.1.50 Fixed a bug where early game XP boost (level 1-5) didn't function in certain circumstances Updated German locale (thanks OverCrave) From c1379f7ac623d4d99a6dc8a87b7db9ffcf32c26d Mon Sep 17 00:00:00 2001 From: nossr50 Date: Tue, 30 Apr 2019 17:26:14 -0700 Subject: [PATCH 2/4] 2.1.51 - mikroskeem patch --- Changelog.txt | 2 ++ pom.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog.txt b/Changelog.txt index 583aeb5e4..9ca9cf320 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -4,6 +4,8 @@ Version 2.1.51 Locales can now be overriden by placing a file with an appropriate name inside /plugins/mcMMO/locales/ (Thanks mikroskeem) NOTES + You can find the up to date current en_US locale entries here: https://github.com/mcMMO-Dev/mcMMO/blob/master/src/main/resources/locale/locale_en_US.properties + You do NOT have to replace the whole locale, you can replace only the strings you want to! Locales only support ASCII and UTF16 characters at the moment, so you'll need to run special characters through a UTF16 converter (google it) to get them to work, I'll be fixing this in the future! The locale name must match the internal file you are overriding (ie: locale_en_US.properties) Locale will first check for a users locale file, if it doesn't exist it will use internal resources (files inside the JAR) diff --git a/pom.xml b/pom.xml index b4f17d084..9be1cd258 100755 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.gmail.nossr50.mcMMO mcMMO - 2.1.51-SNAPSHOT + 2.1.51 mcMMO https://github.com/mcMMO-Dev/mcMMO From 0a7c852d893d563bef3af95a60fd969b38095a9f Mon Sep 17 00:00:00 2001 From: SNAKE0053 <6961187+snake0053@users.noreply.github.com> Date: Wed, 1 May 2019 16:57:58 +0900 Subject: [PATCH 3/4] Update locale_ja_JP.properties --- .../resources/locale/locale_ja_JP.properties | Bin 23820 -> 57911 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/locale/locale_ja_JP.properties b/src/main/resources/locale/locale_ja_JP.properties index aeb9a4c4131821997677643f2ab5c9d4a9e64d85..6d0d02acd49c913d05f197ac8bb94f90cb974c17 100644 GIT binary patch literal 57911 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 literal 23820 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 a99WI~S#l^CzRXVq5Hd!}cq4xeY5fO6ey6bj From f61917e8fe4b224aa67c6154c9ad2b008f0d52a1 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Fri, 3 May 2019 01:08:29 -0700 Subject: [PATCH 4/4] 2.1.52 --- Changelog.txt | 5 +++++ pom.xml | 2 +- .../config/experience/ExperienceConfig.java | 3 +++ .../gmail/nossr50/listeners/SelfListener.java | 20 +++++++++++-------- src/main/resources/experience.yml | 4 ++++ 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 9ca9cf320..04813f919 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,3 +1,8 @@ +Version 2.1.52 + Updated Japanese locale (thanks snake0053) + Added a toggle for the early game XP boost to experience.yml 'EarlyGameBoost.Enabled' + Added a max level multiplier for determining early game boosts cutoff to experience.yml 'EarlyGameBoost.MaxLevelMultiplier' + Version 2.1.51 You can now customize a locale outside of the JAR! (Thanks mikroskeem) Added a new locale reload command 'mmolocalereload' (Thanks mikroskeem) diff --git a/pom.xml b/pom.xml index 9be1cd258..8cc6521d2 100755 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.gmail.nossr50.mcMMO mcMMO - 2.1.51 + 2.1.52 mcMMO https://github.com/mcMMO-Dev/mcMMO diff --git a/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java b/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java index f0797ab62..a3e4b9f63 100644 --- a/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java +++ b/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java @@ -137,6 +137,9 @@ public class ExperienceConfig extends AutoUpdateConfigLoader { return noErrorsInConfig(reason); } + public boolean isEarlyGameBoostEnabled() { return config.getBoolean("EarlyGameBoost.Enabled", true); } + public double getEarlyGameBoostMultiplier() { return config.getDouble("EarlyGameBoost.MaxLevelMultiplier", 0.05D); } + /* * FORMULA SETTINGS */ diff --git a/src/main/java/com/gmail/nossr50/listeners/SelfListener.java b/src/main/java/com/gmail/nossr50/listeners/SelfListener.java index 79f45bde5..6c19dbc28 100644 --- a/src/main/java/com/gmail/nossr50/listeners/SelfListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/SelfListener.java @@ -95,17 +95,21 @@ public class SelfListener implements Listener { return; } - int earlyLevelBonusXPCap = mcMMO.isRetroModeEnabled() ? 50 : 5; - - int earlyGameBonusXP = 0; - - //Give some bonus XP for low levels - if(mcMMOPlayer.getSkillLevel(primarySkillType) < earlyLevelBonusXPCap) + if(ExperienceConfig.getInstance().isEarlyGameBoostEnabled()) { - earlyGameBonusXP += (mcMMOPlayer.getXpToLevel(primarySkillType) * 0.05); - event.setRawXpGained(event.getRawXpGained() + earlyGameBonusXP); + int earlyLevelBonusXPCap = (int) (ExperienceConfig.getInstance().getEarlyGameBoostMultiplier() * Config.getInstance().getLevelCap(event.getSkill())); + + int earlyGameBonusXP = 0; + + //Give some bonus XP for low levels + if(mcMMOPlayer.getSkillLevel(primarySkillType) < earlyLevelBonusXPCap) + { + earlyGameBonusXP += (mcMMOPlayer.getXpToLevel(primarySkillType) * 0.05); + event.setRawXpGained(event.getRawXpGained() + earlyGameBonusXP); + } } + int threshold = ExperienceConfig.getInstance().getDiminishedReturnsThreshold(primarySkillType); if (threshold <= 0 || !ExperienceConfig.getInstance().getDiminishedReturnsEnabled()) { diff --git a/src/main/resources/experience.yml b/src/main/resources/experience.yml index b78154041..ab546e708 100644 --- a/src/main/resources/experience.yml +++ b/src/main/resources/experience.yml @@ -22,6 +22,10 @@ # Splits the boss bar into 6 segments #SOLID # The bar is one solid piece +EarlyGameBoost: + Enabled: true + #Used to determine the cap of the max boot, with default level cap it will be 5 on standard, and 50 on retro + MaxLevelMultiplier: 0.05 ExploitFix: # Prevent many exploits related to fishing Fishing: true