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

Compare commits

base: DocRock3r:1.3.1
Branches Tags
DocRock3r:master
DocRock3r:1.9.10 DocRock3r:1.9.9 DocRock3r:1.9.8 DocRock3r:1.9.7 DocRock3r:1.9.6 DocRock3r:1.9.5 DocRock3r:1.9.4 DocRock3r:1.9.3 DocRock3r:1.9.2-hotfix-2 DocRock3r:1.9.2-hotfix DocRock3r:1.9.2 DocRock3r:1.9.1 DocRock3r:1.9 DocRock3r:1.8.7 DocRock3r:1.8.6 DocRock3r:1.8.5 DocRock3r:1.8.4 DocRock3r:1.8.3 DocRock3r:1.8.2 DocRock3r:1.8.1 DocRock3r:1.8 DocRock3r:1.7.3 DocRock3r:1.7.2 DocRock3r:1.7.1 DocRock3r:1.7 DocRock3r:1.6.3 DocRock3r:1.6.2 DocRock3r:1.6.1 DocRock3r:1.6 DocRock3r:1.5.1 DocRock3r:1.5 DocRock3r:1.4.5 DocRock3r:1.4.4 DocRock3r:1.4.3 DocRock3r:1.4.2 DocRock3r:1.4.1 DocRock3r:1.4 DocRock3r:1.3.4 DocRock3r:1.3.3 DocRock3r:1.3.2 DocRock3r:1.3.1 DocRock3r:1.3 DocRock3r:1.2.3 DocRock3r:1.2.2 DocRock3r:1.2.1 DocRock3r:1.2 DocRock3r:1.1 DocRock3r:1.0
...
compare: DocRock3r:1.3.2
Branches Tags
DocRock3r:master
DocRock3r:1.9.10 DocRock3r:1.9.9 DocRock3r:1.9.8 DocRock3r:1.9.7 DocRock3r:1.9.6 DocRock3r:1.9.5 DocRock3r:1.9.4 DocRock3r:1.9.3 DocRock3r:1.9.2-hotfix-2 DocRock3r:1.9.2-hotfix DocRock3r:1.9.2 DocRock3r:1.9.1 DocRock3r:1.9 DocRock3r:1.8.7 DocRock3r:1.8.6 DocRock3r:1.8.5 DocRock3r:1.8.4 DocRock3r:1.8.3 DocRock3r:1.8.2 DocRock3r:1.8.1 DocRock3r:1.8 DocRock3r:1.7.3 DocRock3r:1.7.2 DocRock3r:1.7.1 DocRock3r:1.7 DocRock3r:1.6.3 DocRock3r:1.6.2 DocRock3r:1.6.1 DocRock3r:1.6 DocRock3r:1.5.1 DocRock3r:1.5 DocRock3r:1.4.5 DocRock3r:1.4.4 DocRock3r:1.4.3 DocRock3r:1.4.2 DocRock3r:1.4.1 DocRock3r:1.4 DocRock3r:1.3.4 DocRock3r:1.3.3 DocRock3r:1.3.2 DocRock3r:1.3.1 DocRock3r:1.3 DocRock3r:1.2.3 DocRock3r:1.2.2 DocRock3r:1.2.1 DocRock3r:1.2 DocRock3r:1.1 DocRock3r:1.0

5 Commits
1.3.1 ... 1.3.2

Author SHA1 Message Date
hyperdefined
df23f40d6b Update pom.xml 2022-02-22 15:08:38 -05:00
hyperdefined
0221ee40cf handle logic of lore reset better 2022-02-22 15:07:51 -05:00
hyperdefined
a01d07af4a fixed removing new tag for elytras 
this fixes #5
 2022-02-22 15:07:30 -05:00
hyperdefined
e402d3078a Merge pull request #4 from hyperdefined/dependabot/maven/org.apache.maven.plugins-maven-compiler-plugin-3.10.0 
Bump maven-compiler-plugin from 3.9.0 to 3.10.0
 2022-02-14 21:07:02 -05:00
