Skip to content

Add hover info on snitch placement #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
awoo-civ wants to merge 4 commits into from
Closed

Add hover info on snitch placement #15

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2bb23f6
Refactor
awoo-civ Jan 1, 2017
93a935b
Add null checks
awoo-civ Jan 1, 2017
ae27e5b
Show hover info on snitch placement
awoo-civ Jan 1, 2017
dc0bd9c
Fix not returning early
awoo-civ Jan 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 73 additions & 63 deletions src/main/java/com/untamedears/JukeAlert/listener/JukeAlertListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
import java.util.UUID;
import java.util.logging.Level;

import net.md_5.bungee.api.chat.ComponentBuilder;
import net.md_5.bungee.api.chat.HoverEvent;
import net.md_5.bungee.api.chat.TextComponent;

import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.Material;
Expand Down Expand Up @@ -204,74 +208,80 @@ public void placeSnitchBlock(BlockPlaceEvent event) {

@EventHandler(priority = EventPriority.HIGHEST)
public void reinforceSnitchBlock(ReinforcementCreationEvent event) {

if (event.isCancelled()) {
return;
}
Block block = event.getBlock();
if (block.getType().equals(Material.JUKEBOX)) {
Player player = event.getPlayer();
Location loc = block.getLocation();
Reinforcement rei = event.getReinforcement();
if (rei instanceof PlayerReinforcement) {
PlayerReinforcement reinforcement = (PlayerReinforcement) rei;
Group owner = reinforcement.getGroup();
if (owner == null) {
JukeAlert.getInstance().log(String.format(
"No group on rein (%s)", reinforcement.getLocation().toString()));
}
Snitch snitch;
if (snitchManager.getSnitch(loc.getWorld(), loc) != null) {
snitch = snitchManager.getSnitch(loc.getWorld(), loc);
plugin.getJaLogger().updateSnitchGroup(
snitchManager.getSnitch(loc.getWorld(), loc), owner.getName());
snitchManager.removeSnitch(snitch);
snitch.setGroup(owner);
} else {
snitch = new Snitch(loc, owner, true, false);
plugin.getJaLogger().logSnitchPlace(
player.getWorld().getName(), owner.getName(), "", loc.getBlockX(), loc.getBlockY(),
loc.getBlockZ(), true);
snitch.setId(plugin.getJaLogger().getLastSnitchID());
plugin.getJaLogger().increaseLastSnitchID();
}
snitchManager.addSnitch(snitch);

player.sendMessage(
ChatColor.AQUA + "You've created a snitch block registered to the group " + owner.getName()
+ ". To name your snitch, type /janame.");
}
} else if (block.getType().equals(Material.NOTE_BLOCK)) {
Player player = event.getPlayer();
Location loc = block.getLocation();
Reinforcement rei = event.getReinforcement();
if (rei instanceof PlayerReinforcement) {
PlayerReinforcement reinforcement = (PlayerReinforcement) rei;
Group owner = reinforcement.getGroup();
if (owner == null) {
JukeAlert.getInstance().log(String.format(
"No group on rein (%s)", reinforcement.getLocation().toString()));
}
Snitch snitch;
if (snitchManager.getSnitch(loc.getWorld(), loc) != null) {
snitch = snitchManager.getSnitch(loc.getWorld(), loc);
plugin.getJaLogger().updateSnitchGroup(
snitchManager.getSnitch(loc.getWorld(), loc), owner.getName());
snitchManager.removeSnitch(snitch);
snitch.setGroup(owner);
} else {
snitch = new Snitch(loc, owner, false, false);
plugin.getJaLogger().logSnitchPlace(
player.getWorld().getName(), owner.getName(), "", loc.getBlockX(), loc.getBlockY(),
loc.getBlockZ(), false);
snitch.setId(plugin.getJaLogger().getLastSnitchID());
plugin.getJaLogger().increaseLastSnitchID();
}
snitchManager.addSnitch(snitch);

player.sendMessage(ChatColor.AQUA + "You've created an entry snitch registered to the group "
+ owner.getName() + ". To name your entry snitch, type /janame.");
}
if (block == null || block.getType() == null) {
return;
}
boolean isJukebox = block.getType().equals(Material.JUKEBOX);
Copy link

@ProgrammerDan ProgrammerDan Jan 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to check for isJukebox and isNoteblock, and fast-fail if neither.

As it is, this'll try to create snitches for every kind of block you reinforce.

Copy link
Collaborator Author

@awoo-civ awoo-civ Jan 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh damn, duh.

boolean isNoteblock = block.getType().equals(Material.NOTE_BLOCK);
if (!isJukebox || !isNoteblock) {
return;
}
Player player = event.getPlayer();
if (player == null) {
return;
}
Location loc = block.getLocation();
if (loc == null) {
return;
}
Reinforcement rei = event.getReinforcement();
if (rei == null || !(rei instanceof PlayerReinforcement)) {
return;
}
PlayerReinforcement reinforcement = (PlayerReinforcement) rei;
Group owner = reinforcement.getGroup();
if (owner == null) {
JukeAlert.getInstance().log(String.format(
"No group on rein (%s)", reinforcement.getLocation().toString()));
}
Snitch snitch;
if (snitchManager.getSnitch(loc.getWorld(), loc) != null) {
snitch = snitchManager.getSnitch(loc.getWorld(), loc);
plugin.getJaLogger().updateSnitchGroup(
snitchManager.getSnitch(loc.getWorld(), loc), owner.getName());
snitchManager.removeSnitch(snitch);
snitch.setGroup(owner);
} else {
snitch = new Snitch(loc, owner, isJukebox, false);
plugin.getJaLogger().logSnitchPlace(
player.getWorld().getName(), owner.getName(), "", loc.getBlockX(), loc.getBlockY(),
loc.getBlockZ(), isJukebox);
snitch.setId(plugin.getJaLogger().getLastSnitchID());
plugin.getJaLogger().increaseLastSnitchID();
}
snitchManager.addSnitch(snitch);

String snitchWorldName = "";
if (snitch.getLoc() != null
&& snitch.getLoc().getWorld() != null
&& snitch.getLoc().getWorld().getName() != null) {
snitchWorldName = snitch.getLoc().getWorld().getName();
}
String snitchLocation = "[" + snitch.getX() + " " + snitch.getY() + " " + snitch.getZ() + "]";
String snitchGroupName = "";
if (snitch.getGroup() != null && snitch.getGroup().getName() != null) {
snitchGroupName = snitch.getGroup().getName();
}
String hoverText = String.format("World: %s\nLocation: %s\nGroup: %s",
snitchWorldName, snitchLocation, snitchGroupName);

String message;
if (isJukebox) {
message = (ChatColor.AQUA + "You've created a snitch block registered to the group " + snitchGroupName
+ ". To name your snitch, type /janame.");
} else {
message = (ChatColor.AQUA + "You've created an entry snitch registered to the group " + snitchGroupName
+ ". To name your entry snitch, type /janame.");
}
TextComponent lineText = new TextComponent(message);
lineText.setHoverEvent(
new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(hoverText).create()));
player.spigot().sendMessage(lineText);
}

@EventHandler(ignoreCancelled = true)
Expand Down