Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2024-09-24 20:42:46 +02:00
Code Issues Projects Releases Wiki Activity

Fix issues with banners and display their color

Browse Source 
Also print more info when the code couldn't be generated.
This commit is contained in:
Phoenix616 2018-03-14 18:53:34 +01:00
parent 26ddb52434
commit 51495cdefb
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java
View File

@ -22,7 +22,9 @@ import org.json.simple.JSONObject;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -66,6 +68,17 @@ public class MaterialUtil {
return true; return true;
} }
// Special check for banners as they might include the deprecated base color
if (one.getType() == two.getType()
&& one.getType() == Material.BANNER
&& one.getDurability() == two.getDurability()) {
Map<String, Object> m1 = new HashMap<>(one.getItemMeta().serialize());
Map<String, Object> m2 = new HashMap<>(two.getItemMeta().serialize());
Object c1 = m1.remove("base-color");
Object c2 = m2.remove("base-color");
return (one.getData().equals(two.getData()) || c1.equals(c2)) && m1.equals(m2);
}
// Special check for books as their pages might change when serialising (See SPIGOT-3206) // Special check for books as their pages might change when serialising (See SPIGOT-3206)
return one.getType() == two.getType() return one.getType() == two.getType()
&& one.getDurability() == two.getDurability() && one.getDurability() == two.getDurability()
@ -203,7 +216,7 @@ public class MaterialUtil {
ItemStack codeItem = getItem(code); ItemStack codeItem = getItem(code);
if (!equals(itemStack, codeItem)) { if (!equals(itemStack, codeItem)) {
throw new IllegalArgumentException("Cannot generate code for item " + itemStack + " with maximum length of " + maxLength); throw new IllegalArgumentException("Cannot generate code for item " + itemStack + " with maximum length of " + maxLength + "(tried code " + code);
} }
return code; return code;
@ -275,6 +288,7 @@ public class MaterialUtil {
Material material = getMaterial(split[0]); Material material = getMaterial(split[0]);
short durability = getDurability(itemName); short durability = getDurability(itemName);
byte data = -1;
if (material == null) { if (material == null) {
if (!split[0].contains(" ")) { if (!split[0].contains(" ")) {
@ -286,7 +300,7 @@ public class MaterialUtil {
if (material != null) { if (material != null) {
if (durability == 0) { if (durability == 0) {
durability = DataValue.get(split[0].substring(0, index), material); durability = data = DataValue.get(split[0].substring(0, index), material);
} }
break; break;
@ -300,6 +314,9 @@ public class MaterialUtil {
itemStack = new ItemStack(material); itemStack = new ItemStack(material);
itemStack.setDurability(durability); itemStack.setDurability(durability);
if (data > -1) {
itemStack.getData().setData(data);
}
ItemMeta meta = getMetadata(itemName); ItemMeta meta = getMetadata(itemName);
@ -377,7 +394,7 @@ public class MaterialUtil {
return (byte) texturedMaterial.getTextures().indexOf(mat); return (byte) texturedMaterial.getTextures().indexOf(mat);
} }
} }
} else if (materialData instanceof Colorable) { } else if (materialData instanceof Colorable || material == Material.BANNER) { // Banners might not use the Banner MaterialData...
DyeColor color; DyeColor color;
try { try {
@ -386,7 +403,7 @@ public class MaterialUtil {
return 0; return 0;
} }
if (material == Material.INK_SACK) { if (material == Material.INK_SACK || material == Material.BANNER) {
return color.getDyeData(); return color.getDyeData();
} }
@ -429,6 +446,11 @@ public class MaterialUtil {
return null; return null;
} }
// Banner do not return the Banner MaterialData? Wat?!?
if (data.getItemType() == Material.BANNER && data.getData() < 16) {
return DyeColor.getByDyeData(data.getData()).name();
}
if (data instanceof TexturedMaterial) { if (data instanceof TexturedMaterial) {
return ((TexturedMaterial) data).getMaterial().name(); return ((TexturedMaterial) data).getMaterial().name();
} else if (data instanceof Colorable) { } else if (data instanceof Colorable) {