Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-27 11:07:44 +01:00
Code Issues Projects Releases Wiki Activity

more cleanup in the TreasureConfig.

Browse Source
This commit is contained in:
t00thpick1 2018-08-30 23:59:55 -04:00
parent 22833eea6c
commit 44ed35825f
1 changed files with 7 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ import com.gmail.nossr50.util.EnchantmentUtils;
import com.gmail.nossr50.util.StringUtils; import com.gmail.nossr50.util.StringUtils;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Tag;
import org.bukkit.TreeSpecies; import org.bukkit.TreeSpecies;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
@ -226,33 +227,6 @@ public class TreasureConfig extends ConfigLoader {
} }
item.setItemMeta(itemMeta); item.setItemMeta(itemMeta);
} }
// } else if (materialName.contains("INK_SAC")) {
// String color = materialName.substring(9);
//
// try {
// Dye dye = new Dye();
// dye.setColor(DyeColor.valueOf(color.toUpperCase().trim()));
//
// item = dye.toItemStack(amount);
//
// if (config.contains(type + "." + treasureName + ".Custom_Name")) {
// ItemMeta itemMeta = item.getItemMeta();
// itemMeta.setDisplayName(ChatColor.translateAlternateColorCodes('&', config.getString(type + "." + treasureName + ".Custom_Name")));
// item.setItemMeta(itemMeta);
// }
//
// if (config.contains(type + "." + treasureName + ".Lore")) {
// ItemMeta itemMeta = item.getItemMeta();
// List<String> lore = new ArrayList<String>();
// for (String s : config.getStringList(type + "." + treasureName + ".Lore")) {
// lore.add(ChatColor.translateAlternateColorCodes('&', s));
// }
// itemMeta.setLore(lore);
// item.setItemMeta(itemMeta);
// }
// } catch (IllegalArgumentException ex) {
// reason.add("Invalid Dye_Color: " + color);
// }
} else if (material != null) { } else if (material != null) {
item = new ItemStack(material, amount, data); item = new ItemStack(material, amount, data);
@ -298,11 +272,10 @@ public class TreasureConfig extends ConfigLoader {
for (String dropper : dropList) { for (String dropper : dropList) {
if (dropper.equals("Bushes")) { if (dropper.equals("Bushes")) {
AddHylianTreasure("Small_Fern", hylianTreasure); AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.FERN), hylianTreasure);
AddHylianTreasure("Small_Grass", hylianTreasure); AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.TALL_GRASS), hylianTreasure);
for (TreeSpecies species : TreeSpecies.values()) { for (Material species : Tag.SAPLINGS.getValues())
AddHylianTreasure(StringUtils.getPrettyTreeSpeciesString(species) + "_Sapling", hylianTreasure); AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(species), hylianTreasure);
}
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.DEAD_BUSH), hylianTreasure); AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.DEAD_BUSH), hylianTreasure);
continue; continue;
@ -320,28 +293,8 @@ public class TreasureConfig extends ConfigLoader {
continue; continue;
} }
if (dropper.equals("Pots")) { if (dropper.equals("Pots")) {
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.FLOWER_POT), hylianTreasure); for (Material species : Tag.FLOWER_POTS.getValues())
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POTTED_DANDELION), hylianTreasure); AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(species), hylianTreasure);
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POTTED_POPPY), hylianTreasure);
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POTTED_BLUE_ORCHID), hylianTreasure);
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POTTED_ALLIUM), hylianTreasure);
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POTTED_AZURE_BLUET), hylianTreasure);
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POTTED_RED_TULIP), hylianTreasure);
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POTTED_ORANGE_TULIP), hylianTreasure);
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POTTED_WHITE_TULIP), hylianTreasure);
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POTTED_PINK_TULIP), hylianTreasure);
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POTTED_OXEYE_DAISY), hylianTreasure);
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POTTED_OAK_SAPLING), hylianTreasure);
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POTTED_SPRUCE_SAPLING), hylianTreasure);
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POTTED_BIRCH_SAPLING), hylianTreasure);
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POTTED_JUNGLE_SAPLING), hylianTreasure);
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POTTED_OXEYE_DAISY), hylianTreasure);
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POTTED_OXEYE_DAISY), hylianTreasure);
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POTTED_FERN), hylianTreasure);
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POTTED_DEAD_BUSH), hylianTreasure);
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POTTED_RED_MUSHROOM), hylianTreasure);
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POTTED_BROWN_MUSHROOM), hylianTreasure);
AddHylianTreasure(StringUtils.getFriendlyConfigMaterialString(Material.POTTED_CACTUS), hylianTreasure);
continue; continue;
} }
AddHylianTreasure(dropper, hylianTreasure); AddHylianTreasure(dropper, hylianTreasure);