feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Added config file to override block names

Browse Source
This commit is contained in:
Robin Kupper
2011-10-19 02:08:57 +02:00
parent 12c18c3784
commit 8733b1c41a
2 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/de/diddiz/LogBlock/Config.java
View File

@@ -20,6 +20,8 @@ import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.permissions.PermissionDefault; import org.bukkit.permissions.PermissionDefault;
import de.diddiz.util.BukkitUtils;
import de.diddiz.util.Utils;
public class Config public class Config
{ {
@@ -218,6 +220,16 @@ public class Config
if (wcfg.logEndermen) if (wcfg.logEndermen)
logEndermen = true; logEndermen = true;
} }
final File matFile = new File(logblock.getDataFolder(), "materials.yml");
final YamlConfiguration matCfg = YamlConfiguration.loadConfiguration(matFile);
matCfg.options().header("Add block names you want to be overridden or names for custom blocks");
final Map<Integer, String> materials = new HashMap<Integer, String>();
for (final String material : matCfg.getKeys(false))
if (Utils.isInt(material))
materials.put(Integer.valueOf(material), matCfg.getString(material));
if (materials.size() > 0)
BukkitUtils.overrideMaterialNames(materials);
matCfg.save(matFile);
} }
public static List<String> toStringList(List<?> list) { public static List<String> toStringList(List<?> list) {

32
src/de/diddiz/util/BukkitUtils.java
View File

@@ -4,7 +4,9 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map;
import java.util.Set; import java.util.Set;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Chunk; import org.bukkit.Chunk;
@@ -24,7 +26,8 @@ import org.bukkit.material.MaterialData;
public class BukkitUtils public class BukkitUtils
{ {
private final static Set<Set<Integer>> blockEquivalents; private static final Set<Set<Integer>> blockEquivalents;
private static final Map<Integer, String> materialNames;
static { static {
blockEquivalents = new HashSet<Set<Integer>>(7); blockEquivalents = new HashSet<Set<Integer>>(7);
@@ -35,6 +38,12 @@ public class BukkitUtils
blockEquivalents.add(new HashSet<Integer>(Arrays.asList(73, 74))); blockEquivalents.add(new HashSet<Integer>(Arrays.asList(73, 74)));
blockEquivalents.add(new HashSet<Integer>(Arrays.asList(75, 76))); blockEquivalents.add(new HashSet<Integer>(Arrays.asList(75, 76)));
blockEquivalents.add(new HashSet<Integer>(Arrays.asList(93, 94))); blockEquivalents.add(new HashSet<Integer>(Arrays.asList(93, 94)));
materialNames = new HashMap<Integer, String>(256);
for (int i = 0; i < 256; i++) {
final Material mat = Material.getMaterial(i);
if (mat != null)
materialNames.put(i, mat.toString().replace('_', ' ').toLowerCase());
}
} }
public static ItemStack[] compareInventories(ItemStack[] items1, ItemStack[] items2) { public static ItemStack[] compareInventories(ItemStack[] items1, ItemStack[] items2) {
@@ -122,21 +131,20 @@ public class BukkitUtils
} }
public static String materialName(int type) { public static String materialName(int type) {
final Material mat = Material.getMaterial(type); return materialNames.containsKey(type) ? materialNames.get(type) : String.valueOf(type);
return mat != null ? mat.toString().replace('_', ' ').toLowerCase() : String.valueOf(type);
} }
public static String materialName(int type, byte rawData) { public static String materialName(int type, byte rawData) {
final Material mat = Material.getMaterial(type); if ((type == 6 || type == 17 || type == 18) && rawData > 0 || type == 35 || type == 43 || type == 44) {
if (mat != null) { final MaterialData data = Material.getMaterial(type).getNewData(rawData);
if ((type == 6 || type == 17 || type == 18) && rawData > 0 || type == 35 || type == 43 || type == 44) { if (data != null)
final MaterialData data = mat.getNewData(rawData); return data.toString().toLowerCase().replace('_', ' ').replaceAll("[^a-z ]", "");
if (data != null)
return data.toString().toLowerCase().replace('_', ' ').replaceAll("[^a-z ]", "");
}
return mat.toString().replace('_', ' ').toLowerCase();
} }
return String.valueOf(type); return materialName(type);
}
public static void overrideMaterialNames(Map<Integer, String> materialNames) {
BukkitUtils.materialNames.putAll(materialNames);
} }
public static String senderName(CommandSender sender) { public static String senderName(CommandSender sender) {