Skip to content

Commit 1a15fb9

Browse files
hyperdefinedhyperdefined
committed
misc cleanup
1 parent 44b70a8 commit 1a15fb9

File tree

10 files changed

+26
-63
lines changed

10 files changed

+26
-63
lines changed

‎src/main/java/lol/hyper/toolstats/ToolStats.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
import lol.hyper.toolstats.tools.NumberFormat;
2828
import lol.hyper.toolstats.tools.config.ConfigTools;
2929
import lol.hyper.toolstats.tools.config.ConfigUpdater;
30-
import net.kyori.adventure.text.Component;
31-
import net.kyori.adventure.text.format.NamedTextColor;
3230
import org.bstats.bukkit.Metrics;
3331
import org.bukkit.Bukkit;
3432
import org.bukkit.NamespacedKey;
@@ -205,7 +203,7 @@ public void checkForUpdates() {
205203
e.printStackTrace();
206204
return;
207205
}
208-
GitHubRelease current = api.getReleaseByTag(this.getDescription().getVersion());
206+
GitHubRelease current = api.getReleaseByTag(this.getPluginMeta().getVersion());
209207
GitHubRelease latest = api.getLatestVersion();
210208
if (current == null) {
211209
logger.warning("You are running a version that does not exist on GitHub. If you are in a dev environment, you can ignore this. Otherwise, this is a bug!");

‎src/main/java/lol/hyper/toolstats/events/BlocksMined.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package lol.hyper.toolstats.events;
1919

20-
import io.papermc.paper.threadedregions.scheduler.ScheduledTask;
2120
import lol.hyper.toolstats.ToolStats;
2221
import net.kyori.adventure.text.Component;
2322
import org.bukkit.Bukkit;
@@ -35,11 +34,9 @@
3534
import org.bukkit.inventory.meta.ItemMeta;
3635
import org.bukkit.persistence.PersistentDataContainer;
3736
import org.bukkit.persistence.PersistentDataType;
38-
import org.bukkit.scheduler.BukkitRunnable;
3937

4038
import java.util.List;
4139
import java.util.Locale;
42-
import java.util.function.Consumer;
4340

4441
public class BlocksMined implements Listener {
4542

‎src/main/java/lol/hyper/toolstats/events/EntityDamage.java‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -107,20 +107,16 @@ public void onDamage(EntityDamageByEntityEvent event) {
107107
return;
108108
}
109109
PlayerInventory inventory = shootingPlayer.getInventory();
110-
boolean isMainHand = inventory.getItemInMainHand().getType() == Material.BOW || inventory.getItemInMainHand().getType() == Material.CROSSBOW;
111-
boolean isOffHand = inventory.getItemInOffHand().getType() == Material.BOW || inventory.getItemInMainHand().getType() == Material.CROSSBOW;
110+
ItemStack main = inventory.getItemInMainHand();
111+
ItemStack offHand = inventory.getItemInOffHand();
112+
boolean isMain = main.getType() == Material.BOW || main.getType() == Material.CROSSBOW;
113+
boolean isOffHand = offHand.getType() == Material.BOW || offHand.getType() == Material.CROSSBOW;
112114
ItemStack heldBow = null;
113-
if (isMainHand) {
114-
heldBow = inventory.getItemInMainHand();
115+
if (isMain) {
116+
heldBow = main;
115117
}
116118
if (isOffHand) {
117-
heldBow = inventory.getItemInOffHand();
118-
}
119-
120-
// if the player is holding a bow in both hands
121-
// default to main hand since that takes priority
122-
if (isMainHand && isOffHand) {
123-
heldBow = inventory.getItemInMainHand();
119+
heldBow = offHand;
124120
}
125121

126122
// player swapped

‎src/main/java/lol/hyper/toolstats/events/InventoryOpen.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package lol.hyper.toolstats.events;
1919

20-
import io.papermc.paper.threadedregions.scheduler.ScheduledTask;
2120
import lol.hyper.toolstats.ToolStats;
2221
import lol.hyper.toolstats.tools.UUIDDataType;
2322
import org.bukkit.Bukkit;
@@ -30,10 +29,8 @@
3029
import org.bukkit.inventory.meta.ItemMeta;
3130
import org.bukkit.persistence.PersistentDataContainer;
3231
import org.bukkit.persistence.PersistentDataType;
33-
import org.bukkit.scheduler.BukkitRunnable;
3432

3533
import java.util.UUID;
36-
import java.util.function.Consumer;
3734

3835
public class InventoryOpen implements Listener {
3936

‎src/main/java/lol/hyper/toolstats/events/PlayerInteract.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package lol.hyper.toolstats.events;
1919

20-
import io.papermc.paper.threadedregions.scheduler.ScheduledTask;
2120
import lol.hyper.toolstats.ToolStats;
2221
import org.bukkit.Bukkit;
2322
import org.bukkit.GameMode;
@@ -32,11 +31,9 @@
3231
import org.bukkit.event.block.Action;
3332
import org.bukkit.event.player.PlayerInteractEntityEvent;
3433
import org.bukkit.event.player.PlayerInteractEvent;
35-
import org.bukkit.scheduler.BukkitRunnable;
3634

3735
import java.util.HashMap;
3836
import java.util.Map;
39-
import java.util.function.Consumer;
4037

4138
public class PlayerInteract implements Listener {
4239

‎src/main/java/lol/hyper/toolstats/events/PlayerJoin.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package lol.hyper.toolstats.events;
1919

20-
import io.papermc.paper.threadedregions.scheduler.ScheduledTask;
2120
import lol.hyper.toolstats.ToolStats;
2221
import lol.hyper.toolstats.tools.UUIDDataType;
2322
import org.bukkit.entity.Player;
@@ -29,10 +28,8 @@
2928
import org.bukkit.inventory.meta.ItemMeta;
3029
import org.bukkit.persistence.PersistentDataContainer;
3130
import org.bukkit.persistence.PersistentDataType;
32-
import org.bukkit.scheduler.BukkitRunnable;
3331

3432
import java.util.UUID;
35-
import java.util.function.Consumer;
3633

3734
public class PlayerJoin implements Listener {
3835

‎src/main/java/lol/hyper/toolstats/events/SheepShear.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ public void onShear(PlayerInteractEntityEvent event) {
5959
return;
6060
}
6161

62-
ItemStack shears = getShears(player);
63-
// player swapped items?
64-
if (shears == null) {
62+
ItemStack heldShears = getShears(player.getInventory());
63+
// player swapped or we can't get the shears
64+
if (heldShears == null) {
6565
return;
6666
}
6767

@@ -71,27 +71,27 @@ public void onShear(PlayerInteractEntityEvent event) {
7171
}
7272

7373
// update the stats
74-
addLore(shears);
74+
addLore(heldShears);
7575
}
7676

77-
private static @Nullable ItemStack getShears(Player player) {
78-
PlayerInventory inventory = player.getInventory();
79-
boolean isMainHand = inventory.getItemInMainHand().getType() == Material.SHEARS;
80-
boolean isOffHand = inventory.getItemInOffHand().getType() == Material.SHEARS;
81-
ItemStack shears = null;
82-
if (isMainHand) {
83-
shears = inventory.getItemInMainHand();
77+
private static @Nullable ItemStack getShears(PlayerInventory inventory) {
78+
ItemStack main = inventory.getItemInMainHand();
79+
ItemStack offHand = inventory.getItemInOffHand();
80+
81+
boolean isMain = main.getType() == Material.SHEARS;
82+
boolean isOffHand = offHand.getType() == Material.SHEARS;
83+
84+
// if the player is holding shears in their main hand, use that one
85+
// if the shears are in their offhand instead, use that one after checking main hand
86+
// Minecraft prioritizes main hand if the player holds in both hands
87+
if (isMain) {
88+
return main;
8489
}
8590
if (isOffHand) {
86-
shears = inventory.getItemInOffHand();
91+
return offHand;
8792
}
8893

89-
// if the player is hold shears in both hands
90-
// default to main hand since that takes priority
91-
if (isMainHand && isOffHand) {
92-
shears = inventory.getItemInMainHand();
93-
}
94-
return shears;
94+
return null;
9595
}
9696

9797
/**

‎src/main/java/lol/hyper/toolstats/events/VillagerTrade.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import lol.hyper.toolstats.ToolStats;
2121
import lol.hyper.toolstats.tools.UUIDDataType;
2222
import net.kyori.adventure.text.Component;
23-
import org.bukkit.ChatColor;
2423
import org.bukkit.GameMode;
2524
import org.bukkit.entity.Player;
2625
import org.bukkit.event.EventHandler;

‎src/main/java/lol/hyper/toolstats/tools/ItemLore.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import lol.hyper.toolstats.ToolStats;
2121
import net.kyori.adventure.text.Component;
22-
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
2322
import org.bukkit.inventory.meta.ItemMeta;
2423
import org.bukkit.persistence.PersistentDataContainer;
2524
import org.bukkit.persistence.PersistentDataType;

‎src/main/java/lol/hyper/toolstats/tools/UUIDDataType.java‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,6 @@
1515
* along with ToolStats. If not, see <https://www.gnu.org/licenses/>.
1616
*/
1717

18-
/*
19-
* This file is part of ToolStats.
20-
*
21-
* ToolStats is free software: you can redistribute it and/or modify
22-
* it under the terms of the GNU General Public License as published by
23-
* the Free Software Foundation, either version 3 of the License, or
24-
* (at your option) any later version.
25-
*
26-
* ToolStats is distributed in the hope that it will be useful,
27-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
28-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
29-
* GNU General Public License for more details.
30-
*
31-
* You should have received a copy of the GNU General Public License
32-
* along with ToolStats. If not, see <https://www.gnu.org/licenses/>.
33-
*/
34-
3518
package lol.hyper.toolstats.tools;
3619

3720
import org.bukkit.persistence.PersistentDataAdapterContext;

0 commit comments

Comments
 (0)