Upstream/MobArena
1
0
Fork 0
mirror of https://github.com/garbagemule/MobArena.git synced 2025-02-09 17:11:35 +01:00
Code Issues Projects Releases Wiki Activity

Use a hardcoded potion map to deal with potion metas. Fixes #312 #343

Browse Source 
Thanks slipcor!
This commit is contained in:
Andreas Troelsen 2017-02-18 02:43:12 +01:00
parent 48a85a7e85
commit 51f907218e
1 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/com/garbagemule/MobArena/util/ItemParser.java
View File

@ -1,6 +1,7 @@
package com.garbagemule.MobArena.util; package com.garbagemule.MobArena.util;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
@ -11,14 +12,34 @@ import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.EnchantmentStorageMeta; import org.bukkit.inventory.meta.EnchantmentStorageMeta;
import org.bukkit.inventory.meta.PotionMeta;
import org.bukkit.material.MaterialData; import org.bukkit.material.MaterialData;
import com.garbagemule.MobArena.MobArena; import com.garbagemule.MobArena.MobArena;
import org.bukkit.potion.PotionData;
import org.bukkit.potion.PotionType;
public class ItemParser public class ItemParser
{ {
private static final int WOOL_ID = Material.WOOL.getId(); private static final int WOOL_ID = Material.WOOL.getId();
private static final int DYE_ID = Material.INK_SACK.getId(); private static final int DYE_ID = Material.INK_SACK.getId();
private static final Map<Short, PotionType> POTION_TYPE_MAP = new HashMap<>();
static {
POTION_TYPE_MAP.put((short) 8193, PotionType.REGEN);
POTION_TYPE_MAP.put((short) 8194, PotionType.SPEED);
POTION_TYPE_MAP.put((short) 8195, PotionType.FIRE_RESISTANCE);
POTION_TYPE_MAP.put((short) 8196, PotionType.POISON);
POTION_TYPE_MAP.put((short) 8197, PotionType.INSTANT_HEAL);
POTION_TYPE_MAP.put((short) 8198, PotionType.NIGHT_VISION);
POTION_TYPE_MAP.put((short) 8200, PotionType.WEAKNESS);
POTION_TYPE_MAP.put((short) 8201, PotionType.STRENGTH);
POTION_TYPE_MAP.put((short) 8202, PotionType.SLOWNESS);
POTION_TYPE_MAP.put((short) 8203, PotionType.JUMP);
POTION_TYPE_MAP.put((short) 8204, PotionType.INSTANT_DAMAGE);
POTION_TYPE_MAP.put((short) 8205, PotionType.WATER_BREATHING);
POTION_TYPE_MAP.put((short) 8206, PotionType.INVISIBILITY);
}
public static String parseString(ItemStack... stacks) { public static String parseString(ItemStack... stacks) {
String result = ""; String result = "";
@ -177,9 +198,36 @@ public class ItemParser
int id = getTypeId(item); int id = getTypeId(item);
short d = getData(data, id); short d = getData(data, id);
int a = getAmount(amount); int a = getAmount(amount);
if (id == Material.LINGERING_POTION.getId() || id == Material.TIPPED_ARROW.getId() || id == Material.SPLASH_POTION.getId()) {
return withPotionMeta(id, d, a);
}
return new ItemStack(id,a,d); return new ItemStack(id,a,d);
} }
private static ItemStack withPotionMeta(int id, short d, int a) {
ItemStack result = new ItemStack(id, a);
PotionMeta meta = (PotionMeta) result.getItemMeta();
boolean extended = (d & 64) > 0;
boolean upgraded = (d & 32) > 0;
if (extended) {
d -= 64;
}
if (upgraded) {
d -= 32;
}
PotionType type = POTION_TYPE_MAP.get(d);
if (type != null) {
PotionData pData = new PotionData(type, extended, upgraded);
meta.setBasePotionData(pData);
result.setItemMeta(meta);
return result;
}
return null;
}
private static int getTypeId(String item) { private static int getTypeId(String item) {
if (item.matches("(-)?[0-9]*")) { if (item.matches("(-)?[0-9]*")) {
return Integer.parseInt(item); return Integer.parseInt(item);