Move logic for config format into ConfigStringUtils

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

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);