pieeebot/cafeberry
1
0
Fork 4
Code Issues Pull Requests 1 Actions Packages Projects Releases 2 Wiki Activity

fix: fixed Xbox 360 build issues

Browse Source
This commit is contained in:
qloak
2026-07-31 15:49:59 -07:00
parent db7d47b0ff
commit 036bdcff81
213 changed files with 193105 additions and 237759 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.World/Item.cpp
+97 -18
View File
@@ -473,27 +473,106 @@ void Item::staticCtor()
Item::potatoBaked = (new FoodItem(137, 6, FoodConstants::FOOD_SATURATION_NORMAL, false)) ->setIconName(L"potatoBaked")->setDescriptionId(IDS_ITEM_POTATO_BAKED)->setUseDescriptionId(IDS_DESC_POTATO_BAKED);
Item::potatoPoisonous = (new FoodItem(138, 2, FoodConstants::FOOD_SATURATION_LOW, false)) ->setEatEffect(MobEffect::poison->id, 5, 0, .6f)->setIconName(L"potatoPoisonous")->setDescriptionId(IDS_ITEM_POTATO_POISONOUS)->setUseDescriptionId(IDS_DESC_POTATO_POISONOUS);
Item::emptyMap = (EmptyMapItem *) (new EmptyMapItem(139))->setIconName(L"map_empty")->setBaseItemTypeAndMaterial(eBaseItemType_pockettool, eMaterial_map)->setDescriptionId(IDS_ITEM_MAP_EMPTY)->setUseDescriptionId(IDS_DESC_MAP_EMPTY);
Item::emptyMap = (EmptyMapItem *) (new EmptyMapItem(139));
Item::emptyMap->setIconName(L"map_empty");
Item::emptyMap->setBaseItemTypeAndMaterial(eBaseItemType_pockettool, eMaterial_map);
Item::emptyMap->setDescriptionId(IDS_ITEM_MAP_EMPTY);
Item::emptyMap->setUseDescriptionId(IDS_DESC_MAP_EMPTY);
Item::carrotGolden = (new FoodItem(140, 6, FoodConstants::FOOD_SATURATION_SUPERNATURAL, false)) ->setBaseItemTypeAndMaterial(eBaseItemType_giltFruit, eMaterial_carrot)->setIconName(L"carrotGolden")->setPotionBrewingFormula(PotionBrewing::MOD_GOLDENCARROT)->setDescriptionId(IDS_ITEM_CARROT_GOLDEN)->setUseDescriptionId(IDS_DESC_CARROT_GOLDEN);
Item::carrotGolden = (new FoodItem(140, 6, FoodConstants::FOOD_SATURATION_SUPERNATURAL, false));
Item::carrotGolden->setBaseItemTypeAndMaterial(eBaseItemType_giltFruit, eMaterial_carrot);
Item::carrotGolden->setIconName(L"carrotGolden");
Item::carrotGolden->setPotionBrewingFormula(PotionBrewing::MOD_GOLDENCARROT);
Item::carrotGolden->setDescriptionId(IDS_ITEM_CARROT_GOLDEN);
Item::carrotGolden->setUseDescriptionId(IDS_DESC_CARROT_GOLDEN);
Item::carrotOnAStick = (new CarrotOnAStickItem(142)) ->setBaseItemTypeAndMaterial(eBaseItemType_rod, eMaterial_carrot)->setIconName(L"carrotOnAStick")->setDescriptionId(IDS_ITEM_CARROT_ON_A_STICK)->setUseDescriptionId(IDS_DESC_CARROT_ON_A_STICK);
Item::netherStar = (new SimpleFoiledItem(143)) ->setIconName(L"nether_star")->setDescriptionId(IDS_NETHER_STAR)->setUseDescriptionId(IDS_DESC_NETHER_STAR);
Item::pumpkinPie = (new FoodItem(144, 8, FoodConstants::FOOD_SATURATION_LOW, false)) ->setIconName(L"pumpkinPie")->setDescriptionId(IDS_ITEM_PUMPKIN_PIE)->setUseDescriptionId(IDS_DESC_PUMPKIN_PIE);
Item::fireworks = (new FireworksItem(145)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_fireworks, Item::eMaterial_undefined)->setIconName(L"fireworks")->setDescriptionId(IDS_FIREWORKS)->setUseDescriptionId(IDS_DESC_FIREWORKS);
Item::fireworksCharge = (new FireworksChargeItem(146)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_fireworks, Item::eMaterial_undefined)->setIconName(L"fireworks_charge")->setDescriptionId(IDS_FIREWORKS_CHARGE)->setUseDescriptionId(IDS_DESC_FIREWORKS_CHARGE);
EnchantedBookItem::enchantedBook = (EnchantedBookItem *)(new EnchantedBookItem(147)) ->setMaxStackSize(1)->setIconName(L"enchantedBook")->setDescriptionId(IDS_ITEM_ENCHANTED_BOOK)->setUseDescriptionId(IDS_DESC_ENCHANTED_BOOK);
Item::comparator = (new TilePlanterItem(148, Tile::comparator_off)) ->setIconName(L"comparator")->setDescriptionId(IDS_ITEM_COMPARATOR)->setUseDescriptionId(IDS_DESC_COMPARATOR);
Item::netherbrick = (new Item(149)) ->setIconName(L"netherbrick")->setDescriptionId(IDS_ITEM_NETHERBRICK)->setUseDescriptionId(IDS_DESC_ITEM_NETHERBRICK);
Item::netherQuartz = (new Item(150)) ->setIconName(L"netherquartz")->setDescriptionId(IDS_ITEM_NETHER_QUARTZ)->setUseDescriptionId(IDS_DESC_NETHER_QUARTZ);
Item::minecart_tnt = (new MinecartItem(151, Minecart::TYPE_TNT)) ->setIconName(L"minecart_tnt")->setDescriptionId(IDS_ITEM_MINECART_TNT)->setUseDescriptionId(IDS_DESC_MINECART_TNT);
Item::minecart_hopper = (new MinecartItem(152, Minecart::TYPE_HOPPER)) ->setIconName(L"minecart_hopper")->setDescriptionId(IDS_ITEM_MINECART_HOPPER)->setUseDescriptionId(IDS_DESC_MINECART_HOPPER);
Item::carrotOnAStick = (new CarrotOnAStickItem(142));
Item::carrotOnAStick->setBaseItemTypeAndMaterial(eBaseItemType_rod, eMaterial_carrot);
Item::carrotOnAStick->setIconName(L"carrotOnAStick");
Item::carrotOnAStick->setDescriptionId(IDS_ITEM_CARROT_ON_A_STICK);
Item::carrotOnAStick->setUseDescriptionId(IDS_DESC_CARROT_ON_A_STICK);
Item::horseArmorMetal = (new Item(161)) ->setIconName(L"iron_horse_armor")->setMaxStackSize(1)->setDescriptionId(IDS_ITEM_IRON_HORSE_ARMOR)->setUseDescriptionId(IDS_DESC_IRON_HORSE_ARMOR);
Item::horseArmorGold = (new Item(162)) ->setIconName(L"gold_horse_armor")->setMaxStackSize(1)->setDescriptionId(IDS_ITEM_GOLD_HORSE_ARMOR)->setUseDescriptionId(IDS_DESC_GOLD_HORSE_ARMOR);
Item::horseArmorDiamond = (new Item(163)) ->setIconName(L"diamond_horse_armor")->setMaxStackSize(1)->setDescriptionId(IDS_ITEM_DIAMOND_HORSE_ARMOR)->setUseDescriptionId(IDS_DESC_DIAMOND_HORSE_ARMOR);
Item::lead = (new LeashItem(164)) ->setBaseItemTypeAndMaterial(eBaseItemType_pockettool, eMaterial_undefined)->setIconName(L"lead")->setDescriptionId(IDS_ITEM_LEAD)->setUseDescriptionId(IDS_DESC_LEAD);
Item::nameTag = (new NameTagItem(165)) ->setIconName(L"name_tag")->setDescriptionId(IDS_ITEM_NAME_TAG)->setUseDescriptionId(IDS_DESC_NAME_TAG);}
Item::netherStar = (new SimpleFoiledItem(143));
Item::netherStar->setIconName(L"nether_star");
Item::netherStar->setDescriptionId(IDS_NETHER_STAR);
Item::netherStar->setUseDescriptionId(IDS_DESC_NETHER_STAR);
Item::pumpkinPie = (new FoodItem(144, 8, FoodConstants::FOOD_SATURATION_LOW, false));
Item::pumpkinPie->setIconName(L"pumpkinPie");
Item::pumpkinPie->setDescriptionId(IDS_ITEM_PUMPKIN_PIE);
Item::pumpkinPie->setUseDescriptionId(IDS_DESC_PUMPKIN_PIE);
Item::fireworks = (new FireworksItem(145));
Item::fireworks->setBaseItemTypeAndMaterial(Item::eBaseItemType_fireworks, Item::eMaterial_undefined);
Item::fireworks->setIconName(L"fireworks");
Item::fireworks->setDescriptionId(IDS_FIREWORKS);
Item::fireworks->setUseDescriptionId(IDS_DESC_FIREWORKS);
Item::fireworksCharge = (new FireworksChargeItem(146));
Item::fireworksCharge->setBaseItemTypeAndMaterial(Item::eBaseItemType_fireworks, Item::eMaterial_undefined);
Item::fireworksCharge->setIconName(L"fireworks_charge");
Item::fireworksCharge->setDescriptionId(IDS_FIREWORKS_CHARGE);
Item::fireworksCharge->setUseDescriptionId(IDS_DESC_FIREWORKS_CHARGE);
EnchantedBookItem::enchantedBook = (EnchantedBookItem *)(new EnchantedBookItem(147));
EnchantedBookItem::enchantedBook->setMaxStackSize(1);
EnchantedBookItem::enchantedBook->setIconName(L"enchantedBook");
EnchantedBookItem::enchantedBook->setDescriptionId(IDS_ITEM_ENCHANTED_BOOK);
EnchantedBookItem::enchantedBook->setUseDescriptionId(IDS_DESC_ENCHANTED_BOOK);
Item::comparator = (new TilePlanterItem(148, Tile::comparator_off));
Item::comparator->setIconName(L"comparator");
Item::comparator->setDescriptionId(IDS_ITEM_COMPARATOR);
Item::comparator->setUseDescriptionId(IDS_DESC_COMPARATOR);
Item::netherbrick = (new Item(149));
Item::netherbrick->setIconName(L"netherbrick");
Item::netherbrick->setDescriptionId(IDS_ITEM_NETHERBRICK);
Item::netherbrick->setUseDescriptionId(IDS_DESC_ITEM_NETHERBRICK);
Item::netherQuartz = (new Item(150));
Item::netherQuartz->setIconName(L"netherquartz");
Item::netherQuartz->setDescriptionId(IDS_ITEM_NETHER_QUARTZ);
Item::netherQuartz->setUseDescriptionId(IDS_DESC_NETHER_QUARTZ);
Item::minecart_tnt = (new MinecartItem(151, Minecart::TYPE_TNT));
Item::minecart_tnt->setIconName(L"minecart_tnt");
Item::minecart_tnt->setDescriptionId(IDS_ITEM_MINECART_TNT);
Item::minecart_tnt->setUseDescriptionId(IDS_DESC_MINECART_TNT);
Item::minecart_hopper = (new MinecartItem(152, Minecart::TYPE_HOPPER));
Item::minecart_hopper->setIconName(L"minecart_hopper");
Item::minecart_hopper->setDescriptionId(IDS_ITEM_MINECART_HOPPER);
Item::minecart_hopper->setUseDescriptionId(IDS_DESC_MINECART_HOPPER);
Item::horseArmorMetal = (new Item(161));
Item::horseArmorMetal->setIconName(L"iron_horse_armor");
Item::horseArmorMetal->setMaxStackSize(1);
Item::horseArmorMetal->setDescriptionId(IDS_ITEM_IRON_HORSE_ARMOR);
Item::horseArmorMetal->setUseDescriptionId(IDS_DESC_IRON_HORSE_ARMOR);
Item::horseArmorGold = (new Item(162));
Item::horseArmorGold->setIconName(L"gold_horse_armor");
Item::horseArmorGold->setMaxStackSize(1);
Item::horseArmorGold->setDescriptionId(IDS_ITEM_GOLD_HORSE_ARMOR);
Item::horseArmorGold->setUseDescriptionId(IDS_DESC_GOLD_HORSE_ARMOR);
Item::horseArmorDiamond = (new Item(163));
Item::horseArmorDiamond->setIconName(L"diamond_horse_armor");
Item::horseArmorDiamond->setMaxStackSize(1);
Item::horseArmorDiamond->setDescriptionId(IDS_ITEM_DIAMOND_HORSE_ARMOR);
Item::horseArmorDiamond->setUseDescriptionId(IDS_DESC_DIAMOND_HORSE_ARMOR);
Item::lead = (new LeashItem(164));
Item::lead->setBaseItemTypeAndMaterial(eBaseItemType_pockettool, eMaterial_undefined);
Item::lead->setIconName(L"lead");
Item::lead->setDescriptionId(IDS_ITEM_LEAD);
Item::lead->setUseDescriptionId(IDS_DESC_LEAD);
Item::nameTag = (new NameTagItem(165));
Item::nameTag->setIconName(L"name_tag");
Item::nameTag->setDescriptionId(IDS_ITEM_NAME_TAG);
Item::nameTag->setUseDescriptionId(IDS_DESC_NAME_TAG);}
// 4J Stu - We need to do this after the staticCtor AND after staticCtors for other class