DocRock3r/ToolStats
1
0
Fork 0
mirror of https://github.com/hyperdefined/ToolStats.git synced 2025-12-07 13:15:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

1.9.2-hotfix

Browse Source
This commit is contained in:
hyperdefined
2025-02-11 15:57:49 -05:00
parent 5e3e9f0825
commit eeb6038b66
5 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

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

4
src/main/java/lol/hyper/toolstats/events/PlayerFish.java
View File

@@ -72,7 +72,9 @@ public class PlayerFish implements Listener {
PlayerInventory inventory = player.getInventory(); PlayerInventory inventory = player.getInventory();
boolean isMain = inventory.getItemInMainHand().getType() == Material.FISHING_ROD; boolean isMain = inventory.getItemInMainHand().getType() == Material.FISHING_ROD;
boolean isOffHand = inventory.getItemInOffHand().getType() == Material.FISHING_ROD; boolean isOffHand = inventory.getItemInOffHand().getType() == Material.FISHING_ROD;
if (isMain) { if (isMain && isOffHand) {
inventory.getItemInMainHand().setItemMeta(newFishingRod);
} else if (isMain) {
inventory.getItemInMainHand().setItemMeta(newFishingRod); inventory.getItemInMainHand().setItemMeta(newFishingRod);
} else if (isOffHand) { } else if (isOffHand) {
inventory.getItemInOffHand().setItemMeta(newFishingRod); inventory.getItemInOffHand().setItemMeta(newFishingRod);

12
src/main/java/lol/hyper/toolstats/events/SheepShear.java
View File

@@ -65,15 +65,17 @@ public class SheepShear implements Listener {
} }
// update the stats // update the stats
ItemMeta newItem = toolStats.itemLore.updateSheepSheared(heldShears, 1); ItemMeta newShears = toolStats.itemLore.updateSheepSheared(heldShears, 1);
if (newItem != null) { if (newShears != null) {
PlayerInventory inventory = player.getInventory(); PlayerInventory inventory = player.getInventory();
boolean isMain = inventory.getItemInMainHand().getType() == Material.SHEARS; boolean isMain = inventory.getItemInMainHand().getType() == Material.SHEARS;
boolean isOffHand = inventory.getItemInOffHand().getType() == Material.SHEARS; boolean isOffHand = inventory.getItemInOffHand().getType() == Material.SHEARS;
if (isMain) { if (isMain && isOffHand) {
inventory.getItemInMainHand().setItemMeta(newItem); inventory.getItemInMainHand().setItemMeta(newShears);
} else if (isMain) {
inventory.getItemInMainHand().setItemMeta(newShears);
} else if (isOffHand) { } else if (isOffHand) {
inventory.getItemInOffHand().setItemMeta(newItem); inventory.getItemInOffHand().setItemMeta(newShears);
} }
} }
} }

12
src/main/java/lol/hyper/toolstats/events/ShootBow.java
View File

@@ -56,15 +56,17 @@ public class ShootBow implements Listener {
return; return;
} }
ItemMeta newItem = toolStats.itemLore.updateArrowsShot(heldBow, 1); ItemMeta newBow = toolStats.itemLore.updateArrowsShot(heldBow, 1);
if (newItem != null) { if (newBow != null) {
PlayerInventory inventory = player.getInventory(); PlayerInventory inventory = player.getInventory();
boolean isMain = inventory.getItemInMainHand().getType() == Material.BOW || inventory.getItemInMainHand().getType() == Material.CROSSBOW; boolean isMain = inventory.getItemInMainHand().getType() == Material.BOW || inventory.getItemInMainHand().getType() == Material.CROSSBOW;
boolean isOffHand = inventory.getItemInOffHand().getType() == Material.BOW || inventory.getItemInOffHand().getType() == Material.CROSSBOW; boolean isOffHand = inventory.getItemInOffHand().getType() == Material.BOW || inventory.getItemInOffHand().getType() == Material.CROSSBOW;
if (isMain) { if (isMain && isOffHand) {
inventory.getItemInMainHand().setItemMeta(newItem); inventory.getItemInMainHand().setItemMeta(newBow);
} else if (isMain) {
inventory.getItemInMainHand().setItemMeta(newBow);
} else if (isOffHand) { } else if (isOffHand) {
inventory.getItemInOffHand().setItemMeta(newItem); inventory.getItemInOffHand().setItemMeta(newBow);
} }
} }
} }

9
src/main/java/lol/hyper/toolstats/tools/ItemChecker.java
View File

@@ -220,6 +220,9 @@ public class ItemChecker {
// if the player is holding a bow in their main hand, use that one // if the player is holding a bow in their main hand, use that one
// if the bow is in their offhand instead, use that one after checking main hand // if the bow is in their offhand instead, use that one after checking main hand
// Minecraft prioritizes main hand if the player holds in both hands // Minecraft prioritizes main hand if the player holds in both hands
if (isMain && isOffHand) {
return main;
}
if (isMain) { if (isMain) {
return main; return main;
} }
@@ -246,6 +249,9 @@ public class ItemChecker {
// if the player is holding shears in their main hand, use that one // if the player is holding shears in their main hand, use that one
// if the shears are in their offhand instead, use that one after checking main hand // if the shears are in their offhand instead, use that one after checking main hand
// Minecraft prioritizes main hand if the player holds in both hands // Minecraft prioritizes main hand if the player holds in both hands
if (isMain && isOffHand) {
return main;
}
if (isMain) { if (isMain) {
return main; return main;
} }
@@ -272,6 +278,9 @@ public class ItemChecker {
// if the player is holding a fishing rod in their main hand, use that one // if the player is holding a fishing rod in their main hand, use that one
// if the fishing rod is in their offhand instead, use that one after checking main hand // if the fishing rod is in their offhand instead, use that one after checking main hand
// Minecraft prioritizes main hand if the player holds in both hands // Minecraft prioritizes main hand if the player holds in both hands
if (isMain && isOffHand) {
return main;
}
if (isMain) { if (isMain) {
return main; return main;
} }