Skip to content

Commit 70e1926

Browse files
hyperdefinedhyperdefined
committed
rename many config things
1 parent 5373792 commit 70e1926

File tree

13 files changed

+398
-240
lines changed

13 files changed

+398
-240
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public final class ToolStats extends JavaPlugin {
117117
*/
118118
public final NamespacedKey originType = new NamespacedKey(this, "origin");
119119

120-
public final int CONFIG_VERSION = 11;
120+
public final int CONFIG_VERSION = 12;
121121
public final Logger logger = this.getLogger();
122122
public final File configFile = new File(this.getDataFolder(), "config.yml");
123123
public boolean tokens = false;

‎src/main/java/lol/hyper/toolstats/commands/CommandToolStats.java‎

Lines changed: 63 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -266,84 +266,92 @@ private void fixItemLore(ItemStack original, Player player) {
266266
player.getInventory().setItem(slot, finalItem);
267267
}
268268

269-
if (toolStats.configTools.checkConfig(original.getType(), "created-by")) {
270-
if (container.has(toolStats.itemOwner, new UUIDDataType())) {
271-
UUID owner = container.get(toolStats.itemOwner, new UUIDDataType());
272-
String ownerName = null;
273-
// if we can read the current owner
274-
if (owner != null) {
275-
OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(owner);
276-
ownerName = offlinePlayer.getName();
277-
}
269+
if (container.has(toolStats.itemOwner, new UUIDDataType())) {
270+
UUID owner = container.get(toolStats.itemOwner, new UUIDDataType());
271+
String ownerName = null;
272+
// if we can read the current owner
273+
if (owner != null) {
274+
OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(owner);
275+
ownerName = offlinePlayer.getName();
276+
}
278277

279-
// if the owner's name is null for whatever reason, set the new owner
280-
// to the current player running the command
281-
if (ownerName == null) {
282-
player.sendMessage(Component.text("The owner of this item is null. Setting to " + player.getName() + ".", NamedTextColor.RED));
283-
ownerName = player.getName();
284-
container.set(toolStats.itemOwner, new UUIDDataType(), player.getUniqueId());
285-
}
278+
// if the owner's name is null for whatever reason, set the new owner
279+
// to the current player running the command
280+
if (ownerName == null) {
281+
player.sendMessage(Component.text("The owner of this item is null. Setting to " + player.getName() + ".", NamedTextColor.RED));
282+
ownerName = player.getName();
283+
container.set(toolStats.itemOwner, new UUIDDataType(), player.getUniqueId());
284+
}
286285

287-
// show how the item was created based on the previous lore
288-
switch (origin) {
289-
case 0: {
290-
lore.add(toolStats.configTools.formatLore("created.created-by", "{player}", ownerName));
291-
break;
286+
// show how the item was created based on the previous lore
287+
switch (origin) {
288+
case 0: {
289+
if (toolStats.configTools.checkConfig(original.getType(), "crafted-by")) {
290+
lore.add(toolStats.configTools.formatLore("crafted.crafted-by", "{player}", ownerName));
292291
}
293-
case 2: {
292+
break;
293+
}
294+
case 2: {
295+
if (toolStats.configTools.checkConfig(original.getType(), "looted-by")) {
294296
lore.add(toolStats.configTools.formatLore("looted.looted-by", "{player}", ownerName));
295-
break;
296297
}
297-
case 3: {
298+
break;
299+
}
300+
case 3: {
301+
if (toolStats.configTools.checkConfig(original.getType(), "traded-by")) {
298302
lore.add(toolStats.configTools.formatLore("traded.traded-by", "{player}", ownerName));
299-
break;
300-
}
301-
case 4: {
302-
lore.add(toolStats.configTools.formatLore("looted.found-by", "{player}", ownerName));
303-
break;
304303
}
305-
case 5: {
304+
break;
305+
}
306+
case 5: {
307+
if (toolStats.configTools.checkConfig(original.getType(), "fished-by")) {
306308
lore.add(toolStats.configTools.formatLore("fished.caught-by", "{player}", ownerName));
307-
break;
308309
}
309-
case 6: {
310+
break;
311+
}
312+
case 6: {
313+
if (toolStats.configTools.checkConfig(original.getType(), "spawned-in-by")) {
310314
lore.add(toolStats.configTools.formatLore("spawned-in.spawned-by", "{player}", ownerName));
311-
break;
312315
}
316+
break;
313317
}
314318
}
315319
}
316-
if (toolStats.configTools.checkConfig(original.getType(), "created-date")) {
317-
if (container.has(toolStats.timeCreated, PersistentDataType.LONG)) {
318-
Long time = container.get(toolStats.timeCreated, PersistentDataType.LONG);
319-
if (time != null) {
320-
String date = toolStats.numberFormat.formatDate(new Date(time));
321-
// show how when the item was created based on the previous lore
322-
switch (origin) {
323-
case 0: {
324-
lore.add(toolStats.configTools.formatLore("created.created-on", "{date}", date));
325-
break;
320+
if (container.has(toolStats.timeCreated, PersistentDataType.LONG)) {
321+
Long time = container.get(toolStats.timeCreated, PersistentDataType.LONG);
322+
if (time != null) {
323+
String date = toolStats.numberFormat.formatDate(new Date(time));
324+
// show how when the item was created based on the previous lore
325+
switch (origin) {
326+
case 0: {
327+
if (toolStats.configTools.checkConfig(original.getType(), "crafted-on")) {
328+
lore.add(toolStats.configTools.formatLore("crafted.crafted-on", "{date}", date));
326329
}
327-
case 2: {
330+
break;
331+
}
332+
case 2: {
333+
if (toolStats.configTools.checkConfig(original.getType(), "looted-on")) {
328334
lore.add(toolStats.configTools.formatLore("looted.looted-on", "{date}", date));
329-
break;
330335
}
331-
case 3: {
336+
break;
337+
}
338+
case 3: {
339+
if (toolStats.configTools.checkConfig(original.getType(), "traded-on")) {
332340
lore.add(toolStats.configTools.formatLore("traded.traded-on", "{date}", date));
333-
break;
334-
}
335-
case 4: {
336-
lore.add(toolStats.configTools.formatLore("looted.found-on", "{date}", date));
337-
break;
338341
}
339-
case 5: {
342+
break;
343+
}
344+
case 5: {
345+
if (toolStats.configTools.checkConfig(original.getType(), "fished-on")) {
340346
lore.add(toolStats.configTools.formatLore("fished.caught-on", "{date}", date));
341-
break;
342347
}
343-
case 6: {
348+
break;
349+
}
350+
case 6: {
351+
if (toolStats.configTools.checkConfig(original.getType(), "spawned-in-on")) {
344352
lore.add(toolStats.configTools.formatLore("spawned-in.spawned-on", "{date}", date));
345-
break;
346353
}
354+
break;
347355
}
348356
}
349357
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,12 @@ private ItemStack addCraftOrigin(ItemStack itemStack, Player owner) {
139139
}
140140

141141
// if creation date is enabled, add it
142-
if (toolStats.configTools.checkConfig(itemStack.getType(), "created-date")) {
142+
if (toolStats.configTools.checkConfig(itemStack.getType(), "crafted-on")) {
143143
container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
144144
container.set(toolStats.originType, PersistentDataType.INTEGER, 0);
145145

146146
String date = toolStats.numberFormat.formatDate(finalDate);
147-
Component newLine = toolStats.configTools.formatLore("created.created-on", "{date}", date);
147+
Component newLine = toolStats.configTools.formatLore("crafted.crafted-on", "{date}", date);
148148
if (newLine == null) {
149149
return null;
150150
}
@@ -153,11 +153,11 @@ private ItemStack addCraftOrigin(ItemStack itemStack, Player owner) {
153153
}
154154

155155
// if creation owner is enabled, add it
156-
if (toolStats.configTools.checkConfig(itemStack.getType(), "created-by")) {
156+
if (toolStats.configTools.checkConfig(itemStack.getType(), "crafted-by")) {
157157
container.set(toolStats.itemOwner, new UUIDDataType(), owner.getUniqueId());
158158
container.set(toolStats.originType, PersistentDataType.INTEGER, 0);
159159

160-
Component newLine = toolStats.configTools.formatLore("created.created-by", "{player}", owner.getName());
160+
Component newLine = toolStats.configTools.formatLore("crafted.crafted-by", "{player}", owner.getName());
161161
if (newLine == null) {
162162
return null;
163163
}

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

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.bukkit.persistence.PersistentDataContainer;
3131
import org.bukkit.persistence.PersistentDataType;
3232

33+
import java.util.ArrayList;
3334
import java.util.Date;
3435
import java.util.List;
3536

@@ -96,22 +97,45 @@ private ItemStack addCreativeOrigin(ItemStack itemStack, Player owner) {
9697
return null;
9798
}
9899

99-
// if hash is enabled, add it
100-
if (toolStats.config.getBoolean("generate-hash-for-items")) {
101-
String hash = toolStats.hashMaker.makeHash(newSpawnedItem.getType(), owner.getUniqueId(), timeCreated);
102-
container.set(toolStats.hash, PersistentDataType.STRING, hash);
100+
// get the current lore the item
101+
List<Component> lore;
102+
if (meta.hasLore()) {
103+
lore = meta.lore();
104+
} else {
105+
lore = new ArrayList<>();
103106
}
104107

105-
// if spawned in is enabled, add it
106-
if (toolStats.configTools.checkConfig(newSpawnedItem.getType(), "spawned-in")) {
108+
if (toolStats.configTools.checkConfig(itemStack.getType(), "spawned-in-on")) {
107109
container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
110+
container.set(toolStats.originType, PersistentDataType.INTEGER, 6);
111+
112+
String date = toolStats.numberFormat.formatDate(finalDate);
113+
Component newLine = toolStats.configTools.formatLore("spawned-in.spawned-on", "{date}", date);
114+
if (newLine == null) {
115+
return null;
116+
}
117+
lore.add(newLine);
118+
meta.lore(lore);
119+
}
120+
121+
if (toolStats.configTools.checkConfig(itemStack.getType(), "spawned-in-by")) {
108122
container.set(toolStats.itemOwner, new UUIDDataType(), owner.getUniqueId());
109123
container.set(toolStats.originType, PersistentDataType.INTEGER, 6);
110124

111-
String formattedDate = toolStats.numberFormat.formatDate(finalDate);
112-
List<Component> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
113-
meta.lore(newLore);
125+
Component newLine = toolStats.configTools.formatLore("spawned-in.spawned-by", "{player}", owner.getName());
126+
if (newLine == null) {
127+
return null;
128+
}
129+
lore.add(newLine);
130+
meta.lore(lore);
114131
}
132+
133+
// if hash is enabled, add it
134+
if (toolStats.config.getBoolean("generate-hash-for-items")) {
135+
String hash = toolStats.hashMaker.makeHash(newSpawnedItem.getType(), owner.getUniqueId(), timeCreated);
136+
container.set(toolStats.hash, PersistentDataType.STRING, hash);
137+
}
138+
115139
newSpawnedItem.setItemMeta(meta);
116140
return newSpawnedItem;
117141
}

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

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import org.bukkit.persistence.PersistentDataContainer;
3737
import org.bukkit.persistence.PersistentDataType;
3838

39+
import java.util.ArrayList;
3940
import java.util.Date;
4041
import java.util.List;
4142

@@ -102,26 +103,49 @@ private ItemStack addLootedOrigin(ItemStack itemStack, Player owner) {
102103
Date finalDate = new Date(timeCreated);
103104
PersistentDataContainer container = meta.getPersistentDataContainer();
104105

105-
if (!toolStats.configTools.checkConfig(newItem.getType(), "looted-tag")) {
106+
if (container.has(toolStats.timeCreated, PersistentDataType.LONG) || container.has(toolStats.itemOwner, PersistentDataType.LONG)) {
106107
return null;
107108
}
108109

109-
if (container.has(toolStats.timeCreated, PersistentDataType.LONG) || container.has(toolStats.itemOwner, PersistentDataType.LONG)) {
110-
return null;
110+
// get the current lore the item
111+
List<Component> lore;
112+
if (meta.hasLore()) {
113+
lore = meta.lore();
114+
} else {
115+
lore = new ArrayList<>();
116+
}
117+
118+
if (toolStats.configTools.checkConfig(newItem.getType(), "looted-on")) {
119+
container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
120+
container.set(toolStats.originType, PersistentDataType.INTEGER, 2);
121+
122+
String date = toolStats.numberFormat.formatDate(finalDate);
123+
Component newLine = toolStats.configTools.formatLore("looted.looted-on", "{date}", date);
124+
if (newLine == null) {
125+
return null;
126+
}
127+
lore.add(newLine);
128+
meta.lore(lore);
129+
}
130+
131+
if (toolStats.configTools.checkConfig(newItem.getType(), "looted-by")) {
132+
container.set(toolStats.itemOwner, new UUIDDataType(), owner.getUniqueId());
133+
container.set(toolStats.originType, PersistentDataType.INTEGER, 2);
134+
135+
Component newLine = toolStats.configTools.formatLore("looted.looted-by", "{player}", owner.getName());
136+
if (newLine == null) {
137+
return null;
138+
}
139+
lore.add(newLine);
140+
meta.lore(lore);
111141
}
112142

113-
// only make the hash if it's enabled
143+
// if hash is enabled, add it
114144
if (toolStats.config.getBoolean("generate-hash-for-items")) {
115145
String hash = toolStats.hashMaker.makeHash(newItem.getType(), owner.getUniqueId(), timeCreated);
116146
container.set(toolStats.hash, PersistentDataType.STRING, hash);
117147
}
118148

119-
container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
120-
container.set(toolStats.itemOwner, new UUIDDataType(), owner.getUniqueId());
121-
container.set(toolStats.originType, PersistentDataType.INTEGER, 2);
122-
String formattedDate = toolStats.numberFormat.formatDate(finalDate);
123-
List<Component> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
124-
meta.lore(newLore);
125149
newItem.setItemMeta(meta);
126150
return newItem;
127151
}

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

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.bukkit.persistence.PersistentDataContainer;
3636
import org.bukkit.persistence.PersistentDataType;
3737

38+
import java.util.ArrayList;
3839
import java.util.Date;
3940
import java.util.List;
4041

@@ -103,13 +104,25 @@ private ItemStack addElytraOrigin(ItemStack itemStack, Player owner) {
103104
container.set(toolStats.hash, PersistentDataType.STRING, hash);
104105
}
105106

107+
// get the current lore the item
108+
List<Component> lore;
109+
if (meta.hasLore()) {
110+
lore = meta.lore();
111+
} else {
112+
lore = new ArrayList<>();
113+
}
114+
106115
container.set(toolStats.timeCreated, PersistentDataType.LONG, timeCreated);
107116
container.set(toolStats.itemOwner, new UUIDDataType(), owner.getUniqueId());
108117
container.set(toolStats.originType, PersistentDataType.INTEGER, 4);
109118
container.remove(toolStats.newElytra);
119+
110120
String formattedDate = toolStats.numberFormat.formatDate(finalDate);
111-
List<Component> newLore = toolStats.itemLore.addNewOwner(meta, owner.getName(), formattedDate);
112-
meta.lore(newLore);
121+
Component dateCreatedLore = toolStats.configTools.formatLore("looted.found-on", "{date}", formattedDate);
122+
Component itemOwnerLore = toolStats.configTools.formatLore("looted.found-by", "{player}", owner.getName());
123+
lore.add(dateCreatedLore);
124+
lore.add(itemOwnerLore);
125+
meta.lore(lore);
113126
finalItem.setItemMeta(meta);
114127
return finalItem;
115128
}

0 commit comments

Comments
 (0)