Added basic Minecraft TU0 support and basic TU75 (1.0.80) inventory s…

…upport

bindings.ini

@@ -22,6 +22,32 @@ Down = Down
 Left = Left
 Right = Right
 
+; Configure these binds in-game.
+; Sprint = D-PAD LEFT
+; Pick Block = D-PAD RIGHT
+[584111F7 - Minecraft]
+W = LS-Up
+S = LS-Down
+A = LS-Left
+D = LS-Right
+Ctrl = Left
+LClick = RT
+RClick = LT
+MClick = Right
+MWheelUp = LB
+MWheelDown = RB
+Space = A
+Q = B
+E = Y
+R = X
+Up = Up
+Down = Down
+Left = Left
+Right = Right
+LShift = RS
+Tab = Back
+Enter = Start
+
 ; Configure these binds in-game.
 ; Walk = D-PAD UP
 ; Previous Inventory = LB

src/xenia/hid/winkey/hookables/Minecraft.cc

@@ -0,0 +1,173 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2023 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include "xenia/hid/winkey/hookables/Minecraft.h"
+
+#include "xenia/base/platform_win.h"
+#include "xenia/cpu/processor.h"
+#include "xenia/emulator.h"
+#include "xenia/hid/hid_flags.h"
+#include "xenia/hid/input_system.h"
+#include "xenia/kernel/util/shim_utils.h"
+#include "xenia/kernel/xmodule.h"
+#include "xenia/kernel/xthread.h"
+#include "xenia/xbox.h"
+
+using namespace xe::kernel;
+
+DECLARE_double(sensitivity);
+DECLARE_bool(invert_y);
+DECLARE_bool(invert_x);
+
+namespace xe {
+namespace hid {
+namespace winkey {
+
+MinecraftGame::~MinecraftGame() = default;
+
+struct GameBuildAddrs {
+  uint32_t camera_base_addr;
+  std::string title_version;
+  int32_t camera_x_offset;
+  int32_t camera_y_offset;
+  uint32_t inventory_flag;
+  uint32_t inventory_ptr;
+  uint32_t inventory_x_offset;
+  uint32_t inventory_y_offset;
+};
+
+//compiler cannot be trusted to std::map structs properly
+struct GameBuildAddrs supported_builds[3] = {
+    {NULL, "", NULL, NULL, NULL, NULL, NULL, NULL}, 
+    {0x705AFD60, "1.0", 0x88, 0x8C, NULL, NULL, NULL, NULL}, 
+    {0x3002B02C, "1.0.80", -0x4EC, -0x4E8, 0x409EC558, 0x409E3DC0, 0x1A1C,0x1A20}
+};
+
+/* std::map<MinecraftGame::GameBuild, GameBuildAddrs> supported_builds{
+    {MinecraftGame::GameBuild::TU0, {0x705AFD60, "1.0",  0x88, 0x8C, NULL, NULL, NULL, NULL}},
+    {MinecraftGame::GameBuild::TU75,{0x3002B02C, "1.0.80", -0x4EC, -0x4E8, 0x409EC558, 0x409E3DC0, 0x1A1C, 0x1A20}}};*/
+
+bool MinecraftGame::IsGameSupported() {
+  auto title_id = kernel_state()->title_id();
+  if (title_id != 0x584111F7)
+    return false;
+
+  const std::string current_version =
+      kernel_state()->emulator()->title_version();
+
+  /* for (auto& build : supported_builds) {
+    if (current_version == build.second.title_version) {
+      game_build_ = build.first;
+      return true;
+    }
+  }*/
+  for (int i = 0; i < 3; i++)
+  {
+        if (current_version == supported_builds[i].title_version)
+        {
+            game_build_ = static_cast<MinecraftGame::GameBuild>(i);
+            return true;
+        }
+  }
+
+  return false;
+}
+
+bool MinecraftGame::DoHooks(uint32_t user_index, RawInputState& input_state,
+                           X_INPUT_STATE* out_state) {
+  if (!IsGameSupported()) {
+    return false;
+  }
+
+  XThread* current_thread = XThread::GetCurrentThread();
+
+  if (!current_thread) {
+    return false;
+  }
+
+  auto inventory_flag = *kernel_memory()->TranslateVirtual<xe::be<uint32_t>*>(supported_builds[game_build_].inventory_flag);
+  if (inventory_flag == 1)
+  {
+        auto inventory_addr = *kernel_memory()->TranslateVirtual<xe::be<uint32_t>*>(supported_builds[game_build_].inventory_ptr);
+        if (inventory_addr != 0)
+        {
+            auto inventory_input = *kernel_memory()->TranslateVirtual<xe::be<uint32_t>*>(inventory_addr);
+            auto* inventory_ptr = kernel_memory()->TranslateVirtual(inventory_input);
+            auto* inventoryX_ptr = reinterpret_cast<xe::be<float>*>(inventory_ptr + supported_builds[game_build_].inventory_x_offset);
+            auto* inventoryY_ptr = reinterpret_cast<xe::be<float>*>(inventory_ptr + supported_builds[game_build_].inventory_y_offset);
+
+            float inventoryX = *inventoryX_ptr;
+            float inventoryY = *inventoryY_ptr;
+
+              inventoryX += (((float)input_state.mouse.x_delta)) *
+                      (float)cvars::sensitivity;
+
+              inventoryY += (((float)input_state.mouse.y_delta)) *
+                      (float)cvars::sensitivity;
+
+            *inventoryX_ptr = inventoryX;
+            *inventoryY_ptr = inventoryY;
+
+            return true;
+        }
+  }
+
+    auto global_addr = *kernel_memory()->TranslateVirtual<xe::be<uint32_t>*>(supported_builds[game_build_].camera_base_addr);
+  int32_t offset = supported_builds[game_build_].camera_x_offset;
+    if (global_addr && global_addr < 0x0000000050000000) { //is realistically going to be between 40000000-50000000
+      auto* input_globals = kernel_memory()->TranslateVirtual(global_addr);
+
+      auto* player_cam_x = reinterpret_cast<xe::be<float>*>(input_globals + supported_builds[game_build_].camera_x_offset);
+      auto* player_cam_y = reinterpret_cast<xe::be<float>*>(input_globals + supported_builds[game_build_].camera_y_offset);
+
+      // Have to do weird things converting it to normal float otherwise
+      // xe::be += treats things as int?
+      float camX = (float)*player_cam_x;
+      float camY = (float)*player_cam_y;
+
+      if (!cvars::invert_x) {
+        camX += (((float)input_state.mouse.x_delta) / 5.f) *
+                (float)cvars::sensitivity;
+      } else {
+        camX -= (((float)input_state.mouse.x_delta) / 5.f) *
+                (float)cvars::sensitivity;
+      }
+
+      if (!cvars::invert_y) {
+        camY += (((float)input_state.mouse.y_delta) / 5.f) *
+                (float)cvars::sensitivity;
+      } else {
+        camY -= (((float)input_state.mouse.y_delta) / 5.f) *
+                (float)cvars::sensitivity;
+      }
+
+      //Keep in bounds because game can't catch up
+      if (camY > 90.0f)
+          camY = 90.0f;
+      else if (camY < -90.0f) 
+          camY = -90.0f;
+
+      *player_cam_x = camX;
+      *player_cam_y = camY;
+    }
+
+  return true;
+}
+
+bool MinecraftGame::ModifierKeyHandler(uint32_t user_index,
+                                      RawInputState& input_state,
+                                      X_INPUT_STATE* out_state) {
+  float thumb_lx = (int16_t)out_state->gamepad.thumb_lx;
+  float thumb_ly = (int16_t)out_state->gamepad.thumb_ly;
+  return false;
+}
+
+}  // namespace winkey
+}  // namespace hid
+}  // namespace xe

