EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-03 21:15:28 +02:00
Code Issues Projects Releases Wiki Activity

Setup Fishing XP Methods

Browse Source
This commit is contained in:
nossr50
2019-04-10 03:32:49 -07:00
parent e156d6d5ef
commit 2170c6de24
6 changed files with 86 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java
View File

@@ -160,11 +160,6 @@ public class ExperienceConfig extends ConfigValidated {
/*
* XP SETTINGS
*/
/* Archery */
if (getArcheryDistanceMultiplier() < 0) {
reason.add(EXPERIENCE + "." + ARCHERY + "." + DISTANCE + MULTIPLIER + " should be at least 0!");
}
/* Combat XP Multipliers */
if (getAnimalsXP() < 0) {
reason.add(EXPERIENCE + "." + COMBAT + "." + MULTIPLIER + "." + ANIMALS + " should be at least 0!");
@@ -379,11 +374,6 @@ public class ExperienceConfig extends ConfigValidated {
return BarStyle.SOLID;
}
/* Archery */
public double getArcheryDistanceMultiplier() {
return getDoubleValue(EXPERIENCE, ARCHERY, DISTANCE + MULTIPLIER);
}
public int getFishingShakeXP() {
return getIntValue(EXPERIENCE, FISHING, SHAKE);
}

12
src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperience.java
View File

@@ -143,4 +143,16 @@ public class ConfigExperience {
public boolean isPvpXPEnabled() {
return experienceCombat.isPvpXPEnabled();
}
public double getDistanceMultiplier() {
return experienceArchery.getDistanceMultiplier();
}
public HashMap<String, Integer> getFishingXPMap() {
return experienceFishing.getFishingXPMap();
}
public int getShakeXP() {
return experienceFishing.getShakeXP();
}
}

12
src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceArchery.java
View File

@@ -1,10 +1,22 @@
package com.gmail.nossr50.config.hocon.experience;
import ninja.leaping.configurate.objectmapping.Setting;
import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
@ConfigSerializable
public class ConfigExperienceArchery {
public static final double DISTANCE_MULTIPLIER_DEFAULT = 0.025D;
@Setting(value = "Distance-Multiplier", comment = "The distance multiplier is multiplied against the distance an " +
"arrow travels before hitting its target to determine final XP values awarded." +
"\nThe maximum distance bonus is 50, so expect this multiplier to peak at being multiplied against 50." +
"\nDistance is in blocks traveled." +
"\nThis value is added on to normal XP gains from damage for Archery." +
"\nDefault value: "+DISTANCE_MULTIPLIER_DEFAULT)
private double distanceMultiplier = DISTANCE_MULTIPLIER_DEFAULT;
public double getDistanceMultiplier() {
return distanceMultiplier;
}
}

28
src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceFishing.java
View File

@@ -1,8 +1,36 @@
package com.gmail.nossr50.config.hocon.experience;
import ninja.leaping.configurate.objectmapping.Setting;
import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
import org.bukkit.Material;
import java.util.HashMap;
@ConfigSerializable
public class ConfigExperienceFishing {
private final static HashMap<String, Integer> FISHING_DEFAULT_XP_MAP;
public static final int SHAKE_XP_DEFAULT = 50;
static {
FISHING_DEFAULT_XP_MAP = new HashMap<>();
FISHING_DEFAULT_XP_MAP.put(Material.COD.getKey().toString(), 100);
FISHING_DEFAULT_XP_MAP.put(Material.SALMON.getKey().toString(), 600);
FISHING_DEFAULT_XP_MAP.put(Material.TROPICAL_FISH.getKey().toString(), 10000);
FISHING_DEFAULT_XP_MAP.put(Material.PUFFERFISH.getKey().toString(), 2400);
}
@Setting(value = "Fishing-Experience-Values", comment = "Experience values for Fishing.")
HashMap<String, Integer> fishingXPMap = FISHING_DEFAULT_XP_MAP;
@Setting(value = "Shake", comment = "XP Granted when shaking a mob")
private int shakeXP = SHAKE_XP_DEFAULT;
public HashMap<String, Integer> getFishingXPMap() {
return fishingXPMap;
}
public int getShakeXP() {
return shakeXP;
}
}