mirror of
https://gitlab.com/phoenix-dvpmt/mmoitems.git
synced 2024-12-23 04:47:34 +01:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
6c3edb2b37
@ -158,6 +158,7 @@ public class ItemStats {
|
|||||||
REMOVE_ON_CRAFT = new BooleanStat("REMOVE_ON_CRAFT", Material.GLASS_BOTTLE, "Remove on Craft", new String[]{"If the item should be completely", "removed when used in a recipe,", "or if it should become an", "empty bottle or bucket."}, new String[]{"all"}, Material.POTION, Material.SPLASH_POTION, Material.LINGERING_POTION, Material.MILK_BUCKET, Material.LAVA_BUCKET, Material.WATER_BUCKET),
|
REMOVE_ON_CRAFT = new BooleanStat("REMOVE_ON_CRAFT", Material.GLASS_BOTTLE, "Remove on Craft", new String[]{"If the item should be completely", "removed when used in a recipe,", "or if it should become an", "empty bottle or bucket."}, new String[]{"all"}, Material.POTION, Material.SPLASH_POTION, Material.LINGERING_POTION, Material.MILK_BUCKET, Material.LAVA_BUCKET, Material.WATER_BUCKET),
|
||||||
COMPATIBLE_TYPES = new CompatibleTypes(),
|
COMPATIBLE_TYPES = new CompatibleTypes(),
|
||||||
COMPATIBLE_IDS = new CompatibleIds(),
|
COMPATIBLE_IDS = new CompatibleIds(),
|
||||||
|
COMPATIBLE_MATERIALS = new CompatibleMaterials(),
|
||||||
GEM_SOCKETS = new GemSockets(),
|
GEM_SOCKETS = new GemSockets(),
|
||||||
RANDOM_UNSOCKET = new RandomUnsocket(),
|
RANDOM_UNSOCKET = new RandomUnsocket(),
|
||||||
//todo CAN_UNSOCKET = new CanUnsocket(),
|
//todo CAN_UNSOCKET = new CanUnsocket(),
|
||||||
|
@ -5,12 +5,12 @@ import io.lumine.mythic.lib.api.item.NBTItem;
|
|||||||
import io.lumine.mythic.lib.version.VersionMaterial;
|
import io.lumine.mythic.lib.version.VersionMaterial;
|
||||||
import net.Indyuce.mmoitems.ItemStats;
|
import net.Indyuce.mmoitems.ItemStats;
|
||||||
import net.Indyuce.mmoitems.MMOItems;
|
import net.Indyuce.mmoitems.MMOItems;
|
||||||
import net.Indyuce.mmoitems.util.MMOUtils;
|
|
||||||
import net.Indyuce.mmoitems.api.Type;
|
import net.Indyuce.mmoitems.api.Type;
|
||||||
import net.Indyuce.mmoitems.api.item.mmoitem.VolatileMMOItem;
|
import net.Indyuce.mmoitems.api.item.mmoitem.VolatileMMOItem;
|
||||||
import net.Indyuce.mmoitems.api.util.message.Message;
|
import net.Indyuce.mmoitems.api.util.message.Message;
|
||||||
import net.Indyuce.mmoitems.stat.data.SkullTextureData;
|
import net.Indyuce.mmoitems.stat.data.SkullTextureData;
|
||||||
import net.Indyuce.mmoitems.stat.data.StringListData;
|
import net.Indyuce.mmoitems.stat.data.StringListData;
|
||||||
|
import net.Indyuce.mmoitems.util.MMOUtils;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.Sound;
|
import org.bukkit.Sound;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
@ -40,26 +40,13 @@ public class ItemSkin extends UseItem {
|
|||||||
return new ApplyResult(ResultType.NONE);
|
return new ApplyResult(ResultType.NONE);
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean compatible = false;
|
|
||||||
|
|
||||||
//SKIN//MMOItems.log("\u00a78SKIN \u00a7eCPT\u00a77 Applying onto " + MMOUtils.getDisplayName(target.getItem()));
|
//SKIN//MMOItems.log("\u00a78SKIN \u00a7eCPT\u00a77 Applying onto " + MMOUtils.getDisplayName(target.getItem()));
|
||||||
|
|
||||||
|
// Types compatibility check
|
||||||
if (getMMOItem().hasData(ItemStats.COMPATIBLE_TYPES)) {
|
if (getMMOItem().hasData(ItemStats.COMPATIBLE_TYPES)) {
|
||||||
//SKIN//MMOItems.log("\u00a78SKIN \u00a7eCPT\u00a77 Testing that TYPE is compatible: ");
|
//SKIN//MMOItems.log("\u00a78SKIN \u00a7eCPT\u00a77 Testing that TYPE is compatible: ");
|
||||||
|
final List<String> acceptedTypes = ((StringListData) getMMOItem().getData(ItemStats.COMPATIBLE_TYPES)).getList();
|
||||||
List<String> acceptedTypes = ((StringListData) getMMOItem().getData(ItemStats.COMPATIBLE_TYPES)).getList();
|
if (acceptedTypes.size() > 0 && acceptedTypes.stream().noneMatch(s -> s.equalsIgnoreCase(targetType.getId()))) {
|
||||||
|
|
||||||
for (String type : acceptedTypes) {
|
|
||||||
//SKIN//MMOItems.log("\u00a78SKIN \u00a7eCPT\u00a7e >\u00a7f " + type);
|
|
||||||
|
|
||||||
if (type.equalsIgnoreCase(targetType.getId())) {
|
|
||||||
//SKIN//MMOItems.log("\u00a78SKIN \u00a7eCPT\u00a7a Matched");
|
|
||||||
compatible = true; break; }
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!compatible && acceptedTypes.size() > 0) {
|
|
||||||
//SKIN//MMOItems.log("\u00a78SKIN \u00a7eCPT\u00a7c Incompatible");
|
|
||||||
|
|
||||||
player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1, 2);
|
player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1, 2);
|
||||||
Message.SKIN_INCOMPATIBLE.format(ChatColor.RED, "#item#", MMOUtils.getDisplayName(target.getItem()))
|
Message.SKIN_INCOMPATIBLE.format(ChatColor.RED, "#item#", MMOUtils.getDisplayName(target.getItem()))
|
||||||
.send(player);
|
.send(player);
|
||||||
@ -67,22 +54,28 @@ public class ItemSkin extends UseItem {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// IDs compatibility check
|
||||||
if (getMMOItem().hasData(ItemStats.COMPATIBLE_IDS)) {
|
if (getMMOItem().hasData(ItemStats.COMPATIBLE_IDS)) {
|
||||||
//SKIN//MMOItems.log("\u00a78SKIN \u00a7eCPT\u00a77 Testing that ID is compatible: ");
|
//SKIN//MMOItems.log("\u00a78SKIN \u00a7eCPT\u00a77 Testing that ID is compatible: ");
|
||||||
|
final List<String> acceptedIDs = ((StringListData) getMMOItem().getData(ItemStats.COMPATIBLE_IDS)).getList();
|
||||||
|
final String targetId = target.getString("MMOITEMS_ITEM_ID");
|
||||||
|
|
||||||
List<String> acceptedIDs = ((StringListData) getMMOItem().getData(ItemStats.COMPATIBLE_IDS)).getList();
|
if (acceptedIDs.size() > 0 && acceptedIDs.stream()
|
||||||
|
.noneMatch(s -> s.equalsIgnoreCase(targetId))) {
|
||||||
for (String id : acceptedIDs) {
|
player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1, 2);
|
||||||
//SKIN//MMOItems.log("\u00a78SKIN \u00a7eCPT\u00a76 >\u00a7f " + id);
|
Message.SKIN_INCOMPATIBLE.format(ChatColor.RED, "#item#", MMOUtils.getDisplayName(target.getItem()))
|
||||||
|
.send(player);
|
||||||
if (id.equalsIgnoreCase(target.getString("MMOITEMS_ITEM_ID"))) {
|
return new ApplyResult(ResultType.NONE);
|
||||||
//SKIN//MMOItems.log("\u00a78SKIN \u00a7eCPT\u00a7a Matched");
|
}
|
||||||
compatible = true;break; }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!compatible && acceptedIDs.size() > 0) {
|
// Material compatibility check
|
||||||
//SKIN//MMOItems.log("\u00a78SKIN \u00a7eCPT\u00a7c Incompatible");
|
if (getMMOItem().hasData(ItemStats.COMPATIBLE_MATERIALS)) {
|
||||||
|
//SKIN//MMOItems.log("\u00a78SKIN \u00a7eCPT\u00a77 Testing that MATERIAL is compatible: ");
|
||||||
|
List<String> acceptedMaterials = ((StringListData) getMMOItem().getData(ItemStats.COMPATIBLE_MATERIALS)).getList();
|
||||||
|
|
||||||
|
if (acceptedMaterials.size() > 0 && acceptedMaterials.stream()
|
||||||
|
.noneMatch(s -> s.equalsIgnoreCase(target.getItem().getType().name()))) {
|
||||||
player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1, 2);
|
player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1, 2);
|
||||||
Message.SKIN_INCOMPATIBLE.format(ChatColor.RED, "#item#", MMOUtils.getDisplayName(target.getItem()))
|
Message.SKIN_INCOMPATIBLE.format(ChatColor.RED, "#item#", MMOUtils.getDisplayName(target.getItem()))
|
||||||
.send(player);
|
.send(player);
|
||||||
@ -115,8 +108,6 @@ public class ItemSkin extends UseItem {
|
|||||||
* When applying a skin to an item, the skin item ID is saved
|
* When applying a skin to an item, the skin item ID is saved
|
||||||
* in the target item so that if deskined, it can be retrieved
|
* in the target item so that if deskined, it can be retrieved
|
||||||
* and given back to the player.
|
* and given back to the player.
|
||||||
*
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public static final String SKIN_ID_TAG = "MMOITEMS_SKIN_ID";
|
public static final String SKIN_ID_TAG = "MMOITEMS_SKIN_ID";
|
||||||
|
|
||||||
@ -154,7 +145,7 @@ public class ItemSkin extends UseItem {
|
|||||||
((Damageable) meta).setDamage(((Damageable) skinMeta).getDamage());
|
((Damageable) meta).setDamage(((Damageable) skinMeta).getDamage());
|
||||||
}
|
}
|
||||||
|
|
||||||
if(skinMeta instanceof LeatherArmorMeta && meta instanceof LeatherArmorMeta)
|
if (skinMeta instanceof LeatherArmorMeta && meta instanceof LeatherArmorMeta)
|
||||||
((LeatherArmorMeta) meta).setColor(((LeatherArmorMeta) skinMeta).getColor());
|
((LeatherArmorMeta) meta).setColor(((LeatherArmorMeta) skinMeta).getColor());
|
||||||
|
|
||||||
if (skinItemMMO.hasData(ItemStats.SKULL_TEXTURE) && item.getType() == VersionMaterial.PLAYER_HEAD.toMaterial()
|
if (skinItemMMO.hasData(ItemStats.SKULL_TEXTURE) && item.getType() == VersionMaterial.PLAYER_HEAD.toMaterial()
|
||||||
@ -179,30 +170,34 @@ public class ItemSkin extends UseItem {
|
|||||||
* Copies a skin from one item to another
|
* Copies a skin from one item to another
|
||||||
*
|
*
|
||||||
* @param target Target item that you are copying the skin onto
|
* @param target Target item that you are copying the skin onto
|
||||||
*
|
|
||||||
* @param originalItemNBT Item with a skin already, as NBT. Operation will fail
|
* @param originalItemNBT Item with a skin already, as NBT. Operation will fail
|
||||||
* if it doesnt have a skin.
|
* if it doesnt have a skin.
|
||||||
*
|
|
||||||
* @return Built ItemStack from the target NBT but with the skin data contained in the skin consumable
|
* @return Built ItemStack from the target NBT but with the skin data contained in the skin consumable
|
||||||
*
|
|
||||||
* @author Gunging
|
* @author Gunging
|
||||||
*/
|
*/
|
||||||
@Nullable public static ItemStack applySkin(@NotNull NBTItem target, @NotNull NBTItem originalItemNBT) {
|
@Nullable
|
||||||
|
public static ItemStack applySkin(@NotNull NBTItem target, @NotNull NBTItem originalItemNBT) {
|
||||||
|
|
||||||
// No skin no service
|
// No skin no service
|
||||||
if (!originalItemNBT.getBoolean(HAS_SKIN_TAG)) { return null; }
|
if (!originalItemNBT.getBoolean(HAS_SKIN_TAG)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
// Copy over data
|
// Copy over data
|
||||||
target.addTag(new ItemTag(HAS_SKIN_TAG, true));
|
target.addTag(new ItemTag(HAS_SKIN_TAG, true));
|
||||||
target.addTag(new ItemTag(SKIN_ID_TAG, originalItemNBT.getString("MMOITEMS_ITEM_ID")));
|
target.addTag(new ItemTag(SKIN_ID_TAG, originalItemNBT.getString("MMOITEMS_ITEM_ID")));
|
||||||
if (originalItemNBT.getInteger("CustomModelData") != 0) {
|
if (originalItemNBT.getInteger("CustomModelData") != 0) {
|
||||||
target.addTag(new ItemTag("CustomModelData", originalItemNBT.getInteger("CustomModelData"))); }
|
target.addTag(new ItemTag("CustomModelData", originalItemNBT.getInteger("CustomModelData")));
|
||||||
|
}
|
||||||
if (!originalItemNBT.getString("MMOITEMS_ITEM_PARTICLES").isEmpty()) {
|
if (!originalItemNBT.getString("MMOITEMS_ITEM_PARTICLES").isEmpty()) {
|
||||||
target.addTag(new ItemTag("MMOITEMS_ITEM_PARTICLES", originalItemNBT.getString("MMOITEMS_ITEM_PARTICLES"))); }
|
target.addTag(new ItemTag("MMOITEMS_ITEM_PARTICLES", originalItemNBT.getString("MMOITEMS_ITEM_PARTICLES")));
|
||||||
|
}
|
||||||
|
|
||||||
// ItemMeta values copy-over
|
// ItemMeta values copy-over
|
||||||
ItemStack item = target.toItem();
|
ItemStack item = target.toItem();
|
||||||
if (item.getType() != originalItemNBT.getItem().getType()) { item.setType(originalItemNBT.getItem().getType()); }
|
if (item.getType() != originalItemNBT.getItem().getType()) {
|
||||||
|
item.setType(originalItemNBT.getItem().getType());
|
||||||
|
}
|
||||||
|
|
||||||
ItemMeta meta = item.getItemMeta();
|
ItemMeta meta = item.getItemMeta();
|
||||||
ItemMeta originalMeta = originalItemNBT.getItem().getItemMeta();
|
ItemMeta originalMeta = originalItemNBT.getItem().getItemMeta();
|
||||||
@ -214,7 +209,7 @@ public class ItemSkin extends UseItem {
|
|||||||
((Damageable) meta).setDamage(((Damageable) originalMeta).getDamage());
|
((Damageable) meta).setDamage(((Damageable) originalMeta).getDamage());
|
||||||
}
|
}
|
||||||
|
|
||||||
if(originalMeta instanceof LeatherArmorMeta && meta instanceof LeatherArmorMeta)
|
if (originalMeta instanceof LeatherArmorMeta && meta instanceof LeatherArmorMeta)
|
||||||
((LeatherArmorMeta) meta).setColor(((LeatherArmorMeta) originalMeta).getColor());
|
((LeatherArmorMeta) meta).setColor(((LeatherArmorMeta) originalMeta).getColor());
|
||||||
|
|
||||||
VolatileMMOItem originalVolatile = new VolatileMMOItem(originalItemNBT);
|
VolatileMMOItem originalVolatile = new VolatileMMOItem(originalItemNBT);
|
||||||
|
@ -25,6 +25,6 @@ public class ArrowParticles extends BukkitRunnable {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
particleInfo.display(arrow.getLocation().add(0, .25, 0));
|
particleInfo.display(arrow.getLocation().add(0, 0, 0));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -31,4 +31,8 @@ public class MoneyCondition extends Condition {
|
|||||||
public void whenCrafting(PlayerData data) {
|
public void whenCrafting(PlayerData data) {
|
||||||
MMOItems.plugin.getVault().getEconomy().withdrawPlayer(data.getPlayer(), amount);
|
MMOItems.plugin.getVault().getEconomy().withdrawPlayer(data.getPlayer(), amount);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public double getAmount() {
|
||||||
|
return amount;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -16,6 +16,7 @@ import net.Indyuce.mmoitems.api.crafting.recipe.Recipe;
|
|||||||
import net.Indyuce.mmoitems.api.event.PlayerUseCraftingStationEvent;
|
import net.Indyuce.mmoitems.api.event.PlayerUseCraftingStationEvent;
|
||||||
import net.Indyuce.mmoitems.api.item.util.ConfigItems;
|
import net.Indyuce.mmoitems.api.item.util.ConfigItems;
|
||||||
import net.Indyuce.mmoitems.api.util.message.Message;
|
import net.Indyuce.mmoitems.api.util.message.Message;
|
||||||
|
import net.Indyuce.mmoitems.comp.eco.MoneyCondition;
|
||||||
import net.Indyuce.mmoitems.listener.CustomSoundListener;
|
import net.Indyuce.mmoitems.listener.CustomSoundListener;
|
||||||
import net.Indyuce.mmoitems.util.MMOUtils;
|
import net.Indyuce.mmoitems.util.MMOUtils;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
@ -221,6 +222,13 @@ public class CraftingStationView extends PluginInventory {
|
|||||||
// Give ingredients back
|
// Give ingredients back
|
||||||
for (Ingredient ingredient : recipeInfo.getRecipe().getIngredients())
|
for (Ingredient ingredient : recipeInfo.getRecipe().getIngredients())
|
||||||
new SmartGive(player).give(ingredient.generateItemStack(playerData.getRPG()));
|
new SmartGive(player).give(ingredient.generateItemStack(playerData.getRPG()));
|
||||||
|
|
||||||
|
// Give money back
|
||||||
|
recipe.getConditions()
|
||||||
|
.stream()
|
||||||
|
.filter(condition -> condition instanceof MoneyCondition)
|
||||||
|
.map(condition -> (MoneyCondition) condition)
|
||||||
|
.forEach(condition -> MMOItems.plugin.getVault().getEconomy().depositPlayer(player, condition.getAmount()));
|
||||||
}
|
}
|
||||||
|
|
||||||
updateData();
|
updateData();
|
||||||
|
@ -3,7 +3,10 @@ package net.Indyuce.mmoitems.stat;
|
|||||||
import com.google.gson.JsonArray;
|
import com.google.gson.JsonArray;
|
||||||
import com.google.gson.JsonParser;
|
import com.google.gson.JsonParser;
|
||||||
import com.google.gson.JsonSyntaxException;
|
import com.google.gson.JsonSyntaxException;
|
||||||
|
import io.lumine.mythic.lib.api.item.ItemTag;
|
||||||
import io.lumine.mythic.lib.api.item.SupportedNBTTagValues;
|
import io.lumine.mythic.lib.api.item.SupportedNBTTagValues;
|
||||||
|
import io.lumine.mythic.lib.api.util.AltChar;
|
||||||
|
import io.lumine.mythic.lib.version.VersionMaterial;
|
||||||
import net.Indyuce.mmoitems.ItemStats;
|
import net.Indyuce.mmoitems.ItemStats;
|
||||||
import net.Indyuce.mmoitems.MMOItems;
|
import net.Indyuce.mmoitems.MMOItems;
|
||||||
import net.Indyuce.mmoitems.api.edition.StatEdition;
|
import net.Indyuce.mmoitems.api.edition.StatEdition;
|
||||||
@ -11,12 +14,8 @@ import net.Indyuce.mmoitems.api.item.build.ItemStackBuilder;
|
|||||||
import net.Indyuce.mmoitems.api.item.mmoitem.ReadMMOItem;
|
import net.Indyuce.mmoitems.api.item.mmoitem.ReadMMOItem;
|
||||||
import net.Indyuce.mmoitems.gui.edition.EditionInventory;
|
import net.Indyuce.mmoitems.gui.edition.EditionInventory;
|
||||||
import net.Indyuce.mmoitems.stat.data.StringListData;
|
import net.Indyuce.mmoitems.stat.data.StringListData;
|
||||||
import net.Indyuce.mmoitems.stat.data.random.RandomStatData;
|
|
||||||
import net.Indyuce.mmoitems.stat.data.type.StatData;
|
import net.Indyuce.mmoitems.stat.data.type.StatData;
|
||||||
import net.Indyuce.mmoitems.stat.type.ItemStat;
|
import net.Indyuce.mmoitems.stat.type.ItemStat;
|
||||||
import io.lumine.mythic.lib.api.item.ItemTag;
|
|
||||||
import io.lumine.mythic.lib.api.util.AltChar;
|
|
||||||
import io.lumine.mythic.lib.version.VersionMaterial;
|
|
||||||
import org.apache.commons.lang.Validate;
|
import org.apache.commons.lang.Validate;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.event.inventory.InventoryAction;
|
import org.bukkit.event.inventory.InventoryAction;
|
||||||
@ -31,7 +30,7 @@ import java.util.Optional;
|
|||||||
public class CompatibleIds extends ItemStat<StringListData, StringListData> {
|
public class CompatibleIds extends ItemStat<StringListData, StringListData> {
|
||||||
public CompatibleIds() {
|
public CompatibleIds() {
|
||||||
super("COMPATIBLE_IDS", VersionMaterial.COMMAND_BLOCK.toMaterial(), "Compatible IDs",
|
super("COMPATIBLE_IDS", VersionMaterial.COMMAND_BLOCK.toMaterial(), "Compatible IDs",
|
||||||
new String[] { "The item ids this skin is", "compatible with." }, new String[] { "skin" });
|
new String[]{"The item ids this skin is", "compatible with."}, new String[]{"skin"});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -46,8 +45,8 @@ public class CompatibleIds extends ItemStat<StringListData, StringListData> {
|
|||||||
if (event.getAction() == InventoryAction.PICKUP_ALL)
|
if (event.getAction() == InventoryAction.PICKUP_ALL)
|
||||||
new StatEdition(inv, ItemStats.COMPATIBLE_IDS).enable("Write in the chat the item id you want to add.");
|
new StatEdition(inv, ItemStats.COMPATIBLE_IDS).enable("Write in the chat the item id you want to add.");
|
||||||
|
|
||||||
if (event.getAction() == InventoryAction.PICKUP_HALF) {
|
if (event.getAction() != InventoryAction.PICKUP_HALF || !inv.getEditedSection().contains("compatible-ids"))
|
||||||
if (inv.getEditedSection().contains("compatible-ids")) {
|
return;
|
||||||
List<String> lore = inv.getEditedSection().getStringList("compatible-ids");
|
List<String> lore = inv.getEditedSection().getStringList("compatible-ids");
|
||||||
if (lore.size() < 1)
|
if (lore.size() < 1)
|
||||||
return;
|
return;
|
||||||
@ -58,8 +57,6 @@ public class CompatibleIds extends ItemStat<StringListData, StringListData> {
|
|||||||
inv.registerTemplateEdition();
|
inv.registerTemplateEdition();
|
||||||
inv.getPlayer().sendMessage(MMOItems.plugin.getPrefix() + "Successfully removed '" + last + "'.");
|
inv.getPlayer().sendMessage(MMOItems.plugin.getPrefix() + "Successfully removed '" + last + "'.");
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void whenInput(@NotNull EditionInventory inv, @NotNull String message, Object... info) {
|
public void whenInput(@NotNull EditionInventory inv, @NotNull String message, Object... info) {
|
||||||
@ -73,11 +70,9 @@ public class CompatibleIds extends ItemStat<StringListData, StringListData> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void whenDisplayed(List<String> lore, Optional<StringListData> statData) {
|
public void whenDisplayed(List<String> lore, Optional<StringListData> statData) {
|
||||||
|
|
||||||
if (statData.isPresent()) {
|
if (statData.isPresent()) {
|
||||||
lore.add(ChatColor.GRAY + "Current Value:");
|
lore.add(ChatColor.GRAY + "Current Value:");
|
||||||
((StringListData) statData.get()).getList().forEach(str -> lore.add(ChatColor.GRAY + str));
|
statData.get().getList().forEach(str -> lore.add(ChatColor.GRAY + str));
|
||||||
|
|
||||||
} else
|
} else
|
||||||
lore.add(ChatColor.GRAY + "Current Value: " + ChatColor.RED + "Compatible with any item.");
|
lore.add(ChatColor.GRAY + "Current Value: " + ChatColor.RED + "Compatible with any item.");
|
||||||
|
|
||||||
@ -94,7 +89,6 @@ public class CompatibleIds extends ItemStat<StringListData, StringListData> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void whenApplied(@NotNull ItemStackBuilder item, @NotNull StringListData data) {
|
public void whenApplied(@NotNull ItemStackBuilder item, @NotNull StringListData data) {
|
||||||
|
|
||||||
// Copy Array, for lore
|
// Copy Array, for lore
|
||||||
List<String> compatibleIds = new ArrayList<>(data.getList());
|
List<String> compatibleIds = new ArrayList<>(data.getList());
|
||||||
item.getLore().insert("compatible-ids", compatibleIds);
|
item.getLore().insert("compatible-ids", compatibleIds);
|
||||||
@ -106,12 +100,13 @@ public class CompatibleIds extends ItemStat<StringListData, StringListData> {
|
|||||||
@NotNull
|
@NotNull
|
||||||
@Override
|
@Override
|
||||||
public ArrayList<ItemTag> getAppliedNBT(@NotNull StringListData data) {
|
public ArrayList<ItemTag> getAppliedNBT(@NotNull StringListData data) {
|
||||||
|
|
||||||
// Build Json Array
|
// Build Json Array
|
||||||
JsonArray array = new JsonArray();
|
JsonArray array = new JsonArray();
|
||||||
|
|
||||||
// For each string in the ids of the data
|
// For each string in the ids of the data
|
||||||
for (String sts : data.getList()) { array.add(sts); }
|
for (String sts : data.getList()) {
|
||||||
|
array.add(sts);
|
||||||
|
}
|
||||||
|
|
||||||
// Make returning array
|
// Make returning array
|
||||||
ArrayList<ItemTag> tags = new ArrayList<>();
|
ArrayList<ItemTag> tags = new ArrayList<>();
|
||||||
@ -124,7 +119,6 @@ public class CompatibleIds extends ItemStat<StringListData, StringListData> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void whenLoaded(@NotNull ReadMMOItem mmoitem) {
|
public void whenLoaded(@NotNull ReadMMOItem mmoitem) {
|
||||||
|
|
||||||
// FInd relvant tags
|
// FInd relvant tags
|
||||||
ArrayList<ItemTag> relevantTags = new ArrayList<>();
|
ArrayList<ItemTag> relevantTags = new ArrayList<>();
|
||||||
if (mmoitem.getNBT().hasTag(getNBTPath()))
|
if (mmoitem.getNBT().hasTag(getNBTPath()))
|
||||||
@ -133,34 +127,31 @@ public class CompatibleIds extends ItemStat<StringListData, StringListData> {
|
|||||||
// Generate data
|
// Generate data
|
||||||
StatData data = getLoadedNBT(relevantTags);
|
StatData data = getLoadedNBT(relevantTags);
|
||||||
|
|
||||||
if (data != null) { mmoitem.setData(this, data);}
|
if (data != null)
|
||||||
|
mmoitem.setData(this, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
@Override
|
@Override
|
||||||
public StringListData getLoadedNBT(@NotNull ArrayList<ItemTag> storedTags) {
|
public StringListData getLoadedNBT(@NotNull ArrayList<ItemTag> storedTags) {
|
||||||
|
|
||||||
// Find relevant tag
|
// Find relevant tag
|
||||||
ItemTag rTag = ItemTag.getTagAtPath(getNBTPath(), storedTags);
|
ItemTag rTag = ItemTag.getTagAtPath(getNBTPath(), storedTags);
|
||||||
|
|
||||||
// Found?
|
// Found?
|
||||||
if (rTag != null) {
|
if (rTag == null)
|
||||||
|
// Nope
|
||||||
|
return null;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Parse onto Json Array
|
// Parse onto Json Array
|
||||||
JsonArray array = new JsonParser().parse((String) rTag.getValue()).getAsJsonArray();
|
JsonArray array = new JsonParser().parse((String) rTag.getValue()).getAsJsonArray();
|
||||||
|
|
||||||
// Make and return list
|
// Make and return list
|
||||||
return new StringListData(array);
|
return new StringListData(array);
|
||||||
|
} catch (JsonSyntaxException | IllegalStateException exception) {
|
||||||
} catch (JsonSyntaxException |IllegalStateException exception) {
|
|
||||||
/*
|
/*
|
||||||
* OLD ITEM WHICH MUST BE UPDATED.
|
* OLD ITEM WHICH MUST BE UPDATED.
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// Nope
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,169 @@
|
|||||||
|
package net.Indyuce.mmoitems.stat;
|
||||||
|
|
||||||
|
import com.google.gson.JsonArray;
|
||||||
|
import com.google.gson.JsonParser;
|
||||||
|
import com.google.gson.JsonSyntaxException;
|
||||||
|
import io.lumine.mythic.lib.api.item.ItemTag;
|
||||||
|
import io.lumine.mythic.lib.api.item.SupportedNBTTagValues;
|
||||||
|
import io.lumine.mythic.lib.api.util.AltChar;
|
||||||
|
import io.lumine.mythic.lib.version.VersionMaterial;
|
||||||
|
import net.Indyuce.mmoitems.ItemStats;
|
||||||
|
import net.Indyuce.mmoitems.MMOItems;
|
||||||
|
import net.Indyuce.mmoitems.api.edition.StatEdition;
|
||||||
|
import net.Indyuce.mmoitems.api.item.build.ItemStackBuilder;
|
||||||
|
import net.Indyuce.mmoitems.api.item.mmoitem.ReadMMOItem;
|
||||||
|
import net.Indyuce.mmoitems.gui.edition.EditionInventory;
|
||||||
|
import net.Indyuce.mmoitems.stat.data.StringListData;
|
||||||
|
import net.Indyuce.mmoitems.stat.data.type.StatData;
|
||||||
|
import net.Indyuce.mmoitems.stat.type.ItemStat;
|
||||||
|
import org.apache.commons.lang.Validate;
|
||||||
|
import org.bukkit.ChatColor;
|
||||||
|
import org.bukkit.Material;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.event.inventory.InventoryAction;
|
||||||
|
import org.bukkit.event.inventory.InventoryClickEvent;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
public class CompatibleMaterials extends ItemStat<StringListData, StringListData> {
|
||||||
|
|
||||||
|
public CompatibleMaterials() {
|
||||||
|
super("COMPATIBLE_MATERIALS", VersionMaterial.COMMAND_BLOCK.toMaterial(), "Compatible Materials",
|
||||||
|
new String[]{"The item materials this skin is", "compatible with."}, new String[]{"skin"});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
public StringListData whenInitialized(Object object) {
|
||||||
|
Validate.isTrue(object instanceof List<?>, "Must specify a string list");
|
||||||
|
return new StringListData((List<String>) object);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void whenClicked(@NotNull EditionInventory inv, @NotNull InventoryClickEvent event) {
|
||||||
|
if (event.getAction() == InventoryAction.PICKUP_ALL)
|
||||||
|
new StatEdition(inv, ItemStats.COMPATIBLE_MATERIALS).enable("Write in the chat the name of the material you want to add.");
|
||||||
|
|
||||||
|
if (event.getAction() != InventoryAction.PICKUP_HALF || !inv.getEditedSection().contains("compatible-materials"))
|
||||||
|
return;
|
||||||
|
List<String> lore = inv.getEditedSection().getStringList("compatible-materials");
|
||||||
|
if (lore.size() < 1)
|
||||||
|
return;
|
||||||
|
|
||||||
|
String last = lore.get(lore.size() - 1);
|
||||||
|
lore.remove(last);
|
||||||
|
inv.getEditedSection().set("compatible-materials", lore);
|
||||||
|
inv.registerTemplateEdition();
|
||||||
|
inv.getPlayer().sendMessage(MMOItems.plugin.getPrefix() + "Successfully removed '" + last + "'.");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void whenInput(@NotNull EditionInventory inv, @NotNull String message, Object... info) {
|
||||||
|
final Player player = inv.getPlayer();
|
||||||
|
// Check if material exists
|
||||||
|
if (Arrays.stream(Material.values()).noneMatch(versionMaterial -> versionMaterial.name().equalsIgnoreCase(message))) {
|
||||||
|
player.sendMessage(MMOItems.plugin.getPrefix() + "Invalid material name.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
List<String> lore = inv.getEditedSection().contains("compatible-materials") ? inv.getEditedSection().getStringList("compatible-materials")
|
||||||
|
: new ArrayList<>();
|
||||||
|
lore.add(message.toUpperCase());
|
||||||
|
inv.getEditedSection().set("compatible-materials", lore);
|
||||||
|
inv.registerTemplateEdition();
|
||||||
|
player.sendMessage(MMOItems.plugin.getPrefix() + "Compatible Materials successfully added.");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void whenDisplayed(List<String> lore, Optional<StringListData> statData) {
|
||||||
|
if (statData.isPresent()) {
|
||||||
|
lore.add(ChatColor.GRAY + "Current Value:");
|
||||||
|
statData.get().getList().forEach(str -> lore.add(ChatColor.GRAY + str));
|
||||||
|
} else
|
||||||
|
lore.add(ChatColor.GRAY + "Current Value: " + ChatColor.RED + "Compatible with any material.");
|
||||||
|
|
||||||
|
lore.add("");
|
||||||
|
lore.add(ChatColor.YELLOW + AltChar.listDash + " Click to add a new material.");
|
||||||
|
lore.add(ChatColor.YELLOW + AltChar.listDash + " Right click to remove the last material.");
|
||||||
|
}
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
@Override
|
||||||
|
public StringListData getClearStatData() {
|
||||||
|
return new StringListData();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void whenApplied(@NotNull ItemStackBuilder item, @NotNull StringListData data) {
|
||||||
|
// Copy Array, for lore
|
||||||
|
List<String> compatibleMaterials = new ArrayList<>(data.getList());
|
||||||
|
item.getLore().insert("compatible-materials", compatibleMaterials);
|
||||||
|
|
||||||
|
// Add data
|
||||||
|
item.addItemTag(getAppliedNBT(data));
|
||||||
|
}
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
@Override
|
||||||
|
public ArrayList<ItemTag> getAppliedNBT(@NotNull StringListData data) {
|
||||||
|
// Build Json Array
|
||||||
|
JsonArray array = new JsonArray();
|
||||||
|
|
||||||
|
// For each string in the ids of the data
|
||||||
|
for (String sts : data.getList()) {
|
||||||
|
array.add(sts);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Make returning array
|
||||||
|
ArrayList<ItemTag> tags = new ArrayList<>();
|
||||||
|
|
||||||
|
// Add Json Array
|
||||||
|
tags.add(new ItemTag(getNBTPath(), array.toString()));
|
||||||
|
|
||||||
|
return tags;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void whenLoaded(@NotNull ReadMMOItem mmoitem) {
|
||||||
|
// FInd relevant tags
|
||||||
|
ArrayList<ItemTag> relevantTags = new ArrayList<>();
|
||||||
|
if (mmoitem.getNBT().hasTag(getNBTPath()))
|
||||||
|
relevantTags.add(ItemTag.getTagAtPath(getNBTPath(), mmoitem.getNBT(), SupportedNBTTagValues.STRING));
|
||||||
|
|
||||||
|
// Generate data
|
||||||
|
StatData data = getLoadedNBT(relevantTags);
|
||||||
|
|
||||||
|
if (data != null)
|
||||||
|
mmoitem.setData(this, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public StringListData getLoadedNBT(@NotNull ArrayList<ItemTag> storedTags) {
|
||||||
|
// Find relevant tag
|
||||||
|
ItemTag rTag = ItemTag.getTagAtPath(getNBTPath(), storedTags);
|
||||||
|
|
||||||
|
// Found?
|
||||||
|
if (rTag == null)
|
||||||
|
// Nope
|
||||||
|
return null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
// Parse onto Json Array
|
||||||
|
JsonArray array = new JsonParser().parse((String) rTag.getValue()).getAsJsonArray();
|
||||||
|
|
||||||
|
// Make and return list
|
||||||
|
return new StringListData(array);
|
||||||
|
} catch (JsonSyntaxException | IllegalStateException exception) {
|
||||||
|
/*
|
||||||
|
* OLD ITEM WHICH MUST BE UPDATED.
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
@ -1,19 +1,12 @@
|
|||||||
package net.Indyuce.mmoitems.stat;
|
package net.Indyuce.mmoitems.stat;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
import com.google.gson.JsonSyntaxException;
|
|
||||||
import io.lumine.mythic.lib.api.item.SupportedNBTTagValues;
|
|
||||||
import org.apache.commons.lang.Validate;
|
|
||||||
import org.bukkit.ChatColor;
|
|
||||||
import org.bukkit.event.inventory.InventoryAction;
|
|
||||||
import org.bukkit.event.inventory.InventoryClickEvent;
|
|
||||||
|
|
||||||
import com.google.gson.JsonArray;
|
import com.google.gson.JsonArray;
|
||||||
import com.google.gson.JsonParser;
|
import com.google.gson.JsonParser;
|
||||||
|
import com.google.gson.JsonSyntaxException;
|
||||||
|
import io.lumine.mythic.lib.api.item.ItemTag;
|
||||||
|
import io.lumine.mythic.lib.api.item.SupportedNBTTagValues;
|
||||||
|
import io.lumine.mythic.lib.api.util.AltChar;
|
||||||
|
import io.lumine.mythic.lib.version.VersionMaterial;
|
||||||
import net.Indyuce.mmoitems.ItemStats;
|
import net.Indyuce.mmoitems.ItemStats;
|
||||||
import net.Indyuce.mmoitems.MMOItems;
|
import net.Indyuce.mmoitems.MMOItems;
|
||||||
import net.Indyuce.mmoitems.api.edition.StatEdition;
|
import net.Indyuce.mmoitems.api.edition.StatEdition;
|
||||||
@ -21,19 +14,23 @@ import net.Indyuce.mmoitems.api.item.build.ItemStackBuilder;
|
|||||||
import net.Indyuce.mmoitems.api.item.mmoitem.ReadMMOItem;
|
import net.Indyuce.mmoitems.api.item.mmoitem.ReadMMOItem;
|
||||||
import net.Indyuce.mmoitems.gui.edition.EditionInventory;
|
import net.Indyuce.mmoitems.gui.edition.EditionInventory;
|
||||||
import net.Indyuce.mmoitems.stat.data.StringListData;
|
import net.Indyuce.mmoitems.stat.data.StringListData;
|
||||||
import net.Indyuce.mmoitems.stat.data.random.RandomStatData;
|
|
||||||
import net.Indyuce.mmoitems.stat.data.type.StatData;
|
import net.Indyuce.mmoitems.stat.data.type.StatData;
|
||||||
import net.Indyuce.mmoitems.stat.type.ItemStat;
|
import net.Indyuce.mmoitems.stat.type.ItemStat;
|
||||||
import io.lumine.mythic.lib.api.item.ItemTag;
|
import org.apache.commons.lang.Validate;
|
||||||
import io.lumine.mythic.lib.api.util.AltChar;
|
import org.bukkit.ChatColor;
|
||||||
import io.lumine.mythic.lib.version.VersionMaterial;
|
import org.bukkit.event.inventory.InventoryAction;
|
||||||
|
import org.bukkit.event.inventory.InventoryClickEvent;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
public class CompatibleTypes extends ItemStat<StringListData, StringListData> {
|
public class CompatibleTypes extends ItemStat<StringListData, StringListData> {
|
||||||
public CompatibleTypes() {
|
public CompatibleTypes() {
|
||||||
super("COMPATIBLE_TYPES", VersionMaterial.COMMAND_BLOCK.toMaterial(), "Compatible Types",
|
super("COMPATIBLE_TYPES", VersionMaterial.COMMAND_BLOCK.toMaterial(), "Compatible Types",
|
||||||
new String[] { "The item types this skin is", "compatible with." }, new String[] { "skin" });
|
new String[]{"The item types this skin is", "compatible with."}, new String[]{"skin"});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -48,8 +45,8 @@ public class CompatibleTypes extends ItemStat<StringListData, StringListData> {
|
|||||||
if (event.getAction() == InventoryAction.PICKUP_ALL)
|
if (event.getAction() == InventoryAction.PICKUP_ALL)
|
||||||
new StatEdition(inv, ItemStats.COMPATIBLE_TYPES).enable("Write in the chat the name of the type you want to add.");
|
new StatEdition(inv, ItemStats.COMPATIBLE_TYPES).enable("Write in the chat the name of the type you want to add.");
|
||||||
|
|
||||||
if (event.getAction() == InventoryAction.PICKUP_HALF) {
|
if (event.getAction() != InventoryAction.PICKUP_HALF || !inv.getEditedSection().contains("compatible-types"))
|
||||||
if (inv.getEditedSection().contains("compatible-types")) {
|
return;
|
||||||
List<String> lore = inv.getEditedSection().getStringList("compatible-types");
|
List<String> lore = inv.getEditedSection().getStringList("compatible-types");
|
||||||
if (lore.size() < 1)
|
if (lore.size() < 1)
|
||||||
return;
|
return;
|
||||||
@ -60,8 +57,6 @@ public class CompatibleTypes extends ItemStat<StringListData, StringListData> {
|
|||||||
inv.registerTemplateEdition();
|
inv.registerTemplateEdition();
|
||||||
inv.getPlayer().sendMessage(MMOItems.plugin.getPrefix() + "Successfully removed '" + last + "'.");
|
inv.getPlayer().sendMessage(MMOItems.plugin.getPrefix() + "Successfully removed '" + last + "'.");
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void whenInput(@NotNull EditionInventory inv, @NotNull String message, Object... info) {
|
public void whenInput(@NotNull EditionInventory inv, @NotNull String message, Object... info) {
|
||||||
@ -75,11 +70,9 @@ public class CompatibleTypes extends ItemStat<StringListData, StringListData> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void whenDisplayed(List<String> lore, Optional<StringListData> statData) {
|
public void whenDisplayed(List<String> lore, Optional<StringListData> statData) {
|
||||||
|
|
||||||
if (statData.isPresent()) {
|
if (statData.isPresent()) {
|
||||||
lore.add(ChatColor.GRAY + "Current Value:");
|
lore.add(ChatColor.GRAY + "Current Value:");
|
||||||
((StringListData) statData.get()).getList().forEach(str -> lore.add(ChatColor.GRAY + str));
|
statData.get().getList().forEach(str -> lore.add(ChatColor.GRAY + str));
|
||||||
|
|
||||||
} else
|
} else
|
||||||
lore.add(ChatColor.GRAY + "Current Value: " + ChatColor.RED + "Compatible with any item.");
|
lore.add(ChatColor.GRAY + "Current Value: " + ChatColor.RED + "Compatible with any item.");
|
||||||
|
|
||||||
@ -96,9 +89,8 @@ public class CompatibleTypes extends ItemStat<StringListData, StringListData> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void whenApplied(@NotNull ItemStackBuilder item, @NotNull StringListData data) {
|
public void whenApplied(@NotNull ItemStackBuilder item, @NotNull StringListData data) {
|
||||||
|
|
||||||
// Copy Array, for lore
|
// Copy Array, for lore
|
||||||
List<String> compatibleTypes = new ArrayList<>(((StringListData) data).getList());
|
List<String> compatibleTypes = new ArrayList<>(data.getList());
|
||||||
item.getLore().insert("compatible-types", compatibleTypes);
|
item.getLore().insert("compatible-types", compatibleTypes);
|
||||||
|
|
||||||
// Add data
|
// Add data
|
||||||
@ -108,12 +100,13 @@ public class CompatibleTypes extends ItemStat<StringListData, StringListData> {
|
|||||||
@NotNull
|
@NotNull
|
||||||
@Override
|
@Override
|
||||||
public ArrayList<ItemTag> getAppliedNBT(@NotNull StringListData data) {
|
public ArrayList<ItemTag> getAppliedNBT(@NotNull StringListData data) {
|
||||||
|
|
||||||
// Build Json Array
|
// Build Json Array
|
||||||
JsonArray array = new JsonArray();
|
JsonArray array = new JsonArray();
|
||||||
|
|
||||||
// For each string in the ids of the data
|
// For each string in the ids of the data
|
||||||
for (String sts : ((StringListData) data).getList()) { array.add(sts); }
|
for (String sts : data.getList()) {
|
||||||
|
array.add(sts);
|
||||||
|
}
|
||||||
|
|
||||||
// Make returning array
|
// Make returning array
|
||||||
ArrayList<ItemTag> tags = new ArrayList<>();
|
ArrayList<ItemTag> tags = new ArrayList<>();
|
||||||
@ -126,8 +119,7 @@ public class CompatibleTypes extends ItemStat<StringListData, StringListData> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void whenLoaded(@NotNull ReadMMOItem mmoitem) {
|
public void whenLoaded(@NotNull ReadMMOItem mmoitem) {
|
||||||
|
// FInd relevant tags
|
||||||
// FInd relvant tags
|
|
||||||
ArrayList<ItemTag> relevantTags = new ArrayList<>();
|
ArrayList<ItemTag> relevantTags = new ArrayList<>();
|
||||||
if (mmoitem.getNBT().hasTag(getNBTPath()))
|
if (mmoitem.getNBT().hasTag(getNBTPath()))
|
||||||
relevantTags.add(ItemTag.getTagAtPath(getNBTPath(), mmoitem.getNBT(), SupportedNBTTagValues.STRING));
|
relevantTags.add(ItemTag.getTagAtPath(getNBTPath(), mmoitem.getNBT(), SupportedNBTTagValues.STRING));
|
||||||
@ -135,35 +127,32 @@ public class CompatibleTypes extends ItemStat<StringListData, StringListData> {
|
|||||||
// Generate data
|
// Generate data
|
||||||
StatData data = getLoadedNBT(relevantTags);
|
StatData data = getLoadedNBT(relevantTags);
|
||||||
|
|
||||||
if (data != null) { mmoitem.setData(this, data);}
|
if (data != null)
|
||||||
|
mmoitem.setData(this, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
@Override
|
@Override
|
||||||
public StringListData getLoadedNBT(@NotNull ArrayList<ItemTag> storedTags) {
|
public StringListData getLoadedNBT(@NotNull ArrayList<ItemTag> storedTags) {
|
||||||
|
|
||||||
// Find relevant tag
|
// Find relevant tag
|
||||||
ItemTag rTag = ItemTag.getTagAtPath(getNBTPath(), storedTags);
|
ItemTag rTag = ItemTag.getTagAtPath(getNBTPath(), storedTags);
|
||||||
|
|
||||||
// Found?
|
// Found?
|
||||||
if (rTag != null) {
|
if (rTag == null)
|
||||||
|
// Nope
|
||||||
|
return null;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
// Parse onto Json Array
|
// Parse onto Json Array
|
||||||
JsonArray array = new JsonParser().parse((String) rTag.getValue()).getAsJsonArray();
|
JsonArray array = new JsonParser().parse((String) rTag.getValue()).getAsJsonArray();
|
||||||
|
|
||||||
// Make and return list
|
// Make and return list
|
||||||
return new StringListData(array);
|
return new StringListData(array);
|
||||||
|
} catch (JsonSyntaxException | IllegalStateException exception) {
|
||||||
} catch (JsonSyntaxException |IllegalStateException exception) {
|
|
||||||
/*
|
/*
|
||||||
* OLD ITEM WHICH MUST BE UPDATED.
|
* OLD ITEM WHICH MUST BE UPDATED.
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// Nope
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user