Compare commits

...

5 Commits
1.6.1 ... 1.6.3

Author SHA1 Message Date
hyperdefined
72e869d5e2 Update pom.xml 2023-05-22 20:22:02 -04:00
hyperdefined
300fe56c5a use continue here, not return
closes #33
2023-05-22 20:21:16 -04:00
hyperdefined
fe5e55d746 Update pom.xml 2023-05-22 00:05:00 -04:00
hyperdefined
0574fb61a6 fix traded-by tags :3333 2023-05-22 00:03:42 -04:00
hyperdefined
433ab547cb minor adjustments 2023-05-21 23:49:07 -04:00
3 changed files with 16 additions and 15 deletions

View File

@@ -23,7 +23,7 @@
<groupId>lol.hyper</groupId> <groupId>lol.hyper</groupId>
<artifactId>toolstats</artifactId> <artifactId>toolstats</artifactId>
<version>1.6.1</version> <version>1.6.3</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>ToolStats</name> <name>ToolStats</name>

View File

@@ -56,7 +56,7 @@ public class ChunkPopulate implements Listener {
for (Entity entity : chunk.getEntities()) { for (Entity entity : chunk.getEntities()) {
// if there is a new item frame // if there is a new item frame
if (!(entity instanceof ItemFrame)) { if (!(entity instanceof ItemFrame)) {
return; continue;
} }
ItemFrame itemFrame = (ItemFrame) entity; ItemFrame itemFrame = (ItemFrame) entity;
// if the item frame has an elytra // if the item frame has an elytra
@@ -64,7 +64,7 @@ public class ChunkPopulate implements Listener {
ItemStack elytraCopy = itemFrame.getItem(); ItemStack elytraCopy = itemFrame.getItem();
ItemMeta meta = elytraCopy.getItemMeta(); ItemMeta meta = elytraCopy.getItemMeta();
if (meta == null) { if (meta == null) {
return; continue;
} }
// add the new tag so we know it's new // add the new tag so we know it's new
PersistentDataContainer container = meta.getPersistentDataContainer(); PersistentDataContainer container = meta.getPersistentDataContainer();

View File

@@ -66,20 +66,21 @@ public class VillagerTrade implements Listener {
if (event.getSlotType() == InventoryType.SlotType.RESULT) { if (event.getSlotType() == InventoryType.SlotType.RESULT) {
ItemStack item = event.getCurrentItem(); ItemStack item = event.getCurrentItem();
// only check items we want // only check items we want
if (ItemChecker.isValidItem(item.getType())) { if (!ItemChecker.isValidItem(item.getType())) {
// if the player shift clicks, show the warning return;
if (event.isShiftClick()) { }
String configMessage = toolStats.config.getString("messages.shift-click-warning.trading"); // if the player shift clicks, show the warning
if (configMessage != null) { if (event.isShiftClick()) {
event.getWhoClicked().sendMessage(ChatColor.translateAlternateColorCodes('&', configMessage)); String configMessage = toolStats.config.getString("messages.shift-click-warning.trading");
} if (configMessage != null) {
} player.sendMessage(ChatColor.translateAlternateColorCodes('&', configMessage));
ItemStack newItem = addLore(item, player);
if (newItem != null) {
// this gets delayed since villager inventories suck for no reason
Bukkit.getScheduler().runTaskLater(toolStats, () -> event.setCurrentItem(newItem), 5);
} }
} }
ItemStack newItem = addLore(item, player);
if (newItem != null) {
// set the new item
inventory.setItem(event.getSlot(), newItem);
}
} }
} }
} }