gifts: added cords; lootChests: added serverAge and player cords

doej1367 · Mar 2, 2022 · b1e97f6 · b1e97f6
1 parent 451f21a
commit b1e97f6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/src/main/java/me/hyblockrnganalyzer/command/TestCommand.java b/src/main/java/me/hyblockrnganalyzer/command/TestCommand.java
@@ -1,7 +1,5 @@
 package me.hyblockrnganalyzer.command;
 
-import java.io.File;
-
 import me.hyblockrnganalyzer.util.HypixelEntityExtractor;
 import me.hyblockrnganalyzer.util.StackedArmorStand;
 import net.minecraft.client.Minecraft;

diff --git a/src/main/java/me/hyblockrnganalyzer/eventhandler/GiftEventHandler.java b/src/main/java/me/hyblockrnganalyzer/eventhandler/GiftEventHandler.java
@@ -75,8 +75,11 @@ public void run() {
 					} else
 						name = loot;
 					if (name != null && !name.isEmpty() && giftType >= 0)
-						main.getTxtDatabase().addDataset("_giftType:" + giftType + "," + name + ":" + count + "\n",
-								fileName);
+						main.getTxtDatabase()
+								.addDataset("_giftType:" + giftType + ",_x:" + (int) closestArmorStand.getPos().xCoord
+										+ ",_y:" + closestArmorStand.getPos().yCoord + ",_z:"
+										+ (int) closestArmorStand.getPos().zCoord + "," + name + ":" + count + "\n",
+										fileName);
 					giftTypeAtPosition.cleanup();
 				}
 			}.start();

diff --git a/src/main/java/me/hyblockrnganalyzer/eventhandler/TreasureChestEventHandler.java b/src/main/java/me/hyblockrnganalyzer/eventhandler/TreasureChestEventHandler.java
@@ -5,6 +5,7 @@
 import me.hyblockrnganalyzer.Main;
 import me.hyblockrnganalyzer.event.OpenCustomChestEvent;
 import me.hyblockrnganalyzer.util.DiscordWebhook;
+import net.minecraft.client.Minecraft;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -43,7 +44,12 @@ public void onOpenCustomChest(OpenCustomChestEvent event) {
 			sb.append(e.getKey() + ":" + e.getValue() + ",");
 		if (chestName.contains("Treasure Chest"))
 			main.getTxtDatabase().addDataset(sb.toString() + "\n", fileName0);
-		else if (chestName.contains("Loot Chest"))
-			main.getTxtDatabase().addDataset(sb.toString() + "\n", fileName1);
+		else if (chestName.contains("Loot Chest")) {
+			main.getTxtDatabase().addDataset("_lobbyAge:" + Minecraft.getMinecraft().theWorld.getTotalWorldTime()
+					+ ",_x:" + (int) Minecraft.getMinecraft().thePlayer.getPosition().getX() + ",_y:"
+					+ (int) Minecraft.getMinecraft().thePlayer.getPosition().getY() + ",_z:"
+					+ (int) Minecraft.getMinecraft().thePlayer.getPosition().getZ() + "," + sb.toString() + "\n",
+					fileName1);
+		}
 	}
 }
diff --git a/src/main/java/me/hyblockrnganalyzer/util/DiscordWebhook.java b/src/main/java/me/hyblockrnganalyzer/util/DiscordWebhook.java
@@ -1,10 +1,8 @@
 package me.hyblockrnganalyzer.util;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;