From 0521b540fd65d10f9869ac809333b10c57034e2f Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Sun, 14 Jul 2024 22:12:08 -0400 Subject: [PATCH] Fix Example Mods --- dependencies/symbol-processor/src | 2 +- .../expanded-creative/expanded-creative.cpp | 178 +++++++++--------- example-mods/recipes/recipes.cpp | 4 +- test | Bin 0 -> 18416 bytes test.cpp | 12 ++ 5 files changed, 104 insertions(+), 92 deletions(-) create mode 100755 test create mode 100644 test.cpp diff --git a/dependencies/symbol-processor/src b/dependencies/symbol-processor/src index 11342dbb78..346d4403df 160000 --- a/dependencies/symbol-processor/src +++ b/dependencies/symbol-processor/src @@ -1 +1 @@ -Subproject commit 11342dbb78b8897ddf75fb4c1b72d40915fab245 +Subproject commit 346d4403df854a03e0cce15d26519a8700014615 diff --git a/example-mods/expanded-creative/expanded-creative.cpp b/example-mods/expanded-creative/expanded-creative.cpp index b6e4fc959d..ef8f145266 100644 --- a/example-mods/expanded-creative/expanded-creative.cpp +++ b/example-mods/expanded-creative/expanded-creative.cpp @@ -10,623 +10,623 @@ static void Inventory_setupDefault_FillingContainer_addItem_call_injection(Filli fire_instance->count = 255; fire_instance->auxiliary = 0; fire_instance->id = 51; - FillingContainer_addItem(filling_container, fire_instance); + filling_container->addItem(fire_instance); ItemInstance *mushroomStew_instance = new ItemInstance; ALLOC_CHECK(mushroomStew_instance); mushroomStew_instance->count = 255; mushroomStew_instance->auxiliary = 0; mushroomStew_instance->id = 282; - FillingContainer_addItem(filling_container, mushroomStew_instance); + filling_container->addItem(mushroomStew_instance); ItemInstance *steak_instance = new ItemInstance; ALLOC_CHECK(steak_instance); steak_instance->count = 255; steak_instance->auxiliary = 0; steak_instance->id = 364; - FillingContainer_addItem(filling_container, steak_instance); + filling_container->addItem(steak_instance); ItemInstance *cookedChicken_instance = new ItemInstance; ALLOC_CHECK(cookedChicken_instance); cookedChicken_instance->count = 255; cookedChicken_instance->auxiliary = 0; cookedChicken_instance->id = 366; - FillingContainer_addItem(filling_container, cookedChicken_instance); + filling_container->addItem(cookedChicken_instance); ItemInstance *porkCooked_instance = new ItemInstance; ALLOC_CHECK(porkCooked_instance); porkCooked_instance->count = 255; porkCooked_instance->auxiliary = 0; porkCooked_instance->id = 320; - FillingContainer_addItem(filling_container, porkCooked_instance); + filling_container->addItem(porkCooked_instance); ItemInstance *apple_instance = new ItemInstance; ALLOC_CHECK(apple_instance); apple_instance->count = 255; apple_instance->auxiliary = 0; apple_instance->id = 260; - FillingContainer_addItem(filling_container, apple_instance); + filling_container->addItem(apple_instance); ItemInstance *tallGrass_instance = new ItemInstance; ALLOC_CHECK(tallGrass_instance); tallGrass_instance->count = 255; tallGrass_instance->auxiliary = 0; tallGrass_instance->id = 31; - FillingContainer_addItem(filling_container, tallGrass_instance); + filling_container->addItem(tallGrass_instance); ItemInstance *crops_instance = new ItemInstance; ALLOC_CHECK(crops_instance); crops_instance->count = 255; crops_instance->auxiliary = 0; crops_instance->id = 59; - FillingContainer_addItem(filling_container, crops_instance); + filling_container->addItem(crops_instance); ItemInstance *farmland_instance = new ItemInstance; ALLOC_CHECK(farmland_instance); farmland_instance->count = 255; farmland_instance->auxiliary = 0; farmland_instance->id = 60; - FillingContainer_addItem(filling_container, farmland_instance); + filling_container->addItem(farmland_instance); ItemInstance *activeFurnace_instance = new ItemInstance; ALLOC_CHECK(activeFurnace_instance); activeFurnace_instance->count = 255; activeFurnace_instance->auxiliary = 0; activeFurnace_instance->id = 62; - FillingContainer_addItem(filling_container, activeFurnace_instance); + filling_container->addItem(activeFurnace_instance); ItemInstance *ironDoor_instance = new ItemInstance; ALLOC_CHECK(ironDoor_instance); ironDoor_instance->count = 255; ironDoor_instance->auxiliary = 0; ironDoor_instance->id = 330; - FillingContainer_addItem(filling_container, ironDoor_instance); + filling_container->addItem(ironDoor_instance); ItemInstance *activeRedstoneOre_instance = new ItemInstance; ALLOC_CHECK(activeRedstoneOre_instance); activeRedstoneOre_instance->count = 255; activeRedstoneOre_instance->auxiliary = 0; activeRedstoneOre_instance->id = 74; - FillingContainer_addItem(filling_container, activeRedstoneOre_instance); + filling_container->addItem(activeRedstoneOre_instance); ItemInstance *pumkinStem_instance = new ItemInstance; ALLOC_CHECK(pumkinStem_instance); pumkinStem_instance->count = 255; pumkinStem_instance->auxiliary = 0; pumkinStem_instance->id = 105; - FillingContainer_addItem(filling_container, pumkinStem_instance); + filling_container->addItem(pumkinStem_instance); ItemInstance *newGrass_instance = new ItemInstance; ALLOC_CHECK(newGrass_instance); newGrass_instance->count = 255; newGrass_instance->auxiliary = 0; newGrass_instance->id = 253; - FillingContainer_addItem(filling_container, newGrass_instance); + filling_container->addItem(newGrass_instance); ItemInstance *reserved6_instance = new ItemInstance; ALLOC_CHECK(reserved6_instance); reserved6_instance->count = 255; reserved6_instance->auxiliary = 0; reserved6_instance->id = 1; - FillingContainer_addItem(filling_container, reserved6_instance); + filling_container->addItem(reserved6_instance); ItemInstance *doubleStoneSlab_instance = new ItemInstance; ALLOC_CHECK(doubleStoneSlab_instance); doubleStoneSlab_instance->count = 255; doubleStoneSlab_instance->auxiliary = 0; doubleStoneSlab_instance->id = 43; - FillingContainer_addItem(filling_container, doubleStoneSlab_instance); + filling_container->addItem(doubleStoneSlab_instance); ItemInstance *arrow_instance = new ItemInstance; ALLOC_CHECK(arrow_instance); arrow_instance->count = 255; arrow_instance->auxiliary = 0; arrow_instance->id = 262; - FillingContainer_addItem(filling_container, arrow_instance); + filling_container->addItem(arrow_instance); ItemInstance *coal_instance = new ItemInstance; ALLOC_CHECK(coal_instance); coal_instance->count = 255; coal_instance->auxiliary = 0; coal_instance->id = 263; - FillingContainer_addItem(filling_container, coal_instance); + filling_container->addItem(coal_instance); ItemInstance *diamond_instance = new ItemInstance; ALLOC_CHECK(diamond_instance); diamond_instance->count = 255; diamond_instance->auxiliary = 0; diamond_instance->id = 264; - FillingContainer_addItem(filling_container, diamond_instance); + filling_container->addItem(diamond_instance); ItemInstance *ironIngot_instance = new ItemInstance; ALLOC_CHECK(ironIngot_instance); ironIngot_instance->count = 255; ironIngot_instance->auxiliary = 0; ironIngot_instance->id = 265; - FillingContainer_addItem(filling_container, ironIngot_instance); + filling_container->addItem(ironIngot_instance); ItemInstance *goldIngot_instance = new ItemInstance; ALLOC_CHECK(goldIngot_instance); goldIngot_instance->count = 255; goldIngot_instance->auxiliary = 0; goldIngot_instance->id = 266; - FillingContainer_addItem(filling_container, goldIngot_instance); + filling_container->addItem(goldIngot_instance); ItemInstance *woodSword_instance = new ItemInstance; ALLOC_CHECK(woodSword_instance); woodSword_instance->count = 255; woodSword_instance->auxiliary = 0; woodSword_instance->id = 268; - FillingContainer_addItem(filling_container, woodSword_instance); + filling_container->addItem(woodSword_instance); ItemInstance *woodShovel_instance = new ItemInstance; ALLOC_CHECK(woodShovel_instance); woodShovel_instance->count = 255; woodShovel_instance->auxiliary = 0; woodShovel_instance->id = 269; - FillingContainer_addItem(filling_container, woodShovel_instance); + filling_container->addItem(woodShovel_instance); ItemInstance *woodPickaxe_instance = new ItemInstance; ALLOC_CHECK(woodPickaxe_instance); woodPickaxe_instance->count = 255; woodPickaxe_instance->auxiliary = 0; woodPickaxe_instance->id = 270; - FillingContainer_addItem(filling_container, woodPickaxe_instance); + filling_container->addItem(woodPickaxe_instance); ItemInstance *woodAxe_instance = new ItemInstance; ALLOC_CHECK(woodAxe_instance); woodAxe_instance->count = 255; woodAxe_instance->auxiliary = 0; woodAxe_instance->id = 271; - FillingContainer_addItem(filling_container, woodAxe_instance); + filling_container->addItem(woodAxe_instance); ItemInstance *stoneSword_instance = new ItemInstance; ALLOC_CHECK(stoneSword_instance); stoneSword_instance->count = 255; stoneSword_instance->auxiliary = 0; stoneSword_instance->id = 272; - FillingContainer_addItem(filling_container, stoneSword_instance); + filling_container->addItem(stoneSword_instance); ItemInstance *stoneShovel_instance = new ItemInstance; ALLOC_CHECK(stoneShovel_instance); stoneShovel_instance->count = 255; stoneShovel_instance->auxiliary = 0; stoneShovel_instance->id = 273; - FillingContainer_addItem(filling_container, stoneShovel_instance); + filling_container->addItem(stoneShovel_instance); ItemInstance *stonePickaxe_instance = new ItemInstance; ALLOC_CHECK(stonePickaxe_instance); stonePickaxe_instance->count = 255; stonePickaxe_instance->auxiliary = 0; stonePickaxe_instance->id = 274; - FillingContainer_addItem(filling_container, stonePickaxe_instance); + filling_container->addItem(stonePickaxe_instance); ItemInstance *stoneAxe_instance = new ItemInstance; ALLOC_CHECK(stoneAxe_instance); stoneAxe_instance->count = 255; stoneAxe_instance->auxiliary = 0; stoneAxe_instance->id = 275; - FillingContainer_addItem(filling_container, stoneAxe_instance); + filling_container->addItem(stoneAxe_instance); ItemInstance *shovelIron_instance = new ItemInstance; ALLOC_CHECK(shovelIron_instance); shovelIron_instance->count = 255; shovelIron_instance->auxiliary = 0; shovelIron_instance->id = 256; - FillingContainer_addItem(filling_container, shovelIron_instance); + filling_container->addItem(shovelIron_instance); ItemInstance *ironPick_instance = new ItemInstance; ALLOC_CHECK(ironPick_instance); ironPick_instance->count = 255; ironPick_instance->auxiliary = 0; ironPick_instance->id = 257; - FillingContainer_addItem(filling_container, ironPick_instance); + filling_container->addItem(ironPick_instance); ItemInstance *ironAxe_instance = new ItemInstance; ALLOC_CHECK(ironAxe_instance); ironAxe_instance->count = 255; ironAxe_instance->auxiliary = 0; ironAxe_instance->id = 258; - FillingContainer_addItem(filling_container, ironAxe_instance); + filling_container->addItem(ironAxe_instance); ItemInstance *diamondSword_instance = new ItemInstance; ALLOC_CHECK(diamondSword_instance); diamondSword_instance->count = 255; diamondSword_instance->auxiliary = 0; diamondSword_instance->id = 276; - FillingContainer_addItem(filling_container, diamondSword_instance); + filling_container->addItem(diamondSword_instance); ItemInstance *diamondShovel_instance = new ItemInstance; ALLOC_CHECK(diamondShovel_instance); diamondShovel_instance->count = 255; diamondShovel_instance->auxiliary = 0; diamondShovel_instance->id = 277; - FillingContainer_addItem(filling_container, diamondShovel_instance); + filling_container->addItem(diamondShovel_instance); ItemInstance *diamondPickaxe_instance = new ItemInstance; ALLOC_CHECK(diamondPickaxe_instance); diamondPickaxe_instance->count = 255; diamondPickaxe_instance->auxiliary = 0; diamondPickaxe_instance->id = 278; - FillingContainer_addItem(filling_container, diamondPickaxe_instance); + filling_container->addItem(diamondPickaxe_instance); ItemInstance *diamondAxe_instance = new ItemInstance; ALLOC_CHECK(diamondAxe_instance); diamondAxe_instance->count = 255; diamondAxe_instance->auxiliary = 0; diamondAxe_instance->id = 279; - FillingContainer_addItem(filling_container, diamondAxe_instance); + filling_container->addItem(diamondAxe_instance); ItemInstance *magicWand_instance = new ItemInstance; ALLOC_CHECK(magicWand_instance); magicWand_instance->count = 255; magicWand_instance->auxiliary = 0; magicWand_instance->id = 280; - FillingContainer_addItem(filling_container, magicWand_instance); + filling_container->addItem(magicWand_instance); ItemInstance *bowl_instance = new ItemInstance; ALLOC_CHECK(bowl_instance); bowl_instance->count = 255; bowl_instance->auxiliary = 0; bowl_instance->id = 281; - FillingContainer_addItem(filling_container, bowl_instance); + filling_container->addItem(bowl_instance); ItemInstance *goldSword_instance = new ItemInstance; ALLOC_CHECK(goldSword_instance); goldSword_instance->count = 255; goldSword_instance->auxiliary = 0; goldSword_instance->id = 283; - FillingContainer_addItem(filling_container, goldSword_instance); + filling_container->addItem(goldSword_instance); ItemInstance *goldShovel_instance = new ItemInstance; ALLOC_CHECK(goldShovel_instance); goldShovel_instance->count = 255; goldShovel_instance->auxiliary = 0; goldShovel_instance->id = 284; - FillingContainer_addItem(filling_container, goldShovel_instance); + filling_container->addItem(goldShovel_instance); ItemInstance *goldPickaxe_instance = new ItemInstance; ALLOC_CHECK(goldPickaxe_instance); goldPickaxe_instance->count = 255; goldPickaxe_instance->auxiliary = 0; goldPickaxe_instance->id = 285; - FillingContainer_addItem(filling_container, goldPickaxe_instance); + filling_container->addItem(goldPickaxe_instance); ItemInstance *goldAxe_instance = new ItemInstance; ALLOC_CHECK(goldAxe_instance); goldAxe_instance->count = 255; goldAxe_instance->auxiliary = 0; goldAxe_instance->id = 286; - FillingContainer_addItem(filling_container, goldAxe_instance); + filling_container->addItem(goldAxe_instance); ItemInstance *string_instance = new ItemInstance; ALLOC_CHECK(string_instance); string_instance->count = 255; string_instance->auxiliary = 0; string_instance->id = 287; - FillingContainer_addItem(filling_container, string_instance); + filling_container->addItem(string_instance); ItemInstance *feather_instance = new ItemInstance; ALLOC_CHECK(feather_instance); feather_instance->count = 255; feather_instance->auxiliary = 0; feather_instance->id = 288; - FillingContainer_addItem(filling_container, feather_instance); + filling_container->addItem(feather_instance); ItemInstance *gunpowder_instance = new ItemInstance; ALLOC_CHECK(gunpowder_instance); gunpowder_instance->count = 255; gunpowder_instance->auxiliary = 0; gunpowder_instance->id = 289; - FillingContainer_addItem(filling_container, gunpowder_instance); + filling_container->addItem(gunpowder_instance); ItemInstance *woodHoe_instance = new ItemInstance; ALLOC_CHECK(woodHoe_instance); woodHoe_instance->count = 255; woodHoe_instance->auxiliary = 0; woodHoe_instance->id = 290; - FillingContainer_addItem(filling_container, woodHoe_instance); + filling_container->addItem(woodHoe_instance); ItemInstance *stoneHoe_instance = new ItemInstance; ALLOC_CHECK(stoneHoe_instance); stoneHoe_instance->count = 255; stoneHoe_instance->auxiliary = 0; stoneHoe_instance->id = 291; - FillingContainer_addItem(filling_container, stoneHoe_instance); + filling_container->addItem(stoneHoe_instance); ItemInstance *flint1_instance = new ItemInstance; ALLOC_CHECK(flint1_instance); flint1_instance->count = 255; flint1_instance->auxiliary = 0; flint1_instance->id = 292; - FillingContainer_addItem(filling_container, flint1_instance); + filling_container->addItem(flint1_instance); ItemInstance *diamondHoe_instance = new ItemInstance; ALLOC_CHECK(diamondHoe_instance); diamondHoe_instance->count = 255; diamondHoe_instance->auxiliary = 0; diamondHoe_instance->id = 293; - FillingContainer_addItem(filling_container, diamondHoe_instance); + filling_container->addItem(diamondHoe_instance); ItemInstance *goldHoe_instance = new ItemInstance; ALLOC_CHECK(goldHoe_instance); goldHoe_instance->count = 255; goldHoe_instance->auxiliary = 0; goldHoe_instance->id = 294; - FillingContainer_addItem(filling_container, goldHoe_instance); + filling_container->addItem(goldHoe_instance); ItemInstance *seeds_instance = new ItemInstance; ALLOC_CHECK(seeds_instance); seeds_instance->count = 255; seeds_instance->auxiliary = 0; seeds_instance->id = 295; - FillingContainer_addItem(filling_container, seeds_instance); + filling_container->addItem(seeds_instance); ItemInstance *wheat_instance = new ItemInstance; ALLOC_CHECK(wheat_instance); wheat_instance->count = 255; wheat_instance->auxiliary = 0; wheat_instance->id = 296; - FillingContainer_addItem(filling_container, wheat_instance); + filling_container->addItem(wheat_instance); ItemInstance *bread_instance = new ItemInstance; ALLOC_CHECK(bread_instance); bread_instance->count = 255; bread_instance->auxiliary = 0; bread_instance->id = 297; - FillingContainer_addItem(filling_container, bread_instance); + filling_container->addItem(bread_instance); ItemInstance *diamondHelm_instance = new ItemInstance; ALLOC_CHECK(diamondHelm_instance); diamondHelm_instance->count = 255; diamondHelm_instance->auxiliary = 0; diamondHelm_instance->id = 310; - FillingContainer_addItem(filling_container, diamondHelm_instance); + filling_container->addItem(diamondHelm_instance); ItemInstance *diamondChest_instance = new ItemInstance; ALLOC_CHECK(diamondChest_instance); diamondChest_instance->count = 255; diamondChest_instance->auxiliary = 0; diamondChest_instance->id = 311; - FillingContainer_addItem(filling_container, diamondChest_instance); + filling_container->addItem(diamondChest_instance); ItemInstance *diamondLeg_instance = new ItemInstance; ALLOC_CHECK(diamondLeg_instance); diamondLeg_instance->count = 255; diamondLeg_instance->auxiliary = 0; diamondLeg_instance->id = 312; - FillingContainer_addItem(filling_container, diamondLeg_instance); + filling_container->addItem(diamondLeg_instance); ItemInstance *diamondBoot_instance = new ItemInstance; ALLOC_CHECK(diamondBoot_instance); diamondBoot_instance->count = 255; diamondBoot_instance->auxiliary = 0; diamondBoot_instance->id = 313; - FillingContainer_addItem(filling_container, diamondBoot_instance); + filling_container->addItem(diamondBoot_instance); ItemInstance *leatherCap_instance = new ItemInstance; ALLOC_CHECK(leatherCap_instance); leatherCap_instance->count = 255; leatherCap_instance->auxiliary = 0; leatherCap_instance->id = 298; - FillingContainer_addItem(filling_container, leatherCap_instance); + filling_container->addItem(leatherCap_instance); ItemInstance *leatherShirt_instance = new ItemInstance; ALLOC_CHECK(leatherShirt_instance); leatherShirt_instance->count = 255; leatherShirt_instance->auxiliary = 0; leatherShirt_instance->id = 299; - FillingContainer_addItem(filling_container, leatherShirt_instance); + filling_container->addItem(leatherShirt_instance); ItemInstance *leatherPants_instance = new ItemInstance; ALLOC_CHECK(leatherPants_instance); leatherPants_instance->count = 255; leatherPants_instance->auxiliary = 0; leatherPants_instance->id = 300; - FillingContainer_addItem(filling_container, leatherPants_instance); + filling_container->addItem(leatherPants_instance); ItemInstance *leatherBoots_instance = new ItemInstance; ALLOC_CHECK(leatherBoots_instance); leatherBoots_instance->count = 255; leatherBoots_instance->auxiliary = 0; leatherBoots_instance->id = 301; - FillingContainer_addItem(filling_container, leatherBoots_instance); + filling_container->addItem(leatherBoots_instance); ItemInstance *chainHelm_instance = new ItemInstance; ALLOC_CHECK(chainHelm_instance); chainHelm_instance->count = 255; chainHelm_instance->auxiliary = 0; chainHelm_instance->id = 302; - FillingContainer_addItem(filling_container, chainHelm_instance); + filling_container->addItem(chainHelm_instance); ItemInstance *chainShirt_instance = new ItemInstance; ALLOC_CHECK(chainShirt_instance); chainShirt_instance->count = 255; chainShirt_instance->auxiliary = 0; chainShirt_instance->id = 303; - FillingContainer_addItem(filling_container, chainShirt_instance); + filling_container->addItem(chainShirt_instance); ItemInstance *chainLegs_instance = new ItemInstance; ALLOC_CHECK(chainLegs_instance); chainLegs_instance->count = 255; chainLegs_instance->auxiliary = 0; chainLegs_instance->id = 304; - FillingContainer_addItem(filling_container, chainLegs_instance); + filling_container->addItem(chainLegs_instance); ItemInstance *chainBoots_instance = new ItemInstance; ALLOC_CHECK(chainBoots_instance); chainBoots_instance->count = 255; chainBoots_instance->auxiliary = 0; chainBoots_instance->id = 305; - FillingContainer_addItem(filling_container, chainBoots_instance); + filling_container->addItem(chainBoots_instance); ItemInstance *goldHelm_instance = new ItemInstance; ALLOC_CHECK(goldHelm_instance); goldHelm_instance->count = 255; goldHelm_instance->auxiliary = 0; goldHelm_instance->id = 314; - FillingContainer_addItem(filling_container, goldHelm_instance); + filling_container->addItem(goldHelm_instance); ItemInstance *goldChest_instance = new ItemInstance; ALLOC_CHECK(goldChest_instance); goldChest_instance->count = 255; goldChest_instance->auxiliary = 0; goldChest_instance->id = 315; - FillingContainer_addItem(filling_container, goldChest_instance); + filling_container->addItem(goldChest_instance); ItemInstance *goldLegs_instance = new ItemInstance; ALLOC_CHECK(goldLegs_instance); goldLegs_instance->count = 255; goldLegs_instance->auxiliary = 0; goldLegs_instance->id = 316; - FillingContainer_addItem(filling_container, goldLegs_instance); + filling_container->addItem(goldLegs_instance); ItemInstance *goldBoots_instance = new ItemInstance; ALLOC_CHECK(goldBoots_instance); goldBoots_instance->count = 255; goldBoots_instance->auxiliary = 0; goldBoots_instance->id = 317; - FillingContainer_addItem(filling_container, goldBoots_instance); + filling_container->addItem(goldBoots_instance); ItemInstance *ironHelm_instance = new ItemInstance; ALLOC_CHECK(ironHelm_instance); ironHelm_instance->count = 255; ironHelm_instance->auxiliary = 0; ironHelm_instance->id = 306; - FillingContainer_addItem(filling_container, ironHelm_instance); + filling_container->addItem(ironHelm_instance); ItemInstance *ironChest_instance = new ItemInstance; ALLOC_CHECK(ironChest_instance); ironChest_instance->count = 255; ironChest_instance->auxiliary = 0; ironChest_instance->id = 307; - FillingContainer_addItem(filling_container, ironChest_instance); + filling_container->addItem(ironChest_instance); ItemInstance *ironLegs_instance = new ItemInstance; ALLOC_CHECK(ironLegs_instance); ironLegs_instance->count = 255; ironLegs_instance->auxiliary = 0; ironLegs_instance->id = 308; - FillingContainer_addItem(filling_container, ironLegs_instance); + filling_container->addItem(ironLegs_instance); ItemInstance *ironBoots_instance = new ItemInstance; ALLOC_CHECK(ironBoots_instance); ironBoots_instance->count = 255; ironBoots_instance->auxiliary = 0; ironBoots_instance->id = 309; - FillingContainer_addItem(filling_container, ironBoots_instance); + filling_container->addItem(ironBoots_instance); ItemInstance *flint2_instance = new ItemInstance; ALLOC_CHECK(flint2_instance); flint2_instance->count = 255; flint2_instance->auxiliary = 0; flint2_instance->id = 318; - FillingContainer_addItem(filling_container, flint2_instance); + filling_container->addItem(flint2_instance); ItemInstance *porkRaw_instance = new ItemInstance; ALLOC_CHECK(porkRaw_instance); porkRaw_instance->count = 255; porkRaw_instance->auxiliary = 0; porkRaw_instance->id = 319; - FillingContainer_addItem(filling_container, porkRaw_instance); + filling_container->addItem(porkRaw_instance); ItemInstance *leather_instance = new ItemInstance; ALLOC_CHECK(leather_instance); leather_instance->count = 255; leather_instance->auxiliary = 0; leather_instance->id = 334; - FillingContainer_addItem(filling_container, leather_instance); + filling_container->addItem(leather_instance); ItemInstance *clayBrick_instance = new ItemInstance; ALLOC_CHECK(clayBrick_instance); clayBrick_instance->count = 255; clayBrick_instance->auxiliary = 0; clayBrick_instance->id = 336; - FillingContainer_addItem(filling_container, clayBrick_instance); + filling_container->addItem(clayBrick_instance); ItemInstance *clay_instance = new ItemInstance; ALLOC_CHECK(clay_instance); clay_instance->count = 255; clay_instance->auxiliary = 0; clay_instance->id = 337; - FillingContainer_addItem(filling_container, clay_instance); + filling_container->addItem(clay_instance); ItemInstance *notepad_instance = new ItemInstance; ALLOC_CHECK(notepad_instance); notepad_instance->count = 255; notepad_instance->auxiliary = 0; notepad_instance->id = 339; - FillingContainer_addItem(filling_container, notepad_instance); + filling_container->addItem(notepad_instance); ItemInstance *book_instance = new ItemInstance; ALLOC_CHECK(book_instance); book_instance->count = 255; book_instance->auxiliary = 0; book_instance->id = 340; - FillingContainer_addItem(filling_container, book_instance); + filling_container->addItem(book_instance); ItemInstance *slimeball_instance = new ItemInstance; ALLOC_CHECK(slimeball_instance); slimeball_instance->count = 255; slimeball_instance->auxiliary = 0; slimeball_instance->id = 341; - FillingContainer_addItem(filling_container, slimeball_instance); + filling_container->addItem(slimeball_instance); ItemInstance *compass_instance = new ItemInstance; ALLOC_CHECK(compass_instance); compass_instance->count = 255; compass_instance->auxiliary = 0; compass_instance->id = 345; - FillingContainer_addItem(filling_container, compass_instance); + filling_container->addItem(compass_instance); ItemInstance *clock_instance = new ItemInstance; ALLOC_CHECK(clock_instance); clock_instance->count = 255; clock_instance->auxiliary = 0; clock_instance->id = 347; - FillingContainer_addItem(filling_container, clock_instance); + filling_container->addItem(clock_instance); ItemInstance *glowDust_instance = new ItemInstance; ALLOC_CHECK(glowDust_instance); glowDust_instance->count = 255; glowDust_instance->auxiliary = 0; glowDust_instance->id = 348; - FillingContainer_addItem(filling_container, glowDust_instance); + filling_container->addItem(glowDust_instance); ItemInstance *bone_instance = new ItemInstance; ALLOC_CHECK(bone_instance); bone_instance->count = 255; bone_instance->auxiliary = 0; bone_instance->id = 352; - FillingContainer_addItem(filling_container, bone_instance); + filling_container->addItem(bone_instance); ItemInstance *sugar_instance = new ItemInstance; ALLOC_CHECK(sugar_instance); sugar_instance->count = 255; sugar_instance->auxiliary = 0; sugar_instance->id = 353; - FillingContainer_addItem(filling_container, sugar_instance); + filling_container->addItem(sugar_instance); ItemInstance *melon_instance = new ItemInstance; ALLOC_CHECK(melon_instance); melon_instance->count = 255; melon_instance->auxiliary = 0; melon_instance->id = 360; - FillingContainer_addItem(filling_container, melon_instance); + filling_container->addItem(melon_instance); ItemInstance *beefRaw_instance = new ItemInstance; ALLOC_CHECK(beefRaw_instance); beefRaw_instance->count = 255; beefRaw_instance->auxiliary = 0; beefRaw_instance->id = 363; - FillingContainer_addItem(filling_container, beefRaw_instance); + filling_container->addItem(beefRaw_instance); ItemInstance *chickenRaw_instance = new ItemInstance; ALLOC_CHECK(chickenRaw_instance); chickenRaw_instance->count = 255; chickenRaw_instance->auxiliary = 0; chickenRaw_instance->id = 365; - FillingContainer_addItem(filling_container, chickenRaw_instance); + filling_container->addItem(chickenRaw_instance); } // Init diff --git a/example-mods/recipes/recipes.cpp b/example-mods/recipes/recipes.cpp index ae489565c4..a94428715a 100644 --- a/example-mods/recipes/recipes.cpp +++ b/example-mods/recipes/recipes.cpp @@ -32,7 +32,7 @@ static void Recipes_injection(Recipes *recipes) { .auxiliary = 0 }; std::vector types = {type1, type2}; - Recipes_addShapelessRecipe(recipes, &result, &types); + recipes->addShapelessRecipe(&result, &types); } // Custom Furnace Recipes @@ -43,7 +43,7 @@ static void FurnaceRecipes_injection(FurnaceRecipes *recipes) { .id = 246, .auxiliary = 0 }; - FurnaceRecipes_addFurnaceRecipe(recipes, 49, &result); + recipes->addFurnaceRecipe(49, &result); } // Init diff --git a/test b/test new file mode 100755 index 0000000000000000000000000000000000000000..2133302f68ad85a7bea9da56b5b2e2c5c459d3c6 GIT binary patch literal 18416 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