Add Nether Reactor Stages To Expanded Creative Inventory

mods/src/creative/creative.cpp

@@ -48,10 +48,37 @@ static int32_t Inventory_setupDefault_FillingContainer_addItem_call_injection(un
     inventory_add_item(filling_container, *Tile_bedrock, true);
     inventory_add_item(filling_container, *Tile_info_updateGame1, true);
     inventory_add_item(filling_container, *Tile_info_updateGame2, true);
+    // Nether Reactor
+    for (int i = 0; i < 3; i++) {
+        if (i == 0) {
+            // Default Is Already In The Creative Inventory
+            continue;
+        }
+        ItemInstance *new_item_instance = new ItemInstance;
+        ALLOC_CHECK(new_item_instance);
+        new_item_instance = (*ItemInstance_constructor_tile_extra)(new_item_instance, *Tile_netherReactor, 1, i);
+        (*FillingContainer_addItem)(filling_container, new_item_instance);
+    }
 
     return ret;
 }
 
+// Hook Specific TileItem Constructor
+static unsigned char *Tile_initTiles_TileItem_injection(unsigned char *tile_item, int32_t id) {
+    // Call Original Method
+    unsigned char *ret = (*TileItem)(tile_item, id);
+
+    // Switch VTable
+    *(unsigned char **) tile_item = AuxDataTileItem_vtable;
+    // Configure Item
+    *(bool *) (tile_item + Item_is_stacked_by_data_property_offset) = true;
+    *(int32_t *) (tile_item + Item_max_damage_property_offset) = 0;
+    *(unsigned char **) (tile_item + AuxDataTileItem_icon_tile_property_offset) = Tile_tiles[id + 0x100];
+
+    // Return
+    return ret;
+}
+
 // Check Restriction Status
 static int is_restricted = 1;
 int creative_is_restricted() {
@@ -63,6 +90,16 @@ void init_creative() {
     // Add Extra Items To Creative Inventory (Only Replace Specific Function Call)
     if (feature_has("Expand Creative Inventory", 0)) {
         overwrite_call((void *) 0x8e0fc, (void *) Inventory_setupDefault_FillingContainer_addItem_call_injection);
+
+        // Use AuxDataTileItem by default instead of TileItem, so tiles in the Creative
+        // Inventory can have arbitrary auxiliary values.
+        {
+            // Fix Size
+            unsigned char size_patch[4] = {AUX_DATA_TILE_ITEM_SIZE, 0x00, 0xa0, 0xe3}; // "mov r0, #AUX_DATA_TILE_ITEM_SIZE"
+            patch((void *) 0xc6f64, size_patch);
+            // Hook Constructor
+            overwrite_call((void *) 0xc6f74, (void *) Tile_initTiles_TileItem_injection);
+        }
     }
 
     // Remove Creative Restrictions (Opening Chests, Crafting, Etc)

symbols/include/symbols/minecraft.h

@@ -76,6 +76,8 @@ struct RakNet_SystemAddress {
 
 // Tile
 
+static unsigned char **Tile_tiles = (unsigned char **) 0x180e08;
+
 typedef void (*Tile_initTiles_t)();
 static Tile_initTiles_t Tile_initTiles = (Tile_initTiles_t) 0xc358c;
 
@@ -251,6 +253,25 @@ typedef int32_t (*MouseBuildInput_tickBuild_t)(unsigned char *mouse_build_input,
 static MouseBuildInput_tickBuild_t MouseBuildInput_tickBuild = (MouseBuildInput_tickBuild_t) 0x17c98;
 static void *MouseBuildInput_tickBuild_vtable_addr = (void *) 0x102564;
 
+// Item
+
+static uint32_t Item_is_stacked_by_data_property_offset = 0x19; // unsigned char / bool
+static uint32_t Item_category_property_offset = 0x10; // int32_t
+static uint32_t Item_max_damage_property_offset = 0x8; // int32_t
+
+// TileItem
+
+typedef unsigned char *(*TileItem_t)(unsigned char *tile_item, int32_t id);
+static TileItem_t TileItem = (TileItem_t) 0xce3a4;
+
+// AuxDataTileItem
+
+#define AUX_DATA_TILE_ITEM_SIZE 0x2c
+
+static unsigned char *AuxDataTileItem_vtable = (unsigned char *) 0x114a58;
+
+static uint32_t AuxDataTileItem_icon_tile_property_offset = 0x28; // Tile *
+
 // ItemInstance
 
 typedef struct {