src/xenia/hid/winkey/hookables/Minecraft.h

@@ -0,0 +1,43 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2023 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#ifndef XENIA_HID_WINKEY_MINECRAFT_H_
+#define XENIA_HID_WINKEY_MINECRAFT_H_
+
+#include "xenia/hid/winkey/hookables/hookable_game.h"
+
+namespace xe {
+namespace hid {
+namespace winkey {
+
+class MinecraftGame : public HookableGame {
+ public:
+  enum /* class */ GameBuild{
+    Unknown,
+    TU0,
+    TU75
+  };
+
+  ~MinecraftGame() override;
+
+  bool IsGameSupported();
+  bool DoHooks(uint32_t user_index, RawInputState& input_state,
+               X_INPUT_STATE* out_state);
+  bool ModifierKeyHandler(uint32_t user_index, RawInputState& input_state,
+                          X_INPUT_STATE* out_state);
+
+ private:
+  GameBuild game_build_ = GameBuild::Unknown;
+};
+
+}  // namespace winkey
+}  // namespace hid
+}  // namespace xe
+
+#endif  // XENIA_HID_WINKEY_MINECRAFT_H_

src/xenia/hid/winkey/winkey_input_driver.cc

@@ -25,6 +25,7 @@
 #include "xenia/hid/winkey/hookables/halo3.h"
 #include "xenia/hid/winkey/hookables/SourceEngine.h"
 #include "xenia/hid/winkey/hookables/Crackdown2.h"
+#include "xenia/hid/winkey/hookables/Minecraft.h"
 
 DEFINE_bool(invert_y, false, "Invert mouse Y axis", "MouseHook");
 DEFINE_bool(invert_x, false, "Invert mouse X axis", "MouseHook");
@@ -307,6 +308,7 @@ WinKeyInputDriver::WinKeyInputDriver(xe::ui::Window* window,
   hookable_games_.push_back(std::move(std::make_unique<Halo3Game>()));
   hookable_games_.push_back(std::move(std::make_unique<SourceEngine>()));
   hookable_games_.push_back(std::move(std::make_unique<Crackdown2Game>()));
+  hookable_games_.push_back(std::move(std::make_unique<MinecraftGame>()));
 
   // Read bindings file if it exists
   std::ifstream binds("bindings.ini");