EpicKnarvik97/ArmoredElytra
EpicKnarvik97/ArmoredElytra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Made printing stuff to console/player nicer.

Browse Source
This commit is contained in:
Pim van der Loos 2017-09-26 11:41:02 +02:00
parent 9fb779f495
commit 33540e4b16
2 changed files with 45 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/main/java/nl/pim16aap2/armoredElytra/ArmoredElytra.java
View File

@ -14,6 +14,7 @@ import org.bukkit.event.Listener;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import net.md_5.bungee.api.ChatColor;
import nl.pim16aap2.armoredElytra.nms.NBTEditor; import nl.pim16aap2.armoredElytra.nms.NBTEditor;
import nl.pim16aap2.armoredElytra.nms.NBTEditor_V1_11_R1; import nl.pim16aap2.armoredElytra.nms.NBTEditor_V1_11_R1;
import nl.pim16aap2.armoredElytra.nms.NBTEditor_V1_12_R1; import nl.pim16aap2.armoredElytra.nms.NBTEditor_V1_12_R1;
@ -68,20 +69,36 @@ public class ArmoredElytra extends JavaPlugin implements Listener
config.options().copyDefaults(true); config.options().copyDefaults(true);
saveConfig(); saveConfig();
Bukkit.getLogger().log(Level.INFO, "["+this.getName()+"] "+"Allowed enchantments:"); myLogger(Level.INFO, ("Allowed enchantments:"));
for (String s : allowedEnchants) for (String s : allowedEnchants)
{ {
Bukkit.getLogger().log(Level.INFO, "["+this.getName()+"] "+s); myLogger(Level.INFO, s);
} }
if (compatibleMCVer()) if (compatibleMCVer())
{ {
Bukkit.getPluginManager().registerEvents(new EventHandlers(this, nbtEditor, cursesAllowed, LEATHER_TO_FULL, GOLD_TO_FULL, IRON_TO_FULL, DIAMONDS_TO_FULL, allowedEnchants, usageDeniedMessage), this); Bukkit.getPluginManager().registerEvents(new EventHandlers(this, nbtEditor, cursesAllowed, LEATHER_TO_FULL, GOLD_TO_FULL, IRON_TO_FULL, DIAMONDS_TO_FULL, allowedEnchants, usageDeniedMessage), this);
} else { } else {
Bukkit.getLogger().log(Level.WARNING, "Trying to load the plugin on an incompatible version of Minecraft!"); myLogger(Level.WARNING, "Trying to load the plugin on an incompatible version of Minecraft!");
} }
} }
public void messagePlayer(Player player, ChatColor color, String s)
{
player.sendMessage(color + s);
}
public void messagePlayer(Player player, String s)
{
messagePlayer(player, ChatColor.WHITE, s);
}
// Print a string to the log.
public void myLogger(Level level, String s)
{
Bukkit.getLogger().log(level, "["+this.getName()+"] " + s);
}
@Override @Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args)
{ {
@ -103,12 +120,12 @@ public class ArmoredElytra extends JavaPlugin implements Listener
{ {
if (elytraReceivedMessage != null) if (elytraReceivedMessage != null)
{ {
player.sendMessage(elytraReceivedMessage); messagePlayer(player, elytraReceivedMessage);
} }
newElytra = nbtEditor.addArmorNBTTags(new ItemStack(Material.ELYTRA, 1), 1); newElytra = nbtEditor.addArmorNBTTags(new ItemStack(Material.ELYTRA, 1), 1);
} else } else
{ {
player.sendMessage("You do not have the required permission node for this armor tier!"); messagePlayer(player, ChatColor.RED, "You do not have the required permission node for this armor tier!");
} }
// Gold armor. // Gold armor.
@ -118,12 +135,12 @@ public class ArmoredElytra extends JavaPlugin implements Listener
{ {
if (elytraReceivedMessage != null) if (elytraReceivedMessage != null)
{ {
player.sendMessage(elytraReceivedMessage); messagePlayer(player, elytraReceivedMessage);
} }
newElytra = nbtEditor.addArmorNBTTags(new ItemStack(Material.ELYTRA, 1), 2); newElytra = nbtEditor.addArmorNBTTags(new ItemStack(Material.ELYTRA, 1), 2);
} else } else
{ {
player.sendMessage("You do not have the required permission node for this armor tier!"); messagePlayer(player, "You do not have the required permission node for this armor tier!");
} }
// Chain armor. // Chain armor.
@ -133,12 +150,12 @@ public class ArmoredElytra extends JavaPlugin implements Listener
{ {
if (elytraReceivedMessage != null) if (elytraReceivedMessage != null)
{ {
player.sendMessage(elytraReceivedMessage); messagePlayer(player, elytraReceivedMessage);
} }
newElytra = nbtEditor.addArmorNBTTags(new ItemStack(Material.ELYTRA, 1), 3); newElytra = nbtEditor.addArmorNBTTags(new ItemStack(Material.ELYTRA, 1), 3);
} else } else
{ {
player.sendMessage("You do not have the required permission node for this armor tier!"); messagePlayer(player, "You do not have the required permission node for this armor tier!");
} }
// Iron armor. // Iron armor.
@ -148,12 +165,12 @@ public class ArmoredElytra extends JavaPlugin implements Listener
{ {
if (elytraReceivedMessage != null) if (elytraReceivedMessage != null)
{ {
player.sendMessage(elytraReceivedMessage); messagePlayer(player, elytraReceivedMessage);
} }
newElytra = nbtEditor.addArmorNBTTags(new ItemStack(Material.ELYTRA, 1), 4); newElytra = nbtEditor.addArmorNBTTags(new ItemStack(Material.ELYTRA, 1), 4);
} else } else
{ {
player.sendMessage("You do not have the required permission node for this armor tier!"); messagePlayer(player, "You do not have the required permission node for this armor tier!");
} }
// Diamond armor. // Diamond armor.
@ -163,17 +180,17 @@ public class ArmoredElytra extends JavaPlugin implements Listener
{ {
if (elytraReceivedMessage != null) if (elytraReceivedMessage != null)
{ {
player.sendMessage(elytraReceivedMessage); messagePlayer(player, elytraReceivedMessage);
} }
newElytra = nbtEditor.addArmorNBTTags(new ItemStack(Material.ELYTRA, 1), 5); newElytra = nbtEditor.addArmorNBTTags(new ItemStack(Material.ELYTRA, 1), 5);
} else } else
{ {
player.sendMessage("You do not have the required permission node for this armor tier!"); messagePlayer(player, "You do not have the required permission node for this armor tier!");
} }
} else } else
{ {
player.sendMessage("Not a supported armor tier! Try one of these: leather, gold, chain, iron, diamond."); messagePlayer(player, "Not a supported armor tier! Try one of these: leather, gold, chain, iron, diamond.");
} }
giveArmoredElytraToPlayer(player, newElytra); giveArmoredElytraToPlayer(player, newElytra);
return true; return true;
@ -194,52 +211,52 @@ public class ArmoredElytra extends JavaPlugin implements Listener
{ {
if (elytraReceivedMessage != null) if (elytraReceivedMessage != null)
{ {
player.sendMessage(elytraReceivedMessage); messagePlayer(player, elytraReceivedMessage);
} }
Bukkit.getLogger().log(Level.INFO, "Giving an armored elytra of the leather armor tier to player "+player.getName()); myLogger(Level.INFO, ("Giving an armored elytra of the leather armor tier to player "+player.getName()));
newElytra = nbtEditor.addArmorNBTTags(new ItemStack(Material.ELYTRA, 1), 1); newElytra = nbtEditor.addArmorNBTTags(new ItemStack(Material.ELYTRA, 1), 1);
// Gold armor tier. // Gold armor tier.
} else if (tier.equalsIgnoreCase("gold")) } else if (tier.equalsIgnoreCase("gold"))
{ {
if (elytraReceivedMessage != null) if (elytraReceivedMessage != null)
{ {
player.sendMessage(elytraReceivedMessage); messagePlayer(player, elytraReceivedMessage);
} }
Bukkit.getLogger().log(Level.INFO, "Giving an armored elytra of the gold armor tier to player "+player.getName()); myLogger(Level.INFO, ("Giving an armored elytra of the gold armor tier to player "+player.getName()));
newElytra = nbtEditor.addArmorNBTTags(new ItemStack(Material.ELYTRA, 1), 2); newElytra = nbtEditor.addArmorNBTTags(new ItemStack(Material.ELYTRA, 1), 2);
// Chain armor tier. // Chain armor tier.
} else if (tier.equalsIgnoreCase("chain")) } else if (tier.equalsIgnoreCase("chain"))
{ {
if (elytraReceivedMessage != null) if (elytraReceivedMessage != null)
{ {
player.sendMessage(elytraReceivedMessage); messagePlayer(player, elytraReceivedMessage);
} }
Bukkit.getLogger().log(Level.INFO, "Giving an armored elytra of the chain armor tier to player "+player.getName()); myLogger(Level.INFO, ("Giving an armored elytra of the chain armor tier to player "+player.getName()));
newElytra = nbtEditor.addArmorNBTTags(new ItemStack(Material.ELYTRA, 1), 3); newElytra = nbtEditor.addArmorNBTTags(new ItemStack(Material.ELYTRA, 1), 3);
// Iron armor tier. // Iron armor tier.
} else if (tier.equalsIgnoreCase("iron")) } else if (tier.equalsIgnoreCase("iron"))
{ {
if (elytraReceivedMessage != null) if (elytraReceivedMessage != null)
{ {
player.sendMessage(elytraReceivedMessage); messagePlayer(player, elytraReceivedMessage);
} }
Bukkit.getLogger().log(Level.INFO, "Giving an armored elytra of the iron armor tier to player "+player.getName()); myLogger(Level.INFO, ("Giving an armored elytra of the iron armor tier to player "+player.getName()));
newElytra = nbtEditor.addArmorNBTTags(new ItemStack(Material.ELYTRA, 1), 4); newElytra = nbtEditor.addArmorNBTTags(new ItemStack(Material.ELYTRA, 1), 4);
// Diamond armor tier. // Diamond armor tier.
} else if (tier.equalsIgnoreCase("diamond")) } else if (tier.equalsIgnoreCase("diamond"))
{ {
if (elytraReceivedMessage != null) if (elytraReceivedMessage != null)
{ {
player.sendMessage(elytraReceivedMessage); messagePlayer(player, elytraReceivedMessage);
} }
Bukkit.getLogger().log(Level.INFO, "Giving an armored elytra of the armor armor tier to player "+player.getName()); myLogger(Level.INFO, ("Giving an armored elytra of the armor armor tier to player "+player.getName()));
newElytra = nbtEditor.addArmorNBTTags(new ItemStack(Material.ELYTRA, 1), 5); newElytra = nbtEditor.addArmorNBTTags(new ItemStack(Material.ELYTRA, 1), 5);
} }
giveArmoredElytraToPlayer(player, newElytra); giveArmoredElytraToPlayer(player, newElytra);
return true; return true;
} else } else
{ {
Bukkit.getLogger().log(Level.INFO, "Player "+args[1]+" not found!"); myLogger(Level.INFO, ("Player "+args[1]+" not found!"));
return true; return true;
} }
} }

