Update Jingle dep, update some item tracker logic, add crafted items to item tracker, add 1.15 item tracking (#4)

* Rename item constants with version

* Update build.gradle

* Add crafted item tracking, add 1.15 item tracking, tweak some other item logic

Author: DuncanRuns

build.gradle

@@ -26,7 +26,7 @@ dependencies {
     // Choose Julti version: https://jitpack.io/#DuncanRuns/Julti/
     implementation 'com.github.DuncanRuns:Julti:v1.6.0'
     // Choose Jingle version: https://jitpack.io/#DuncanRuns/Jingle/
-    implementation 'com.github.DuncanRuns:Jingle:eeb4291b13'
+    implementation 'com.github.DuncanRuns:Jingle:v1.1.0'
 
     provided 'com.jetbrains.intellij.java:java-gui-forms-rt:203.7148.30'
     provided 'com.google.code.gson:gson:2.10'

src/main/java/gg/paceman/tracker/ItemTracker.java

@@ -9,12 +9,14 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.*;
 
 public class ItemTracker {
     private static final Gson GSON = new Gson();
     private Dictionary<String, Integer> estimatedCounts;
     private Dictionary<String, Integer> usages;
+    private Dictionary<String, Integer> crafted;
 
     public void tryUpdate(Path worldPath) {
         try {
@@ -28,6 +30,7 @@ private void update(Path worldPath) throws IOException, JsonSyntaxException {
         // Clear tables (and trash old ones)
         this.estimatedCounts = new Hashtable<>();
         this.usages = new Hashtable<>();
+        this.crafted = new Hashtable<>();
 
         Path recordFile = worldPath.resolve("speedrunigt").resolve("record.json");
         if (!Files.exists(recordFile)) { // No record file shouldn't happen, but I guess if it does then give up /shrug
@@ -75,27 +78,51 @@ private void update(Path worldPath) throws IOException, JsonSyntaxException {
                 this.usages.put(entry.getKey(), entry.getValue().getAsInt());
             }
         }
+
+        if (stats.has("minecraft:crafted")) {
+            JsonObject pickedUp = stats.getAsJsonObject("minecraft:crafted");
+            for (Map.Entry<String, JsonElement> entry : pickedUp.entrySet()) {
+                // Set crafted count for this item
+                this.crafted.put(entry.getKey(), entry.getValue().getAsInt());
+            }
+        }
     }
 
     public int getEstimatedCount(String item) {
         return Optional.ofNullable(this.estimatedCounts.get(item)).orElse(0);
     }
 
+    private int getCraftedCount(String item) {
+        return Optional.ofNullable(this.crafted.get(item)).orElse(0);
+    }
+
     public int getUsages(String item) {
         return Optional.ofNullable(this.usages.get(item)).orElse(0);
     }
 
-    public Optional<JsonObject> constructItemData(Set<String> itemsToGetEstimate, Set<String> itemsToGetUsage) {
+    /**
+     * @param itemsToGetEstimate items to get an estimated count for
+     * @param itemsToGetUsage    items to get an exact amount of times used for
+     * @param itemsToGetCrafted  items to get an exact amount of times crafted/traded for
+     * @return a json object suitable to be sent as item data to PaceMan.gg
+     */
+    public Optional<JsonObject> constructItemData(Set<String> itemsToGetEstimate, Set<String> itemsToGetUsage, Set<String> itemsToGetCrafted) {
         JsonObject estimatedCounts = new JsonObject();
         itemsToGetEstimate.stream().filter(s -> this.getEstimatedCount(s) > 0).forEach(s -> estimatedCounts.addProperty(s, this.getEstimatedCount(s)));
+
+        JsonObject crafted = new JsonObject();
+        itemsToGetCrafted.stream().filter(s -> this.getCraftedCount(s) > 0).forEach(s -> crafted.addProperty(s, this.getCraftedCount(s)));
+
         JsonObject usages = new JsonObject();
         itemsToGetUsage.stream().filter(s -> this.getUsages(s) > 0).forEach(s -> usages.addProperty(s, this.getUsages(s)));
+
         JsonObject itemData = new JsonObject();
-        if (estimatedCounts.size() == 0 && usages.size() == 0) {
+        if (estimatedCounts.size() == 0 && usages.size() == 0 && crafted.size() == 0) {
             return Optional.empty();
         }
-        itemData.add("estimatedCounts", estimatedCounts);
-        itemData.add("usages", usages);
+        if (!itemsToGetEstimate.isEmpty()) itemData.add("estimatedCounts", estimatedCounts);
+        if (!itemsToGetCrafted.isEmpty()) itemData.add("crafted", crafted);
+        if (!itemsToGetUsage.isEmpty()) itemData.add("usages", usages);
         return Optional.of(itemData);
     }
 }

src/main/java/gg/paceman/tracker/PaceManTracker.java

@@ -44,8 +44,11 @@ public class PaceManTracker {
     // Unimportant events are not considered when determining if an event is recent enough to send the run to PaceMan
     private static final List<String> UNIMPORTANT_EVENTS = Arrays.asList("common.leave_world", "common.rejoin_world");
 
-    private static final Set<String> IMPORTANT_ITEM_COUNTS = new HashSet<>(Arrays.asList("minecraft:ender_pearl", "minecraft:obsidian", "minecraft:blaze_rod"));
-    private static final Set<String> IMPORTANT_ITEM_USAGES = new HashSet<>(Arrays.asList("minecraft:ender_pearl", "minecraft:obsidian"));
+    private static final Set<String> IMPORTANT_ITEM_COUNTS_116 = new HashSet<>(Arrays.asList("minecraft:ender_pearl", "minecraft:obsidian", "minecraft:blaze_rod"));
+    private static final Set<String> IMPORTANT_ITEM_USAGES_116 = new HashSet<>(Arrays.asList("minecraft:ender_pearl", "minecraft:obsidian"));
+
+    private static final Set<String> IMPORTANT_ITEM_COUNTS_115 = Collections.singleton("minecraft:blaze_rod");
+    private static final Set<String> IMPORTANT_ITEM_CRAFTED_115 = Collections.singleton("minecraft:ender_pearl");
 
     public static final Pattern RANDOM_WORLD_PATTERN = Pattern.compile("^Random Speedrun #\\d+$");
     private static final Pattern GAME_VERSION_PATTERN = Pattern.compile("1\\.(\\d+)(?:\\.\\d+)?");
@@ -292,7 +295,9 @@ private PaceManResponse sendEventsToPacemanGG() {
 
     private Optional<JsonObject> constructItemData() {
         if (this.eventTracker.getGameVersion().equals("1.16.1")) {
-            return this.itemTracker.constructItemData(IMPORTANT_ITEM_COUNTS, IMPORTANT_ITEM_USAGES);
+            return this.itemTracker.constructItemData(IMPORTANT_ITEM_COUNTS_116, IMPORTANT_ITEM_USAGES_116, Collections.emptySet());
+        } else if (this.eventTracker.getGameVersion().equals("1.15.2")) {
+            return this.itemTracker.constructItemData(IMPORTANT_ITEM_COUNTS_115, Collections.emptySet(), IMPORTANT_ITEM_CRAFTED_115);
         }
         return Optional.empty();
     }
@@ -390,7 +395,7 @@ private void tick() {
             }
         }
 
-        if (this.eventTracker.getGameVersion().equals("1.16.1")) {
+        if (this.eventTracker.getGameVersion().equals("1.16.1") || this.eventTracker.getGameVersion().equals("1.15.2")) {
             this.itemTracker.tryUpdate(this.eventTracker.getWorldPath());
         }