EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-19 23:41:27 +02:00
Code Issues Projects Releases Wiki Activity

2.1.131

Browse Source
This commit is contained in:
nossr50 2020-06-30 11:51:46 -07:00
parent 75f404f387
commit 254e1a1071
5 changed files with 8 additions and 9 deletions
Changelog.txtpom.xml
src/main
java/com/gmail/nossr50
config/skills/salvage
SalvageConfig.java
util/compat
CompatibilityManager.java
resources
config.yml

1
Changelog.txt

@ -33,7 +33,6 @@ Version 2.1.131
Added Netherite to Experience tables for Repair in experience.yml (see notes)
Added Piglin Brute to Experience tables for all combat skills in experience.yml
Netherite now requires 100 Salvage skill (by default configs) in order to salvage
Added the missing NMS wiring (it should be noted NMS isn't currently being used in mcMMO, but the framework is there. Working on a sideproject involving this...)

2
pom.xml

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.gmail.nossr50.mcMMO</groupId>
<artifactId>mcMMO</artifactId>
<version>2.1.131-SNAPSHOT</version>
<version>2.1.131</version>
<name>mcMMO</name>
<url>https://github.com/mcMMO-Dev/mcMMO</url>
<scm>

3
src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java

@ -39,6 +39,7 @@ public class SalvageConfig extends ConfigLoader {
Set<String> keys = section.getKeys(false);
//Original version of 1.16 support had maximum quantities that were bad, this fixes it
if(mcMMO.getUpgradeManager().shouldUpgrade(UpgradeType.FIX_NETHERITE_SALVAGE_QUANTITIES)) {
mcMMO.p.getLogger().info("Fixing incorrect Salvage quantities on Netherite gear, this will only run once...");
for(String namespacedkey : mcMMO.getMaterialMapStore().getNetheriteArmor()) {
@ -47,7 +48,7 @@ public class SalvageConfig extends ConfigLoader {
try {
config.save(getFile());
// mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.FIX_NETHERITE_SALVAGE_QUANTITIES);
mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.FIX_NETHERITE_SALVAGE_QUANTITIES);
mcMMO.p.getLogger().info("Fixed incorrect Salvage quantities for Netherite gear!");
} catch (IOException e) {
mcMMO.p.getLogger().info("Unable to fix Salvage config, please delete the salvage yml file to generate a new one.");

5
src/main/java/com/gmail/nossr50/util/compat/CompatibilityManager.java

@ -113,6 +113,11 @@ public class CompatibilityManager {
return NMSVersion.NMS_1_14_4;
case 15:
return NMSVersion.NMS_1_15_2;
case 16:
switch(minecraftGameVersion.getPatchVersion().asInt()) {
case 1:
return NMSVersion.NMS_1_16_1;
}
}
}

6
src/main/resources/config.yml

@ -336,10 +336,8 @@ Skills:
Enabled_For_PVP: true
Enabled_For_PVE: true
Level_Cap: 0
Ability_Activation_Level_Gate: 10
Excavation:
Level_Cap: 0
Ability_Activation_Level_Gate: 10
Fishing:
Level_Cap: 0
Drops_Enabled: true
@ -353,7 +351,6 @@ Skills:
Mining:
Level_Cap: 0
Detonator_Name: FLINT_AND_STEEL
Ability_Activation_Level_Gate: 10
Repair:
Level_Cap: 0
Anvil_Messages: true
@ -376,7 +373,6 @@ Skills:
Enabled_For_PVP: true
Enabled_For_PVE: true
Level_Cap: 0
Ability_Activation_Level_Gate: 10
Taming:
Enabled_For_PVP: true
Enabled_For_PVE: true
@ -409,7 +405,6 @@ Skills:
Enabled_For_PVP: true
Enabled_For_PVE: true
Level_Cap: 0
Ability_Activation_Level_Gate: 10
Block_Cracker:
SmoothBrick_To_CrackedBrick: true
# When using Unarmed, picked up items will automatically get moved to a free slot instead of going in the slot
@ -420,7 +415,6 @@ Skills:
Woodcutting:
Tree_Feller_Sounds: true
Level_Cap: 0
Ability_Activation_Level_Gate: 10
#
# Settings for Double Drops