dependabot[bot]
4f44ca0777 Bump maven-compiler-plugin from 3.9.0 to 3.10.0 
Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.9.0 to 3.10.0.
- [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
- [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.9.0...maven-compiler-plugin-3.10.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-compiler-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-14 11:38:14 +00:00
3 changed files with 56 additions and 42 deletions
Expand all files Collapse all files

4
pom.xml
View File

@@ -23,7 +23,7 @@
<groupId>lol.hyper</groupId> <groupId>lol.hyper</groupId>
<artifactId>toolstats</artifactId> <artifactId>toolstats</artifactId>
<version>1.3.1</version> <version>1.3.2</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>ToolStats</name> <name>ToolStats</name>
@@ -51,7 +51,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.9.0</version> <version>3.10.0</version>
<configuration> <configuration>
<source>${java.version}</source> <source>${java.version}</source>
<target>${java.version}</target> <target>${java.version}</target>

92
src/main/java/lol/hyper/toolstats/commands/CommandToolStats.java
View File

@@ -129,6 +129,25 @@ public class CommandToolStats implements TabExecutor {
} }
} }
} }
// hard code elytras
if (finalItem.getType() == Material.ELYTRA) {
if (toolStats.config.getBoolean("enabled.elytra-tag")) {
lore.add(toolStats.getLoreFromConfig("looted.found-by", true).replace("{player}", player.getName()));
if (container.has(toolStats.timeCreated, PersistentDataType.LONG)) {
Long time = container.get(toolStats.timeCreated, PersistentDataType.LONG);
if (time != null) {
lore.add(toolStats.getLoreFromConfig("looted.found-on", true).replace("{date}", format.format(new Date(time))));
}
}
finalMeta.setLore(lore);
finalItem.setItemMeta(finalMeta);
int slot = player.getInventory().getHeldItemSlot();
player.getInventory().setItem(slot, finalItem);
return;
}
}
if (toolStats.checkConfig(original, "created-by")) { if (toolStats.checkConfig(original, "created-by")) {
if (container.has(toolStats.genericOwner, new UUIDDataType())) { if (container.has(toolStats.genericOwner, new UUIDDataType())) {
container.set(toolStats.genericOwner, new UUIDDataType(), player.getUniqueId()); container.set(toolStats.genericOwner, new UUIDDataType(), player.getUniqueId());
@@ -143,7 +162,7 @@ public class CommandToolStats implements TabExecutor {
break; break;
} }
case "LOOTED": { case "LOOTED": {
lore.add(toolStats.getLoreFromConfig("looted.looted-by", true).replace("{player}", player.getName())); lore.add(toolStats.getLoreFromConfig("looted.found-by", true).replace("{player}", player.getName()));
break; break;
} }
case "TRADED": { case "TRADED": {
@@ -156,26 +175,25 @@ public class CommandToolStats implements TabExecutor {
if (toolStats.checkConfig(original, "created-date")) { if (toolStats.checkConfig(original, "created-date")) {
if (container.has(toolStats.timeCreated, PersistentDataType.LONG)) { if (container.has(toolStats.timeCreated, PersistentDataType.LONG)) {
Long time = container.get(toolStats.timeCreated, PersistentDataType.LONG); Long time = container.get(toolStats.timeCreated, PersistentDataType.LONG);
if (time == null) { if (time != null) {
return; // show how when the item was created based on the previous lore
} switch (type) {
// show how when the item was created based on the previous lore case "DEFAULT": {
switch (type) { lore.add(toolStats.getLoreFromConfig("created.created-on", true).replace("{date}", format.format(new Date(time))));
case "DEFAULT": { break;
lore.add(toolStats.getLoreFromConfig("created.created-on", true).replace("{date}", format.format(new Date(time)))); }
break; case "CAUGHT": {
} lore.add(toolStats.getLoreFromConfig("fished.caught-on", true).replace("{date}", format.format(new Date(time))));
case "CAUGHT": { break;
lore.add(toolStats.getLoreFromConfig("fished.caught-on", true).replace("{date}", format.format(new Date(time)))); }
break; case "LOOTED": {
} lore.add(toolStats.getLoreFromConfig("looted.foundon", true).replace("{date}", format.format(new Date(time))));
case "LOOTED": { break;
lore.add(toolStats.getLoreFromConfig("looted.looted-on", true).replace("{date}", format.format(new Date(time)))); }
break; case "TRADED": {
} lore.add(toolStats.getLoreFromConfig("traded.traded-on", true).replace("{date}", format.format(new Date(time))));
case "TRADED": { break;
lore.add(toolStats.getLoreFromConfig("traded.traded-on", true).replace("{date}", format.format(new Date(time)))); }
break;
} }
} }
} }
@@ -183,59 +201,55 @@ public class CommandToolStats implements TabExecutor {
if (toolStats.checkConfig(original, "player-kills")) { if (toolStats.checkConfig(original, "player-kills")) {
if (container.has(toolStats.swordPlayerKills, PersistentDataType.INTEGER)) { if (container.has(toolStats.swordPlayerKills, PersistentDataType.INTEGER)) {
Integer kills = container.get(toolStats.swordPlayerKills, PersistentDataType.INTEGER); Integer kills = container.get(toolStats.swordPlayerKills, PersistentDataType.INTEGER);
if (kills == null) { if (kills != null) {
return; lore.add(toolStats.getLoreFromConfig("kills.player", true).replace("{kills}", Integer.toString(kills)));
} }
lore.add(toolStats.getLoreFromConfig("kills.player", true).replace("{kills}", Integer.toString(kills)));
} }
} }
if (toolStats.checkConfig(original, "mob-kills")) { if (toolStats.checkConfig(original, "mob-kills")) {
if (container.has(toolStats.swordMobKills, PersistentDataType.INTEGER)) { if (container.has(toolStats.swordMobKills, PersistentDataType.INTEGER)) {
Integer kills = container.get(toolStats.swordMobKills, PersistentDataType.INTEGER); Integer kills = container.get(toolStats.swordMobKills, PersistentDataType.INTEGER);
if (kills == null) { if (kills != null) {
return; lore.add(toolStats.getLoreFromConfig("kills.mob", true).replace("{kills}", Integer.toString(kills)));
} }
lore.add(toolStats.getLoreFromConfig("kills.mob", true).replace("{kills}", Integer.toString(kills)));
} }
} }
if (toolStats.checkConfig(original, "blocks-mined")) { if (toolStats.checkConfig(original, "blocks-mined")) {
if (container.has(toolStats.genericMined, PersistentDataType.INTEGER)) { if (container.has(toolStats.genericMined, PersistentDataType.INTEGER)) {
Integer blocksMined = container.get(toolStats.genericMined, PersistentDataType.INTEGER); Integer blocksMined = container.get(toolStats.genericMined, PersistentDataType.INTEGER);
if (blocksMined == null) { if (blocksMined != null) {
return; lore.add(toolStats.getLoreFromConfig("blocks-mined", true).replace("{blocks}", Integer.toString(blocksMined)));
} }
lore.add(toolStats.getLoreFromConfig("blocks-mined", true).replace("{blocks}", Integer.toString(blocksMined)));
} }
} }
if (toolStats.config.getBoolean("enabled.fish-caught")) { if (toolStats.config.getBoolean("enabled.fish-caught")) {
if (container.has(toolStats.fishingRodCaught, PersistentDataType.INTEGER)) { if (container.has(toolStats.fishingRodCaught, PersistentDataType.INTEGER)) {
Integer fish = container.get(toolStats.fishingRodCaught, PersistentDataType.INTEGER); Integer fish = container.get(toolStats.fishingRodCaught, PersistentDataType.INTEGER);
if (fish == null) { if (fish != null) {
return; lore.add(toolStats.getLoreFromConfig("fished.fish-caught", true).replace("{fish}", Integer.toString(fish)));
} }
lore.add(toolStats.getLoreFromConfig("fished.fish-caught", true).replace("{fish}", Integer.toString(fish)));
} }
} }
if (toolStats.config.getBoolean("enabled.sheep-sheared")) { if (toolStats.config.getBoolean("enabled.sheep-sheared")) {
if (container.has(toolStats.shearsSheared, PersistentDataType.INTEGER)) { if (container.has(toolStats.shearsSheared, PersistentDataType.INTEGER)) {
Integer sheep = container.get(toolStats.shearsSheared, PersistentDataType.INTEGER); Integer sheep = container.get(toolStats.shearsSheared, PersistentDataType.INTEGER);
if (sheep == null) { if (sheep != null) {
return; lore.add(toolStats.getLoreFromConfig("sheep-sheared", true).replace("{sheep}", Integer.toString(sheep)));
} }
lore.add(toolStats.getLoreFromConfig("sheep-sheared", true).replace("{sheep}", Integer.toString(sheep)));
} }
} }
if (toolStats.config.getBoolean("enabled.armor-damage")) { if (toolStats.config.getBoolean("enabled.armor-damage")) {
if (container.has(toolStats.armorDamage, PersistentDataType.INTEGER)) { if (container.has(toolStats.armorDamage, PersistentDataType.INTEGER)) {
Integer damage = container.get(toolStats.armorDamage, PersistentDataType.INTEGER); Integer damage = container.get(toolStats.armorDamage, PersistentDataType.INTEGER);
if (damage == null) { if (damage != null) {
return; lore.add(toolStats.getLoreFromConfig("damage-taken", true).replace("{damage}", Integer.toString(damage)));
} }
lore.add(toolStats.getLoreFromConfig("damage-taken", true).replace("{damage}", Integer.toString(damage)));
} }
} }
finalMeta.setLore(lore); finalMeta.setLore(lore);
finalItem.setItemMeta(finalMeta); finalItem.setItemMeta(finalMeta);
int slot = player.getInventory().getHeldItemSlot();
player.getInventory().setItem(slot, finalItem);
} }
@Nullable @Nullable

2
src/main/java/lol/hyper/toolstats/events/PickupItem.java
View File

@@ -61,7 +61,6 @@ public class PickupItem implements Listener {
PersistentDataContainer container = meta.getPersistentDataContainer(); PersistentDataContainer container = meta.getPersistentDataContainer();
// the elytra has the new key, set the lore to it // the elytra has the new key, set the lore to it
if (container.has(toolStats.newElytra, PersistentDataType.INTEGER)) { if (container.has(toolStats.newElytra, PersistentDataType.INTEGER)) {
container.remove(toolStats.newElytra);
addLore(itemStack, (Player) event.getEntity()); addLore(itemStack, (Player) event.getEntity());
} }
} }
@@ -83,6 +82,7 @@ public class PickupItem implements Listener {
PersistentDataContainer container = meta.getPersistentDataContainer(); PersistentDataContainer container = meta.getPersistentDataContainer();
container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated); container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId()); container.set(toolStats.genericOwner, new UUIDDataType(), owner.getUniqueId());
container.remove(toolStats.newElytra);
String foundByLoreRaw = toolStats.getLoreFromConfig("looted.found-by", true); String foundByLoreRaw = toolStats.getLoreFromConfig("looted.found-by", true);
String foundOnLoreRaw = toolStats.getLoreFromConfig("looted.found-on", true); String foundOnLoreRaw = toolStats.getLoreFromConfig("looted.found-on", true);