Move to amethyst latest

Author: FrederoxDev

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.12)
 project(BetterInventory)
-set(MOD_VERSION "1.4.0")
+set(MOD_VERSION "1.5.0")
 
 # Define only RelWithDebInfo as the available build configuration
 set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo" CACHE STRING "Build configurations" FORCE)

include/dllmain.h

@@ -5,11 +5,7 @@
 #include <fstream>
 #include <chrono>
 #include <amethyst/Log.h>
-#include <amethyst/HookManager.h>
-#include <amethyst/InputManager.h>
 #include <amethyst/Memory.h>
-#include <amethyst/events/EventManager.h>
-#include <amethyst/events/Event.h>
 #include <minecraft/src/common/world/item/ItemStack.h>
 #include <minecraft/src/common/world/item/ShulkerBoxBlockItem.h>
 #include <minecraft/src/common/world/item/ItemStackBase.h>
@@ -29,6 +25,7 @@
 #include <minecraft/src-client/common/client/gui/controls/renderers/HoverRenderer.h>
 #include <chrono>
 #include <amethyst-deps/safetyhook.hpp>
+#include <amethyst/runtime/AmethystContext.h>
 
 #include "ShulkerRenderer.h"
 

src/ShulkerRenderer.cpp

@@ -97,15 +97,15 @@ void ShulkerRenderer::Render(UIRenderContext* ctx, HoverRenderer* hoverRenderer,
         for (int y = 0; y < 3; y++) {
             ItemStack* itemStack = &shulkerInventory[index][y * 9 + x];
             if (itemStack->mItem == nullptr) continue;
-            if (itemStack->count == 1) continue;
+            if (itemStack->mCount == 1) continue;
 
             float top = (y * slotSize) + borderSize + textHeight + panelY;
             float bottom = top + 16.f;
 
             float left = (x * slotSize) + borderSize + panelX;
             float right = left + 16.f;
 
-            std::string text = fmt::format("{}", itemStack->count);
+            std::string text = fmt::format("{}", itemStack->mCount);
             RectangleArea rect = { left, right, top + 7.f, bottom};
 
             ctx->drawDebugText(&rect, &text, &mce::Color::WHITE, 1.0f, ui::Left, &textData, &caretData);

src/dllmain.cpp

@@ -20,8 +20,7 @@ static void Item_appendFormattedHovertext(Item* self, const ItemStackBase& itemS
         text.append(fmt::format("\n{}7Durability: {} / {}{}r", "\xc2\xa7", current, max, "\xc2\xa7"));
     }
 
-    std::string rawNameId;
-    itemStack.getRawNameId(rawNameId);
+    std::string rawNameId = itemStack.getRawNameId();
 
     if (rawNameId.find("shulker_box") != std::string::npos) {
         // Don't append the id for shulker boxes (makes it too long)
@@ -35,7 +34,6 @@ static void Item_appendFormattedHovertext(Item* self, const ItemStackBase& itemS
 int index = 0;
 
 static void Shulker_appendFormattedHovertext(ShulkerBoxBlockItem* self, const ItemStackBase& itemStack, Level& level, std::string& text, uint8_t someBool) {
-    Log::Info("Shulker appendFormattedHovertext");
     // Use the appendFormattedHovertext for regular items, we don't want the list of items
     Item_appendFormattedHovertext(self, itemStack, level, text, someBool);
 
@@ -89,13 +87,13 @@ static void HoverRenderer__renderHoverBox(HoverRenderer* self, MinecraftUIRender
     _HoverRenderer__renderHoverBox.thiscall(self, ctx, client, aabb, someFloat);
 }
 
-ModFunction void Initialize(HookManager* hookManager, Amethyst::EventManager* eventManager, InputManager * inputManager) {
-    hookManager->RegisterFunction(&Item::appendFormattedHovertext, "40 55 53 56 57 41 54 41 55 41 56 41 57 48 8D 6C 24 ? 48 81 EC ? ? ? ? 48 8B 05 ? ? ? ? 48 33 C4 48 89 45 ? 49 8B F1 4C 89 44 24 ? 4C 8B F2 48 8B D9");
-    hookManager->CreateHook(&Item::appendFormattedHovertext, _Item_appendFormattedHoverText, &Item_appendFormattedHovertext);
+ModFunction void Initialize(AmethystContext* ctx) {
+    ctx->mHookManager.RegisterFunction(&Item::appendFormattedHovertext, "40 55 53 56 57 41 54 41 55 41 56 41 57 48 8D 6C 24 ? 48 81 EC ? ? ? ? 48 8B 05 ? ? ? ? 48 33 C4 48 89 45 ? 49 8B F1 4C 89 44 24 ? 4C 8B F2 48 8B D9");
+    ctx->mHookManager.CreateHook(&Item::appendFormattedHovertext, _Item_appendFormattedHoverText, &Item_appendFormattedHovertext);
 
-    hookManager->RegisterFunction(&ShulkerBoxBlockItem::appendFormattedHovertext, "40 53 55 56 57 41 56 41 57 48 81 EC ? ? ? ? 48 8B 05 ? ? ? ? 48 33 C4 48 89 44 24 ? 4D 8B F9 48 8B DA");
-    hookManager->CreateHook(&ShulkerBoxBlockItem::appendFormattedHovertext, _Shulker_appendFormattedHoverText, &Shulker_appendFormattedHovertext);
+    ctx->mHookManager.RegisterFunction(&ShulkerBoxBlockItem::appendFormattedHovertext, "40 53 55 56 57 41 56 41 57 48 81 EC ? ? ? ? 48 8B 05 ? ? ? ? 48 33 C4 48 89 44 24 ? 4D 8B F9 48 8B DA");
+    ctx->mHookManager.CreateHook(&ShulkerBoxBlockItem::appendFormattedHovertext, _Shulker_appendFormattedHoverText, &Shulker_appendFormattedHovertext);
 
-    hookManager->RegisterFunction(&HoverRenderer::_renderHoverBox, "48 8B C4 48 89 58 ? 48 89 70 ? 48 89 78 ? 4C 89 70 ? 55 48 8D 68 ? 48 81 EC ? ? ? ? 0F 29 70 ? 0F 29 78 ? 44 0F 29 40 ? 49 8B D9");
-    hookManager->CreateHook(&HoverRenderer::_renderHoverBox, _HoverRenderer__renderHoverBox, &HoverRenderer__renderHoverBox);
+    ctx->mHookManager.RegisterFunction(&HoverRenderer::_renderHoverBox, "48 8B C4 48 89 58 ? 48 89 70 ? 48 89 78 ? 4C 89 70 ? 55 48 8D 68 ? 48 81 EC ? ? ? ? 0F 29 70 ? 0F 29 78 ? 44 0F 29 40 ? 49 8B D9");
+    ctx->mHookManager.CreateHook(&HoverRenderer::_renderHoverBox, _HoverRenderer__renderHoverBox, &HoverRenderer__renderHoverBox);
 }