Fully working shulker hover

Author: FrederoxDev

CMakeLists.txt

@@ -1,8 +1,7 @@
 cmake_minimum_required(VERSION 3.12)
-project(ItemInformation)
+project(BetterInventory)
 set(MOD_VERSION "1.4.0")
 
-
 # Define only RelWithDebInfo as the available build configuration
 set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo" CACHE STRING "Build configurations" FORCE)
 set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo" FORCE)

include/ShulkerRenderer.h

@@ -10,7 +10,9 @@
 #include <minecraft/src-client/common/client/renderer/NinesliceInfo.h>
 #include <amethyst/ui/NinesliceHelper.h>
 
+#define SHULKER_CACHE_SIZE 16
+
 class ShulkerRenderer {
 public:
-	void Render(UIRenderContext* ctx, HoverRenderer* hoverRenderer);
+	void Render(UIRenderContext* ctx, HoverRenderer* hoverRenderer, int index);
 };

src/ShulkerRenderer.cpp

@@ -1,6 +1,6 @@
 #include "ShulkerRenderer.h"
 
-extern ItemStack shulkerInventory[27];
+extern ItemStack shulkerInventory[SHULKER_CACHE_SIZE][27];
 
 // Texture loading
 static HashedString flushString(0xA99285D21E94FC80, "ui_flush");
@@ -22,23 +22,34 @@ glm::tvec2<float> itemSlotUvPos(188.0f / 256.0f, 184.0f / 256.0f);
 glm::tvec2<float> itemSlotUvSize(22.0f / 256.0f, 22.0f / 256.0f);
 Amethyst::NinesliceHelper backgroundNineslice(16, 16, 4, 4);
 
