LegacyConsole/GabsPuNs-Project_Zenith_Main
4
0
Fork 0
mirror of https://github.com/GabsPuNs/Project-Zenith-Main.git synced 2026-06-11 04:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

TU24

Browse Source
This commit is contained in:
GabsPuNs
2026-05-14 21:52:21 -04:00
parent 1b2f5c6fe8
commit f8a2d644f5
291 changed files with 7363 additions and 18368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
Minecraft.Client/Minecraft.cpp
View File

@@ -1514,7 +1514,7 @@ void Minecraft::run_middle()
if(g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_CRAFTING) || g_KBMInput.IsKeyPressed(KeyboardMouseInput::KEY_CRAFTING_ALT))
{
if((ui.IsSceneInStack(i, eUIScene_Crafting2x2Menu) || ui.IsSceneInStack(i, eUIScene_Crafting3x3Menu) || ui.IsSceneInStack(i, eUIScene_CreativeMenu) || ui.IsSceneInStack(i, eUIScene_ClassicCraftingMenu) || isClosableByEitherKey) && !isEditing)
if((ui.IsSceneInStack(i, eUIScene_Crafting2x2Menu) || ui.IsSceneInStack(i, eUIScene_Crafting3x3Menu) || ui.IsSceneInStack(i, eUIScene_CreativeMenu) || isClosableByEitherKey) && !isEditing)
ui.CloseUIScenes(i);
else
localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_CRAFTING;
@@ -2542,35 +2542,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
switch (itemInstance->getItem()->id)
{
// Equip
case Item::helmet_leather_Id:
case Item::chestplate_leather_Id:
case Item::leggings_leather_Id:
case Item::boots_leather_Id:
case Item::helmet_chain_Id:
case Item::chestplate_chain_Id:
case Item::leggings_chain_Id:
case Item::boots_chain_Id:
case Item::helmet_iron_Id:
case Item::chestplate_iron_Id:
case Item::leggings_iron_Id:
case Item::boots_iron_Id:
case Item::helmet_gold_Id:
case Item::chestplate_gold_Id:
case Item::leggings_gold_Id:
case Item::boots_gold_Id:
case Item::helmet_diamond_Id:
case Item::chestplate_diamond_Id:
case Item::leggings_diamond_Id:
case Item::boots_diamond_Id:
{
if ((player->getArmor(Mob::getEquipmentSlotForItem(itemInstance) - 1)) == nullptr)
{
*piUse=IDS_TOOLTIPS_EQUIP;
}
}
break;
// food
case Item::potatoBaked_Id:
case Item::potato_Id:
@@ -2786,22 +2757,12 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
case Tile::furnace_Id:
case Tile::furnace_lit_Id:
case Tile::door_wood_Id:
case Tile::door_spruce_Id:
case Tile::door_birch_Id:
case Tile::door_jungle_Id:
case Tile::door_acacia_Id:
case Tile::door_dark_oak_Id:
case Tile::dispenser_Id:
case Tile::lever_Id:
case Tile::button_stone_Id:
case Tile::button_wood_Id:
case Tile::trapdoor_Id:
case Tile::fenceGate_Id:
case Tile::spruceFenceGate_Id:
case Tile::birchFenceGate_Id:
case Tile::jungleFenceGate_Id:
case Tile::acaciaFenceGate_Id:
case Tile::darkOakFenceGate_Id:
case Tile::beacon_Id:
*piAction=IDS_TOOLTIPS_MINE;
*piUse=IDS_TOOLTIPS_USE;
@@ -3847,11 +3808,7 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
else
{
ui.PlayUISFX(eSFX_Press);
if(app.GetGameSettings(iPad,eGameSetting_ClassicCrafting))
app.LoadInventoryMenu(iPad,player);
else
app.LoadCrafting2x2Menu(iPad,player);
app.LoadCrafting2x2Menu(iPad,player);
}
}
@@ -4746,7 +4703,7 @@ void Minecraft::startAndConnectTo(const wstring& name, const wstring& sid, const
*/
Minecraft *minecraft;
// 4J - was new Minecraft(frame, canvas, nullptr, 854, 480, fullScreen);
// 4J - was new Minecraft(frame, canvas, NULL, 854, 480, fullScreen);
// Logical width is proportional to the real screen aspect ratio so that
// the ortho projection and HUD layout match the viewport without stretching.
extern int g_iScreenWidth;
@@ -4844,7 +4801,6 @@ void Minecraft::main()
User::staticCtor();
Tutorial::staticCtor();
ColourTable::staticCtor();
StructureTable::staticCtor();
app.loadDefaultGameRules();
#ifdef _LARGE_WORLDS
@@ -5314,20 +5270,6 @@ ColourTable *Minecraft::getColourTable()
return colours;
}
StructureTable *Minecraft::getStructureTable()
{
TexturePack *selected = skins->getSelected();
StructureTable *structures = selected->getStructureTable();
if (structures == nullptr)
{
structures = skins->getDefault()->getStructureTable();
}
return structures;
}
#if defined __ORBIS__
int Minecraft::MustSignInReturnedPSN(void *pParam, int iPad, C4JStorage::EMessageResult result)
{