added social and equipment to pv (#158)

* Added equippment to pv

* not working :thumn up :trollface:

* working i think

* i forgot

* 2.1md gaming

* Fixing offset i think?

* Rename social_xp -> social

* thank you hy pixel for making equipemnt in a different order to armoru

Co-authored-by: jani270 <jani270@gmx.de>
Co-authored-by: jani270 <69345714+jani270@users.noreply.github.com>
Co-authored-by: kr45732 <52721908+kr45732@users.noreply.github.com>

1 files changed, 28 insertions, 0 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java
index e4014ca3..3f131465 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/profileviewer/GuiProfileViewer.java
@@ -265,6 +265,7 @@ public class GuiProfileViewer extends GuiScreen {
 	private ItemStack[] bestWeapons = null;
 	private ItemStack[] bestRods = null;
 	private ItemStack[] armorItems = null;
+	private ItemStack[] equipmentItems = null;
 	private HashMap<String, ItemStack[][][]> inventoryItems = new HashMap<>();
 	private String selectedInventory = "inv_contents";
 	private int currentInventoryIndex = 0;
@@ -2936,6 +2937,32 @@ public class GuiProfileViewer extends GuiScreen {
 			}
 		}
 
+		if (equipmentItems == null) {
+			equipmentItems = new ItemStack[4];
+			JsonArray equippment = Utils.getElement(inventoryInfo, "equippment_contents").getAsJsonArray();
+			for (int i = 0; i < equippment.size(); i++) {
+				if (equippment.get(i) == null || !equippment.get(i).isJsonObject()) continue;
+				equipmentItems[i] = NotEnoughUpdates.INSTANCE.manager.jsonToStack(equippment.get(i).getAsJsonObject(), false);
+			}
+		}
+
+		for (int i = 0; i < equipmentItems.length; i++) {
+			ItemStack stack = equipmentItems[i];
+			if (stack != null) {
+				Utils.drawItemStack(stack, guiLeft + 192, guiTop + 13 + 18 * i);
+				if (stack != fillerStack) {
+					if (mouseX >= guiLeft + 192 - 1 && mouseX <= guiLeft + 192 + 16 + 1) {
+						if (mouseY >= guiTop + 13 + 18 * i - 1 && mouseY <= guiTop + 13 + 18 * i + 16 + 1) {
+							tooltipToDisplay = stack.getTooltip(
+								Minecraft.getMinecraft().thePlayer,
+								Minecraft.getMinecraft().gameSettings.advancedItemTooltips
+							);
+						}
+					}
+				}
+			}
+		}
+
 		ItemStack[][][] inventories = getItemsForInventory(inventoryInfo, selectedInventory);
 		if (currentInventoryIndex >= inventories.length) currentInventoryIndex = inventories.length - 1;
 		if (currentInventoryIndex < 0) currentInventoryIndex = 0;
@@ -5236,6 +5263,7 @@ public class GuiProfileViewer extends GuiScreen {
 		bestWeapons = null;
 		bestRods = null;
 		armorItems = null;
+		equipmentItems = null;
 		inventoryItems = new HashMap<>();
 		currentInventoryIndex = 0;
 		arrowCount = -1;