Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-07-02 17:45:01 +02:00
Code Issues Projects Releases Wiki Activity

Revert "Implement 1.13 item support (#2153)"

Browse Source
This commit is contained in:
md678685 2018-09-09 16:35:20 +01:00
parent ff0ca9bc7b
commit cdba518bae
14 changed files with 269 additions and 19470 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Essentials/pom.xml
View File

@ -106,18 +106,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.ess3</groupId>
<artifactId>IdProvider</artifactId>
<version>2.15.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.ess3</groupId>
<artifactId>FlattenedProvider</artifactId>
<version>2.15.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<repositories>
<repository>

22
Essentials/src/com/earth2me/essentials/Essentials.java
View File

@ -34,13 +34,9 @@ import com.google.common.collect.Iterables;
import net.ess3.api.*;
import net.ess3.api.IEssentials;
import net.ess3.api.ISettings;
import net.ess3.nms.ItemDbProvider;
import net.ess3.nms.PotionMetaProvider;
import net.ess3.nms.SpawnEggProvider;
import net.ess3.nms.SpawnerProvider;
import net.ess3.nms.flattened.FlatItemDbProvider;
import net.ess3.nms.flattened.FlatSpawnEggProvider;
import net.ess3.nms.ids.LegacyItemDbProvider;
import net.ess3.nms.legacy.LegacyPotionMetaProvider;
import net.ess3.nms.refl.ReflSpawnEggProvider;
import net.ess3.nms.updatedmeta.BasePotionDataProvider;
@ -107,7 +103,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
private transient EssentialsTimer timer;
private final transient Set<String> vanishedPlayers = new LinkedHashSet<>();
private transient Method oldGetOnlinePlayers;
private transient ItemDbProvider itemDbProvider;
private transient SpawnerProvider spawnerProvider;
private transient SpawnEggProvider spawnEggProvider;
private transient PotionMetaProvider potionMetaProvider;
@ -216,13 +211,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
execTimer.mark("Init(Worth/ItemDB)");
jails = new Jails(this);
confList.add(jails);
execTimer.mark("Init(Jails)");
itemDbProvider = new ProviderFactory<>(getLogger(),
Arrays.asList(
FlatItemDbProvider.class,
LegacyItemDbProvider.class
), "item database").getProvider();
spawnerProvider = new ProviderFactory<>(getLogger(),
Arrays.asList(
BlockMetaSpawnerProvider.class,
@ -232,7 +220,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
), "mob spawner").getProvider();
spawnEggProvider = new ProviderFactory<>(getLogger(),
Arrays.asList(
FlatSpawnEggProvider.class,
ReflSpawnEggProvider.class,
LegacySpawnEggProvider.class
), "spawn egg").getProvider();
@ -241,10 +228,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
BasePotionDataProvider.class,
LegacyPotionMetaProvider.class
), "potion meta").getProvider();
itemDbProvider.setSpawnerProvider(spawnerProvider);
itemDbProvider.setSpawnEggProvider(spawnEggProvider);
itemDbProvider.setPotionMetaProvider(potionMetaProvider);
execTimer.mark("Init(Providers)");
reload();
} catch (YAMLException exception) {
if (pm.getPlugin("EssentialsUpdate") != null) {
@ -889,11 +872,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
return potionMetaProvider;
}
@Override
public ItemDbProvider getItemDbProvider() {
return itemDbProvider;
}
private static void addDefaultBackPermissionsToWorld(World w) {
String permName = "essentials.back.into." + w.getName();

287
Essentials/src/com/earth2me/essentials/ItemDb.java
View File

@ -1,14 +1,17 @@
package com.earth2me.essentials;
import com.earth2me.essentials.utils.NumberUtil;
import com.earth2me.essentials.utils.StringUtil;
import net.ess3.api.IEssentials;
import net.ess3.nms.ItemDbProvider;
import net.ess3.nms.ids.LegacyItemDbProvider;
import net.ess3.nms.refl.ReflUtil;
import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit;
import org.bukkit.Color;
import org.bukkit.FireworkEffect;
import org.bukkit.Material;
import org.bukkit.block.Banner;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.EntityType;
import org.bukkit.inventory.ItemFlag;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.*;
@ -17,6 +20,8 @@ import org.bukkit.potion.PotionEffect;
import java.util.*;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static com.earth2me.essentials.I18n.tl;
@ -24,40 +29,189 @@ import static com.earth2me.essentials.I18n.tl;
public class ItemDb implements IConf, net.ess3.api.IItemDb {
protected static final Logger LOGGER = Logger.getLogger("Essentials");
private final transient IEssentials ess;
private transient ItemDbProvider provider = null;
private transient ManagedFile file = null;
private final transient Map<String, Integer> items = new HashMap<>();
private final transient Map<ItemData, List<String>> names = new HashMap<>();
private final transient Map<ItemData, String> primaryName = new HashMap<>();
private final transient Map<Integer, ItemData> legacyIds = new HashMap<>();
private final transient Map<String, Short> durabilities = new HashMap<>();
private final transient Map<String, String> nbtData = new HashMap<>();
private final transient ManagedFile file;
private final transient Pattern splitPattern = Pattern.compile("((.*)[:+',;.](\\d+))");
private final transient Pattern csvSplitPattern = Pattern.compile("(\"([^\"]*)\"|[^,]*)(,|$)");
public ItemDb(final IEssentials ess) {
this.ess = ess;
file = new ManagedFile("items.csv", ess);
}
@Override
public void reloadConfig() {
if (provider == null) {
this.provider = ess.getItemDbProvider();
final List<String> lines = file.getLines();
if (lines.isEmpty()) {
return;
}
if (file == null) {
if (provider instanceof LegacyItemDbProvider) {
file = new ManagedFile("items.csv", ess);
} else {
file = new ManagedFile("items.json", ess);
durabilities.clear();
items.clear();
names.clear();
primaryName.clear();
for (String line : lines) {
if (line.length() > 0 && line.charAt(0) == '#') {
continue;
}
String itemName = null;
int numeric = -1;
short data = 0;
String nbt = null;
int col = 0;
Matcher matcher = csvSplitPattern.matcher(line);
while (matcher.find()) {
String match = matcher.group(1);
if (StringUtils.stripToNull(match) == null) {
continue;
}
match = StringUtils.strip(match.trim(), "\"");
switch (col) {
case 0:
itemName = match.toLowerCase(Locale.ENGLISH);
break;
case 1:
numeric = Integer.parseInt(match);
break;
case 2:
data = Short.parseShort(match);
break;
case 3:
nbt = StringUtils.stripToNull(match);
break;
default:
continue;
}
col++;
}
// Invalid row
if (itemName == null || numeric < 0) {
continue;
}
Material material = Material.matchMaterial(itemName);
if (material == null) {
LOGGER.warning(String.format("Failed to find material for %s", itemName));
continue;
}
durabilities.put(itemName, data);
items.put(itemName, numeric);
if (nbt != null) {
nbtData.put(itemName, nbt);
}
ItemData itemData = new ItemData(material, numeric, data);
if (names.containsKey(itemData)) {
List<String> nameList = names.get(itemData);
nameList.add(itemName);
} else {
List<String> nameList = new ArrayList<>();
nameList.add(itemName);
names.put(itemData, nameList);
primaryName.put(itemData, itemName);
}
legacyIds.put(numeric, itemData);
}
provider.rebuild(file.getLines());
LOGGER.info(String.format("Loaded %s items.", provider.listNames().size()));
for (List<String> nameList : names.values()) {
Collections.sort(nameList, LengthCompare.INSTANCE);
}
}
@Override
public ItemStack get(final String id, final int quantity) throws Exception {
return provider.getStack(id, quantity);
final ItemStack retval = get(id.toLowerCase(Locale.ENGLISH));
retval.setAmount(quantity);
return retval;
}
@Override
public ItemStack get(final String id) throws Exception {
return provider.getStack(id);
int itemid = 0;
String itemname;
short metaData = 0;
Matcher parts = splitPattern.matcher(id);
if (parts.matches()) {
itemname = parts.group(2);
metaData = Short.parseShort(parts.group(3));
} else {
itemname = id;
}
if (NumberUtil.isInt(itemname)) {
itemid = Integer.parseInt(itemname);
} else if (NumberUtil.isInt(id)) {
itemid = Integer.parseInt(id);
} else {
itemname = itemname.toLowerCase(Locale.ENGLISH);
}
if (itemid < 1) {
if (items.containsKey(itemname)) {
itemid = items.get(itemname);
if (durabilities.containsKey(itemname) && metaData == 0) {
metaData = durabilities.get(itemname);
}
}
}
if (itemid < 1) {
throw new Exception(tl("unknownItemName", itemname));
}
ItemData data = legacyIds.get(itemid);
if (data == null) {
throw new Exception(tl("unknownItemId", itemid));
}
Material mat = data.getMaterial();
ItemStack retval = new ItemStack(mat);
if (nbtData.containsKey(itemname)) {
String nbt = nbtData.get(itemname);
if (nbt.startsWith("*")) {
nbt = nbtData.get(nbt.substring(1));
}
retval = ess.getServer().getUnsafe().modifyItemStack(retval, nbt);
}
Material MOB_SPAWNER;
try {
MOB_SPAWNER = Material.SPAWNER;
} catch (Exception e) {
MOB_SPAWNER = Material.valueOf("MOB_SPAWNER");
}
if (mat == MOB_SPAWNER) {
if (metaData == 0) metaData = EntityType.PIG.getTypeId();
try {
retval = ess.getSpawnerProvider().setEntityType(retval, EntityType.fromId(metaData));
} catch (IllegalArgumentException e) {
throw new Exception("Can't spawn entity ID " + metaData + " from mob spawners.");
}
} else if (mat == Material.LEGACY_MONSTER_EGG) {
EntityType type;
try {
type = EntityType.fromId(metaData);
} catch (IllegalArgumentException e) {
throw new Exception("Can't spawn entity ID " + metaData + " from spawn eggs.");
}
retval = ess.getSpawnEggProvider().createEggItem(type);
} else if (mat.name().endsWith("POTION")
&& ReflUtil.getNmsVersionObject().isLowerThan(ReflUtil.V1_11_R1)) { // Only apply this to pre-1.11 as items.csv might only work in 1.11
retval = ess.getPotionMetaProvider().createPotionItem(mat, metaData);
} else {
retval.setDurability(metaData);
}
retval.setAmount(mat.getMaxStackSize());
return retval;
}
@Override
@ -95,7 +249,15 @@ public class ItemDb implements IConf, net.ess3.api.IItemDb {
@Override
public String names(ItemStack item) {
List<String> nameList = provider.getNames(item);
ItemData itemData = new ItemData(item.getType(), item.getDurability());
List<String> nameList = names.get(itemData);
if (nameList == null) {
itemData = new ItemData(item.getType(), (short) 0);
nameList = names.get(itemData);
if (nameList == null) {
return null;
}
}
if (nameList.size() > 15) {
nameList = nameList.subList(0, 14);
@ -105,7 +267,16 @@ public class ItemDb implements IConf, net.ess3.api.IItemDb {
@Override
public String name(ItemStack item) {
return provider.getPrimaryName(item);
ItemData itemData = new ItemData(item.getType(), item.getDurability());
String name = primaryName.get(itemData);
if (name == null) {
itemData = new ItemData(item.getType(), (short) 0);
name = primaryName.get(itemData);
if (name == null) {
return null;
}
}
return name;
}
@Override
@ -284,16 +455,90 @@ public class ItemDb implements IConf, net.ess3.api.IItemDb {
@Override
public Material getFromLegacyId(int id) {
return provider.getFromLegacyId(id);
ItemData data = this.legacyIds.get(id);
if(data == null) {
return null;
}
return data.getMaterial();
}
@Override
public int getLegacyId(Material material) throws Exception {
return provider.getLegacyId(material);
for(Map.Entry<String, Integer> entry : items.entrySet()) {
if(material.name().toLowerCase(Locale.ENGLISH).equalsIgnoreCase(entry.getKey())) {
return entry.getValue();
}
}
throw new Exception("Itemid not found for material: " + material.name());
}
@Override
public Collection<String> listNames() {
return provider.listNames();
return primaryName.values();
}
static class ItemData {
final private Material material;
private int legacyId;
final private short itemData;
ItemData(Material material, short itemData) {
this.material = material;
this.itemData = itemData;
}
@Deprecated
ItemData(Material material, final int legacyId, final short itemData) {
this.material = material;
this.legacyId = legacyId;
this.itemData = itemData;
}
public Material getMaterial() {
return material;
}
@Deprecated
public int getItemNo() {
return legacyId;
}
public short getItemData() {
return itemData;
}
@Override
public int hashCode() {
return (31 * material.hashCode()) ^ itemData;
}
@Override
public boolean equals(Object o) {
if (o == null) {
return false;
}
if (!(o instanceof ItemData)) {
return false;
}
ItemData pairo = (ItemData) o;
return this.material == pairo.getMaterial() && this.itemData == pairo.getItemData();
}
}
static class LengthCompare implements java.util.Comparator<String> {
private static final LengthCompare INSTANCE = new LengthCompare();
public LengthCompare() {
super();
}
@Override
public int compare(String s1, String s2) {
return s1.length() - s2.length();
}
}
}

18541
Essentials/src/items.json
View File

File diff suppressed because it is too large Load Diff

3
Essentials/src/net/ess3/api/IEssentials.java
View File

@ -1,6 +1,5 @@
package net.ess3.api;
import net.ess3.nms.ItemDbProvider;
import net.ess3.nms.PotionMetaProvider;
import net.ess3.nms.SpawnEggProvider;
@ -13,6 +12,4 @@ public interface IEssentials extends com.earth2me.essentials.IEssentials {
SpawnEggProvider getSpawnEggProvider();
PotionMetaProvider getPotionMetaProvider();
ItemDbProvider getItemDbProvider();
}

22
nms/FlattenedProvider/pom.xml
View File

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>EssentialsXParent</artifactId>
<groupId>net.ess3</groupId>
<version>2.15.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>FlattenedProvider</artifactId>
<dependencies>
<dependency>
<groupId>net.ess3</groupId>
<artifactId>NMSProvider</artifactId>
<version>2.15.0</version>
</dependency>
</dependencies>
</project>

209
nms/FlattenedProvider/src/net/ess3/nms/flattened/FlatItemDbProvider.java
View File

@ -1,209 +0,0 @@
package net.ess3.nms.flattened;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import net.ess3.nms.ItemDbProvider;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.inventory.meta.PotionMeta;
import org.bukkit.potion.PotionData;
import java.util.*;
import java.util.stream.Collectors;
public class FlatItemDbProvider extends ItemDbProvider {
private static Gson gson = new Gson();
private final transient Map<String, FlatItemData> primaryNames = new HashMap<>();
private final transient Map<String, List<String>> names = new HashMap<>();
@Override
public ItemData resolve(String name) {
return getByName(name);
}
@Override
public boolean supportsLegacyIds() {
return false;
}
@Override
public int getLegacyId(Material material) {
return -1;
}
@Override
public Material getFromLegacyId(int id) {
return null;
}
@Override
public String getPrimaryName(ItemStack item) {
ItemData itemData = new FlatItemData(null, item.getType(), getPotionData(item));
for (Map.Entry<String, FlatItemData> entry : primaryNames.entrySet()) {
if (entry.getValue().equals(itemData)) {
return entry.getKey();
}
}
return null;
}
private PotionData getPotionData(ItemStack item) {
ItemMeta meta = item.getItemMeta();
if (meta instanceof PotionMeta) {
return ((PotionMeta) meta).getBasePotionData();
}
return null;
}
@Override
public List<String> getNames(ItemStack item) {
String primaryName = getPrimaryName(item);
for (Map.Entry<String, List<String>> entry : names.entrySet()) {
if (entry.getKey().equals(primaryName)) {
return Collections.unmodifiableList(entry.getValue());
}
}
return null;
}
@Override
public ItemStack getStack(String name) throws Exception {
ItemData data = Objects.requireNonNull(getByName(name));
PotionData potionData = data.getPotionData();
Material material = data.getMaterial();
ItemStack stack = new ItemStack(material);
if (potionData != null) {
PotionMeta meta = (PotionMeta) stack.getItemMeta();
meta.setBasePotionData(potionData);
stack.setItemMeta(meta);
}
return stack;
}
@Override
public Collection<String> listNames() {
return Collections.unmodifiableSet(primaryNames.keySet());
}
private ItemData getByName(String name) {
if (primaryNames.containsKey(name.toLowerCase())) {
return primaryNames.get(name);
} else {
for (Map.Entry<String, List<String>> entry : names.entrySet()) {
if (entry.getValue().contains(name.toLowerCase())) {
return primaryNames.get(entry.getKey());
}
}
}
return null;
}
private void resetDb() {
primaryNames.clear();
names.clear();
}
@Override
public void addFrom(List<String> lines) {
String json = lines.stream()
.filter(line -> !line.startsWith("#"))
.collect(Collectors.joining("\n"));
JsonObject map = (new JsonParser()).parse(json).getAsJsonObject();
for (Map.Entry<String, JsonElement> entry : map.entrySet()) {
String key = entry.getKey();
JsonElement element = entry.getValue();
if (element.isJsonObject()) {
FlatItemData data = gson.fromJson(element, FlatItemData.class);
primaryNames.put(key, data);
} else {
try {
String target = element.getAsString();
addAlias(target, key);
} catch (Exception e) {
// TODO: log invalid entry
}
}
}
}
@Override
public void rebuild(List<String> lines) {
resetDb();
addFrom(lines);
}
private void addAlias(String primaryName, String alias) {
List<String> aliasList;
if (names.containsKey(primaryName)) {
aliasList = names.get(primaryName);
} else {
aliasList = new ArrayList<>();
names.put(primaryName, aliasList);
}
aliasList.add(alias);
}
@Override
public boolean tryProvider() {
// Build the database initially so that we can actually test the provider
this.rebuild(this.loadResource("/items.json"));
return super.tryProvider();
}
@Override
public String getHumanName() {
return "Post-1.13 item database provider";
}
public static class FlatItemData extends ItemData {
private FlatItemData(String itemName, Material material, PotionData potionData) {
this.itemName = itemName;
this.material = material;
this.potionData = potionData;
}
@Override
public int hashCode() {
return (31 * material.hashCode()) ^ potionData.hashCode();
}
@Override
public boolean equals(Object o) {
if (o == null) {
return false;
}
if (!(o instanceof ItemData)) {
return false;
}
ItemData pairo = (ItemData) o;
return this.material == pairo.getMaterial() && potionDataEquals(pairo);
}
private boolean potionDataEquals(ItemData o) {
if (this.potionData == null && o.getPotionData() == null) {
return true;
} else if (this.potionData != null && o.getPotionData() != null) {
return this.potionData.equals(o.getPotionData());
} else {
return false;
}
}
}
}

30
nms/FlattenedProvider/src/net/ess3/nms/flattened/FlatSpawnEggProvider.java
View File

@ -1,30 +0,0 @@
package net.ess3.nms.flattened;
import net.ess3.nms.SpawnEggProvider;
import org.bukkit.Material;
import org.bukkit.entity.EntityType;
import org.bukkit.inventory.ItemStack;
public class FlatSpawnEggProvider extends SpawnEggProvider {
@Override
public ItemStack createEggItem(EntityType type) throws IllegalArgumentException {
String name = type.name() + "_SPAWN_EGG";
Material material = Material.valueOf(name);
return new ItemStack(material);
}
@Override
public EntityType getSpawnedType(ItemStack eggItem) throws IllegalArgumentException {
String materialName = eggItem.getType().name();
if (materialName.contains("_SPAWN_EGG")) {
return EntityType.valueOf(materialName.replace("_SPAWN_EGG", ""));
} else {
throw new IllegalArgumentException("Not a spawn egg");
}
}
@Override
public String getHumanName() {
return "1.13+ flat spawn egg provider";
}
}

32
nms/IdProvider/pom.xml
View File

@ -1,32 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>EssentialsXParent</artifactId>
<groupId>net.ess3</groupId>
<version>2.15.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>IdProvider</artifactId>
<dependencies>
<dependency>
<groupId>net.ess3</groupId>
<artifactId>NMSProvider</artifactId>
<version>2.15.0</version>
</dependency>
<dependency>
<groupId>net.ess3</groupId>
<artifactId>ReflectionProvider</artifactId>
<version>2.15.0</version>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.12.2-R0.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

331
nms/IdProvider/src/net/ess3/nms/ids/LegacyItemDbProvider.java
View File

@ -1,331 +0,0 @@
package net.ess3.nms.ids;
import net.ess3.nms.ItemDbProvider;
import net.ess3.nms.refl.ReflUtil;
import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.EntityType;
import org.bukkit.inventory.ItemStack;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class LegacyItemDbProvider extends ItemDbProvider {
// Maps all item names to legacy IDs
private final transient Map<String, Integer> items = new HashMap<>();
// Maps item data to all known names for an item
private final transient Map<ItemData, List<String>> names = new HashMap<>();
// Maps item data to the primary name for an item
private final transient Map<ItemData, String> primaryNames = new HashMap<>();
// Maps legacy IDs to item data
private final transient Map<Integer, LegacyItemData> legacyIds = new HashMap<>();
// Maps names for an item to durability/meta values
private final transient Map<String, Short> durabilities = new HashMap<>();
// Maps names for an item to NBT data
private final transient Map<String, String> nbtData = new HashMap<>();
private final transient Pattern splitPattern = Pattern.compile("((.*)[:+',;.](\\d+))");
private final transient Pattern csvSplitPattern = Pattern.compile("(\"([^\"]*)\"|[^,]*)(,|$)");
@Override
public ItemData resolve(String name) {
// TODO: refactor getStack into here
return null;
}
@Override
public ItemStack getStack(String name) throws Exception {
int itemid = 0;
String itemname;
short metaData = 0;
// If the user provided id:metadata, split it
Matcher parts = splitPattern.matcher(name);
if (parts.matches()) {
itemname = parts.group(2);
metaData = Short.parseShort(parts.group(3));
} else {
itemname = name;
}
// Check whether the user provided an ID
if (isInt(itemname)) {
itemid = Integer.parseInt(itemname);
} else if (isInt(name)) {
itemid = Integer.parseInt(name);
} else {
itemname = itemname.toLowerCase(Locale.ENGLISH);
}
if (itemid < 1) {
if (items.containsKey(itemname)) {
itemid = items.get(itemname);
if (durabilities.containsKey(itemname) && metaData == 0) {
metaData = durabilities.get(itemname);
}
}
}
if (itemid < 1) {
throw new Exception("Unknown item name " + itemname);
}
ItemData data = legacyIds.get(itemid);
if (data == null) {
throw new Exception("Unknown item ID " + itemid);
}
Material mat = data.getMaterial();
ItemStack retval = new ItemStack(mat);
if (nbtData.containsKey(itemname)) {
String nbt = nbtData.get(itemname);
if (nbt.startsWith("*")) {
nbt = nbtData.get(nbt.substring(1));
}
retval = Bukkit.getServer().getUnsafe().modifyItemStack(retval, nbt);
}
Material MOB_SPAWNER;
try {
MOB_SPAWNER = Material.valueOf("SPAWNER");
} catch (Exception e) {
MOB_SPAWNER = Material.valueOf("MOB_SPAWNER");
}
if (mat == MOB_SPAWNER) {
if (metaData == 0) metaData = EntityType.PIG.getTypeId();
try {
retval = getSpawnerProvider().setEntityType(retval, EntityType.fromId(metaData));
} catch (IllegalArgumentException e) {
throw new Exception("Can't spawn entity ID " + metaData + " from mob spawners.");
}
} else if (mat == Material.MONSTER_EGG) {
EntityType type;
try {
type = EntityType.fromId(metaData);
} catch (IllegalArgumentException e) {
throw new Exception("Can't spawn entity ID " + metaData + " from spawn eggs.");
}
retval = getSpawnEggProvider().createEggItem(type);
} else if ((mat.name().endsWith("POTION") || mat.name().equals("TIPPED_ARROW"))
&& ReflUtil.getNmsVersionObject().isLowerThan(ReflUtil.V1_11_R1)) { // Only apply this to pre-1.11 as items.csv might only work in 1.11
retval = getPotionMetaProvider().createPotionItem(mat, metaData);
} else {
retval.setDurability(metaData);
}
retval.setAmount(mat.getMaxStackSize());
return retval;
}
@Override
public Collection<String> listNames() {
return primaryNames.values();
}
@Override
public boolean supportsLegacyIds() {
return true;
}
@Override
public int getLegacyId(Material material) throws Exception {
for (Map.Entry<String, Integer> entry : items.entrySet()) {
if (material.name().toLowerCase(Locale.ENGLISH).equalsIgnoreCase(entry.getKey())) {
return entry.getValue();
}
}
throw new Exception("Item ID missing for material " + material.name());
}
@Override
public Material getFromLegacyId(int id) {
ItemData data = this.legacyIds.get(id);
if (data == null) {
return null;
}
return data.getMaterial();
}
@Override
public String getPrimaryName(ItemStack item) {
ItemData itemData = new LegacyItemData(null, item.getType(), item.getTypeId(), item.getDurability(), null);
String name = primaryNames.get(itemData);
if (name == null) {
itemData = new LegacyItemData(null, item.getType(), item.getTypeId(), (short) 0, null);
name = primaryNames.get(itemData);
if (name == null) {
return null;
}
}
return name;
}
@Override
public List<String> getNames(ItemStack item) {
ItemData itemData = new LegacyItemData(null, item.getType(), item.getTypeId(), item.getDurability(), null);
List<String> nameList = names.get(itemData);
if (nameList == null) {
itemData = new LegacyItemData(null, item.getType(), item.getTypeId(), (short) 0, null);
nameList = names.get(itemData);
if (nameList == null) {
return null;
}
}
return nameList;
}
private void resetDb() {
durabilities.clear();
items.clear();
names.clear();
primaryNames.clear();
}
@Override
public void addFrom(List<String> lines) {
lines.stream()
.filter(line -> line.length() > 0 && !(line.charAt(0) == '#'))
.map(this::parseLine)
.filter(Objects::nonNull)
.forEach(this::addItem);
for (List<String> nameList : names.values()) {
nameList.sort(LengthCompare.INSTANCE);
}
}
@Override
public void rebuild(List<String> lines) {
resetDb();
addFrom(lines);
}
private LegacyItemData parseLine(String line) {
String itemName = null;
int numeric = -1;
short data = 0;
String nbt = null;
int col = 0;
Matcher matcher = csvSplitPattern.matcher(line);
while (matcher.find()) {
String match = matcher.group(1);
if (StringUtils.stripToNull(match) == null) {
continue;
}
match = StringUtils.strip(match.trim(), "\"");
switch (col) {
case 0:
itemName = match.toLowerCase(Locale.ENGLISH);
break;
case 1:
numeric = Integer.parseInt(match);
break;
case 2:
data = Short.parseShort(match);
break;
case 3:
nbt = StringUtils.stripToNull(match);
break;
default:
continue;
}
col++;
}
// Invalid row
if (itemName == null || numeric < 0) {
return null;
}
Material material = Material.matchMaterial(itemName);
if (material == null) {
return null;
}
return new LegacyItemData(itemName, material, numeric, data, nbt);
}
private void addItem(LegacyItemData itemData) {
final String name = itemData.getItemName();
final int numeric = itemData.getItemNo();
final short data = itemData.getItemData();
final String nbt = itemData.getNbt();
durabilities.put(name, data);
items.put(name, numeric);
if (nbt != null) {
nbtData.put(itemData.getItemName(), nbt);
}
if (names.containsKey(itemData)) {
List<String> nameList = names.get(itemData);
nameList.add(name);
} else {
List<String> nameList = new ArrayList<>();
nameList.add(name);
names.put(itemData, nameList);
primaryNames.put(itemData, name);
}
legacyIds.put(numeric, itemData);
}
@Override
public boolean tryProvider() {
// Build the database initially so that we can actually test the provider
this.rebuild(this.loadResource("/items.csv"));
return super.tryProvider();
}
@Override
public String getHumanName() {
return "Pre-1.13 item database provider";
}
private boolean isInt(String integer) {
try {
Integer.parseInt(integer);
return true;
} catch (NumberFormatException e) {
return false;
}
}
public static class LegacyItemData extends ItemData {
private LegacyItemData(String itemName, Material material, final int legacyId, final short itemData, String nbt) {
this.itemName = itemName;
this.material = material;
this.legacyId = legacyId;
this.itemData = itemData;
this.nbt = nbt;
}
@Override
public int hashCode() {
return (31 * legacyId) ^ itemData;
}
@Override
public boolean equals(Object o) {
if (o == null) {
return false;
}
if (!(o instanceof ItemData)) {
return false;
}
ItemData pairo = (ItemData) o;
return this.legacyId == pairo.getItemNo() && this.itemData == pairo.getItemData();
}
}
}

236
nms/NMSProvider/src/net/ess3/nms/ItemDbProvider.java
View File

@ -1,236 +0,0 @@
package net.ess3.nms;
import net.ess3.providers.Provider;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionData;
import org.bukkit.potion.PotionType;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
public abstract class ItemDbProvider implements Provider {
private SpawnerProvider spawnerProvider;
private SpawnEggProvider spawnEggProvider;
private PotionMetaProvider potionMetaProvider;
/**
* Populate the item database using the given lines of data.
*
* @param lines The lines of data from which the database should be populated
*/
public abstract void addFrom(List<String> lines);
/**
* Reset the database and rebuild it from the given lines of data.
*
* @param lines The lines of the file from which the database should be built
*/
public abstract void rebuild(List<String> lines);
/**
* Read a resource from the jar.
* Used to build the database before data from a ManagedFile is available.
*
* @param name The name of the resource to load.
* @return The lines of the resource.
*/
protected List<String> loadResource(final String name) {
try (InputStreamReader isr = new InputStreamReader(ItemDbProvider.class.getResourceAsStream(name))) {
BufferedReader br = new BufferedReader(isr);
return br.lines().collect(Collectors.toList());
} catch (IOException e) {
return null;
}
}
/**
* Resolves a material name to the corresponding ItemData.
*
* @param name The item name to look up
* @return The corresponding ItemData for the given name
*/
public abstract ItemData resolve(String name);
/**
* Whether the provider supports legacy ID values or not.
*
* @return True if the provider supports legacy IDs, otherwise false
*/
public abstract boolean supportsLegacyIds();
/**
* Get the legacy ID for the material.
*
* @param material The material to look up
* @return The ID corresponding to the material, or null if not supported
*/
public abstract int getLegacyId(Material material) throws Exception;
/**
* Get the material for the legacy ID.
*
* @param id The ID to look up
* @return The material corresponding to the ID, or -1 if not supported
*/
public abstract Material getFromLegacyId(int id);
/**
* Get the primary name for the item in the given stack.
*
* @param item The ItemStack to check
* @return The primary name for the item
*/
public abstract String getPrimaryName(ItemStack item);
/**
* Get all names for the item in the given stack.
*
* @param item The ItemStack to check
* @return The names for the item
*/
public abstract List<String> getNames(ItemStack item);
/**
* Creates a stack of a given item by its name.
*
* @param name The material name to look up
* @return An ItemStack of size 1 of the given item
*/
public abstract ItemStack getStack(String name) throws Exception;
/**
* Creates a stack with the given amount of a given item by its name.
*
* @param name The material name to look up
* @param amount The amount of items in the returned ItemStack
* @return An ItemStack with the given amount of the given item
*/
public ItemStack getStack(String name, int amount) throws Exception {
ItemStack is = getStack(name);
is.setAmount(amount);
return is;
}
/**
* Get all registered primary names for materials.
* This does not include any additional aliases.
*
* @return A collection of primary names
*/
public abstract Collection<String> listNames();
@Override
public boolean tryProvider() {
try {
getStack("cobblestone");
getStack("dstone");
getStack("steelbar", 5);
getStack("splbreathlevel2pot");
getStack("skeletonhorsespawnegg", 12);
return true;
} catch (Exception e) {
return false;
}
}
/**
* Get the current spawner provider.
*
* @return The current spawner provider
*/
protected SpawnerProvider getSpawnerProvider() {
return spawnerProvider;
}
/**
* Set the current spawner provider.
*/
public void setSpawnerProvider(SpawnerProvider spawnerProvider) {
this.spawnerProvider = spawnerProvider;
}
/**
* Get the current spawn egg provider.
*
* @return The current spawn egg provider
*/
protected SpawnEggProvider getSpawnEggProvider() {
return spawnEggProvider;
}
/**
* Set the current spawn egg provider.
*/
public void setSpawnEggProvider(SpawnEggProvider spawnEggProvider) {
this.spawnEggProvider = spawnEggProvider;
}
/**
* Get the current potion provider.
*
* @return The current potion provider
*/
protected PotionMetaProvider getPotionMetaProvider() {
return potionMetaProvider;
}
/**
* Set the current potion provider.
*/
public void setPotionMetaProvider(PotionMetaProvider potionMetaProvider) {
this.potionMetaProvider = potionMetaProvider;
}
public abstract static class ItemData {
protected String itemName;
protected Material material;
protected int legacyId;
protected short itemData;
protected String nbt;
protected PotionData potionData;
public String getItemName() {
return itemName;
}
public Material getMaterial() {
return material;
}
public int getItemNo() {
return legacyId;
}
public short getItemData() {
return itemData;
}
public String getNbt() {
return nbt;
}
public PotionData getPotionData() {
return this.potionData;
}
}
protected static class LengthCompare implements java.util.Comparator<String> {
public static final LengthCompare INSTANCE = new LengthCompare();
public LengthCompare() {
super();
}
@Override
public int compare(String s1, String s2) {
return s1.length() - s2.length();
}
}
}

5
nms/ReflectionProvider/pom.xml
View File

@ -18,10 +18,5 @@
<artifactId>NMSProvider</artifactId>
<version>2.15.0</version>
</dependency>
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.12.2-R0.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

5
nms/ReflectionProvider/src/net/ess3/nms/refl/SpawnEggRefl.java
View File

@ -79,7 +79,8 @@ public class SpawnEggRefl {
*/
@SuppressWarnings("deprecation")
public ItemStack toItemStack(int amount) throws Exception {
ItemStack item = new ItemStack(Material.MONSTER_EGG, amount);
// TODO: Get off of the deprecated LEGACY material.
ItemStack item = new ItemStack(Material.LEGACY_MONSTER_EGG, amount);
Class<?> craftItemStackClass = ReflUtil.getOBCClass("inventory.CraftItemStack");
Method asNMSCopyMethod = ReflUtil.getMethodCached(craftItemStackClass, "asNMSCopy", ItemStack.class);
@ -122,7 +123,7 @@ public class SpawnEggRefl {
public static SpawnEggRefl fromItemStack(ItemStack item) throws Exception {
if (item == null)
throw new IllegalArgumentException("Item cannot be null");
if (item.getType() != Material.MONSTER_EGG)
if (item.getType() != Material.LEGACY_MONSTER_EGG)
throw new IllegalArgumentException("Item is not a monster egg");
Class<?> NMSItemStackClass = ReflUtil.getNMSClass("ItemStack");

4
pom.xml
View File

@ -47,8 +47,6 @@
<module>nms/1_8_R2Provider</module>
<module>nms/LegacyProvider</module>
<module>nms/ReflectionProvider</module>
<module>nms/IdProvider</module>
<module>nms/FlattenedProvider</module>
</modules>
<dependencies>
@ -173,7 +171,6 @@
<include>messages*.properties</include>
<include>config.yml</include>
<include>items.csv</include>
<include>items.json</include>
</includes>
<excludes>
<exclude>plugin.yml</exclude>
@ -279,7 +276,6 @@
<include>*.yml</include>
<include>*.csv</include>
<include>*.txt</include>
<include>*.json</include>
</includes>
<filtering>true</filtering>
</resource>