10
src/main/java/nl/pim16aap2/armoredElytra/EventHandlers.java
View File

@ -4,7 +4,6 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -173,9 +172,6 @@ public class EventHandlers implements Listener
} }
} }
result.addUnsafeEnchantment(entry.getKey(), enchantLevel); result.addUnsafeEnchantment(entry.getKey(), enchantLevel);
} else
{
// p.sendMessage(ChatColor.RED+"This enchantment is not allowed on this item!");
} }
} }
} }
@ -429,7 +425,7 @@ public class EventHandlers implements Listener
{ {
if (usageDeniedMessage != null) if (usageDeniedMessage != null)
{ {
player.sendMessage(ChatColor.RED + usageDeniedMessage); plugin.messagePlayer(player, ChatColor.RED + usageDeniedMessage);
} }
event.setCancelled(true); event.setCancelled(true);
} }
@ -460,7 +456,7 @@ public class EventHandlers implements Listener
int armorTier = nbtEditor.getArmorTier(chestplate); int armorTier = nbtEditor.getArmorTier(chestplate);
if ((chestplate.getDurability() >= chestplate.getType().getMaxDurability())) if ((chestplate.getDurability() >= chestplate.getType().getMaxDurability()))
{ {
player.sendMessage(ChatColor.RED + "You cannot equip this elytra! Please repair it in an anvil first."); plugin.messagePlayer(player, ChatColor.RED + "You cannot equip this elytra! Please repair it in an anvil first.");
unenquipChestPlayer(player); unenquipChestPlayer(player);
} else if ((armorTier == 1 && !player.hasPermission("armoredelytra.wear.leather")) || } else if ((armorTier == 1 && !player.hasPermission("armoredelytra.wear.leather")) ||
(armorTier == 2 && !player.hasPermission("armoredelytra.wear.gold")) || (armorTier == 2 && !player.hasPermission("armoredelytra.wear.gold")) ||
@ -470,7 +466,7 @@ public class EventHandlers implements Listener
{ {
if (usageDeniedMessage != null) if (usageDeniedMessage != null)
{ {
player.sendMessage(ChatColor.RED + usageDeniedMessage); plugin.messagePlayer(player, ChatColor.RED + usageDeniedMessage);
} }
unenquipChestPlayer(player); unenquipChestPlayer(player);
} }