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

Move logic for config format into ConfigStringUtils

Browse Source
This commit is contained in:
nossr50
2024-11-02 19:39:06 -07:00
parent ce18f3df97
commit 39b0e87b9a
14 changed files with 470 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/gmail/nossr50/config/GeneralConfig.java
View File

@@ -18,6 +18,9 @@ import java.util.List;
import java.util.Locale;
import java.util.Set;
import static com.gmail.nossr50.util.text.ConfigStringUtils.getConfigPartyFeatureString;
import static com.gmail.nossr50.util.text.ConfigStringUtils.getMaterialConfigString;
public class GeneralConfig extends BukkitConfig {
public GeneralConfig(@NotNull File dataFolder) {
@@ -122,7 +125,7 @@ public class GeneralConfig extends BukkitConfig {
for (PartyFeature partyFeature : PartyFeature.values()) {
if (getPartyFeatureUnlockLevel(partyFeature) < 0) {
reason.add("Party.Leveling." + StringUtils.getPrettyPartyFeatureString(partyFeature).replace(" ", "") + "_UnlockLevel should be at least 0!");
reason.add("Party.Leveling." + getConfigPartyFeatureString(partyFeature) + "_UnlockLevel should be at least 0!");
}
}
@@ -627,7 +630,7 @@ public class GeneralConfig extends BukkitConfig {
}
public int getPartyFeatureUnlockLevel(PartyFeature partyFeature) {
return config.getInt("Party.Leveling." + StringUtils.getPrettyPartyFeatureString(partyFeature).replace(" ", "") + "_UnlockLevel", 0);
return config.getInt("Party.Leveling." + getConfigPartyFeatureString(partyFeature) + "_UnlockLevel", 0);
}
/* Party Teleport Settings */
@@ -711,7 +714,7 @@ public class GeneralConfig extends BukkitConfig {
if (material.toString().equalsIgnoreCase("LILY_PAD"))
return false;
return config.getBoolean("Bonus_Drops." + StringUtils.getCapitalized(skill.toString()) + "." + StringUtils.getFormattedMaterialString(material).replace(" ", "_"));
return config.getBoolean("Bonus_Drops." + StringUtils.getCapitalized(skill.toString()) + "." + getMaterialConfigString(material).replace(" ", "_"));
}
public boolean getDoubleDropsDisabled(PrimarySkillType skill) {
@@ -892,7 +895,7 @@ public class GeneralConfig extends BukkitConfig {
/* Woodcutting */
public boolean getWoodcuttingDoubleDropsEnabled(BlockData blockData) {
return config.getBoolean("Bonus_Drops.Woodcutting."
+ StringUtils.getFormattedMaterialString(blockData.getMaterial()));
+ getMaterialConfigString(blockData.getMaterial()));
}
public boolean getTreeFellerSoundsEnabled() {

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

@@ -20,6 +20,8 @@ import java.util.List;
import java.util.Map;
import static com.gmail.nossr50.util.skills.SkillTools.isChildSkill;
import static com.gmail.nossr50.util.text.ConfigStringUtils.getConfigEntityTypeString;
import static com.gmail.nossr50.util.text.ConfigStringUtils.getMaterialConfigString;
public class ExperienceConfig extends BukkitConfig {
private static ExperienceConfig instance;
@@ -327,11 +329,11 @@ public class ExperienceConfig extends BukkitConfig {
}
public double getCombatXP(EntityType entity) {
return config.getDouble("Experience_Values.Combat.Multiplier." + StringUtils.getPrettyEntityTypeString(entity).replace(" ", "_"));
return config.getDouble("Experience_Values.Combat.Multiplier." + getConfigEntityTypeString(entity).replace(" ", "_"));
}
public double getAnimalsXP(EntityType entity) {
return config.getDouble("Experience_Values.Combat.Multiplier." + StringUtils.getPrettyEntityTypeString(entity).replace(" ", "_"), getAnimalsXP());
return config.getDouble("Experience_Values.Combat.Multiplier." + getConfigEntityTypeString(entity).replace(" ", "_"), getAnimalsXP());
}
public double getAnimalsXP() {
@@ -339,7 +341,7 @@ public class ExperienceConfig extends BukkitConfig {
}
public boolean hasCombatXP(EntityType entity) {
return config.contains("Experience_Values.Combat.Multiplier." + StringUtils.getPrettyEntityTypeString(entity).replace(" ", "_"));
return config.contains("Experience_Values.Combat.Multiplier." + getConfigEntityTypeString(entity).replace(" ", "_"));
}
/* Materials */
@@ -349,7 +351,7 @@ public class ExperienceConfig extends BukkitConfig {
return 0;
final String baseString = "Experience_Values." + StringUtils.getCapitalized(skill.toString()) + ".";
final String configPath = baseString + StringUtils.getFormattedMaterialString(material);
final String configPath = baseString + getMaterialConfigString(material);
return config.getInt(configPath, 0);
}
@@ -479,7 +481,7 @@ public class ExperienceConfig extends BukkitConfig {
/* Taming */
public int getTamingXP(EntityType type) {
return config.getInt("Experience_Values.Taming.Animal_Taming." + StringUtils.getPrettyEntityTypeString(type));
return config.getInt("Experience_Values.Taming.Animal_Taming." + getConfigEntityTypeString(type));
}
public boolean preventStoneLavaFarming() {

5
src/main/java/com/gmail/nossr50/config/party/ItemWeightConfig.java
View File

@@ -1,12 +1,13 @@
package com.gmail.nossr50.config.party;
import com.gmail.nossr50.config.BukkitConfig;
import com.gmail.nossr50.util.text.StringUtils;
import org.bukkit.Material;
import java.util.HashSet;
import java.util.Locale;
import static com.gmail.nossr50.util.text.ConfigStringUtils.getMaterialConfigString;
public class ItemWeightConfig extends BukkitConfig {
private static ItemWeightConfig instance;
@@ -23,7 +24,7 @@ public class ItemWeightConfig extends BukkitConfig {
}
public int getItemWeight(Material material) {
return config.getInt("Item_Weights." + StringUtils.getFormattedMaterialString(material).replace(" ", "_"), config.getInt("Item_Weights.Default"));
return config.getInt("Item_Weights." + getMaterialConfigString(material).replace(" ", "_"), config.getInt("Item_Weights.Default"));
}
public HashSet<Material> getMiscItems() {

31
src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java
View File

@@ -7,7 +7,6 @@ import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.BlockUtils;
import com.gmail.nossr50.util.LogUtils;
import com.gmail.nossr50.util.PotionUtil;
import com.gmail.nossr50.util.text.StringUtils;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.Tag;
@@ -22,6 +21,8 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import static com.gmail.nossr50.util.text.ConfigStringUtils.getMaterialConfigString;
public class TreasureConfig extends BukkitConfig {
public static final String FILENAME = "treasures.yml";
@@ -239,29 +240,29 @@ public class TreasureConfig extends BukkitConfig {
for (String dropper : dropList) {
if (dropper.equals("Bushes")) {
AddHylianTreasure(StringUtils.getFormattedMaterialString(Material.FERN), hylianTreasure);
AddHylianTreasure(StringUtils.getFormattedMaterialString(BlockUtils.getShortGrass()), hylianTreasure);
AddHylianTreasure(getMaterialConfigString(Material.FERN), hylianTreasure);
AddHylianTreasure(getMaterialConfigString(BlockUtils.getShortGrass()), hylianTreasure);
for (Material species : Tag.SAPLINGS.getValues())
AddHylianTreasure(StringUtils.getFormattedMaterialString(species), hylianTreasure);
AddHylianTreasure(getMaterialConfigString(species), hylianTreasure);
AddHylianTreasure(StringUtils.getFormattedMaterialString(Material.DEAD_BUSH), hylianTreasure);
AddHylianTreasure(getMaterialConfigString(Material.DEAD_BUSH), hylianTreasure);
continue;
}
if (dropper.equals("Flowers")) {
AddHylianTreasure(StringUtils.getFormattedMaterialString(Material.POPPY), hylianTreasure);
AddHylianTreasure(StringUtils.getFormattedMaterialString(Material.DANDELION), hylianTreasure);
AddHylianTreasure(StringUtils.getFormattedMaterialString(Material.BLUE_ORCHID), hylianTreasure);
AddHylianTreasure(StringUtils.getFormattedMaterialString(Material.ALLIUM), hylianTreasure);
AddHylianTreasure(StringUtils.getFormattedMaterialString(Material.AZURE_BLUET), hylianTreasure);
AddHylianTreasure(StringUtils.getFormattedMaterialString(Material.ORANGE_TULIP), hylianTreasure);
AddHylianTreasure(StringUtils.getFormattedMaterialString(Material.PINK_TULIP), hylianTreasure);
AddHylianTreasure(StringUtils.getFormattedMaterialString(Material.RED_TULIP), hylianTreasure);
AddHylianTreasure(StringUtils.getFormattedMaterialString(Material.WHITE_TULIP), hylianTreasure);
AddHylianTreasure(getMaterialConfigString(Material.POPPY), hylianTreasure);
AddHylianTreasure(getMaterialConfigString(Material.DANDELION), hylianTreasure);
AddHylianTreasure(getMaterialConfigString(Material.BLUE_ORCHID), hylianTreasure);
AddHylianTreasure(getMaterialConfigString(Material.ALLIUM), hylianTreasure);
AddHylianTreasure(getMaterialConfigString(Material.AZURE_BLUET), hylianTreasure);
AddHylianTreasure(getMaterialConfigString(Material.ORANGE_TULIP), hylianTreasure);
AddHylianTreasure(getMaterialConfigString(Material.PINK_TULIP), hylianTreasure);
AddHylianTreasure(getMaterialConfigString(Material.RED_TULIP), hylianTreasure);
AddHylianTreasure(getMaterialConfigString(Material.WHITE_TULIP), hylianTreasure);
continue;
}
if (dropper.equals("Pots")) {
for (Material species : Tag.FLOWER_POTS.getValues())
AddHylianTreasure(StringUtils.getFormattedMaterialString(species), hylianTreasure);
AddHylianTreasure(getMaterialConfigString(species), hylianTreasure);
continue;
}
AddHylianTreasure(dropper, hylianTreasure);