mirror of
https://gitlab.com/phoenix-dvpmt/mmoitems.git
synced 2025-01-23 09:41:20 +01:00
Fixed 1.12 recipe compatibility issue
This commit is contained in:
Indyuce
parent
f053b983e5
commit
1d9747c01b
@ -50,4 +50,11 @@ public enum CraftingType {
|
||||
public boolean shouldAdd() {
|
||||
return MMOLib.plugin.getVersion().isStrictlyHigher(1, 14) || old;
|
||||
}
|
||||
|
||||
public static CraftingType getBySlot(int slot) {
|
||||
for (CraftingType type : values())
|
||||
if (type.getSlot() == slot)
|
||||
return type;
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@ -94,7 +94,8 @@ public class MMOItemsCommand implements CommandExecutor {
|
||||
if (args[1].equalsIgnoreCase("blocks")) {
|
||||
if (MMOLib.plugin.getVersion().isStrictlyHigher(1, 12))
|
||||
new BlockBrowser((Player) sender).open();
|
||||
else sender.sendMessage(ChatColor.RED + "Blocks are only for 1.13+.");
|
||||
else
|
||||
sender.sendMessage(ChatColor.RED + "Blocks are only for 1.13+.");
|
||||
return true;
|
||||
}
|
||||
if (!Type.isValid(args[1])) {
|
||||
@ -108,8 +109,7 @@ public class MMOItemsCommand implements CommandExecutor {
|
||||
else if (args[0].equalsIgnoreCase("update")) {
|
||||
if (args.length < 2) {
|
||||
sender.sendMessage("");
|
||||
sender.sendMessage(ChatColor.GRAY
|
||||
+ "Sometimes updates happen to break config files due to a change in data storage. Applying a plugin config update using /mi update allows to instantly fix these issues.");
|
||||
sender.sendMessage(ChatColor.GRAY + "Sometimes updates happen to break config files due to a change in data storage. Applying a plugin config update using /mi update allows to instantly fix these issues.");
|
||||
sender.sendMessage("");
|
||||
sender.sendMessage(ChatColor.RED + "Make sure you only apply required updates! You may also consider backing up your data before applying any update.");
|
||||
sender.sendMessage("");
|
||||
@ -292,8 +292,7 @@ public class MMOItemsCommand implements CommandExecutor {
|
||||
if (args.length < 3)
|
||||
return true;
|
||||
try {
|
||||
player.getInventory().setItemInMainHand(MMOLib.plugin.getNMS().getNBTItem(player.getInventory().getItemInMainHand())
|
||||
.addTag(new ItemTag(args[1].toUpperCase().replace("-", "_"), args[2].replace("%%", " "))).toItem());
|
||||
player.getInventory().setItemInMainHand(MMOLib.plugin.getNMS().getNBTItem(player.getInventory().getItemInMainHand()).addTag(new ItemTag(args[1].toUpperCase().replace("-", "_"), args[2].replace("%%", " "))).toItem());
|
||||
player.sendMessage("Successfully set tag.");
|
||||
|
||||
} catch (Exception e) {
|
||||
@ -336,7 +335,7 @@ public class MMOItemsCommand implements CommandExecutor {
|
||||
sender.sendMessage(MMOItems.plugin.getPrefix() + "The item you are holding is already identified.");
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
final int amount = player.getInventory().getItemInMainHand().getAmount();
|
||||
ItemStack identifiedItem = new IdentifiedItem(item).identify();
|
||||
identifiedItem.setAmount(amount);
|
||||
@ -347,16 +346,14 @@ public class MMOItemsCommand implements CommandExecutor {
|
||||
// ==================================================================================================================================
|
||||
else if (args[0].equalsIgnoreCase("stations")) {
|
||||
if (args.length < 2) {
|
||||
sender.sendMessage(ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "-----------------[" + ChatColor.LIGHT_PURPLE + " Crafting Stations " + ChatColor.DARK_GRAY + ""
|
||||
+ ChatColor.STRIKETHROUGH + "]-----------------");
|
||||
sender.sendMessage(ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "-----------------[" + ChatColor.LIGHT_PURPLE + " Crafting Stations " + ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "]-----------------");
|
||||
sender.sendMessage(ChatColor.LIGHT_PURPLE + "/mi stations list" + ChatColor.WHITE + " shows available crafting stations.");
|
||||
sender.sendMessage(ChatColor.LIGHT_PURPLE + "/mi stations open <station> (player)" + ChatColor.WHITE + " opens a station.");
|
||||
return true;
|
||||
}
|
||||
|
||||
if (args[1].equalsIgnoreCase("list")) {
|
||||
sender.sendMessage(ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "-----------------[" + ChatColor.LIGHT_PURPLE + " Crafting Stations " + ChatColor.DARK_GRAY + ""
|
||||
+ ChatColor.STRIKETHROUGH + "]-----------------");
|
||||
sender.sendMessage(ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "-----------------[" + ChatColor.LIGHT_PURPLE + " Crafting Stations " + ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "]-----------------");
|
||||
for (CraftingStation station : MMOItems.plugin.getCrafting().getAll())
|
||||
sender.sendMessage(ChatColor.GRAY + "- " + ChatColor.WHITE + station.getId());
|
||||
}
|
||||
@ -390,8 +387,7 @@ public class MMOItemsCommand implements CommandExecutor {
|
||||
}
|
||||
|
||||
RPGPlayer rpg = PlayerData.get(player).getRPG();
|
||||
sender.sendMessage(ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "-----------------[" + ChatColor.LIGHT_PURPLE + " Player Information " + ChatColor.DARK_GRAY + ""
|
||||
+ ChatColor.STRIKETHROUGH + "]-----------------");
|
||||
sender.sendMessage(ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "-----------------[" + ChatColor.LIGHT_PURPLE + " Player Information " + ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "]-----------------");
|
||||
sender.sendMessage(ChatColor.WHITE + "Information about " + ChatColor.LIGHT_PURPLE + player.getName());
|
||||
sender.sendMessage("");
|
||||
sender.sendMessage(ChatColor.WHITE + "Player Class: " + ChatColor.LIGHT_PURPLE + rpg.getClassName());
|
||||
@ -411,8 +407,7 @@ public class MMOItemsCommand implements CommandExecutor {
|
||||
player.setFoodLevel(20);
|
||||
player.setFireTicks(0);
|
||||
player.setSaturation(12);
|
||||
for (PotionEffectType pe : new PotionEffectType[] { PotionEffectType.POISON, PotionEffectType.BLINDNESS, PotionEffectType.CONFUSION, PotionEffectType.HUNGER, PotionEffectType.WEAKNESS,
|
||||
PotionEffectType.SLOW, PotionEffectType.SLOW_DIGGING })
|
||||
for (PotionEffectType pe : new PotionEffectType[] { PotionEffectType.POISON, PotionEffectType.BLINDNESS, PotionEffectType.CONFUSION, PotionEffectType.HUNGER, PotionEffectType.WEAKNESS, PotionEffectType.SLOW, PotionEffectType.SLOW_DIGGING })
|
||||
player.removePotionEffect(pe);
|
||||
}
|
||||
// ==================================================================================================================================
|
||||
@ -435,7 +430,7 @@ public class MMOItemsCommand implements CommandExecutor {
|
||||
* discoverRecipes must be called on the main thread.
|
||||
*/
|
||||
Bukkit.getScheduler().runTask(MMOItems.plugin, () -> {
|
||||
if (MMOItems.plugin.getConfig().getBoolean("auto-recipe-book"))
|
||||
if (MMOLib.plugin.getVersion().isStrictlyHigher(1, 12) && MMOItems.plugin.getConfig().getBoolean("auto-recipe-book"))
|
||||
Bukkit.getOnlinePlayers().forEach(online -> online.discoverRecipes(MMOItems.plugin.getRecipes().getNamespacedKeys()));
|
||||
|
||||
sender.sendMessage(MMOItems.plugin.getPrefix() + "Successfully reloaded recipes.");
|
||||
@ -499,10 +494,7 @@ public class MMOItemsCommand implements CommandExecutor {
|
||||
for (Type type : MMOItems.plugin.getTypes().getAll()) {
|
||||
FileConfiguration config = type.getConfigFile().getConfig();
|
||||
for (String s : config.getKeys(false))
|
||||
sender.sendMessage("* " + ChatColor.GREEN + s
|
||||
+ (config.getConfigurationSection(s).contains("name")
|
||||
? " " + ChatColor.WHITE + "(" + ChatColor.translateAlternateColorCodes('&', config.getString(s + ".name")) + ChatColor.WHITE + ")"
|
||||
: ""));
|
||||
sender.sendMessage("* " + ChatColor.GREEN + s + (config.getConfigurationSection(s).contains("name") ? " " + ChatColor.WHITE + "(" + ChatColor.translateAlternateColorCodes('&', config.getString(s + ".name")) + ChatColor.WHITE + ")" : ""));
|
||||
}
|
||||
}
|
||||
// ==================================================================================================================================
|
||||
@ -524,27 +516,18 @@ public class MMOItemsCommand implements CommandExecutor {
|
||||
FileConfiguration config = type.getConfigFile().getConfig();
|
||||
if (!(sender instanceof Player)) {
|
||||
for (String s : config.getKeys(false))
|
||||
sender.sendMessage("* " + ChatColor.GREEN + s
|
||||
+ (config.getConfigurationSection(s).contains("name")
|
||||
? " " + ChatColor.WHITE + "(" + ChatColor.translateAlternateColorCodes('&', config.getString(s + ".name")) + ChatColor.WHITE + ")"
|
||||
: ""));
|
||||
sender.sendMessage("* " + ChatColor.GREEN + s + (config.getConfigurationSection(s).contains("name") ? " " + ChatColor.WHITE + "(" + ChatColor.translateAlternateColorCodes('&', config.getString(s + ".name")) + ChatColor.WHITE + ")" : ""));
|
||||
return true;
|
||||
}
|
||||
for (String s : config.getKeys(false)) {
|
||||
String nameFormat = config.getConfigurationSection(s).contains("name")
|
||||
? " " + ChatColor.WHITE + "(" + ChatColor.translateAlternateColorCodes('&', config.getString(s + ".name")) + ChatColor.WHITE + ")"
|
||||
: "";
|
||||
MMOLib.plugin.getNMS().sendJson((Player) sender,
|
||||
"{\"text\":\"* " + ChatColor.GREEN + s + nameFormat + "\",\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/mi edit " + type.getId() + " " + s
|
||||
+ "\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"Click to edit "
|
||||
+ (nameFormat.equals("") ? s : ChatColor.translateAlternateColorCodes('&', config.getString(s + ".name"))) + ChatColor.WHITE + ".\",\"color\":\"white\"}}}");
|
||||
String nameFormat = config.getConfigurationSection(s).contains("name") ? " " + ChatColor.WHITE + "(" + ChatColor.translateAlternateColorCodes('&', config.getString(s + ".name")) + ChatColor.WHITE + ")" : "";
|
||||
MMOLib.plugin.getNMS().sendJson((Player) sender, "{\"text\":\"* " + ChatColor.GREEN + s + nameFormat + "\",\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/mi edit " + type.getId() + " " + s + "\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"Click to edit " + (nameFormat.equals("") ? s : ChatColor.translateAlternateColorCodes('&', config.getString(s + ".name"))) + ChatColor.WHITE + ".\",\"color\":\"white\"}}}");
|
||||
}
|
||||
}
|
||||
// ==================================================================================================================================
|
||||
else if (args[0].equalsIgnoreCase("list")) {
|
||||
if (args.length < 2) {
|
||||
sender.sendMessage(ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "-----------------[" + ChatColor.LIGHT_PURPLE + " MMOItems: lists " + ChatColor.DARK_GRAY + ""
|
||||
+ ChatColor.STRIKETHROUGH + "]-----------------");
|
||||
sender.sendMessage(ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "-----------------[" + ChatColor.LIGHT_PURPLE + " MMOItems: lists " + ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "]-----------------");
|
||||
sender.sendMessage(ChatColor.LIGHT_PURPLE + "/mi list type " + ChatColor.WHITE + "shows all item types (sword, axe...)");
|
||||
sender.sendMessage(ChatColor.LIGHT_PURPLE + "/mi list spirit " + ChatColor.WHITE + "shows all available staff spirits");
|
||||
sender.sendMessage(ChatColor.LIGHT_PURPLE + "/mi list lute " + ChatColor.WHITE + "shows all available lute attack effects");
|
||||
@ -552,20 +535,8 @@ public class MMOItemsCommand implements CommandExecutor {
|
||||
if (sender instanceof Player) {
|
||||
sender.sendMessage("");
|
||||
sender.sendMessage("Spigot Javadoc Links:");
|
||||
MMOLib.plugin.getNMS().sendJson((Player) sender, "[{\"text\":\"" + ChatColor.UNDERLINE + ChatColor.GREEN
|
||||
+ "Materials/Blocks\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Material.html\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\""
|
||||
+ ChatColor.GREEN + "Click to open webpage.\"}]}}},{\"text\":\" " + ChatColor.LIGHT_PURPLE + "- \"},{\"text\":\"" + ChatColor.UNDERLINE + ChatColor.GREEN
|
||||
+ "Potion Effects\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://hub.spigotmc.org/javadocs/spigot/org/bukkit/potion/PotionEffectType.html\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\""
|
||||
+ ChatColor.GREEN + "Click to open webpage.\"}]}}},{\"text\":\" " + ChatColor.LIGHT_PURPLE + "- \"},{\"text\":\"" + ChatColor.UNDERLINE + ChatColor.GREEN
|
||||
+ "Sounds\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Sound.html\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\""
|
||||
+ ChatColor.GREEN + "Click to open webpage.\"}]}}}]");
|
||||
MMOLib.plugin.getNMS().sendJson((Player) sender, "[{\"text\":\"" + ChatColor.UNDERLINE + ChatColor.GREEN
|
||||
+ "Entities/Mobs\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://hub.spigotmc.org/javadocs/spigot/org/bukkit/entity/EntityType.html\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\""
|
||||
+ ChatColor.GREEN + "Click to open webpage.\"}]}}},{\"text\":\" " + ChatColor.LIGHT_PURPLE + "- \"},{\"text\":\"" + ChatColor.UNDERLINE + ChatColor.GREEN
|
||||
+ "Enchantments\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://hub.spigotmc.org/javadocs/spigot/org/bukkit/enchantments/Enchantment.html\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\""
|
||||
+ ChatColor.GREEN + "Click to open webpage.\"}]}}},{\"text\":\" " + ChatColor.LIGHT_PURPLE + "- \"},{\"text\":\"" + ChatColor.UNDERLINE + ChatColor.GREEN
|
||||
+ "Particles\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Particles.html\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\""
|
||||
+ ChatColor.GREEN + "Click to open webpage.\"}]}}}]");
|
||||
MMOLib.plugin.getNMS().sendJson((Player) sender, "[{\"text\":\"" + ChatColor.UNDERLINE + ChatColor.GREEN + "Materials/Blocks\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Material.html\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\"" + ChatColor.GREEN + "Click to open webpage.\"}]}}},{\"text\":\" " + ChatColor.LIGHT_PURPLE + "- \"},{\"text\":\"" + ChatColor.UNDERLINE + ChatColor.GREEN + "Potion Effects\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://hub.spigotmc.org/javadocs/spigot/org/bukkit/potion/PotionEffectType.html\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\"" + ChatColor.GREEN + "Click to open webpage.\"}]}}},{\"text\":\" " + ChatColor.LIGHT_PURPLE + "- \"},{\"text\":\"" + ChatColor.UNDERLINE + ChatColor.GREEN + "Sounds\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Sound.html\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\"" + ChatColor.GREEN + "Click to open webpage.\"}]}}}]");
|
||||
MMOLib.plugin.getNMS().sendJson((Player) sender, "[{\"text\":\"" + ChatColor.UNDERLINE + ChatColor.GREEN + "Entities/Mobs\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://hub.spigotmc.org/javadocs/spigot/org/bukkit/entity/EntityType.html\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\"" + ChatColor.GREEN + "Click to open webpage.\"}]}}},{\"text\":\" " + ChatColor.LIGHT_PURPLE + "- \"},{\"text\":\"" + ChatColor.UNDERLINE + ChatColor.GREEN + "Enchantments\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://hub.spigotmc.org/javadocs/spigot/org/bukkit/enchantments/Enchantment.html\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\"" + ChatColor.GREEN + "Click to open webpage.\"}]}}},{\"text\":\" " + ChatColor.LIGHT_PURPLE + "- \"},{\"text\":\"" + ChatColor.UNDERLINE + ChatColor.GREEN + "Particles\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Particles.html\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\"" + ChatColor.GREEN + "Click to open webpage.\"}]}}}]");
|
||||
}
|
||||
|
||||
return true;
|
||||
@ -573,11 +544,9 @@ public class MMOItemsCommand implements CommandExecutor {
|
||||
|
||||
// ability list
|
||||
if (args[1].equalsIgnoreCase("ability")) {
|
||||
sender.sendMessage(ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "-----------------[" + ChatColor.LIGHT_PURPLE + " Abilities " + ChatColor.DARK_GRAY + ""
|
||||
+ ChatColor.STRIKETHROUGH + "]-----------------");
|
||||
sender.sendMessage(ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "-----------------[" + ChatColor.LIGHT_PURPLE + " Abilities " + ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "]-----------------");
|
||||
sender.sendMessage(ChatColor.WHITE + "Here are all the abilities you can bind to items.");
|
||||
sender.sendMessage(ChatColor.WHITE + "The values inside brackets are " + ChatColor.UNDERLINE + "modifiers" + ChatColor.WHITE
|
||||
+ " which allow you to change the ability values (cooldown, damage...)");
|
||||
sender.sendMessage(ChatColor.WHITE + "The values inside brackets are " + ChatColor.UNDERLINE + "modifiers" + ChatColor.WHITE + " which allow you to change the ability values (cooldown, damage...)");
|
||||
for (Ability a : MMOItems.plugin.getAbilities().getAll()) {
|
||||
String modFormat = ChatColor.GRAY + String.join(ChatColor.WHITE + ", " + ChatColor.GRAY, a.getModifiers());
|
||||
modFormat = ChatColor.WHITE + "(" + modFormat + ChatColor.WHITE + ")";
|
||||
@ -587,16 +556,14 @@ public class MMOItemsCommand implements CommandExecutor {
|
||||
|
||||
// item type list
|
||||
if (args[1].equalsIgnoreCase("type")) {
|
||||
sender.sendMessage(ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "-----------------[" + ChatColor.LIGHT_PURPLE + " Item Types " + ChatColor.DARK_GRAY + ""
|
||||
+ ChatColor.STRIKETHROUGH + "]-----------------");
|
||||
sender.sendMessage(ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "-----------------[" + ChatColor.LIGHT_PURPLE + " Item Types " + ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "]-----------------");
|
||||
for (Type t : MMOItems.plugin.getTypes().getAll())
|
||||
sender.sendMessage("* " + ChatColor.LIGHT_PURPLE + t.getName());
|
||||
}
|
||||
|
||||
// staff spirit list
|
||||
if (args[1].equalsIgnoreCase("spirit")) {
|
||||
sender.sendMessage(ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "-----------------[" + ChatColor.LIGHT_PURPLE + " Staff Spirits " + ChatColor.DARK_GRAY + ""
|
||||
+ ChatColor.STRIKETHROUGH + "]-----------------");
|
||||
sender.sendMessage(ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "-----------------[" + ChatColor.LIGHT_PURPLE + " Staff Spirits " + ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "]-----------------");
|
||||
for (StaffSpirit ss : StaffSpirit.values()) {
|
||||
String lore = !ss.hasLore() ? " " + ChatColor.WHITE + ">> " + ChatColor.GRAY + "" + ChatColor.ITALIC + ss.getLore() : "";
|
||||
sender.sendMessage("* " + ChatColor.LIGHT_PURPLE + ss.getName() + lore);
|
||||
@ -605,8 +572,7 @@ public class MMOItemsCommand implements CommandExecutor {
|
||||
|
||||
// lute attack effect list
|
||||
if (args[1].equalsIgnoreCase("lute")) {
|
||||
sender.sendMessage(ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "-----------------[" + ChatColor.LIGHT_PURPLE + " Lute Attack Effects " + ChatColor.DARK_GRAY + ""
|
||||
+ ChatColor.STRIKETHROUGH + "]-----------------");
|
||||
sender.sendMessage(ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "-----------------[" + ChatColor.LIGHT_PURPLE + " Lute Attack Effects " + ChatColor.DARK_GRAY + "" + ChatColor.STRIKETHROUGH + "]-----------------");
|
||||
for (LuteAttackEffect lae : LuteAttackEffect.values())
|
||||
sender.sendMessage("* " + ChatColor.LIGHT_PURPLE + lae.getName());
|
||||
}
|
||||
@ -838,8 +804,7 @@ public class MMOItemsCommand implements CommandExecutor {
|
||||
long old = System.currentTimeMillis();
|
||||
new ItemEdition((Player) sender, type, args[2], item).open();
|
||||
long ms = System.currentTimeMillis() - old;
|
||||
MMOLib.plugin.getNMS().sendActionBar((Player) sender,
|
||||
ChatColor.YELLOW + "Took " + ms + "ms (" + new DecimalFormat("#.##").format(ms / 50.) + "tick" + (ms > 99 ? "s" : "") + ") to open the menu.");
|
||||
MMOLib.plugin.getNMS().sendActionBar((Player) sender, ChatColor.YELLOW + "Took " + ms + "ms (" + new DecimalFormat("#.##").format(ms / 50.) + "tick" + (ms > 99 ? "s" : "") + ") to open the menu.");
|
||||
}
|
||||
// ==================================================================================================================================
|
||||
else if (args[0].equalsIgnoreCase("ability")) {
|
||||
@ -1027,8 +992,7 @@ public class MMOItemsCommand implements CommandExecutor {
|
||||
|
||||
// message
|
||||
if (sender != target)
|
||||
sender.sendMessage(MMOItems.plugin.getPrefix() + ChatColor.YELLOW + "Successfully gave " + ChatColor.GOLD + MMOUtils.getDisplayName(item)
|
||||
+ (item.getAmount() > 1 ? " x" + item.getAmount() : "") + ChatColor.YELLOW + " to " + ChatColor.GOLD + target.getName() + ChatColor.YELLOW + ".");
|
||||
sender.sendMessage(MMOItems.plugin.getPrefix() + ChatColor.YELLOW + "Successfully gave " + ChatColor.GOLD + MMOUtils.getDisplayName(item) + (item.getAmount() > 1 ? " x" + item.getAmount() : "") + ChatColor.YELLOW + " to " + ChatColor.GOLD + target.getName() + ChatColor.YELLOW + ".");
|
||||
Message.RECEIVED_ITEM.format(ChatColor.YELLOW, "#item#", MMOUtils.getDisplayName(item), "#amount#", (item.getAmount() > 1 ? " x" + item.getAmount() : "")).send(target);
|
||||
|
||||
// item
|
||||
|
||||
@ -1,9 +1,7 @@
|
||||
package net.Indyuce.mmoitems.gui.edition;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.ChatColor;
|
||||
@ -25,16 +23,10 @@ import net.Indyuce.mmoitems.stat.type.ItemStat;
|
||||
import net.mmogroup.mmolib.MMOLib;
|
||||
|
||||
public class CraftingEdition extends EditionInventory {
|
||||
public static Map<Integer, String> correspondingSlot = new HashMap<>();
|
||||
|
||||
private static final int[] slots = { 21, 22, 23, 30, 31, 32 };
|
||||
|
||||
public CraftingEdition(Player player, Type type, String id) {
|
||||
super(player, type, id);
|
||||
|
||||
if (correspondingSlot.isEmpty())
|
||||
for (CraftingType ctype : CraftingType.values())
|
||||
correspondingSlot.put(ctype.getSlot(), ctype.name().toLowerCase());
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -79,37 +71,28 @@ public class CraftingEdition extends EditionInventory {
|
||||
if (event.getInventory() != event.getClickedInventory() || !MMOUtils.isPluginItem(item, false))
|
||||
return;
|
||||
|
||||
if (correspondingSlot.containsKey(event.getSlot())) {
|
||||
if (event.getAction() == InventoryAction.PICKUP_ALL) {
|
||||
if (event.getSlot() == 21 || event.getSlot() == 22)
|
||||
new RecipeEdition(player, type, id, event.getSlot() == 22).open(getPreviousPage());
|
||||
else
|
||||
new StatEdition(this, ItemStat.CRAFTING, "item", getTypeFromSlot(event.getSlot()).name().toLowerCase()).enable("Write in the chat the item you want.", "Format: '[MATERIAL]' or '[MATERIAL]:[DURABILITY]' or '[TYPE].[ID]'");
|
||||
}
|
||||
CraftingType corresponding = CraftingType.getBySlot(event.getSlot());
|
||||
if (corresponding == null)
|
||||
return;
|
||||
|
||||
if (event.getAction() == InventoryAction.PICKUP_HALF) {
|
||||
ConfigFile config = type.getConfigFile();
|
||||
String ctype = correspondingSlot.get(event.getSlot());
|
||||
if (!config.getConfig().contains(id + ".crafting." + ctype))
|
||||
return;
|
||||
if (event.getAction() == InventoryAction.PICKUP_ALL) {
|
||||
if (event.getSlot() == 21 || event.getSlot() == 22)
|
||||
new RecipeEdition(player, type, id, event.getSlot() == 22).open(getPreviousPage());
|
||||
else
|
||||
new StatEdition(this, ItemStat.CRAFTING, "item", corresponding.name().toLowerCase()).enable("Write in the chat the item you want.", "Format: '[MATERIAL]' or '[MATERIAL]:[DURABILITY]' or '[TYPE].[ID]'");
|
||||
}
|
||||
|
||||
config.getConfig().set(id + ".crafting." + ctype, null);
|
||||
if (event.getAction() == InventoryAction.PICKUP_HALF) {
|
||||
ConfigFile config = type.getConfigFile();
|
||||
if (!config.getConfig().contains(id + ".crafting." + corresponding.name().toLowerCase()))
|
||||
return;
|
||||
|
||||
if (config.getConfig().getConfigurationSection(id + ".crafting") == null)
|
||||
config.getConfig().set(id + ".crafting", null);
|
||||
config.getConfig().set(id + ".crafting." + corresponding.name().toLowerCase(), null);
|
||||
|
||||
registerItemEdition(config);
|
||||
}
|
||||
if (config.getConfig().getConfigurationSection(id + ".crafting") == null)
|
||||
config.getConfig().set(id + ".crafting", null);
|
||||
|
||||
registerItemEdition(config);
|
||||
}
|
||||
}
|
||||
|
||||
private CraftingType getTypeFromSlot(int slot) {
|
||||
if (slot == 23)
|
||||
return CraftingType.FURNACE;
|
||||
if (slot == 30)
|
||||
return CraftingType.BLAST;
|
||||
if (slot == 31)
|
||||
return CraftingType.SMOKER;
|
||||
return CraftingType.CAMPFIRE;
|
||||
}
|
||||
}
|
||||
@ -13,7 +13,6 @@ import org.bukkit.inventory.Inventory;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.inventory.meta.ItemMeta;
|
||||
|
||||
import net.Indyuce.mmoitems.MMOUtils;
|
||||
import net.Indyuce.mmoitems.api.ConfigFile;
|
||||
import net.Indyuce.mmoitems.api.Type;
|
||||
import net.Indyuce.mmoitems.api.edition.StatEdition;
|
||||
@ -113,16 +112,15 @@ public class RecipeEdition extends EditionInventory {
|
||||
|
||||
@Override
|
||||
public void whenClicked(InventoryClickEvent event) {
|
||||
ItemStack item = event.getCurrentItem();
|
||||
|
||||
event.setCancelled(true);
|
||||
if (!MMOUtils.isPluginItem(item, false) || event.getInventory() != event.getClickedInventory())
|
||||
if (event.getInventory() != event.getClickedInventory())
|
||||
return;
|
||||
|
||||
if (event.getAction() == InventoryAction.PICKUP_ALL) {
|
||||
if (slotToInt(event.getRawSlot()) > -1) {
|
||||
if (slotToInt(event.getRawSlot()) >= 0)
|
||||
new StatEdition(this, ItemStat.CRAFTING, "recipe", (shapeless ? "shapeless" : "shaped"), slotToInt(event.getRawSlot())).enable("Write in the chat the item you want.", "Format: '[MATERIAL]' or '[MATERIAL]:[DURABILITY]' or '[TYPE].[ID]'");
|
||||
}
|
||||
|
||||
} else if (event.getAction() == InventoryAction.PICKUP_HALF) {
|
||||
if (shapeless)
|
||||
deleteShapeless(slotToInt(event.getRawSlot()));
|
||||
|
||||
@ -93,7 +93,7 @@ public class RecipeManagerLegacy extends RecipeManager {
|
||||
if (rc.isAir())
|
||||
recipe.setIngredient(c, Material.AIR);
|
||||
else
|
||||
recipe.setIngredient(c, rc.getMaterial());
|
||||
recipe.setIngredient(c, rc.generateStack().getType());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Loading…
Reference in New Issue
Block a user