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

Fixed material names. Show dye color instead of ink for all.

Browse Source
This commit is contained in:
Robin Kupper
2011-11-01 11:56:05 +01:00
parent feccb1539c
commit c3f64b1a33
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,11 +39,8 @@ public class BukkitUtils
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); materialNames = new HashMap<Integer, String>(256);
for (int i = 0; i < 256; i++) { for (final Material mat : Material.values())
final Material mat = Material.getMaterial(i); materialNames.put(mat.getId(), mat.toString().replace('_', ' ').toLowerCase());
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) {
@@ -135,7 +132,7 @@ public class BukkitUtils
} }
public static String materialName(int type, byte rawData) { public static String materialName(int type, byte rawData) {
if ((type == 6 || type == 17 || type == 18) && rawData > 0 || type == 35 || type == 43 || type == 44) { if ((type == 6 || type == 17 || type == 18) && rawData > 0 || type == 35 || type == 43 || type == 44 || type == 351) {
final MaterialData data = Material.getMaterial(type).getNewData(rawData); final MaterialData data = Material.getMaterial(type).getNewData(rawData);
if (data != null) if (data != null)
return data.toString().toLowerCase().replace('_', ' ').replaceAll("[^a-z ]", ""); return data.toString().toLowerCase().replace('_', ' ').replaceAll("[^a-z ]", "");