-void ShulkerRenderer::Render(UIRenderContext* ctx, HoverRenderer* hoverRenderer) {
+int countNewlines(const std::string& str) {
+    int newlineCount = 0;
+
+    for (char c : str) {
+        if (c == '\n') {
+            newlineCount++;
+        }
+    }
+
+    return newlineCount;
+}
+
+void ShulkerRenderer::Render(UIRenderContext* ctx, HoverRenderer* hoverRenderer, int index) {
 	// Only load inventory resources once
 	if (!hasLoadedTexture) {
 		ctx->getTexture(itemSlotTexture.get(), &itemSlotLocation, true);
         ctx->getTexture(backgroundTexture.get(), &backgroundLocation, true);
 		hasLoadedTexture = true;
 	}
 
-    float textHeight = 30.0f;
+    float textHeight = (countNewlines(hoverRenderer->mFilteredContent) + 1) * 10.0f;
     float panelWidth = slotSize * 9;
     float panelHeight = slotSize * 3 + textHeight;
 
     float panelX = hoverRenderer->mCursorPosition.x + hoverRenderer->mOffset.x;
     float panelY = hoverRenderer->mCursorPosition.y + hoverRenderer->mOffset.y;
 
     // Draw the background panel
-    //RectangleArea background = {panelX, panelX + panelWidth, panelY, panelY + panelHeight};
     RectangleArea background = {panelX - 4, panelX + panelWidth + 4, panelY - 4, panelY + panelHeight + 4};
     backgroundNineslice.Draw(background, backgroundTexture.get(), ctx);
     ctx->flushImages(mce::Color::WHITE, 1.0f, flushString);
@@ -61,7 +72,7 @@ void ShulkerRenderer::Render(UIRenderContext* ctx, HoverRenderer* hoverRenderer)
 
     for (int x = 0; x < 9; x++) {
         for (int y = 0; y < 3; y++) {
-            const ItemStack* itemStack = &shulkerInventory[y * 9 + x];
+            const ItemStack* itemStack = &shulkerInventory[index][y * 9 + x];
             if (itemStack->mItem == nullptr) continue;
 
             float xPos = (x * slotSize) + borderSize + panelX;
@@ -84,7 +95,7 @@ void ShulkerRenderer::Render(UIRenderContext* ctx, HoverRenderer* hoverRenderer)
     // Draw the item counts
     for (int x = 0; x < 9; x++) {
         for (int y = 0; y < 3; y++) {
-            ItemStack* itemStack = &shulkerInventory[y * 9 + x];
+            ItemStack* itemStack = &shulkerInventory[index][y * 9 + x];
             if (itemStack->mItem == nullptr) continue;
             if (itemStack->count == 1) continue;
 

src/dllmain.cpp

@@ -8,7 +8,7 @@ Item::_appendFormattedHovertext _Item_appendFormattedHovertext;
 HoverRenderer::__renderHoverBox __renderHoverBox;
 
 ShulkerRenderer shulkerRenderer;
-ItemStack shulkerInventory[27];
+ItemStack shulkerInventory[SHULKER_CACHE_SIZE][27];
 
 static void Item_appendFormattedHovertext(Item* self, const ItemStackBase& itemStack, Level& level, std::string& text, uint8_t a5) {
     _Item_appendFormattedHovertext(self, itemStack, level, text, a5);
@@ -20,18 +20,36 @@ static void Item_appendFormattedHovertext(Item* self, const ItemStackBase& itemS
         uint64_t current = max - item->getDamageValue(itemStack.mUserData);
         text.append(fmt::format("\n{}7Durability: {} / {}{}r", "\xc2\xa7", current, max, "\xc2\xa7"));
     }
-
+    
     std::string rawNameId;
     itemStack.getRawNameId(rawNameId);
+
+    if (rawNameId.find("shulker_box") != std::string::npos) {
+        // Don't append the id for shulker boxes (makes it too long)
+        text.append(fmt::format("\n{}8{}:{}{}r", "\xc2\xa7", item->mNamespace, rawNameId, "\xc2\xa7"));
+        return;
+    }
+
     text.append(fmt::format("\n{}8{}:{} ({}){}r", "\xc2\xa7", item->mNamespace, rawNameId, item->mId, "\xc2\xa7"));
 }
 
+int index = 0;
+
 static void Shulker_appendFormattedHovertext(ShulkerBoxBlockItem* self, const ItemStackBase& itemStack, Level& level, std::string& text, uint8_t someBool) {
     // Use the appendFormattedHovertext for regular items, we don't want the list of items
     Item_appendFormattedHovertext(self, itemStack, level, text, someBool);
+    
+    index++;
+    if (index >= SHULKER_CACHE_SIZE) index = 0;
+
+    // Hide a secret index in the shulker name
+    // We do this because appendFormattedHovertext gets called for the neightboring items so if there is a shulker
+    // to the right of this one then its preview will get overriden, so we keep track of multiple at once using a rolling identifier
+    text += fmt::format("{}{:x}", "\xc2\xa7", index);
+    int thisIndex = index;
 
     // Reset all the currrent item stacks
-    for (auto& itemStack : shulkerInventory) {
+    for (auto& itemStack : shulkerInventory[index]) {
         itemStack = ItemStack();
     }
 
@@ -45,15 +63,26 @@ static void Shulker_appendFormattedHovertext(ShulkerBoxBlockItem* self, const It
     for (int i = 0; i < items->size(); i++) {
         const CompoundTag* itemCompound = items->getCompound(i);
         byte slot = itemCompound->getByte("Slot");
-        shulkerInventory[slot]._loadItem(itemCompound);
+        shulkerInventory[thisIndex][slot]._loadItem(itemCompound);
     }
 }
 
 static void _renderHoverBox(HoverRenderer* self, MinecraftUIRenderContext* ctx, IClientInstance* client, RectangleArea* aabb, float someFloat) {
     // This is really bad code, it is relying on the fact that I have also hooked appendFormattedHovertext for items to append the item identifier
     // I have no idea where the currently hovered item is stored in the game! I can't find any references to it, so it might be set in some weird place?
+
     if (self->mFilteredContent.find("shulker_box") != std::string::npos) {
-        shulkerRenderer.Render(ctx, self);
+        std::string cachedIndex = self->mFilteredContent.substr(self->mFilteredContent.size() - 7, 1);
+
+        try {
+            int index = std::stoi(cachedIndex, nullptr, 16);
+            shulkerRenderer.Render(ctx, self, index);
+        }
+        catch (...) {
+            Log::Warning("There was an issue reading the shulker box! No id found, instead got: {}", cachedIndex);
+            return;
+        }
+
         return;
     }